Frida-project#

This page was last edited on: 05 January 2023 · user variables

public static final int VAR_IMPATIENCE
# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo

+    
# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo

 # Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.

 # This program and the accompanying materials are made available under the

 # terms of the Eclipse Public License 2.0 which is available at

diff -Nru sumo-1.17.0/docs/pydoc/sumolib.files.additional.html sumo-1.18.0/docs/pydoc/sumolib.files.additional.html

--- sumo-1.17.0/docs/pydoc/sumolib.files.additional.html	2023-04-24 22:07:49.000000000 +0000
+++ sumo-1.18.0/docs/pydoc/sumolib.files.additional.html	2023-06-28 22:08:06.000000000 +0000
@@ -9,7 +9,7 @@
  
sumolib.files.additionalindex
/home/delphi/gcc/sumo/tools/sumolib/files/additional.py
-    
# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo

+    
# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo

 # Copyright (C) 2008-2023 German Aerospace Center (DLR) and others.

 # This program and the accompanying materials are made available under the

 # terms of the Eclipse Public License 2.0 which is available at

diff -Nru sumo-1.17.0/docs/pydoc/sumolib.files.html sumo-1.18.0/docs/pydoc/sumolib.files.html
--- sumo-1.17.0/docs/pydoc/sumolib.files.html	2023-04-24 22:07:49.000000000 +0000
+++ sumo-1.18.0/docs/pydoc/sumolib.files.html	2023-06-28 22:08:06.000000000 +0000
@@ -9,7 +9,7 @@
  
sumolib.filesindex
/home/delphi/gcc/sumo/tools/sumolib/files/__init__.py
-    
# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo

+    
# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo

 # Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.

 # This program and the accompanying materials are made available under the

 # terms of the Eclipse Public License 2.0 which is available at

diff -Nru sumo-1.17.0/docs/pydoc/sumolib.files.selection.html sumo-1.18.0/docs/pydoc/sumolib.files.selection.html
--- sumo-1.17.0/docs/pydoc/sumolib.files.selection.html	2023-04-24 22:07:49.000000000 +0000
+++ sumo-1.18.0/docs/pydoc/sumolib.files.selection.html	2023-06-28 22:08:06.000000000 +0000
@@ -9,7 +9,7 @@
  
sumolib.files.selectionindex
/home/delphi/gcc/sumo/tools/sumolib/files/selection.py
-    
# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo

+    
# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo

 # Copyright (C) 2008-2023 German Aerospace Center (DLR) and others.

 # This program and the accompanying materials are made available under the

 # terms of the Eclipse Public License 2.0 which is available at

diff -Nru sumo-1.17.0/docs/pydoc/sumolib.fpdiff.html sumo-1.18.0/docs/pydoc/sumolib.fpdiff.html
--- sumo-1.17.0/docs/pydoc/sumolib.fpdiff.html	2023-04-24 22:07:49.000000000 +0000
+++ sumo-1.18.0/docs/pydoc/sumolib.fpdiff.html	2023-06-28 22:08:06.000000000 +0000
@@ -10,7 +10,7 @@
 >index
/home/delphi/gcc/sumo/tools/sumolib/fpdiff.py
     
# -*- coding: utf-8 -*-

-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo

+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo

 # Copyright (C) 2011-2023 German Aerospace Center (DLR) and others.

 # This program and the accompanying materials are made available under the

 # terms of the Eclipse Public License 2.0 which is available at

diff -Nru sumo-1.17.0/docs/pydoc/sumolib.geomhelper.html sumo-1.18.0/docs/pydoc/sumolib.geomhelper.html
--- sumo-1.17.0/docs/pydoc/sumolib.geomhelper.html	2023-04-24 22:07:49.000000000 +0000
+++ sumo-1.18.0/docs/pydoc/sumolib.geomhelper.html	2023-06-28 22:08:06.000000000 +0000
@@ -9,7 +9,7 @@
  
sumolib.geomhelperindex
/home/delphi/gcc/sumo/tools/sumolib/geomhelper.py
-    
# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo

+    
# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo

 # Copyright (C) 2013-2023 German Aerospace Center (DLR) and others.

 # This program and the accompanying materials are made available under the

 # terms of the Eclipse Public License 2.0 which is available at

diff -Nru sumo-1.17.0/docs/pydoc/sumolib.html sumo-1.18.0/docs/pydoc/sumolib.html
--- sumo-1.17.0/docs/pydoc/sumolib.html	2023-04-24 22:07:49.000000000 +0000
+++ sumo-1.18.0/docs/pydoc/sumolib.html	2023-06-28 22:08:06.000000000 +0000
@@ -10,7 +10,7 @@
 >index
/home/delphi/gcc/sumo/tools/sumolib/__init__.py
     
# -*- coding: utf-8 -*-

-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo

+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo

 # Copyright (C) 2011-2023 German Aerospace Center (DLR) and others.

 # This program and the accompanying materials are made available under the

 # terms of the Eclipse Public License 2.0 which is available at

@@ -42,8 +42,9 @@
 sensors (package)

 shapes (package)

 statistics

-vehicletype

-version

+translation

+vehicletype

+version

 visualization (package)

 xml

 

diff -Nru sumo-1.17.0/docs/pydoc/sumolib.miscutils.html sumo-1.18.0/docs/pydoc/sumolib.miscutils.html
--- sumo-1.17.0/docs/pydoc/sumolib.miscutils.html	2023-04-24 22:07:49.000000000 +0000
+++ sumo-1.18.0/docs/pydoc/sumolib.miscutils.html	2023-06-28 22:08:06.000000000 +0000
@@ -9,7 +9,7 @@
  
sumolib.miscutilsindex
/home/delphi/gcc/sumo/tools/sumolib/miscutils.py
-    
# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo

+    
# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo

 # Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.

 # This program and the accompanying materials are made available under the

 # terms of the Eclipse Public License 2.0 which is available at

@@ -260,7 +260,8 @@
 Data
     
        
-absolute_import = _Feature((2, 5, 0, 'alpha', 1), (3, 0, 0, 'alpha', 0), 262144)

+SPECIAL_TIME_STRINGS = ['triggered', 'containerTriggered', 'split', 'begin']

+absolute_import = _Feature((2, 5, 0, 'alpha', 1), (3, 0, 0, 'alpha', 0), 262144)

 division = _Feature((2, 2, 0, 'alpha', 2), (3, 0, 0, 'alpha', 0), 131072)

 print_function = _Feature((2, 6, 0, 'alpha', 2), (3, 0, 0, 'alpha', 0), 1048576)

 uMax = uMax

diff -Nru sumo-1.17.0/docs/pydoc/sumolib.net.connection.html sumo-1.18.0/docs/pydoc/sumolib.net.connection.html
--- sumo-1.17.0/docs/pydoc/sumolib.net.connection.html	2023-04-24 22:07:49.000000000 +0000
+++ sumo-1.18.0/docs/pydoc/sumolib.net.connection.html	2023-06-28 22:08:06.000000000 +0000
@@ -9,7 +9,7 @@
  
sumolib.net.connectionindex
/home/delphi/gcc/sumo/tools/sumolib/net/connection.py
-    
# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo

+    
# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo

 # Copyright (C) 2011-2023 German Aerospace Center (DLR) and others.

 # This program and the accompanying materials are made available under the

 # terms of the Eclipse Public License 2.0 which is available at

diff -Nru sumo-1.17.0/docs/pydoc/sumolib.net.edge.html sumo-1.18.0/docs/pydoc/sumolib.net.edge.html
--- sumo-1.17.0/docs/pydoc/sumolib.net.edge.html	2023-04-24 22:07:49.000000000 +0000
+++ sumo-1.18.0/docs/pydoc/sumolib.net.edge.html	2023-06-28 22:08:06.000000000 +0000
@@ -9,7 +9,7 @@
  
sumolib.net.edgeindex
/home/delphi/gcc/sumo/tools/sumolib/net/edge.py
-    
# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo

+    
# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo

 # Copyright (C) 2011-2023 German Aerospace Center (DLR) and others.

 # This program and the accompanying materials are made available under the

 # terms of the Eclipse Public License 2.0 which is available at

diff -Nru sumo-1.17.0/docs/pydoc/sumolib.net.lane.html sumo-1.18.0/docs/pydoc/sumolib.net.lane.html
--- sumo-1.17.0/docs/pydoc/sumolib.net.lane.html	2023-04-24 22:07:49.000000000 +0000
+++ sumo-1.18.0/docs/pydoc/sumolib.net.lane.html	2023-06-28 22:08:06.000000000 +0000
@@ -9,7 +9,7 @@
  
sumolib.net.laneindex
/home/delphi/gcc/sumo/tools/sumolib/net/lane.py
-    
# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo

+    
# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo

 # Copyright (C) 2011-2023 German Aerospace Center (DLR) and others.

 # This program and the accompanying materials are made available under the

 # terms of the Eclipse Public License 2.0 which is available at

diff -Nru sumo-1.17.0/docs/pydoc/sumolib.net.node.html sumo-1.18.0/docs/pydoc/sumolib.net.node.html
--- sumo-1.17.0/docs/pydoc/sumolib.net.node.html	2023-04-24 22:07:49.000000000 +0000
+++ sumo-1.18.0/docs/pydoc/sumolib.net.node.html	2023-06-28 22:08:06.000000000 +0000
@@ -9,7 +9,7 @@
  
sumolib.net.nodeindex
/home/delphi/gcc/sumo/tools/sumolib/net/node.py
-    
# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo

+    
# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo

 # Copyright (C) 2011-2023 German Aerospace Center (DLR) and others.

 # This program and the accompanying materials are made available under the

 # terms of the Eclipse Public License 2.0 which is available at

diff -Nru sumo-1.17.0/docs/pydoc/sumolib.net.roundabout.html sumo-1.18.0/docs/pydoc/sumolib.net.roundabout.html
--- sumo-1.17.0/docs/pydoc/sumolib.net.roundabout.html	2023-04-24 22:07:49.000000000 +0000
+++ sumo-1.18.0/docs/pydoc/sumolib.net.roundabout.html	2023-06-28 22:08:06.000000000 +0000
@@ -9,7 +9,7 @@
  
sumolib.net.roundaboutindex
/home/delphi/gcc/sumo/tools/sumolib/net/roundabout.py
-    
# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo

+    
# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo

 # Copyright (C) 2008-2023 German Aerospace Center (DLR) and others.

 # This program and the accompanying materials are made available under the

 # terms of the Eclipse Public License 2.0 which is available at

diff -Nru sumo-1.17.0/docs/pydoc/sumolib.options.html sumo-1.18.0/docs/pydoc/sumolib.options.html
--- sumo-1.17.0/docs/pydoc/sumolib.options.html	2023-04-24 22:07:49.000000000 +0000
+++ sumo-1.18.0/docs/pydoc/sumolib.options.html	2023-06-28 22:08:06.000000000 +0000
@@ -9,7 +9,7 @@
  
sumolib.optionsindex
/home/delphi/gcc/sumo/tools/sumolib/options.py
-    
# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo

+    
# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo

 # Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.

 # This program and the accompanying materials are made available under the

 # terms of the Eclipse Public License 2.0 which is available at

@@ -105,9 +105,7 @@
 
 
parse_args(self, args=None, namespace=None)

 
-parse_known_args(self, args=None, namespace=None)
-
-write_config_file(self, namespace, exit=True, toString=False)
+parse_known_args(self, args=None, namespace=None, check_unknown=False)
 
 write_config_to_file(self, out, namespace, print_template)
 
@@ -117,6 +115,10 @@
 
 data_file(s)
 
+edge(s)
+
+edge_list(s)
+
 edgedata_file(s)
 
 file(s)
@@ -129,6 +131,10 @@
 
 route_file_list(s)
 
+sumoconfig_file(s)
+
+sumoconfig_file_list(s)
+
 time(s)
 
 
diff -Nru sumo-1.17.0/docs/pydoc/sumolib.output.convert.fcdfilter.html sumo-1.18.0/docs/pydoc/sumolib.output.convert.fcdfilter.html
--- sumo-1.17.0/docs/pydoc/sumolib.output.convert.fcdfilter.html	2023-04-24 22:07:49.000000000 +0000
+++ sumo-1.18.0/docs/pydoc/sumolib.output.convert.fcdfilter.html	2023-06-28 22:08:06.000000000 +0000
@@ -9,7 +9,7 @@
  
sumolib.output.convert.fcdfilterindex
/home/delphi/gcc/sumo/tools/sumolib/output/convert/fcdfilter.py
-    # Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo

+    
# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo

 # Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.

 # This program and the accompanying materials are made available under the

 # terms of the Eclipse Public License 2.0 which is available at

diff -Nru sumo-1.17.0/docs/pydoc/sumolib.output.convert.html sumo-1.18.0/docs/pydoc/sumolib.output.convert.html
--- sumo-1.17.0/docs/pydoc/sumolib.output.convert.html	2023-04-24 22:07:49.000000000 +0000
+++ sumo-1.18.0/docs/pydoc/sumolib.output.convert.html	2023-06-28 22:08:06.000000000 +0000
@@ -9,7 +9,7 @@
  
sumolib.output.convertindex
/home/delphi/gcc/sumo/tools/sumolib/output/convert/__init__.py
-    
# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo

+    
# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo

 # Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.

 # This program and the accompanying materials are made available under the

 # terms of the Eclipse Public License 2.0 which is available at

diff -Nru sumo-1.17.0/docs/pydoc/sumolib.output.dump.html sumo-1.18.0/docs/pydoc/sumolib.output.dump.html
--- sumo-1.17.0/docs/pydoc/sumolib.output.dump.html	2023-04-24 22:07:49.000000000 +0000
+++ sumo-1.18.0/docs/pydoc/sumolib.output.dump.html	2023-06-28 22:08:06.000000000 +0000
@@ -9,7 +9,7 @@
  
sumolib.output.dumpindex
/home/delphi/gcc/sumo/tools/sumolib/output/dump.py
-    
# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo

+    
# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo

 # Copyright (C) 2008-2023 German Aerospace Center (DLR) and others.

 # This program and the accompanying materials are made available under the

 # terms of the Eclipse Public License 2.0 which is available at

diff -Nru sumo-1.17.0/docs/pydoc/sumolib.output.html sumo-1.18.0/docs/pydoc/sumolib.output.html
--- sumo-1.17.0/docs/pydoc/sumolib.output.html	2023-04-24 22:07:49.000000000 +0000
+++ sumo-1.18.0/docs/pydoc/sumolib.output.html	2023-06-28 22:08:06.000000000 +0000
@@ -10,7 +10,7 @@
 >index
/home/delphi/gcc/sumo/tools/sumolib/output/__init__.py
     
# -*- coding: utf-8 -*-

-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo

+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo

 # Copyright (C) 2011-2023 German Aerospace Center (DLR) and others.

 # This program and the accompanying materials are made available under the

 # terms of the Eclipse Public License 2.0 which is available at

diff -Nru sumo-1.17.0/docs/pydoc/sumolib.output.inductionloop.html sumo-1.18.0/docs/pydoc/sumolib.output.inductionloop.html
--- sumo-1.17.0/docs/pydoc/sumolib.output.inductionloop.html	2023-04-24 22:07:49.000000000 +0000
+++ sumo-1.18.0/docs/pydoc/sumolib.output.inductionloop.html	2023-06-28 22:08:06.000000000 +0000
@@ -9,7 +9,7 @@
  
sumolib.output.inductionloopindex
/home/delphi/gcc/sumo/tools/sumolib/output/inductionloop.py
-    
# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo

+    
# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo

 # Copyright (C) 2008-2023 German Aerospace Center (DLR) and others.

 # This program and the accompanying materials are made available under the

 # terms of the Eclipse Public License 2.0 which is available at

diff -Nru sumo-1.17.0/docs/pydoc/sumolib.route.html sumo-1.18.0/docs/pydoc/sumolib.route.html
--- sumo-1.17.0/docs/pydoc/sumolib.route.html	2023-04-24 22:07:49.000000000 +0000
+++ sumo-1.18.0/docs/pydoc/sumolib.route.html	2023-06-28 22:08:06.000000000 +0000
@@ -9,7 +9,7 @@
  
sumolib.routeindex
/home/delphi/gcc/sumo/tools/sumolib/route.py
-    
# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo

+    
# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo

 # Copyright (C) 2009-2023 German Aerospace Center (DLR) and others.

 # This program and the accompanying materials are made available under the

 # terms of the Eclipse Public License 2.0 which is available at

@@ -38,7 +38,7 @@
 The list of edges can either contain edge objects or edge ids as strings.

 If there is no connection between two consecutive edges, length 0 is assumed (no error is thrown).

 If there are multiple connections of different length, the shortest is used.
- 
mapTrace(trace, net, delta, verbose=False, airDistFactor=2, fillGaps=0, gapPenalty=-1, debug=False, direction=False, vClass=None)
matching a list of 2D positions to consecutive edges in a network.

+ mapTrace(trace, net, delta, verbose=False, airDistFactor=2, fillGaps=0, gapPenalty=-1, debug=False, direction=False, vClass=None, vias=None)
matching a list of 2D positions to consecutive edges in a network.

 The positions are assumed to be dense (i.e. covering each edge of the route) and in the correct order.
 
 
diff -Nru sumo-1.17.0/docs/pydoc/sumolib.sensors.html sumo-1.18.0/docs/pydoc/sumolib.sensors.html
--- sumo-1.17.0/docs/pydoc/sumolib.sensors.html	2023-04-24 22:07:49.000000000 +0000
+++ sumo-1.18.0/docs/pydoc/sumolib.sensors.html	2023-06-28 22:08:06.000000000 +0000
@@ -9,7 +9,7 @@
  
sumolib.sensorsindex
/home/delphi/gcc/sumo/tools/sumolib/sensors/__init__.py
-    
# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo

+    
# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo

 # Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.

 # This program and the accompanying materials are made available under the

 # terms of the Eclipse Public License 2.0 which is available at

diff -Nru sumo-1.17.0/docs/pydoc/sumolib.shapes.html sumo-1.18.0/docs/pydoc/sumolib.shapes.html
--- sumo-1.17.0/docs/pydoc/sumolib.shapes.html	2023-04-24 22:07:49.000000000 +0000
+++ sumo-1.18.0/docs/pydoc/sumolib.shapes.html	2023-06-28 22:08:06.000000000 +0000
@@ -9,7 +9,7 @@
  
sumolib.shapesindex
/home/delphi/gcc/sumo/tools/sumolib/shapes/__init__.py
-    
# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo

+    
# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo

 # Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.

 # This program and the accompanying materials are made available under the

 # terms of the Eclipse Public License 2.0 which is available at

diff -Nru sumo-1.17.0/docs/pydoc/sumolib.shapes.poi.html sumo-1.18.0/docs/pydoc/sumolib.shapes.poi.html
--- sumo-1.17.0/docs/pydoc/sumolib.shapes.poi.html	2023-04-24 22:07:49.000000000 +0000
+++ sumo-1.18.0/docs/pydoc/sumolib.shapes.poi.html	2023-06-28 22:08:06.000000000 +0000
@@ -9,7 +9,7 @@
  
sumolib.shapes.poiindex
/home/delphi/gcc/sumo/tools/sumolib/shapes/poi.py
-    
# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo

+    
# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo

 # Copyright (C) 2010-2023 German Aerospace Center (DLR) and others.

 # This program and the accompanying materials are made available under the

 # terms of the Eclipse Public License 2.0 which is available at

diff -Nru sumo-1.17.0/docs/pydoc/sumolib.shapes.polygon.html sumo-1.18.0/docs/pydoc/sumolib.shapes.polygon.html
--- sumo-1.17.0/docs/pydoc/sumolib.shapes.polygon.html	2023-04-24 22:07:49.000000000 +0000
+++ sumo-1.18.0/docs/pydoc/sumolib.shapes.polygon.html	2023-06-28 22:08:06.000000000 +0000
@@ -9,7 +9,7 @@
  
sumolib.shapes.polygonindex
/home/delphi/gcc/sumo/tools/sumolib/shapes/polygon.py
-    
# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo

+    
# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo

 # Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.

 # This program and the accompanying materials are made available under the

 # terms of the Eclipse Public License 2.0 which is available at

diff -Nru sumo-1.17.0/docs/pydoc/sumolib.statistics.html sumo-1.18.0/docs/pydoc/sumolib.statistics.html
--- sumo-1.17.0/docs/pydoc/sumolib.statistics.html	2023-04-24 22:07:49.000000000 +0000
+++ sumo-1.18.0/docs/pydoc/sumolib.statistics.html	2023-06-28 22:08:06.000000000 +0000
@@ -9,7 +9,7 @@
  
sumolib.statisticsindex
/home/delphi/gcc/sumo/tools/sumolib/statistics.py
-    
# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo

+    
# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo

 # Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.

 # This program and the accompanying materials are made available under the

 # terms of the Eclipse Public License 2.0 which is available at

@@ -92,12 +92,12 @@
 
 
relStdDev(self, limit=None)
return the relative standard deviation optionally limited to the last limit values

 
-toString(self, precision=2, histStyle=1, fmt=<function identity at 0x7f36da679d80>)
histStyle

+toString(self, precision=2, histStyle=1, fmt=<function identity at 0x7fb85bb09d80>)
histStyle

 0 : not shown

 1 : one line

 2 : fancy
 
-toXML(self, precision=2, tag='statistic', indent=4, label=None, fmt=<function identity at 0x7f36da679d80>)
+toXML(self, precision=2, tag='statistic', indent=4, label=None, fmt=<function identity at 0x7fb85bb09d80>)
 
 update(self, other)
 
diff -Nru sumo-1.17.0/docs/pydoc/sumolib.vehicletype.html sumo-1.18.0/docs/pydoc/sumolib.vehicletype.html
--- sumo-1.17.0/docs/pydoc/sumolib.vehicletype.html	2023-04-24 22:07:49.000000000 +0000
+++ sumo-1.18.0/docs/pydoc/sumolib.vehicletype.html	2023-06-28 22:08:06.000000000 +0000
@@ -9,7 +9,7 @@
  
sumolib.vehicletypeindex
/home/delphi/gcc/sumo/tools/sumolib/vehicletype.py
-    # Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo

+    
# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo

 # Copyright (C) 2008-2023 German Aerospace Center (DLR) and others.

 # This program and the accompanying materials are made available under the

 # terms of the Eclipse Public License 2.0 which is available at

diff -Nru sumo-1.17.0/docs/pydoc/sumolib.xml.html sumo-1.18.0/docs/pydoc/sumolib.xml.html
--- sumo-1.17.0/docs/pydoc/sumolib.xml.html	2023-04-24 22:07:49.000000000 +0000
+++ sumo-1.18.0/docs/pydoc/sumolib.xml.html	2023-06-28 22:08:06.000000000 +0000
@@ -10,7 +10,7 @@
 >index
/home/delphi/gcc/sumo/tools/sumolib/xml.py
     
# -*- coding: utf-8 -*-

-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo

+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo

 # Copyright (C) 2011-2023 German Aerospace Center (DLR) and others.

 # This program and the accompanying materials are made available under the

 # terms of the Eclipse Public License 2.0 which is available at

diff -Nru sumo-1.17.0/docs/pydoc/traci._busstop.html sumo-1.18.0/docs/pydoc/traci._busstop.html
--- sumo-1.17.0/docs/pydoc/traci._busstop.html	2023-04-24 22:07:49.000000000 +0000
+++ sumo-1.18.0/docs/pydoc/traci._busstop.html	2023-06-28 22:08:06.000000000 +0000
@@ -10,7 +10,7 @@
 >index
/home/delphi/gcc/sumo/tools/traci/_busstop.py
     
# -*- coding: utf-8 -*-

-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo

+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo

 # Copyright (C) 2008-2023 German Aerospace Center (DLR) and others.

 # This program and the accompanying materials are made available under the

 # terms of the Eclipse Public License 2.0 which is available at

diff -Nru sumo-1.17.0/docs/pydoc/traci._calibrator.html sumo-1.18.0/docs/pydoc/traci._calibrator.html
--- sumo-1.17.0/docs/pydoc/traci._calibrator.html	2023-04-24 22:07:49.000000000 +0000
+++ sumo-1.18.0/docs/pydoc/traci._calibrator.html	2023-06-28 22:08:06.000000000 +0000
@@ -10,7 +10,7 @@
 >index
/home/delphi/gcc/sumo/tools/traci/_calibrator.py
     
# -*- coding: utf-8 -*-

-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo

+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo

 # Copyright (C) 2008-2023 German Aerospace Center (DLR) and others.

 # This program and the accompanying materials are made available under the

 # terms of the Eclipse Public License 2.0 which is available at

diff -Nru sumo-1.17.0/docs/pydoc/traci._chargingstation.html sumo-1.18.0/docs/pydoc/traci._chargingstation.html
--- sumo-1.17.0/docs/pydoc/traci._chargingstation.html	2023-04-24 22:07:49.000000000 +0000
+++ sumo-1.18.0/docs/pydoc/traci._chargingstation.html	2023-06-28 22:08:06.000000000 +0000
@@ -10,7 +10,7 @@
 >index
/home/delphi/gcc/sumo/tools/traci/_chargingstation.py
     
# -*- coding: utf-8 -*-

-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo

+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo

 # Copyright (C) 2008-2023 German Aerospace Center (DLR) and others.

 # This program and the accompanying materials are made available under the

 # terms of the Eclipse Public License 2.0 which is available at

diff -Nru sumo-1.17.0/docs/pydoc/traci.connection.html sumo-1.18.0/docs/pydoc/traci.connection.html
--- sumo-1.17.0/docs/pydoc/traci.connection.html	2023-04-24 22:07:49.000000000 +0000
+++ sumo-1.18.0/docs/pydoc/traci.connection.html	2023-06-28 22:08:06.000000000 +0000
@@ -10,7 +10,7 @@
 >index
/home/delphi/gcc/sumo/tools/traci/connection.py
     
# -*- coding: utf-8 -*-

-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo

+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo

 # Copyright (C) 2008-2023 German Aerospace Center (DLR) and others.

 # This program and the accompanying materials are made available under the

 # terms of the Eclipse Public License 2.0 which is available at

diff -Nru sumo-1.17.0/docs/pydoc/traci.constants.html sumo-1.18.0/docs/pydoc/traci.constants.html
--- sumo-1.17.0/docs/pydoc/traci.constants.html	2023-04-24 22:07:49.000000000 +0000
+++ sumo-1.18.0/docs/pydoc/traci.constants.html	2023-06-28 22:08:06.000000000 +0000
@@ -451,6 +451,7 @@
 VAR_HEIGHT = 188

 VAR_HIGHLIGHT = 108

 VAR_IMAGEFILE = 147

+VAR_IMPATIENCE = 38

 VAR_IMPERFECTION = 93

 VAR_INSERTED = 21

 VAR_INTERVAL_IDS = 38

diff -Nru sumo-1.17.0/docs/pydoc/traci.domain.html sumo-1.18.0/docs/pydoc/traci.domain.html
--- sumo-1.17.0/docs/pydoc/traci.domain.html	2023-04-24 22:07:49.000000000 +0000
+++ sumo-1.18.0/docs/pydoc/traci.domain.html	2023-06-28 22:08:06.000000000 +0000
@@ -10,7 +10,7 @@
 >index
/home/delphi/gcc/sumo/tools/traci/domain.py
     
# -*- coding: utf-8 -*-

-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo

+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo

 # Copyright (C) 2008-2023 German Aerospace Center (DLR) and others.

 # This program and the accompanying materials are made available under the

 # terms of the Eclipse Public License 2.0 which is available at

@@ -144,7 +144,7 @@
 
 
add(self, refID, varID, data)

 
-addContext(self, refID, domain, objID, varID=None, data=None)
+addContext(self, refID, objID=None, varID=None, data=None)
 
 get(self, refID=None)
 
diff -Nru sumo-1.17.0/docs/pydoc/traci._edge.html sumo-1.18.0/docs/pydoc/traci._edge.html
--- sumo-1.17.0/docs/pydoc/traci._edge.html	2023-04-24 22:07:49.000000000 +0000
+++ sumo-1.18.0/docs/pydoc/traci._edge.html	2023-06-28 22:08:06.000000000 +0000
@@ -10,7 +10,7 @@
 >index
/home/delphi/gcc/sumo/tools/traci/_edge.py
     # -*- coding: utf-8 -*-

-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo

+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo

 # Copyright (C) 2011-2023 German Aerospace Center (DLR) and others.

 # This program and the accompanying materials are made available under the

 # terms of the Eclipse Public License 2.0 which is available at

@@ -72,6 +72,12 @@
 Returns the travel time value (in s) used for (re-)routing

 which is valid on the edge at the given time.

 
+getAngle(self, edgeID, relativePosition=-1073741824.0)
getAngle(string, double) -> double

+Returns the heading of the straight line segment formed by the first lane of the edge at the given position.

+If the given position equals TraCI constant INVALID_DOUBLE_VALUE, it returns the total angle

+formed by the edge, from its start point to its end point. If the edge doesn't have any lanes,

+then INVALID_DOUBLE_VALUE is returned.
+
 getCO2Emission(self, edgeID)
getCO2Emission(string) -> double

  

 Returns the CO2 emission in mg for the last time step on the given edge.
diff -Nru sumo-1.17.0/docs/pydoc/traci.exceptions.html sumo-1.18.0/docs/pydoc/traci.exceptions.html
--- sumo-1.17.0/docs/pydoc/traci.exceptions.html	2023-04-24 22:07:49.000000000 +0000
+++ sumo-1.18.0/docs/pydoc/traci.exceptions.html	2023-06-28 22:08:06.000000000 +0000
@@ -10,7 +10,7 @@
 >index
/home/delphi/gcc/sumo/tools/traci/exceptions.py
     # -*- coding: utf-8 -*-

-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo

+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo

 # Copyright (C) 2008-2023 German Aerospace Center (DLR) and others.

 # This program and the accompanying materials are made available under the

 # terms of the Eclipse Public License 2.0 which is available at

diff -Nru sumo-1.17.0/docs/pydoc/traci._gui.html sumo-1.18.0/docs/pydoc/traci._gui.html
--- sumo-1.17.0/docs/pydoc/traci._gui.html	2023-04-24 22:07:49.000000000 +0000
+++ sumo-1.18.0/docs/pydoc/traci._gui.html	2023-06-28 22:08:06.000000000 +0000
@@ -10,7 +10,7 @@
 >index
/home/delphi/gcc/sumo/tools/traci/_gui.py
     
# -*- coding: utf-8 -*-

-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo

+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo

 # Copyright (C) 2011-2023 German Aerospace Center (DLR) and others.

 # This program and the accompanying materials are made available under the

 # terms of the Eclipse Public License 2.0 which is available at

diff -Nru sumo-1.17.0/docs/pydoc/traci.html sumo-1.18.0/docs/pydoc/traci.html
--- sumo-1.17.0/docs/pydoc/traci.html	2023-04-24 22:07:49.000000000 +0000
+++ sumo-1.18.0/docs/pydoc/traci.html	2023-06-28 22:08:05.000000000 +0000
@@ -10,7 +10,7 @@
 >index
/home/delphi/gcc/sumo/tools/traci/__init__.py
     
# -*- coding: utf-8 -*-

-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo

+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo

 # Copyright (C) 2008-2023 German Aerospace Center (DLR) and others.

 # This program and the accompanying materials are made available under the

 # terms of the Eclipse Public License 2.0 which is available at

diff -Nru sumo-1.17.0/docs/pydoc/traci._inductionloop.html sumo-1.18.0/docs/pydoc/traci._inductionloop.html
--- sumo-1.17.0/docs/pydoc/traci._inductionloop.html	2023-04-24 22:07:49.000000000 +0000
+++ sumo-1.18.0/docs/pydoc/traci._inductionloop.html	2023-06-28 22:08:06.000000000 +0000
@@ -10,7 +10,7 @@
 >index
/home/delphi/gcc/sumo/tools/traci/_inductionloop.py
     
# -*- coding: utf-8 -*-

-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo

+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo

 # Copyright (C) 2011-2023 German Aerospace Center (DLR) and others.

 # This program and the accompanying materials are made available under the

 # terms of the Eclipse Public License 2.0 which is available at

diff -Nru sumo-1.17.0/docs/pydoc/traci._junction.html sumo-1.18.0/docs/pydoc/traci._junction.html
--- sumo-1.17.0/docs/pydoc/traci._junction.html	2023-04-24 22:07:49.000000000 +0000
+++ sumo-1.18.0/docs/pydoc/traci._junction.html	2023-06-28 22:08:06.000000000 +0000
@@ -10,7 +10,7 @@
 >index
/home/delphi/gcc/sumo/tools/traci/_junction.py
     
# -*- coding: utf-8 -*-

-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo

+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo

 # Copyright (C) 2011-2023 German Aerospace Center (DLR) and others.

 # This program and the accompanying materials are made available under the

 # terms of the Eclipse Public License 2.0 which is available at

diff -Nru sumo-1.17.0/docs/pydoc/traci._lanearea.html sumo-1.18.0/docs/pydoc/traci._lanearea.html
--- sumo-1.17.0/docs/pydoc/traci._lanearea.html	2023-04-24 22:07:49.000000000 +0000
+++ sumo-1.18.0/docs/pydoc/traci._lanearea.html	2023-06-28 22:08:06.000000000 +0000
@@ -10,7 +10,7 @@
 >index
/home/delphi/gcc/sumo/tools/traci/_lanearea.py
     
# -*- coding: utf-8 -*-

-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo

+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo

 # Copyright (C) 2011-2023 German Aerospace Center (DLR) and others.

 # This program and the accompanying materials are made available under the

 # terms of the Eclipse Public License 2.0 which is available at

diff -Nru sumo-1.17.0/docs/pydoc/traci._lane.html sumo-1.18.0/docs/pydoc/traci._lane.html
--- sumo-1.17.0/docs/pydoc/traci._lane.html	2023-04-24 22:07:49.000000000 +0000
+++ sumo-1.18.0/docs/pydoc/traci._lane.html	2023-06-28 22:08:06.000000000 +0000
@@ -10,7 +10,7 @@
 >index
/home/delphi/gcc/sumo/tools/traci/_lane.py
     
# -*- coding: utf-8 -*-

-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo

+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo

 # Copyright (C) 2011-2023 German Aerospace Center (DLR) and others.

 # This program and the accompanying materials are made available under the

 # terms of the Eclipse Public License 2.0 which is available at

@@ -64,6 +64,11 @@
  

 Returns a list of allowed vehicle classes. An empty list means all vehicles are allowed.

 
+getAngle(self, laneID, relativePosition=-1073741824.0)
getAngle(string, double) -> double

+Returns the heading of the straight line segment formed by the lane at the given position.

+If the given position equals TraCI constant INVALID_DOUBLE_VALUE, it returns the total angle

+formed by the lane, from its start point to its end point.
+
 getCO2Emission(self, laneID)
getCO2Emission(string) -> double

  

 Returns the CO2 emission in mg/s for the last time step on the given lane.

@@ -93,7 +98,7 @@
 Multiply by the step length to get the value for one step.
 
 getFoes(self, laneID, toLaneID)
getFoes(string, string) -> list(string)

-Returns the ids of incoming lanes that have right of way over the connection from laneID to toLaneID
+Returns the ids of incoming lanes that have right of way over the connection from laneID to toLaneID.
 
 getFriction(self, laneID)
getFriction(string) -> double

  

@@ -110,7 +115,7 @@
 Multiply by the step length to get the value for one step.
 
 getInternalFoes(self, laneID)
getFoes(string) -> list(string)

-Returns the ids of internal lanes that are in conflict with the given internal lane id
+Returns the ids of internal lanes that are in conflict with the given internal lane id.
 
 getLastStepHaltingNumber(self, laneID)
getLastStepHaltingNumber(string) -> integer

  

@@ -181,7 +186,7 @@
 Multiply by the step length to get the value for one step.
 
 getPendingVehicles(self, laneID)
getPendingVehicles(string) -> list(string)

-Returns a list of all vehicle ids waiting for insertion on this lane (with depart delay)
+Returns a list of all vehicle ids waiting for insertion on this lane (with depart delay).
 
 getShape(self, laneID)
getShape(string) -> list((double, double))

  

diff -Nru sumo-1.17.0/docs/pydoc/traci.main.html sumo-1.18.0/docs/pydoc/traci.main.html
--- sumo-1.17.0/docs/pydoc/traci.main.html	2023-04-24 22:07:49.000000000 +0000
+++ sumo-1.18.0/docs/pydoc/traci.main.html	2023-06-28 22:08:06.000000000 +0000
@@ -10,7 +10,7 @@
 >index
/home/delphi/gcc/sumo/tools/traci/main.py
     # -*- coding: utf-8 -*-

-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo

+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo

 # Copyright (C) 2008-2023 German Aerospace Center (DLR) and others.

 # This program and the accompanying materials are made available under the

 # terms of the Eclipse Public License 2.0 which is available at

@@ -111,11 +111,16 @@
 connecting to the TraCI server when using multiple clients. Each client

 must be assigned a unique integer but there are not further restrictions

 on numbering.

- simulationStep(step=0)
simulationStep(float) -> list

+ simulationStep(step=0)
simulationStep(float) -> None

+Make a simulation step and simulate up to the given second in sim time.

+If the given value is 0 or absent, exactly one step is performed.

+Values smaller than or equal to the current sim time result in no action.
+ simulationStepLegacy(step=0)
simulationStep(float) -> list

 Make a simulation step and simulate up to the given second in sim time.

 If the given value is 0 or absent, exactly one step is performed.

 Values smaller than or equal to the current sim time result in no action.

-It returns the subscription results for the current step in a list.
+This is a legacy function which returns the subscription results for the

+current step in a list.
  start(cmd, port=None, numRetries=60, label='default', verbose=False, traceFile=None, traceGetters=True, stdout=None, doSwitch=True)
Start a sumo server using cmd, establish a connection to it and

 store it under the given label. This method is not thread-safe.

  

diff -Nru sumo-1.17.0/docs/pydoc/traci._meandata.html sumo-1.18.0/docs/pydoc/traci._meandata.html
--- sumo-1.17.0/docs/pydoc/traci._meandata.html	2023-04-24 22:07:49.000000000 +0000
+++ sumo-1.18.0/docs/pydoc/traci._meandata.html	2023-06-28 22:08:06.000000000 +0000
@@ -10,7 +10,7 @@
 >index
/home/delphi/gcc/sumo/tools/traci/_meandata.py
     # -*- coding: utf-8 -*-

-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo

+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo

 # Copyright (C) 2008-2023 German Aerospace Center (DLR) and others.

 # This program and the accompanying materials are made available under the

 # terms of the Eclipse Public License 2.0 which is available at

diff -Nru sumo-1.17.0/docs/pydoc/traci._multientryexit.html sumo-1.18.0/docs/pydoc/traci._multientryexit.html
--- sumo-1.17.0/docs/pydoc/traci._multientryexit.html	2023-04-24 22:07:49.000000000 +0000
+++ sumo-1.18.0/docs/pydoc/traci._multientryexit.html	2023-06-28 22:08:06.000000000 +0000
@@ -10,7 +10,7 @@
 >index
/home/delphi/gcc/sumo/tools/traci/_multientryexit.py
     
# -*- coding: utf-8 -*-

-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo

+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo

 # Copyright (C) 2011-2023 German Aerospace Center (DLR) and others.

 # This program and the accompanying materials are made available under the

 # terms of the Eclipse Public License 2.0 which is available at

diff -Nru sumo-1.17.0/docs/pydoc/traci._overheadwire.html sumo-1.18.0/docs/pydoc/traci._overheadwire.html
--- sumo-1.17.0/docs/pydoc/traci._overheadwire.html	2023-04-24 22:07:49.000000000 +0000
+++ sumo-1.18.0/docs/pydoc/traci._overheadwire.html	2023-06-28 22:08:06.000000000 +0000
@@ -10,7 +10,7 @@
 >index
/home/delphi/gcc/sumo/tools/traci/_overheadwire.py
     
# -*- coding: utf-8 -*-

-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo

+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo

 # Copyright (C) 2008-2023 German Aerospace Center (DLR) and others.

 # This program and the accompanying materials are made available under the

 # terms of the Eclipse Public License 2.0 which is available at

diff -Nru sumo-1.17.0/docs/pydoc/traci._parkingarea.html sumo-1.18.0/docs/pydoc/traci._parkingarea.html
--- sumo-1.17.0/docs/pydoc/traci._parkingarea.html	2023-04-24 22:07:49.000000000 +0000
+++ sumo-1.18.0/docs/pydoc/traci._parkingarea.html	2023-06-28 22:08:06.000000000 +0000
@@ -10,7 +10,7 @@
 >index
/home/delphi/gcc/sumo/tools/traci/_parkingarea.py
     
# -*- coding: utf-8 -*-

-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo

+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo

 # Copyright (C) 2008-2023 German Aerospace Center (DLR) and others.

 # This program and the accompanying materials are made available under the

 # terms of the Eclipse Public License 2.0 which is available at

diff -Nru sumo-1.17.0/docs/pydoc/traci._person.html sumo-1.18.0/docs/pydoc/traci._person.html
--- sumo-1.17.0/docs/pydoc/traci._person.html	2023-04-24 22:07:49.000000000 +0000
+++ sumo-1.18.0/docs/pydoc/traci._person.html	2023-06-28 22:08:06.000000000 +0000
@@ -10,7 +10,7 @@
 >index
/home/delphi/gcc/sumo/tools/traci/_person.py
     
# -*- coding: utf-8 -*-

-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo

+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo

 # Copyright (C) 2011-2023 German Aerospace Center (DLR) and others.

 # This program and the accompanying materials are made available under the

 # terms of the Eclipse Public License 2.0 which is available at

@@ -268,6 +268,10 @@
 Returns the height in m of this type.

 If called in the context of a person or vehicle, it will return the value for their current type.

 
+getImpatience(self, typeID)
getImpatience(string) -> double

+ 

+Returns the Impatience of this type
+
 getImperfection(self, typeID)
getImperfection(string) -> double

  

 Returns the driver's imperfection for this type.

@@ -352,6 +356,11 @@
 Sets the apparent deceleration in m/s^2 of this type.

 If called in the context of a person or vehicle, it will change the value just for the single instance.
 
+setBoardingDuration(self, typeID, boardingDuration)
setBoardingDuration(string, double) -> None

+ 

+Sets the boarding duration of the this type.

+If called in the context of a person or vehicle, it will change the value just for the single instance.
+
 setColor(self, typeID, color)
setColor(string, (integer, integer, integer, integer)) -> None

  

 Sets the color of this type.

@@ -377,6 +386,11 @@
 Sets the height in m of this type.

 If called in the context of a person or vehicle, it will change the value just for the single instance.
 
+setImpatience(self, typeID, impatience)
setImpatience(string, double) -> None

+ 

+Sets the impatience of the this type.

+If called in the context of a person or vehicle, it will change the value just for the single instance.
+
 setImperfection(self, typeID, imperfection)
setImperfection(string, double) -> None

  

 Sets the driver imperfection of this type.

diff -Nru sumo-1.17.0/docs/pydoc/traci._poi.html sumo-1.18.0/docs/pydoc/traci._poi.html
--- sumo-1.17.0/docs/pydoc/traci._poi.html	2023-04-24 22:07:49.000000000 +0000
+++ sumo-1.18.0/docs/pydoc/traci._poi.html	2023-06-28 22:08:06.000000000 +0000
@@ -10,7 +10,7 @@
 >index
/home/delphi/gcc/sumo/tools/traci/_poi.py
     # -*- coding: utf-8 -*-

-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo

+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo

 # Copyright (C) 2008-2023 German Aerospace Center (DLR) and others.

 # This program and the accompanying materials are made available under the

 # terms of the Eclipse Public License 2.0 which is available at

diff -Nru sumo-1.17.0/docs/pydoc/traci._polygon.html sumo-1.18.0/docs/pydoc/traci._polygon.html
--- sumo-1.17.0/docs/pydoc/traci._polygon.html	2023-04-24 22:07:49.000000000 +0000
+++ sumo-1.18.0/docs/pydoc/traci._polygon.html	2023-06-28 22:08:06.000000000 +0000
@@ -10,7 +10,7 @@
 >index
/home/delphi/gcc/sumo/tools/traci/_polygon.py
     
# -*- coding: utf-8 -*-

-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo

+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo

 # Copyright (C) 2011-2023 German Aerospace Center (DLR) and others.

 # This program and the accompanying materials are made available under the

 # terms of the Eclipse Public License 2.0 which is available at

diff -Nru sumo-1.17.0/docs/pydoc/traci._rerouter.html sumo-1.18.0/docs/pydoc/traci._rerouter.html
--- sumo-1.17.0/docs/pydoc/traci._rerouter.html	2023-04-24 22:07:49.000000000 +0000
+++ sumo-1.18.0/docs/pydoc/traci._rerouter.html	2023-06-28 22:08:06.000000000 +0000
@@ -10,7 +10,7 @@
 >index
/home/delphi/gcc/sumo/tools/traci/_rerouter.py
     
# -*- coding: utf-8 -*-

-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo

+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo

 # Copyright (C) 2008-2023 German Aerospace Center (DLR) and others.

 # This program and the accompanying materials are made available under the

 # terms of the Eclipse Public License 2.0 which is available at

diff -Nru sumo-1.17.0/docs/pydoc/traci._route.html sumo-1.18.0/docs/pydoc/traci._route.html
--- sumo-1.17.0/docs/pydoc/traci._route.html	2023-04-24 22:07:49.000000000 +0000
+++ sumo-1.18.0/docs/pydoc/traci._route.html	2023-06-28 22:08:06.000000000 +0000
@@ -10,7 +10,7 @@
 >index
/home/delphi/gcc/sumo/tools/traci/_route.py
     
# -*- coding: utf-8 -*-

-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo

+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo

 # Copyright (C) 2008-2023 German Aerospace Center (DLR) and others.

 # This program and the accompanying materials are made available under the

 # terms of the Eclipse Public License 2.0 which is available at

diff -Nru sumo-1.17.0/docs/pydoc/traci._routeprobe.html sumo-1.18.0/docs/pydoc/traci._routeprobe.html
--- sumo-1.17.0/docs/pydoc/traci._routeprobe.html	2023-04-24 22:07:49.000000000 +0000
+++ sumo-1.18.0/docs/pydoc/traci._routeprobe.html	2023-06-28 22:08:06.000000000 +0000
@@ -10,7 +10,7 @@
 >index
/home/delphi/gcc/sumo/tools/traci/_routeprobe.py
     
# -*- coding: utf-8 -*-

-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo

+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo

 # Copyright (C) 2008-2023 German Aerospace Center (DLR) and others.

 # This program and the accompanying materials are made available under the

 # terms of the Eclipse Public License 2.0 which is available at

diff -Nru sumo-1.17.0/docs/pydoc/traci._simulation.html sumo-1.18.0/docs/pydoc/traci._simulation.html
--- sumo-1.17.0/docs/pydoc/traci._simulation.html	2023-04-24 22:07:49.000000000 +0000
+++ sumo-1.18.0/docs/pydoc/traci._simulation.html	2023-06-28 22:08:06.000000000 +0000
@@ -10,7 +10,7 @@
 >index
/home/delphi/gcc/sumo/tools/traci/_simulation.py
     
# -*- coding: utf-8 -*-

-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo

+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo

 # Copyright (C) 2011-2023 German Aerospace Center (DLR) and others.

 # This program and the accompanying materials are made available under the

 # terms of the Eclipse Public License 2.0 which is available at

diff -Nru sumo-1.17.0/docs/pydoc/traci.step.html sumo-1.18.0/docs/pydoc/traci.step.html
--- sumo-1.17.0/docs/pydoc/traci.step.html	2023-04-24 22:07:49.000000000 +0000
+++ sumo-1.18.0/docs/pydoc/traci.step.html	2023-06-28 22:08:06.000000000 +0000
@@ -10,7 +10,7 @@
 >index
/home/delphi/gcc/sumo/tools/traci/step.py
     
# -*- coding: utf-8 -*-

-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo

+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo

 # Copyright (C) 2008-2023 German Aerospace Center (DLR) and others.

 # This program and the accompanying materials are made available under the

 # terms of the Eclipse Public License 2.0 which is available at

diff -Nru sumo-1.17.0/docs/pydoc/traci.storage.html sumo-1.18.0/docs/pydoc/traci.storage.html
--- sumo-1.17.0/docs/pydoc/traci.storage.html	2023-04-24 22:07:49.000000000 +0000
+++ sumo-1.18.0/docs/pydoc/traci.storage.html	2023-06-28 22:08:06.000000000 +0000
@@ -10,7 +10,7 @@
 >index
/home/delphi/gcc/sumo/tools/traci/storage.py
     
# -*- coding: utf-8 -*-

-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo

+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo

 # Copyright (C) 2008-2023 German Aerospace Center (DLR) and others.

 # This program and the accompanying materials are made available under the

 # terms of the Eclipse Public License 2.0 which is available at

diff -Nru sumo-1.17.0/docs/pydoc/traci._trafficlight.html sumo-1.18.0/docs/pydoc/traci._trafficlight.html
--- sumo-1.17.0/docs/pydoc/traci._trafficlight.html	2023-04-24 22:07:49.000000000 +0000
+++ sumo-1.18.0/docs/pydoc/traci._trafficlight.html	2023-06-28 22:08:06.000000000 +0000
@@ -10,7 +10,7 @@
 >index
/home/delphi/gcc/sumo/tools/traci/_trafficlight.py
     
# -*- coding: utf-8 -*-

-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo

+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo

 # Copyright (C) 2011-2023 German Aerospace Center (DLR) and others.

 # This program and the accompanying materials are made available under the

 # terms of the Eclipse Public License 2.0 which is available at

diff -Nru sumo-1.17.0/docs/pydoc/traci._variablespeedsign.html sumo-1.18.0/docs/pydoc/traci._variablespeedsign.html
--- sumo-1.17.0/docs/pydoc/traci._variablespeedsign.html	2023-04-24 22:07:49.000000000 +0000
+++ sumo-1.18.0/docs/pydoc/traci._variablespeedsign.html	2023-06-28 22:08:06.000000000 +0000
@@ -10,7 +10,7 @@
 >index
/home/delphi/gcc/sumo/tools/traci/_variablespeedsign.py
     
# -*- coding: utf-8 -*-

-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo

+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo

 # Copyright (C) 2008-2023 German Aerospace Center (DLR) and others.

 # This program and the accompanying materials are made available under the

 # terms of the Eclipse Public License 2.0 which is available at

diff -Nru sumo-1.17.0/docs/pydoc/traci._vehicle.html sumo-1.18.0/docs/pydoc/traci._vehicle.html
--- sumo-1.17.0/docs/pydoc/traci._vehicle.html	2023-04-24 22:07:49.000000000 +0000
+++ sumo-1.18.0/docs/pydoc/traci._vehicle.html	2023-06-28 22:08:06.000000000 +0000
@@ -10,7 +10,7 @@
 >index
/home/delphi/gcc/sumo/tools/traci/_vehicle.py
     
# -*- coding: utf-8 -*-

-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo

+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo

 # Copyright (C) 2011-2023 German Aerospace Center (DLR) and others.

 # This program and the accompanying materials are made available under the

 # terms of the Eclipse Public License 2.0 which is available at

@@ -310,6 +310,11 @@
 Returns the HC emission in mg/s for the last time step.

 Multiply by the step length to get the value for one step.

 
+getJunctionFoes(self, vehID, distance)
getJunctionFoes(string, double) -> complex

+ 

+Return list of junction foes [(foeId, egoDist, foeDist, egoExitDist, foeExitDist,

+egoLane, foeLane, egoResponse, foeResponse), ...] within the given distance to the given vehicle.
+
 getLaneChangeMode(self, vehID)
getLaneChangeMode(string) -> integer

  

 Gets the vehicle's lane change mode as a bitset.
@@ -505,10 +510,12 @@
 Returns the expected depart delay at the next stop (if that stop defines the

 until-attribute) in seconds. Returns -1 if the next stop is not applicable
 
-getStopParameter(self, vehID, nextStopIndex, param)
getStopParameter(string, int, string) -> string

+getStopParameter(self, vehID, nextStopIndex, param, customParam=False)
getStopParameter(string, int, string) -> string

 Gets the value of the given parameter for the stop at the given index

 Negative indices permit access to past stops.

-Supported params correspond to all legal stop xml-attributes
+Supported params correspond to all legal stop xml-attributes

+If customParam is set to True, the user defined stop parameter with the

+specified param name will be returned instead (or "" if undefined)
 
 getStopSpeed(self, vehID, speed, gap)
getStopSpeed(string, double, double) -> double

 Return the speed for stopping at gap computed by the carFollowModel of vehID
@@ -780,11 +787,13 @@
 Adds or modifies a stop with the given parameters. The duration and the until attribute are

 in seconds.
 
-setStopParameter(self, vehID, nextStopIndex, param, value)
setStopParameter(string, int, string, string) -> None

+setStopParameter(self, vehID, nextStopIndex, param, value, customParam=False)
setStopParameter(string, int, string, string) -> None

 Sets the value of the given parameter for the (upcoming) stop at the

 given index (within the list of all stops).

 Supported params correspond to (almost) all legal stop xml-attributes

-and their value semantics
+and their value semantics

+If customParam is set to True, the user defined stop parameter with the

+specified param name will be set instead
 
 setType(self, vehID, typeID)
setType(string, string) -> None

  

@@ -900,6 +909,10 @@
 Returns the height in m of this type.

 If called in the context of a person or vehicle, it will return the value for their current type.
 
+getImpatience(self, typeID)
getImpatience(string) -> double

+ 

+Returns the Impatience of this type
+
 getImperfection(self, typeID)
getImperfection(string) -> double

  

 Returns the driver's imperfection for this type.

@@ -989,6 +1002,11 @@
 Sets the apparent deceleration in m/s^2 of this type.

 If called in the context of a person or vehicle, it will change the value just for the single instance.
 
+setBoardingDuration(self, typeID, boardingDuration)
setBoardingDuration(string, double) -> None

+ 

+Sets the boarding duration of the this type.

+If called in the context of a person or vehicle, it will change the value just for the single instance.
+
 setColor(self, typeID, color)
setColor(string, (integer, integer, integer, integer)) -> None

  

 Sets the color of this type.

@@ -1014,6 +1032,11 @@
 Sets the height in m of this type.

 If called in the context of a person or vehicle, it will change the value just for the single instance.
 
+setImpatience(self, typeID, impatience)
setImpatience(string, double) -> None

+ 

+Sets the impatience of the this type.

+If called in the context of a person or vehicle, it will change the value just for the single instance.
+
 setImperfection(self, typeID, imperfection)
setImperfection(string, double) -> None

  

 Sets the driver imperfection of this type.

diff -Nru sumo-1.17.0/docs/pydoc/traci._vehicletype.html sumo-1.18.0/docs/pydoc/traci._vehicletype.html
--- sumo-1.17.0/docs/pydoc/traci._vehicletype.html	2023-04-24 22:07:49.000000000 +0000
+++ sumo-1.18.0/docs/pydoc/traci._vehicletype.html	2023-06-28 22:08:06.000000000 +0000
@@ -10,7 +10,7 @@
 >index
/home/delphi/gcc/sumo/tools/traci/_vehicletype.py
     # -*- coding: utf-8 -*-

-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo

+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo

 # Copyright (C) 2008-2023 German Aerospace Center (DLR) and others.

 # This program and the accompanying materials are made available under the

 # terms of the Eclipse Public License 2.0 which is available at

@@ -114,6 +114,10 @@
 Returns the height in m of this type.

 If called in the context of a person or vehicle, it will return the value for their current type.

 
+getImpatience(self, typeID)
getImpatience(string) -> double

+ 

+Returns the Impatience of this type
+
 getImperfection(self, typeID)
getImperfection(string) -> double

  

 Returns the driver's imperfection for this type.

@@ -203,6 +207,11 @@
 Sets the apparent deceleration in m/s^2 of this type.

 If called in the context of a person or vehicle, it will change the value just for the single instance.
 
+setBoardingDuration(self, typeID, boardingDuration)
setBoardingDuration(string, double) -> None

+ 

+Sets the boarding duration of the this type.

+If called in the context of a person or vehicle, it will change the value just for the single instance.
+
 setColor(self, typeID, color)
setColor(string, (integer, integer, integer, integer)) -> None

  

 Sets the color of this type.

@@ -228,6 +237,11 @@
 Sets the height in m of this type.

 If called in the context of a person or vehicle, it will change the value just for the single instance.
 
+setImpatience(self, typeID, impatience)
setImpatience(string, double) -> None

+ 

+Sets the impatience of the this type.

+If called in the context of a person or vehicle, it will change the value just for the single instance.
+
 setImperfection(self, typeID, imperfection)
setImperfection(string, double) -> None

  

 Sets the driver imperfection of this type.

@@ -435,6 +449,10 @@
 Returns the height in m of this type.

 If called in the context of a person or vehicle, it will return the value for their current type.
 
+getImpatience(self, typeID)
getImpatience(string) -> double

+ 

+Returns the Impatience of this type
+
 getImperfection(self, typeID)
getImperfection(string) -> double

  

 Returns the driver's imperfection for this type.

@@ -524,6 +542,11 @@
 Sets the apparent deceleration in m/s^2 of this type.

 If called in the context of a person or vehicle, it will change the value just for the single instance.
 
+setBoardingDuration(self, typeID, boardingDuration)
setBoardingDuration(string, double) -> None

+ 

+Sets the boarding duration of the this type.

+If called in the context of a person or vehicle, it will change the value just for the single instance.
+
 setColor(self, typeID, color)
setColor(string, (integer, integer, integer, integer)) -> None

  

 Sets the color of this type.

@@ -549,6 +572,11 @@
 Sets the height in m of this type.

 If called in the context of a person or vehicle, it will change the value just for the single instance.
 
+setImpatience(self, typeID, impatience)
setImpatience(string, double) -> None

+ 

+Sets the impatience of the this type.

+If called in the context of a person or vehicle, it will change the value just for the single instance.
+
 setImperfection(self, typeID, imperfection)
setImperfection(string, double) -> None

  

 Sets the driver imperfection of this type.

diff -Nru sumo-1.17.0/docs/tutorial/circles/runner.py sumo-1.18.0/docs/tutorial/circles/runner.py
--- sumo-1.17.0/docs/tutorial/circles/runner.py	2023-01-05 23:00:11.000000000 +0000
+++ sumo-1.18.0/docs/tutorial/circles/runner.py	2023-06-23 06:11:10.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2008-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/docs/tutorial/circles/test.sh sumo-1.18.0/docs/tutorial/circles/test.sh
--- sumo-1.17.0/docs/tutorial/circles/test.sh	2023-04-24 22:07:51.000000000 +0000
+++ sumo-1.18.0/docs/tutorial/circles/test.sh	2023-06-28 22:08:08.000000000 +0000
@@ -1 +1,2 @@
+#!/bin/bash
 python runner.py
\ No newline at end of file
diff -Nru sumo-1.17.0/docs/tutorial/city_mobil/data/agentManager.py sumo-1.18.0/docs/tutorial/city_mobil/data/agentManager.py
--- sumo-1.17.0/docs/tutorial/city_mobil/data/agentManager.py	2023-04-24 22:07:51.000000000 +0000
+++ sumo-1.18.0/docs/tutorial/city_mobil/data/agentManager.py	2023-06-28 22:08:08.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2008-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/docs/tutorial/city_mobil/data/constants.py sumo-1.18.0/docs/tutorial/city_mobil/data/constants.py
--- sumo-1.17.0/docs/tutorial/city_mobil/data/constants.py	2023-04-24 22:07:51.000000000 +0000
+++ sumo-1.18.0/docs/tutorial/city_mobil/data/constants.py	2023-06-28 22:08:08.000000000 +0000
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2008-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/docs/tutorial/city_mobil/data/createNet.py sumo-1.18.0/docs/tutorial/city_mobil/data/createNet.py
--- sumo-1.17.0/docs/tutorial/city_mobil/data/createNet.py	2023-04-24 22:07:51.000000000 +0000
+++ sumo-1.18.0/docs/tutorial/city_mobil/data/createNet.py	2023-06-28 22:08:08.000000000 +0000
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2008-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/docs/tutorial/city_mobil/data/createNetTaxi.py sumo-1.18.0/docs/tutorial/city_mobil/data/createNetTaxi.py
--- sumo-1.17.0/docs/tutorial/city_mobil/data/createNetTaxi.py	2023-04-24 22:07:51.000000000 +0000
+++ sumo-1.18.0/docs/tutorial/city_mobil/data/createNetTaxi.py	2023-06-28 22:08:08.000000000 +0000
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2008-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/docs/tutorial/city_mobil/data/simpleManager.py sumo-1.18.0/docs/tutorial/city_mobil/data/simpleManager.py
--- sumo-1.17.0/docs/tutorial/city_mobil/data/simpleManager.py	2023-04-24 22:07:51.000000000 +0000
+++ sumo-1.18.0/docs/tutorial/city_mobil/data/simpleManager.py	2023-06-28 22:08:08.000000000 +0000
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2008-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/docs/tutorial/city_mobil/data/statistics.py sumo-1.18.0/docs/tutorial/city_mobil/data/statistics.py
--- sumo-1.17.0/docs/tutorial/city_mobil/data/statistics.py	2023-04-24 22:07:51.000000000 +0000
+++ sumo-1.18.0/docs/tutorial/city_mobil/data/statistics.py	2023-06-28 22:08:08.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2008-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/docs/tutorial/city_mobil/data/vehicleControl.py sumo-1.18.0/docs/tutorial/city_mobil/data/vehicleControl.py
--- sumo-1.17.0/docs/tutorial/city_mobil/data/vehicleControl.py	2023-04-24 22:07:51.000000000 +0000
+++ sumo-1.18.0/docs/tutorial/city_mobil/data/vehicleControl.py	2023-06-28 22:08:08.000000000 +0000
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2008-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/docs/tutorial/city_mobil/runner.py sumo-1.18.0/docs/tutorial/city_mobil/runner.py
--- sumo-1.17.0/docs/tutorial/city_mobil/runner.py	2023-01-05 23:00:11.000000000 +0000
+++ sumo-1.18.0/docs/tutorial/city_mobil/runner.py	2023-06-23 06:11:10.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2011-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/docs/tutorial/city_mobil/test.sh sumo-1.18.0/docs/tutorial/city_mobil/test.sh
--- sumo-1.17.0/docs/tutorial/city_mobil/test.sh	2023-04-24 22:07:51.000000000 +0000
+++ sumo-1.18.0/docs/tutorial/city_mobil/test.sh	2023-06-28 22:08:08.000000000 +0000
@@ -1 +1,2 @@
+#!/bin/bash
 python runner.py
\ No newline at end of file
diff -Nru sumo-1.17.0/docs/tutorial/hello/runner.py sumo-1.18.0/docs/tutorial/hello/runner.py
--- sumo-1.17.0/docs/tutorial/hello/runner.py	2023-01-05 23:00:11.000000000 +0000
+++ sumo-1.18.0/docs/tutorial/hello/runner.py	2023-06-23 06:11:10.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2008-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/docs/tutorial/hello/test.sh sumo-1.18.0/docs/tutorial/hello/test.sh
--- sumo-1.17.0/docs/tutorial/hello/test.sh	2023-04-24 22:07:51.000000000 +0000
+++ sumo-1.18.0/docs/tutorial/hello/test.sh	2023-06-28 22:08:08.000000000 +0000
@@ -1 +1,2 @@
+#!/bin/bash
 python runner.py
\ No newline at end of file
diff -Nru sumo-1.17.0/docs/tutorial/manhattan/runner.py sumo-1.18.0/docs/tutorial/manhattan/runner.py
--- sumo-1.17.0/docs/tutorial/manhattan/runner.py	2023-01-05 23:00:11.000000000 +0000
+++ sumo-1.18.0/docs/tutorial/manhattan/runner.py	2023-06-23 06:11:10.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2008-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/docs/tutorial/manhattan/test.sh sumo-1.18.0/docs/tutorial/manhattan/test.sh
--- sumo-1.17.0/docs/tutorial/manhattan/test.sh	2023-04-24 22:07:51.000000000 +0000
+++ sumo-1.18.0/docs/tutorial/manhattan/test.sh	2023-06-28 22:08:08.000000000 +0000
@@ -1 +1,2 @@
+#!/bin/bash
 python runner.py
\ No newline at end of file
diff -Nru sumo-1.17.0/docs/tutorial/output_parsing/runner.py sumo-1.18.0/docs/tutorial/output_parsing/runner.py
--- sumo-1.17.0/docs/tutorial/output_parsing/runner.py	2023-01-05 23:00:11.000000000 +0000
+++ sumo-1.18.0/docs/tutorial/output_parsing/runner.py	2023-06-23 06:11:10.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2008-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/docs/tutorial/output_parsing/test.sh sumo-1.18.0/docs/tutorial/output_parsing/test.sh
--- sumo-1.17.0/docs/tutorial/output_parsing/test.sh	2023-04-24 22:07:51.000000000 +0000
+++ sumo-1.18.0/docs/tutorial/output_parsing/test.sh	2023-06-28 22:08:08.000000000 +0000
@@ -1 +1,2 @@
+#!/bin/bash
 python runner.py
\ No newline at end of file
diff -Nru sumo-1.17.0/docs/tutorial/public_transport/runner.py sumo-1.18.0/docs/tutorial/public_transport/runner.py
--- sumo-1.17.0/docs/tutorial/public_transport/runner.py	2023-01-05 23:00:11.000000000 +0000
+++ sumo-1.18.0/docs/tutorial/public_transport/runner.py	2023-06-23 06:11:10.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2008-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/docs/tutorial/public_transport/test.sh sumo-1.18.0/docs/tutorial/public_transport/test.sh
--- sumo-1.17.0/docs/tutorial/public_transport/test.sh	2023-04-24 22:07:51.000000000 +0000
+++ sumo-1.18.0/docs/tutorial/public_transport/test.sh	2023-06-28 22:08:08.000000000 +0000
@@ -1 +1,2 @@
+#!/bin/bash
 python runner.py
\ No newline at end of file
diff -Nru sumo-1.17.0/docs/tutorial/quickstart/runner.py sumo-1.18.0/docs/tutorial/quickstart/runner.py
--- sumo-1.17.0/docs/tutorial/quickstart/runner.py	2023-01-05 23:00:11.000000000 +0000
+++ sumo-1.18.0/docs/tutorial/quickstart/runner.py	2023-06-23 06:11:10.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2008-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/docs/tutorial/quickstart/test.sh sumo-1.18.0/docs/tutorial/quickstart/test.sh
--- sumo-1.17.0/docs/tutorial/quickstart/test.sh	2023-04-24 22:07:51.000000000 +0000
+++ sumo-1.18.0/docs/tutorial/quickstart/test.sh	2023-06-28 22:08:08.000000000 +0000
@@ -1 +1,2 @@
+#!/bin/bash
 python runner.py
\ No newline at end of file
diff -Nru sumo-1.17.0/docs/tutorial/sumolympics/data/makeSumolympicWalkers.py sumo-1.18.0/docs/tutorial/sumolympics/data/makeSumolympicWalkers.py
--- sumo-1.17.0/docs/tutorial/sumolympics/data/makeSumolympicWalkers.py	2023-04-24 22:07:51.000000000 +0000
+++ sumo-1.18.0/docs/tutorial/sumolympics/data/makeSumolympicWalkers.py	2023-06-28 22:08:08.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2009-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/docs/tutorial/sumolympics/runner.py sumo-1.18.0/docs/tutorial/sumolympics/runner.py
--- sumo-1.17.0/docs/tutorial/sumolympics/runner.py	2023-01-05 23:00:11.000000000 +0000
+++ sumo-1.18.0/docs/tutorial/sumolympics/runner.py	2023-06-23 06:11:10.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2008-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/docs/tutorial/sumolympics/test.sh sumo-1.18.0/docs/tutorial/sumolympics/test.sh
--- sumo-1.17.0/docs/tutorial/sumolympics/test.sh	2023-04-24 22:07:51.000000000 +0000
+++ sumo-1.18.0/docs/tutorial/sumolympics/test.sh	2023-06-28 22:08:08.000000000 +0000
@@ -1 +1,2 @@
+#!/bin/bash
 python runner.py
\ No newline at end of file
diff -Nru sumo-1.17.0/docs/tutorial/traci_pedestrian_crossing/runner.py sumo-1.18.0/docs/tutorial/traci_pedestrian_crossing/runner.py
--- sumo-1.17.0/docs/tutorial/traci_pedestrian_crossing/runner.py	2023-01-05 23:00:11.000000000 +0000
+++ sumo-1.18.0/docs/tutorial/traci_pedestrian_crossing/runner.py	2023-06-23 06:11:10.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2009-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/docs/tutorial/traci_pedestrian_crossing/test.sh sumo-1.18.0/docs/tutorial/traci_pedestrian_crossing/test.sh
--- sumo-1.17.0/docs/tutorial/traci_pedestrian_crossing/test.sh	2023-04-24 22:07:51.000000000 +0000
+++ sumo-1.18.0/docs/tutorial/traci_pedestrian_crossing/test.sh	2023-06-28 22:08:08.000000000 +0000
@@ -1 +1,2 @@
+#!/bin/bash
 python runner.py --nogui
\ No newline at end of file
diff -Nru sumo-1.17.0/docs/tutorial/traci_taxi/runner.py sumo-1.18.0/docs/tutorial/traci_taxi/runner.py
--- sumo-1.17.0/docs/tutorial/traci_taxi/runner.py	2023-01-05 23:00:11.000000000 +0000
+++ sumo-1.18.0/docs/tutorial/traci_taxi/runner.py	2023-06-23 06:11:10.000000000 +0000
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2008-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/docs/tutorial/traci_taxi/test.sh sumo-1.18.0/docs/tutorial/traci_taxi/test.sh
--- sumo-1.17.0/docs/tutorial/traci_taxi/test.sh	2023-04-24 22:07:51.000000000 +0000
+++ sumo-1.18.0/docs/tutorial/traci_taxi/test.sh	2023-06-28 22:08:08.000000000 +0000
@@ -1 +1,2 @@
+#!/bin/bash
 python runner.py
\ No newline at end of file
diff -Nru sumo-1.17.0/docs/tutorial/traci_tls/runner.py sumo-1.18.0/docs/tutorial/traci_tls/runner.py
--- sumo-1.17.0/docs/tutorial/traci_tls/runner.py	2023-01-05 23:00:11.000000000 +0000
+++ sumo-1.18.0/docs/tutorial/traci_tls/runner.py	2023-06-23 06:11:10.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2009-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/docs/tutorial/traci_tls/test.sh sumo-1.18.0/docs/tutorial/traci_tls/test.sh
--- sumo-1.17.0/docs/tutorial/traci_tls/test.sh	2023-04-24 22:07:51.000000000 +0000
+++ sumo-1.18.0/docs/tutorial/traci_tls/test.sh	2023-06-28 22:08:08.000000000 +0000
@@ -1 +1,2 @@
+#!/bin/bash
 python runner.py --nogui
\ No newline at end of file
diff -Nru sumo-1.17.0/docs/userdoc/404.html sumo-1.18.0/docs/userdoc/404.html
--- sumo-1.17.0/docs/userdoc/404.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/404.html	2023-06-28 22:08:56.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
diff -Nru sumo-1.17.0/docs/userdoc/activitygen.html sumo-1.18.0/docs/userdoc/activitygen.html
--- sumo-1.17.0/docs/userdoc/activitygen.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/activitygen.html	2023-06-28 22:08:56.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -187,7 +187,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -246,7 +246,7 @@
 Options#
 You may use a XML schema definition file for setting up a activitygen
 configuration:
-activitygenConfiguration.xsd.
+activitygenConfiguration.xsd.
 Configuration#
 All applications of the SUMO-suite handle configuration options the
 same way. These options are discussed at Basics/Using the Command Line
@@ -457,7 +457,7 @@
 
         

           
-            
This page was last edited on: 05 January 2023
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Basics/Basic_Computer_Skills.html sumo-1.18.0/docs/userdoc/Basics/Basic_Computer_Skills.html
--- sumo-1.17.0/docs/userdoc/Basics/Basic_Computer_Skills.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Basics/Basic_Computer_Skills.html	2023-06-28 22:08:56.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -193,7 +193,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -239,8 +239,8 @@
 Or by pressing the Win + R keys and entering notepad
 Notepad is a very basic text editor. You can increase your comfort and
 productivity by switching to an editor with more features. Consider
-Notepad++ or
-vim and also see this comparison of text editors
+Notepad++ or
+vim and also see this comparison of text editors
 
 Note
 Files used by SUMO have by convention names ending with
@@ -325,15 +325,15 @@
 
 
A small window should appear. Under user variables select PATH (or Path - Windows environment variables are case insensitive) and click Edit. If no such variable exists you must create it with the New-Button 

 
-Append ;C:\Program Files\sumo-1.17.0\bin to the end of the PATH value
+
Append ;C:\Program Files\sumo-1.18.0\bin to the end of the PATH value
     (don't delete the existing values!)
 Under user variables now select SUMO_HOME and click Edit. If no such
     variable exists you must create it with the New-Button
-Set C:\Program Files\sumo-1.17.0 as the value of the SUMO_HOME variable
+Set C:\Program Files\sumo-1.18.0 as the value of the SUMO_HOME variable
 
 
 Note
-Replace C:\Program Files\sumo-1.17.0\ with your sumo directory.
+Replace C:\Program Files\sumo-1.18.0\ with your sumo directory.
 
 
 Caution
@@ -437,7 +437,7 @@
 
         
           
-            
This page was last edited on: 15 November 2022
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Basics/Notation.html sumo-1.18.0/docs/userdoc/Basics/Notation.html
--- sumo-1.17.0/docs/userdoc/Basics/Notation.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Basics/Notation.html	2023-06-28 22:08:56.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -172,7 +172,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/Basics/Using_the_Command_Line_Applications.html sumo-1.18.0/docs/userdoc/Basics/Using_the_Command_Line_Applications.html
--- sumo-1.17.0/docs/userdoc/Basics/Using_the_Command_Line_Applications.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Basics/Using_the_Command_Line_Applications.html	2023-06-28 22:08:56.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -208,7 +208,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -261,7 +261,7 @@
 (netgenerate in this case). As no parameter
 has been given, the application does not know what to do and prints only
 an information about itself:
-Eclipse SUMO netgenerate Version 1.17.0
+Eclipse SUMO netgenerate Version 1.18.0
  Build features: Linux-4.1.39-56-default Proj GDAL GUI
  Copyright (C) 2001-2020 German Aerospace Center (DLR) and others; https://sumo.dlr.de
  License EPL-2.0: Eclipse Public License Version 2 <https://eclipse.org/legal/epl-v20.html>
diff -Nru sumo-1.17.0/docs/userdoc/Car-Following-Models/ACC.html sumo-1.18.0/docs/userdoc/Car-Following-Models/ACC.html
--- sumo-1.17.0/docs/userdoc/Car-Following-Models/ACC.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Car-Following-Models/ACC.html	2023-06-28 22:08:56.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -180,7 +180,7 @@
     

 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 

diff -Nru sumo-1.17.0/docs/userdoc/Car-Following-Models/CACC.html sumo-1.18.0/docs/userdoc/Car-Following-Models/CACC.html
--- sumo-1.17.0/docs/userdoc/Car-Following-Models/CACC.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Car-Following-Models/CACC.html	2023-06-28 22:08:56.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -179,7 +179,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/Car-Following-Models/EIDM.html sumo-1.18.0/docs/userdoc/Car-Following-Models/EIDM.html
--- sumo-1.17.0/docs/userdoc/Car-Following-Models/EIDM.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Car-Following-Models/EIDM.html	2023-06-28 22:08:56.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -167,7 +167,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/Car-Following-Models.html sumo-1.18.0/docs/userdoc/Car-Following-Models.html
--- sumo-1.17.0/docs/userdoc/Car-Following-Models.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Car-Following-Models.html	2023-06-28 22:08:56.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -183,7 +183,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/ChangeLog.html sumo-1.18.0/docs/userdoc/ChangeLog.html
--- sumo-1.17.0/docs/userdoc/ChangeLog.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/ChangeLog.html	2023-06-28 22:08:56.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -160,7 +160,7 @@
     
         
             Contents
-            Version 1.17.0 (25.04.2023)
+            Version 1.18.0 (29.06.2023)
                 
                     • Bugfixes
                 
@@ -170,7 +170,7 @@
                 
                     • Miscellaneous
                 
-            Version 1.16.0 (07.02.2023)
+            Version 1.17.0 (25.04.2023)
                 
                     • Bugfixes
                 
@@ -180,7 +180,7 @@
                 
                     • Miscellaneous
                 
-            Version 1.15.0 (08.11.2022)
+            Version 1.16.0 (07.02.2023)
                 
                     • Bugfixes
                 
@@ -190,24 +190,24 @@
                 
                     • Miscellaneous
                 
-            Version 1.14.1 (19.07.2022)
+            Version 1.15.0 (08.11.2022)
                 
                     • Bugfixes
                 
                 
                     • Enhancements
                 
-            Version 1.14.0 (12.07.2022)
                 
-                    • Bugfixes
+                    • Miscellaneous
                 
+            Version 1.14.1 (19.07.2022)
                 
-                    • Enhancements
+                    • Bugfixes
                 
                 
-                    • Miscellaneous
+                    • Enhancements
                 
-            Version 1.13.0 (03.05.2022)
+            Version 1.14.0 (12.07.2022)
                 
                     • Bugfixes
                 
@@ -217,7 +217,7 @@
                 
                     • Miscellaneous
                 
-            Version 1.12.0 (25.01.2022)
+            Version 1.13.0 (03.05.2022)
                 
                     • Bugfixes
                 
@@ -227,12 +227,22 @@
                 
                     • Miscellaneous
                 
+            Version 1.12.0 (25.01.2022)
+                
+                    • Bugfixes
+                
+                
+                    • Enhancements
+                
+                
+                    • Miscellaneous
+                
             Older Versions
         
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -264,9 +274,265 @@
                   
                   
 
-Version 1.17.0 (25.04.2023)#
+Version 1.18.0 (29.06.2023)#
 Bugfixes#
 
+Simulation
+Setting param vTpes for actuated and delay_based tls detectors is working again. Issue #13448 (regression in 1.15.0)
+Fixed invalid emission and consumption outputs for the HBEFA4 emission classes (model was calibrated on km/h instead of m/s). Issue #13250
+Collisions on shared walkingareas without vehicular road intersection are now detected. Issue #13132
+A warning is now given if save-state.times are not reached due to a mismatch with step-length and begin time. Issue #13162
+Fixed crash when loading rail simulation state with step-length > 1. Issue #13161
+Fixed crash when loading state with vehicles that have triggered departure. Issue #13096
+Simulation outputs now include non-zero z-data even if the slope is 0. Issue #13171
+Fixed crash / invalid output if a person has a <stop> after accessing a busStop via an access element. Issue #13108
+Fixed invalid 'started' and 'arrivalDelay' after passing a short waypoint edge at high speed. Issue #13179
+Fixed crash after rerouting and losing a stop. Issue #13190
+Fixed invalid TTC computation when both vehicles are extrapolated to stop. Issue #13212
+A parkingReroute now works even if the parkingArea on the current edge is not included in the alternatives list. Issue #13288
+Fixed unnecessary emergency braking when cars urgently needs to swap lanes. Issue #13295  
+IDM no longer violates right of way due to imprecise stopping at minor link. Issue #13369
+Fixed error when loading personTrip between identical stops. Issue #13385
+Fixed invalid error message for disconnected personTrip between stops. Issue #13386
+Fixed collision on junction due to unsafe lane changing. Issue #13363  
+Fixed error when using option --replay-rerouting. Issue #13389
+Fixed invalid saved state when input contains route distribution within a vehicle. Issue #13449
+Fixed emergency braking / collision at roundabout. Issue #13292
+Fixed emergency braking on traffic light junction #13516
+The simulation now aborts when encountering an invalid stop definition (unless option --ignore-errors is set). Issue #12670
+bidirectional lane use:
+Fixed invalid collision warning when using bidi lane. Issue #13312
+Fixed unsafe right-of-way rules at junction with shared median lane. Issue #13316
+Fixed frontal collision on shared median lane. Issue #13313
+Fixed deadlock on bidi edge. Issue #13396
+Fixed blockage on intersection with oncoming leader. Issue #13397
+Fixed collision and emergency braking. Issue #11642
+
+
+
+
+
+
+netedit
+Fixed crash when importing OSM data direclty. Issue #13297 (regression in 1.16.0)
+Fixed invalid undo operation after moving a set of network elements. Issue #13421 (regression in 1.16.0)
+Fixed segfault when closing netedit and no net is loaded #13131 (regression in 1.17.0)
+Fixed spacing for person mode path info subframe. Issue #13140 (regression in 1.17.0)
+Loading Data Elements via menu item is working again. Issue #13224 (regression in 1.17.0)
+Saving plain xml now works when selecting an existing plain-xml file to define the output prefix. Issue #13200 (regression in 1.16.0)
+netdiff-dialog now permits to change the output prefix. Issue #13130
+Fixed invalid default values in netgenerate dialog and tool dialogs. Issue #13152
+Boolean options can now be reset in tool dialogs. Issue #13156
+Function 'add reverse edge' applied on a selection, no longer adds duplicate reverse edges. Issue #13209
+Fixed inconsistent ordering of popup functions for additionals. Issue #13261
+Stops at a trainStop can now be defined. Issue #13258
+Loading a second .sumocfg now properly resets all options. Issue #13123
+Object ids that contain the characters !, ? or * (which are permitted in sumo) can now be loaded (such ids are discouraged since they make it more difficult to list object ids on the command line). Issue #13351
+A person with a single stop stage is now visible after loading. Issue #13126
+Creation of busStops and trainStops with the same id is now prevented (since this would give an error when loading the simulation). Issue #13269
+Person rides between rail stops can now be defined. Issue #13273
+Fixed crash saving network with stop container plans #13390
+In the vType editor, the vClass attribute is now updated when switching current type. Issue #13317
+The "stacked" person indicator is now working for persons that start at a busStop. Issue #12380
+Z value is no longer applied twice in move mode. Issue #13411
+Fixed error when saving sumo/netedit configs at path containing spaces. Issue #13373
+Added missing updates of frames after undo/redo. Issue #13429
+Python tools now work when the SUMO_HOME path contains spaces. Issue #13458
+Using netedit to define custom detectors for actuated traffic lights is now working. Issue #13412
+Resetting the next attribute of branching traffic light programs is now working. issue #13409
+Trigger attributes can no longer be defined for waypoints (the simulation does not allow this). Issue #13499
+
+
+
+
+sumo-gui
+The breakpoint-dialog now takes into account the begin time when rounding breakpoints to a reachable step. Issue #13163
+game mode now switches time display style for all time labels. Issue #13211
+Fixed crash when switching to a (mismatching) alternative net file. Issue #13215
+Clicking on a vehicle id which is not in the network no longer moves the view to Position::INVALID. Issue #13251
+Fixed invalid rendering of spread-bidi lanes for shared median lane network. Issue #13343
+Fixed bug where vehicle context menu function 'select foes' did not select all relevant junction foes. Issue #13358
+
+
+
+
+netconvert
+Fixed inconsistent network file after setting --default.spreadtype center. Issue #13127
+OpenDRIVE export: fixed invalid crosswalk shape. Issue #10432  
+Fixed invalid connection permissions after joining junction. Issue #13217
+Fixed broken network after setting option --tls.rebuild. Issue #13240
+Fixed classification of turnaround connection on some divided highways. Issue #13238    
+Fixed invalid consistency error for circular public transport line. Issue #13255
+OSM: fixed incomplete pt-route. Issue #13249
+OSM: fixed problems with one-way bus and bicycle infrastructure. Issue #12592
+OSM: fixed crash when using option --osm.turn-lanes. Issue #13413
+User defined node radius is no longer ignored for geometry-like nodes. Issue #13064      
+Fixed incomplete ptline-output for circular route. Issue #13431
+Fixed minor links in rail taxi network. Issue #13456
+Fixed unsafe signal plan at joint tls. Issue #13502
+Fixed overly large junction shapes when edges meet at a sharp angle. Issue #13505
+bidi edges
+Option --railway.topology.repair.minimal now performs minimal repair with respect to public transport lines. Issue #13248
+Fixed bug where bidi edge could not be declared. Issue #13225    
+Fixed bug where option --railway.topology.repair created superfluous bidi edges. Issue #13247
+Fixed missing bidi attribute for shared median lane with disconnected outer lanes. Issue #13335
+Fixed invalid bidi attribute for internal edge. Issue #13344
+Fixed invalid right of way rules when shared median lane ends. Issue #13345
+Fixed unsafe right of way rules at internal junction with bidiLane. Issue #13400
+Fixed asymmetrical bidi attribute. Issue #13510  
+
+
+
+
+
+
+duarouter
+Fixed railway routing failure if the stop is defined on a short buffer edge (also applies to sumo). Issue #13277
+Fixed invalid route cost for train reversal on long edge (also applies to sumo). Issue #13360
+Fixed intermodal routing failing for rail taxi (also applies to sumo). Issue #13424
+Fixed invalid ride in output when starting personTrip on rail edge. Issue #13506
+Initial taxi waiting time is now included in cost computation when a personTrip starts with a taxi ride. Issue #13513
+Fixed invalid route output when a personTrip provides alternative vehicle modes. Issue #13512
+
+
+
+
+activitygen
+Fixed crash when there are no work positions within a city. Issue #13315
+Now handling nan values in population input. Issue #13323
+Fixed invalid work position statistics when stat file is lacking city gates. Issue #13381
+
+
+
+
+TraCI
+Fixed crash when calling traci.load and running with sumo-gui. Issue #13150 (regression in 1.16.0)
+Calling vehicle.insertStop now preserves the original route edges beyond the inserted stop. Issue #13092
+Fixed libtraci crashes when working on closed connection. Issue #13285
+Fixed missing vehicle type in saved state and vehroute-output for vehicle added via TraCI. Issue #13384
+Added missing error reporting when setting invalid carFollowModel parameters via traci.vehicle.setParameter. Issue #13399
+
+
+
+
+Tools
+Fixed mouse control in several game scenarios. Issue #13366 (regression in 1.17.0)
+Fixed error when calling some tools without argument. Issue #13388 (regression in 1.17.0)
+abstractRail.py: Failure to optimize one region is now recoverable. Issue #13193
+gridDistricts.py: Networks with non-normalized offsets now create correct taz shapes. Issue #13264
+Function sumolib.net.getBoxXY now returns correct results for large networks. Issue #13320
+In circlePolygon.py, abbreviation -c is used for config, instead for color
+When loading a tool configuration, unknown options now raise an error. Issue #13091  
+generateRailSignalConstraints.py: fixed invalid bidi constraint for trains with multiple diversionary tracks between stops. Issue #13519
+
+
+
+Enhancements#
+
+Simulation
+Added options --intermodal-collision.action and --intermodal-collision.stoptime to configure vehicle behavior after colliding with a pedestrian. Issue #13133
+In the sublane mode, vehicle elevation is now interpolated when lane changing between lanes that have different z-values. Issue #13170  
+Added device.taxi.idle-algorithm value taxistand which makes idle taxis return to a pre-configured set of locations. Issue #13334
+The SSM-device now supports the new surrogate safety measure "MDRAC" which is modified maximum deceleration rate to avoid crash with perception/reaction time. Issue #13350
+statistic-output now include the number of emergency braking events. Issue #10596
+Vehicles can now be configured to ignore specific vehicles during car-following by using generic parameters carFollowMode.ignoreIDs and carFollowModel.ignoreTypes. Issue #13362  
+Stops now support custom parameters #13365
+Multi-Entry-Exit (E3) detectors now support attribute expectArrival to suppress arrival warnings. Issue #13476
+Vehicles with depart="split" now automatically adapt their departPos to the rear of the train from which they split. Issue #13480
+
+
+
+
+sumo-gui
+Element parkingArea now supports placing stopping places to the left of the lane in right-hand networks by setting attribute lefthand="true". Issue #13303
+Simulation end time is now written into the message window. Issue #13145
+Live edgeData can now be observed after the simulation ends. Issue #13144
+vTypes of typed detectors are now shown in the detector parameter dialog. Issue #13447
+
+
+
+
+netedit
+Supermodes can now be activated using the modes menu. Issue #13138
+After generating a network without warnings, the new network will open directly without manually closing the output dialog. Issue #13149
+Implemented new dialog for setting netedit and sumo options. This dialog supports option help, file selection dialogs and permits dynamic filtering of listed options. Issue #12007
+Simplified selection of .sumocfg files when calling runSeeds.py tool. Issue #13118
+Simplified seelction of edge is when calling python tools. Issue #12852
+The traffic light join mode now has  'OK / 'cancel' buttons. Issue #13028
+Now netedit supports trip and flows over TAZs. Issue #13311
+Improved error messages when loading additional objects. Issue #13507
+
+
+
+
+netconvert
+OpenDRIVE import: now supports road objects from connecting roads. Issue #13196
+OpenDRIVE export: now includes additional road object attributes. Issue #13205
+Added option --geometry.remove.max-junction-size FLOAT to prevent unsmooth road shape when converting large junctions to a geometry point. Issue #13199
+OSM import: typemap osmNetconvertRailUsage.typ.xml now imports service designation. Issue #13213
+Unused edge types are now excluded from .net.xml. Issue #13228
+Added option --railway.signal.guess.by-stops to add rail_signal nodes to a network that is lacking them. Issue #5143
+When using option --tls.rebuild, the tltype can be changed by setting option --tls.default-type. Issue #13267
+Added option --junctions.minimal-shape to enforce small junctions. Issue #13377
+Added option --opendrive.signal-groups to import controller information from OpenDRIVE. Issue #2365
+Added option --tls.join-exclude for more control over automatic tls joining. Issue #13466
+
+
+
+
+TraCI
+Added function simpla.getPlatoonID. Issue #13029
+Added functions lane.getAngle' andedge.getAngle`. Issue #10901
+Added function vehicle.getJunctionFoes. Issue #12640
+Using UTF-8 consistently. Issue #7171  
+getAllContextSubscriptionResults has now entries also for objects without results. Issue #6446
+Vehicles with SSM device now permit retrieval of the minimum PPET using param device.ssm.minPPET. Issue 13293
+Function traci.vehicle.setStopParameter and getStopParameter now supports optional argument customParam=True to work with user defined stop parameters. Issue #13365
+vehicle and vehicletype domain now support the functions set/getBoardingDuration and set/getImpatience. When impatience is set on a vehicle it affects the dynamic impatience which gets reset on starting to drive. Calling vehicle.getImpatience now returns the dynamic impatience instead of the base value defined in the vType. Issue #10430, #13403
+
+
+
+
+tools
+randomTrips.py: added options --from-stops and --to-stops to define pedestrians, personTrips and person rides from and to stops (i.e. busStop). Issue #13375
+randomTrips.py: now issues a warning if option --binomial is too low for the given period. Issue #13404
+plotXMLAttributes.py and plot_trajectories.py now show the plot by default. Issue #13158
+plotXMLAttributes.py: Added option --join-files to treat data points from different files as if coming from the same file. Issue #13154
+plotXMLAttributes.py: Now supports attribute value @DENSITY to create density plots. Issue #13182
+runSeeds.py: shortened generated folder names. Issue #13167
+runSeeds.py: added option --no-folders to keep all written files in the same directory when running with multiple configuration files or applications (folder name becomes file name prefix). Issue #13157
+routeSampler: Added option --taz-files and support for loading origin destination matrices in tazRelation format. Issue #6890
+abstractRail.py: Now handles regions without stops. Issue #13221
+gtfs2pt.py: can now disable generation of pedestrian access via option --skip-access. Issue #12774
+gtfs2pt: stop names are now included in route-output. Issue #13274
+ptlines2flows.py: now support configuration files. Issue #13254  
+generateParkingAreas.py: now support option --lefthand to create lefthand parking areas. Issue #13305
+scheduleStats.py: Now permits analysis of planned and actual travel time between pairs of stops. Issue #13354
+tileGet.py now supports option --parallel-jobs to speed up data retrieval. Issue #13327
+checkStopOrder.py: can now generate a combined stop table for multiple stop locations. Issue #13259
+checkStopOrder.py: marks waypoints in stop table output. Issue #13420
+checkStopOrder.py: added option --filter-ids to filter the input by vehicle id. Issue #13488  
+generateRailSignalConstraints.py: now supports portion working (vehicles with depart="split"). Issue #13478
+generateRailSignalConstraints.py: now finds additional bidi conflicts. Issue #12085
+improved game internationalization. Issue #13082
+
+
+
+Miscellaneous#
+
+splitRouteFiles.py, netcheck.py, plot_csv_bars.py, plot_net_trafficLights.py and plot_csv_timeline now use the -c shortcut for loading a configuration. All options that previously used this continue to work with the respective long option name (e.g. --columns). Issue #8409 and #12874
+plotXMLAttributes.py and plot_trajectories.py no longer create output file 'plot.png' by default. Issue #13166
+netconvert: road objects imported from OpenDRIVE are now placed on a higher layer to make them visible above the road. Issue #13197
+netconvert: option --osm.all-attributes now defaults to exporting all attributes because the explicit list of attributes (--osm.extra-attributes) now defaults to value all. Issue #13218
+netconvert: increased default bike path width. Issue #13425
+Netedit demand mode hotkeys changed: C now activates container mode and L activates person plan mode. Issue #13141
+All strings sent and received by TraCI are now utf8 encoded and interpreted as utf8. Issue #7171
+traci.simulationStep has no return value on Python any longer (similar to the other languages), use traci.simulationStepLegacy for the old behavior. Issue #13296
+The default file extension for netedit configuration files was changed from .neteditconfig to .netecfg for consistency with other config extensions. Issue #13100
+
+Version 1.17.0 (25.04.2023)#
+Bugfixes#
+
 
 Simulation
 
@@ -332,7 +598,7 @@
 Fixed crash when unjoining a joint traffic light. Issue #12610
 Fixed "Invalid reference counter" error after recomputing with volatile options with data elements. Issue #13058
 Netedit now gives a warning when changing user defined junction type 'rail_crossing' to priority. Issue #9273
-Fixed bug where person plan elements after a stop where not loaded correctly. Issue #13125
+Fixed bug where person plan elements after a stop were not loaded correctly. Issue #13125
 
 
 
@@ -415,7 +681,7 @@
 
 
 
-Enhancements#
+Enhancements#
 
 Simulation
 Vehroute-output now includes the used vehicles for <driving> stage. Issue #12520
@@ -437,9 +703,9 @@
 
 
 netconvert
-Added options --shapefile.width and --shapefile.length to allow importing custom widths and lengths from shape files. Issue #12575
-Exceptions for turning restrictions are now imported from OSM. Issue #12645
+Added options --shapefile.width and --shapefile.length to allow importing custom widths and lengths from shape files. Issue #12575  
 Option --osm.extra-attributes now also applies to all node attributes. Issue #12677
+OSM: Exceptions for turning restrictions are now imported. Issue #12645
 OSM: Supporting bus lane restrictions using psv. Issue #6767
 junction attribute 'radius' now overrides option --junctions.small-radius. Issue #12816
 merging two projected plain-xml networks with different offsets is now working. Issue #12841
@@ -451,11 +717,11 @@
 
 
 netedit
-Added menu entry for directly calling netgenerate and and instantly editing the generated network. Issue #2393
+Added menu entry for directly calling netgenerate and instantly editing the generated network. Issue #2393
 Added menu and dialogs for calling python tools without using the command line. Issue #4138
 When calling netdiff from tools menu, the computed differences may be selectively imported for visualization (i.e. differently colored shapes for added, deleted and modified edges). Issue #2736
 All objects with a name attribute can now be located by name using the locate-dialog. Issue #12686
-Inspect now allows inspecting individual objects that are part of a selection via ALT+LEFT_CLICK. Issue #12690
+Inspect mode now allows inspecting individual objects that are part of a selection via ALT+LEFT_CLICK. Issue #12690
 In data mode, overlapped data elements list is now sorted by interval begin. Issue #11330
 If a route is selected it will always be shown on top of other overlapping routes. Issue #12582
 The vehicle type "DEFAULT_RAILTYPE" can now be used for defining trains. Issue #6752
@@ -519,7 +785,7 @@
 Improved compatibility between sumolib phase definitions and libsumo phase definitions. Issue #12131
 Added tool abstractRail.py to generate an abstract/schematic rail network based on a geodetic rail network. Issue #12662
 Added tool stationDistricts.py for segmenting a public transport network based public transport stations. Issue #12662
-Added tool attributeCompare.py to compare matching attribute across multiple files. Issue #13026
+Added tool attributeCompare.py to compare matching attributes across multiple files. Issue #13026
 attributeDiff.py: Can now optionally group attributes by one or more id-attributes before comparing. #12794
 attributeDiff.py: optionally write entries that could not be compared (via new options -m and -M. Issue #12798
 attributeStats.py: Now supports option --human-readable-time (-H) to make attributes with large time values more legible. Issue #12822
@@ -552,7 +818,7 @@
 
 
 
-Miscellaneous#
+Miscellaneous#
 
 Netedit help menu now links to to netedit shortcuts. Issue #12626
 Removed libsumo / libtraci from the binary windows release to avoid version mismatch. Instead the user must install the bindings for their installed python version via pip. Issue #11992
@@ -565,7 +831,7 @@
 Added documentation page for all xml elements and their attributes. Issue #12658
 
 Version 1.16.0 (07.02.2023)#
-Bugfixes#
+Bugfixes#
 
 Simulation
 Improved simulation speed in large networks with simulation routing. Issue #12416 (regression in 1.2.0)
@@ -757,7 +1023,7 @@
 
 
 
-Enhancements#
+Enhancements#
 
 Simulation
 Elements <ride> and <transport> can now be defined without attribute lines and default to a value of ANY (taking any eligible vehicle that stops at the destination). Issue #12167
@@ -899,7 +1165,7 @@
 
 
 
-Miscellaneous#
+Miscellaneous#
 
 Added exemplary plots to many simulation-output documentation pages (with linked example commands to create them).
 Netconvert options for writing polygons are now documented. Issue #12135
@@ -912,7 +1178,7 @@
 The netdiff tool accessible via the 'Tools' menu has been temporarily disabled due to stability issues. #12435
 
 Version 1.15.0 (08.11.2022)#
-Bugfixes#
+Bugfixes#
 
 Simulation
 Fixed crash when using bluelight vehicle and SSM device. Issue #11336 (regression in 1.12.0)
@@ -1123,7 +1389,7 @@
 
 
 
-Enhancements#
+Enhancements#
 
 Simulation
 Added option --tls.actuated.detector-length to set the default length of actuation detectors. Issue #11335
@@ -1292,7 +1558,7 @@
 
 
 
-Miscellaneous#
+Miscellaneous#
 
 Translation efforts for the grahpical applications and command line messages have begun and contributions are welcome at Weblate. Issue #11237
 Added xsd-schema for battery-export. Issue #11173
@@ -1308,7 +1574,7 @@
 Improved documentation for 3D-Visualization. Issue #10926
 
 Version 1.14.1 (19.07.2022)#
-Bugfixes#
+Bugfixes#
 
 Simulation
 Fixed avoidable simulation slow-down (~20% in some scenarios). #11203 (regression in 1.9.0)
@@ -1363,7 +1629,7 @@
 
 
 
-Enhancements#
+Enhancements#
 
 Simulation
 Added new laneChangeModel parameter lcOvertakeDeltaSpeedFactor to configure the threshold for not overtaking a slightly faster leader vehicle. Issue #11010
@@ -1390,7 +1656,7 @@
 
 
 Version 1.14.0 (12.07.2022)#
-Bugfixes#
+Bugfixes#
 
 Simulation
 Fixed invalid speed when approaching stop for carFollowModel IDM. Issue #8577
@@ -1538,7 +1804,7 @@
 
 
 
-Enhancements#
+Enhancements#
 
 Simulation
 Added support for PHEMlight V5. Among other things, this permits modelling of fleet aging. Issue #10237
@@ -1651,7 +1917,7 @@
 
 
 
-Miscellaneous#
+Miscellaneous#
 
 Outputfile comment header no longer includes options that were set automatically (only user defined options). Issue #10712
 Outputs now use attribute period instead of freq whenever denoting a time period. Issue #10657
@@ -1661,7 +1927,7 @@
 The documentation now has a Copy-button next to every code block. Issue #11050
 
 Version 1.13.0 (03.05.2022)#
-Bugfixes#
+Bugfixes#
 
 Simulation
 Fixed crash with departLane=best and given arrivalLane. Issue #10614 (regression in 1.9.0)
@@ -1884,7 +2150,7 @@
 
 
 
-Enhancements#
+Enhancements#
 
 Simulation
 traffic lights
@@ -2036,7 +2302,7 @@
 
 
 
-Miscellaneous#
+Miscellaneous#
 
 simulation
 Rerouter attribute 'file' is no longer supported. Intervals should be child elements of rerouters. Alternatively, element <include href="FILE"/>  may be used. Issue #9579
@@ -2053,7 +2319,7 @@
 Documented attribute plotting and extended vehicle visualization features. Issue #10558, #10559
 
 Version 1.12.0 (25.01.2022)#
-Bugfixes#
+Bugfixes#
 
 simulation
 Fixed bug where persons could enter the wrong vehicle and thereby cause a taxis simulation to crash. Issue #9821, #9733 (regression in 1.11.0)
@@ -2224,7 +2490,7 @@
 
 
 
-Enhancements#
+Enhancements#
 
 simulation
 Persons are now included in saved simulation state when setting option --save-state.transportables. Issue #2792
@@ -2343,7 +2609,7 @@
 
 
 
-Miscellaneous#
+Miscellaneous#
 
 SUMO can now be installed from python wheels. This provides up to date release and nightly versions (via test.pypi.org) for all platforms. #4639
 Added documentation on road capacity and headways. Issue #9870
@@ -2414,7 +2680,7 @@
 
         
           
-            
This page was last edited on: 24 April 2023
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Contact.html sumo-1.18.0/docs/userdoc/Contact.html
--- sumo-1.17.0/docs/userdoc/Contact.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Contact.html	2023-06-28 22:08:56.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -179,7 +179,7 @@
                   
                   
 
-Please refer to eclipse.org/sumo/contact
+Please refer to eclipse.dev/sumo/contact
                 
           
           
@@ -187,7 +187,7 @@
 
         
           
-            
This page was last edited on: 11 February 2021
+            
This page was last edited on: 22 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Contributed/Cadyts.html sumo-1.18.0/docs/userdoc/Contributed/Cadyts.html
--- sumo-1.17.0/docs/userdoc/Contributed/Cadyts.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Contributed/Cadyts.html	2023-06-28 22:08:56.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -166,7 +166,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/Contributed/index.html sumo-1.18.0/docs/userdoc/Contributed/index.html
--- sumo-1.17.0/docs/userdoc/Contributed/index.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Contributed/index.html	2023-06-28 22:08:56.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -180,7 +180,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -251,12 +251,12 @@
 The following extensions are managed and supported by other parties.
 Demand Generators#
 
-Citymob for Roadmapsmobility pattern generator for vehicular networks (VANet focus)
+
Citymob for Roadmapsmobility pattern generator for vehicular networks (VANet focus)
 
 
 Scenario and Network Editors#
 
-eWorldan application that allows to convert and enrich roads networks
+
eWorldan application that allows to convert and enrich roads networks
 
 
 
@@ -274,20 +274,20 @@
 
 
 
-TraNSconnects SUMO to ns-2
+
TraNSconnects SUMO to ns-2
 
 
 
-MOVEconnects SUMO to ns-2
+
MOVEconnects SUMO to ns-2
 
 
 
-VSimRTIC2X environment connecting SUMO to different network and application simulators (OMNeT++ and JiST/SWANS)
+
VSimRTIC2X environment connecting SUMO to different network and application simulators (OMNeT++ and JiST/SWANS)
 
 
 Other#
 
-TraCI4MatlabA Matlab interface for connecting and extending information via TraCI
+
TraCI4MatlabA Matlab interface for connecting and extending information via TraCI
 
 
 
@@ -345,7 +345,7 @@
 
         
           
-            
This page was last edited on: 30 March 2022
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Contributed/iTranSIM.html sumo-1.18.0/docs/userdoc/Contributed/iTranSIM.html
--- sumo-1.17.0/docs/userdoc/Contributed/iTranSIM.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Contributed/iTranSIM.html	2023-06-28 22:08:56.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -166,7 +166,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/Contributed/SmallMaps.html sumo-1.18.0/docs/userdoc/Contributed/SmallMaps.html
--- sumo-1.17.0/docs/userdoc/Contributed/SmallMaps.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Contributed/SmallMaps.html	2023-06-28 22:08:56.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -166,7 +166,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/Contributed/SUMOPlayer.html sumo-1.18.0/docs/userdoc/Contributed/SUMOPlayer.html
--- sumo-1.17.0/docs/userdoc/Contributed/SUMOPlayer.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Contributed/SUMOPlayer.html	2023-06-28 22:08:56.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -167,7 +167,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/Contributed/SUMOPy/Demand/Turn_Flows.html sumo-1.18.0/docs/userdoc/Contributed/SUMOPy/Demand/Turn_Flows.html
--- sumo-1.17.0/docs/userdoc/Contributed/SUMOPy/Demand/Turn_Flows.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Contributed/SUMOPy/Demand/Turn_Flows.html	2023-06-28 22:08:56.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
diff -Nru sumo-1.17.0/docs/userdoc/Contributed/SUMOPy/Demand/Zone_To_Zone.html sumo-1.18.0/docs/userdoc/Contributed/SUMOPy/Demand/Zone_To_Zone.html
--- sumo-1.17.0/docs/userdoc/Contributed/SUMOPy/Demand/Zone_To_Zone.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Contributed/SUMOPy/Demand/Zone_To_Zone.html	2023-06-28 22:08:56.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
diff -Nru sumo-1.17.0/docs/userdoc/Contributed/SUMOPy/GUI/Demand_Modelling.html sumo-1.18.0/docs/userdoc/Contributed/SUMOPy/GUI/Demand_Modelling.html
--- sumo-1.17.0/docs/userdoc/Contributed/SUMOPy/GUI/Demand_Modelling.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Contributed/SUMOPy/GUI/Demand_Modelling.html	2023-06-28 22:08:56.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
diff -Nru sumo-1.17.0/docs/userdoc/Contributed/SUMOPy/GUI/Getting_Started.html sumo-1.18.0/docs/userdoc/Contributed/SUMOPy/GUI/Getting_Started.html
--- sumo-1.17.0/docs/userdoc/Contributed/SUMOPy/GUI/Getting_Started.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Contributed/SUMOPy/GUI/Getting_Started.html	2023-06-28 22:08:56.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -190,7 +190,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -389,7 +389,7 @@
 choosing the menu
 Network>Edit with netedit
 netedit| will be fired up with the network ready to be edited. The use
-of netedit| is documented here: http://sumo.dlr.de/docs/netedit.html. After
+of netedit| is documented here: https://sumo.dlr.de/docs/netedit.html. After
 editing, the network must be saved within netedit| be pressing -s
 or with File>save|. Then netedit| can be closed and the modified
 network will be reimported into SUMOPy.
@@ -436,7 +436,7 @@
 
         
           
-            
This page was last edited on: 11 February 2021
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Contributed/SUMOPy/Installation/Linux.html sumo-1.18.0/docs/userdoc/Contributed/SUMOPy/Installation/Linux.html
--- sumo-1.17.0/docs/userdoc/Contributed/SUMOPy/Installation/Linux.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Contributed/SUMOPy/Installation/Linux.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -197,7 +197,7 @@
 included in the repositories of more recent Linux distributions, as for
 example Ubuntu-16.04. In this case, do the following safe operation to
 install python-wxgtk2.8:
-echo "deb http://archive.ubuntu.com/ubuntu wily main universe"| sudo tee /etc/apt/sources.list.d/wily-copies.list
+echo "deb https://archive.ubuntu.com/ubuntu wily main universe"| sudo tee /etc/apt/sources.list.d/wily-copies.list
 
 sudo apt install python-wxgtk2.8
 
@@ -225,7 +225,7 @@
 
         
           
-            
This page was last edited on: 10 December 2021
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Contributed/SUMOPy/Installation/Windows.html sumo-1.18.0/docs/userdoc/Contributed/SUMOPy/Installation/Windows.html
--- sumo-1.17.0/docs/userdoc/Contributed/SUMOPy/Installation/Windows.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Contributed/SUMOPy/Installation/Windows.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
diff -Nru sumo-1.17.0/docs/userdoc/Contributed/SUMOPy/Simulation/Sublanes.html sumo-1.18.0/docs/userdoc/Contributed/SUMOPy/Simulation/Sublanes.html
--- sumo-1.17.0/docs/userdoc/Contributed/SUMOPy/Simulation/Sublanes.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Contributed/SUMOPy/Simulation/Sublanes.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
diff -Nru sumo-1.17.0/docs/userdoc/Contributed/SUMOPy/Tutorials/Open_and_Simulate.html sumo-1.18.0/docs/userdoc/Contributed/SUMOPy/Tutorials/Open_and_Simulate.html
--- sumo-1.17.0/docs/userdoc/Contributed/SUMOPy/Tutorials/Open_and_Simulate.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Contributed/SUMOPy/Tutorials/Open_and_Simulate.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -169,7 +169,7 @@
     

 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 

diff -Nru sumo-1.17.0/docs/userdoc/Contributed/SUMOPy.html sumo-1.18.0/docs/userdoc/Contributed/SUMOPy.html
--- sumo-1.17.0/docs/userdoc/Contributed/SUMOPy.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Contributed/SUMOPy.html	2023-06-28 22:08:56.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -169,7 +169,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -205,8 +205,8 @@
 SUMOPy. SUMOPy is intended to expand the user-base of the traffic
 micro-simulator SUMO by providing a user-friendly, yet flexible
 simulation suite. The original publication related to SUMOPy can be
-found at the University of Bologna
-and in the proceedings of the SUMO2013.
+found at the University of Bologna
+and in the proceedings of the SUMO2013.
 A further scope of SUMOPy is to manage the huge amount of data necessary
 to run complex multi-modal simulations. This includes different demand
 generation methods such as support for OD matrices, turnflows and a
@@ -309,7 +309,7 @@
 
         

           
-            
This page was last edited on: 19 July 2022
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Contributed/SUMO_Traffic_Modeler.html sumo-1.18.0/docs/userdoc/Contributed/SUMO_Traffic_Modeler.html
--- sumo-1.17.0/docs/userdoc/Contributed/SUMO_Traffic_Modeler.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Contributed/SUMO_Traffic_Modeler.html	2023-06-28 22:08:56.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
diff -Nru sumo-1.17.0/docs/userdoc/Data/Networks.html sumo-1.18.0/docs/userdoc/Data/Networks.html
--- sumo-1.17.0/docs/userdoc/Data/Networks.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Data/Networks.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -166,7 +166,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -219,7 +219,7 @@
 Data/Scenarios/TAPASCologne - a complete scenario based on OSM and TAPAS
 Frida-project#
 
-URL: http://frida.intevation.org/
+URL: https://frida.intevation.org/
 Area: city of Osnabrück
 Demand data: not available
 Extraction: netconvert --shapefile strassen -o frida2.net.xml
@@ -243,7 +243,7 @@
 
         
           
-            
This page was last edited on: 28 April 2021
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Data/Scenarios/TAPASCologne.html sumo-1.18.0/docs/userdoc/Data/Scenarios/TAPASCologne.html
--- sumo-1.17.0/docs/userdoc/Data/Scenarios/TAPASCologne.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Data/Scenarios/TAPASCologne.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             

                             
-                                Contact
+                                Contact
                             
                         

 
@@ -186,7 +186,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -221,14 +221,14 @@
 "TAPAS Cologne" Scenario#
 Availability#
  The data is available under the
-Creative Commons
+Creative Commons
 license. You must tell where the data is from, it is not allowed
 to use it for commercial purposes, as soon as you use it we want to
 be informed about it (use the
 sumo-user mailing list).
-The data can be downloaded from our scenario
+
The data can be downloaded from our scenario
 repository.
-There also vehicle traces available from the KolnTrace project at CITI
+There also vehicle traces available from the KolnTrace project at CITI
 Lab.
 About#
 Brief Description#
@@ -238,10 +238,10 @@
 population generated based on information about travelling habits of
 Germans and on information about the infrastructure of the area they
 live in. More information about the system can be found within this
-publication on
+publication on
 TAPAS. The
 original data was using a closed-source road network and was mapped onto
-one stemming from the OpenStreetMap
+one stemming from the OpenStreetMap
 project.
 As is, TAPASCologne is only hardly usable. Work must be put into
 improving the network quality, as well as into verification of the
@@ -386,7 +386,7 @@
 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].
+[1].
 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
@@ -464,7 +464,7 @@
 
         

           
-            
This page was last edited on: 03 April 2023
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Data/Scenarios.html sumo-1.18.0/docs/userdoc/Data/Scenarios.html
--- sumo-1.17.0/docs/userdoc/Data/Scenarios.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Data/Scenarios.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -188,7 +188,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -231,8 +231,8 @@
 Bologna#
 A small-scale scenario based on the city of Bologna. The large
 roundabout can be found at 44.494554,11.314393. These scenarios were
-developed as part of the iTETRIS project. A
-publication on these scenarios was presented
+developed as part of the iTETRIS project. A
+publication on these scenarios was presented
 at SUMO
 Conference 2014: L.
 Bieker, D. Krajzewicz, A. Morra, C. Michelacci and F. Cartolano,
@@ -240,7 +240,7 @@
 of Bologna", SUMO2014, p 19-26
 
 Bologna Scenario on GitHub
-(Old release) Download .zip files from SourceForge
+(Old release) Download .zip files from SourceForge
 
 Braunschweig#
 
@@ -312,10 +312,10 @@
 mobility wishes for an area population generated based on information
 about travelling habits of Germans and on information about the
 infrastructure of the area they live in.
-More information about the system can be found within this publication
+
More information about the system can be found within this publication
 on TAPAS.
 The original data was using a closed-source road network and was mapped
-onto one stemming from the OpenStreetMap
+onto one stemming from the OpenStreetMap
 project.
 There is further information about
 TAPASCologne.
@@ -329,8 +329,8 @@
 SUMO simulation files for running 24h of car traffic in five large-scale cities
 Further real-world scenarios#
 
-Bologna Ringway.
-    Scenario built within the COLOMBO R&D
+
Bologna Ringway.
+    Scenario built within the COLOMBO R&D
     project.
 
 
@@ -340,14 +340,14 @@
 Synthetic scenarios#
 Synthetic - or abstract - scenarios only resemble typical layouts of
 real-world junctions and arterials without mapping a very specific one.
-Some synthetic scenarios of the COLOMBO R&D
+Some synthetic scenarios of the COLOMBO R&D
 project are examples of the German guideline
-RiLSA. They are described in D1.1 "Scenario Specifications and Required
+RiLSA. They are described in D1.1 "Scenario Specifications and Required
 Modifications to Simulation
 Tools"(chapter
 4).
 
-Download: 4 RiLSA *.zip files
+Download: 4 RiLSA *.zip files
 
 Wildau#
 This scenario can be followed as a tutorial - it showcases how routes can be generated within a network, using counting data.
@@ -364,7 +364,7 @@
 
         
           
-            
This page was last edited on: 13 March 2023
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Data/Traffic_Data.html sumo-1.18.0/docs/userdoc/Data/Traffic_Data.html
--- sumo-1.17.0/docs/userdoc/Data/Traffic_Data.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Data/Traffic_Data.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -174,7 +174,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -219,7 +219,7 @@
 Data Descriptions#
 per-vehicle speed and lengths#
 The data is given as a tar file named
-fsp_speed_and_lengths.tar
+fsp_speed_and_lengths.tar
 (~40MB). Within this tar-file you will find a folder which contains
 compressed (gzip) data files. Each data file represents a day for one
 direction (north/south). The following days are given:
@@ -251,7 +251,7 @@
 Usage examples:
 
 
-"An Example of Microscopic Car Models Validation using the open
+
"An Example of Microscopic Car Models Validation using the open
   source Traffic Simulation
   SUMO";
   Daniel Krajzewicz, Georg Hertkorn, Christian Rössel, Peter Wagner;
@@ -259,7 +259,7 @@
   Symposium, 2002, SCS European Publishing House, 2002, pp. 318-322,
   Simulation in Industry, 14th European Simulation Symposium, Oct.
   2002, Dresden / Germany
-Available as: .pdf, ~320KB.
+Available as: .pdf, ~320KB.
 
 
                 
@@ -269,7 +269,7 @@
 
         
           
-            
This page was last edited on: 11 February 2021
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Definition_of_Vehicles,_Vehicle_Types,_and_Routes.html sumo-1.18.0/docs/userdoc/Definition_of_Vehicles,_Vehicle_Types,_and_Routes.html
--- sumo-1.17.0/docs/userdoc/Definition_of_Vehicles,_Vehicle_Types,_and_Routes.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Definition_of_Vehicles,_Vehicle_Types,_and_Routes.html	2023-06-28 22:08:56.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -270,6 +270,9 @@
                 
                     → Default Krauss Model Description
                 
+                
+                    → Transient carFollowModel Parameters
+                
                 
                     • Lane-Changing Models
                 
@@ -308,6 +311,9 @@
                 
                     • Jumps
                 
+                
+                    • User defined Parameters
+                
             Colors
             Devices
                 
@@ -323,7 +329,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -377,7 +383,7 @@
 
 
 XML Schema
-routes_file.xsd
+routes_file.xsd
 
 
 
@@ -986,7 +992,7 @@
 startupDelay
 float >= 0
 0
-The extra delay time before starting to drive after having had to stop
+The extra delay time before starting to drive after having had to stop. This is not applied after a scheduled <stop> except for carFollowModel="Rail"
 
 
 sigma
@@ -1392,7 +1398,7 @@
 
 rail_urban
 19
-heavier than 'tram' but distinct from 'rail'. Encompasses Light Rail and S-Bahn
+heavier than 'tram' but distinct from 'rail'. Encompasses Light Rail and S-Bahn
 
 
 rail
@@ -1618,7 +1624,7 @@
 
 carFollowing-W99
 W99
-Car following model by Wiedemann, 10-Parameter version
+Car following model by Wiedemann, 10-Parameter version
 
 
 carFollowing-Daniel1
@@ -1688,7 +1694,7 @@
 startupDelay
 0
 >=0
-The extra delay time before starting to drive after having had to stop
+The extra delay time before starting to drive after having had to stop. This is not applied after a scheduled <stop> except for carFollowModel="Rail"
 all models except "Daniel1"
 
 
@@ -2056,7 +2062,7 @@
 
 Default Krauss Model Description#
 The default model is a modification of the model defined by Stefan Krauß
-in Microscopic Modeling of Traffic Flow: Investigation of Collision Free Vehicle Dynamics. The
+in Microscopic Modeling of Traffic Flow: Investigation of Collision Free Vehicle Dynamics. The
 implemented model follows the same idea as that of Krauß, namely: Let
 vehicles drive as fast as possibly while maintaining perfect safety
 (always being able to avoid a collision if the leader starts braking
@@ -2073,6 +2079,26 @@
   collisions when using Ballistic. See also
   Simulation/Basic_Definition#Defining_the_Integration_Method.
 
+Transient carFollowModel Parameters#
+carFollowModel parameters that are expected to change during the simulation are modelled via generic parameters. The following parameters are supported (via xml input and traci.vehicle.setParameter):
+
+carFollowModel.ignoreIDs : ignore foe vehicles with the given ids
+carFollowModel.ignoreTypes : ignore foe vehicles that have any of the given types
+
+If multiple ignore parameters are set, they are combined with "or".
+Foes are ignored while they are being followed.
+Example:
+<vehicle id="ego" depart="0" route="r0">
+   <param key="carFollowModel.ignoreIDs" value="foe1 foe2"/>
+   <param key="carFollowModel.ignoreTypes" value="bikeType"/>
+</vehicle>
+
+
+
+Note
+These parameters take no effect in [meso] (Simulation/Meso.md)
+
+See also transient junctionModel parameters.
 Lane-Changing Models#
 The lane-changing models currently implemented in SUMO are given in the
 following table.
@@ -2086,7 +2112,7 @@
 
 
 LC2013
-The default car following model, developed by Jakob Erdmann based on DK2008 (see SUMO’s Lane-Changing Model). This is the default model.
+The default car following model, developed by Jakob Erdmann based on DK2008 (see SUMO’s Lane-Changing Model). This is the default model.
 
 
 SL2015
@@ -2094,7 +2120,7 @@
 
 
 DK2008
-The original lane-changing model of sumo until version 0.18.0, developed by Daniel Krajzewicz (see Traffic Simulation with SUMO – Simulation of Urban Mobility).
+The original lane-changing model of sumo until version 0.18.0, developed by Daniel Krajzewicz (see Traffic Simulation with SUMO – Simulation of Urban Mobility).
 
 
 
@@ -2689,6 +2715,20 @@
 -1
 when set to a non-negative value, jump to the next mandatory route edge (next stop or arrival edge) and spend the given time for the jump
 
+
+split
+string
+
+vehicle id
+must be set to the id of a vehicle with depart="split". Splits the train upon reaching the stop.
+
+
+join
+string
+
+vehicle id
+must be set to the id of a vehicle that stops with triggered="join". Joins this train to another upn reaching the stop
+
 
 
 
@@ -2747,6 +2787,15 @@
 Caution
 The next stop must be on a different edge that that on which the jump started or the next stop will be skipped.
 
+User defined Parameters#
+Stops support Generic Parameters. These may also be retrieved and modified via TraCI
+<trip id="r0" depart="0"/>
+  <stop edge="E0" duration="10">
+      <param key="userDefined" value="42"/>
+  </stop>
+</trip>
+
+
 Colors#
 A color is defined as red,green,blue or red,green,blue,alpha either
 in a vehicle, route or vType.
@@ -2800,7 +2849,7 @@
 setting the option --device.<DEVICENAME>.probability (e.g. --device.fcd.probability 0.25. This will equip
 about a quarter of the vehicles with an fcd device (each vehicle
 determines this randomly with 25% probability).) To make the assignment
-exact the additional option --device.<DEVICENAME>.deterministic can be set Another option is to pass the
+exact the additional option --device.<DEVICENAME>.deterministic can be set. Another option is to pass the
 list of vehicle ids that shall be equipped using the option --device.<DEVICENAME>.explicit <ID1,ID2,...IDk>.
 
 Note
@@ -2840,7 +2889,7 @@
 
         
           
-            
This page was last edited on: 19 April 2023
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Demand/Activity-based_Demand_Generation.html sumo-1.18.0/docs/userdoc/Demand/Activity-based_Demand_Generation.html
--- sumo-1.17.0/docs/userdoc/Demand/Activity-based_Demand_Generation.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Demand/Activity-based_Demand_Generation.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -217,7 +217,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -1017,7 +1017,7 @@
 
 Model Documentation#
 ActivityGen was developed as a tool for the evaluation of trust
-scenarios in VANETs. The work was part of the project Fidens: Trust
+scenarios in VANETs. The work was part of the project Fidens: Trust
 between Cooperative Systems featuring
 trusted probabilistic knowledge processing in vehicular networks. For
 further documentation on the internals of the model, refer to the source
@@ -1030,7 +1030,7 @@
 
         

           
-            
This page was last edited on: 30 August 2022
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Demand/Automatic_Routing.html sumo-1.18.0/docs/userdoc/Demand/Automatic_Routing.html
--- sumo-1.17.0/docs/userdoc/Demand/Automatic_Routing.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Demand/Automatic_Routing.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -181,7 +181,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -355,6 +355,14 @@
 Another way for defining the set of vehicles that are equipped with a
 rerouting device is via generic
 parameters.
+The following parameters are supported as child elements of a <vType>, <vehicle>, <trip> or <flow>:
+
+device.rerouting.period
+device.rerouting.pre-period
+device.rerouting.proability
+device.rerouting.deterministic
+has.rerouting.device
+
 TraCI#
 The device can be accessed using the TraCI function
 vehicle.getParameter and vehicle.setParameter:
@@ -402,7 +410,7 @@
 
         
           
-            
This page was last edited on: 12 October 2022
+            
This page was last edited on: 09 May 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Demand/Dynamic_User_Assignment.html sumo-1.18.0/docs/userdoc/Demand/Dynamic_User_Assignment.html
--- sumo-1.17.0/docs/userdoc/Demand/Dynamic_User_Assignment.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Demand/Dynamic_User_Assignment.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -163,6 +163,9 @@
             Introduction
             Iterative Assignment (Dynamic User Equilibrium)
                 
+                    • Alternative Route Selection
+                
+                
                     • Route-Choice algorithm
                 
                 
@@ -192,13 +195,15 @@
                 

                     → Loading vehicle types from an additional file
                 
+            Iterative Assignment (Approximating System Optimum)
+            Iterative Assignment (Mixing DUE and SO)
             oneShot-assignment
             marouter
         
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -285,9 +290,15 @@
 the router to the route set of each vehicle in each iteration (at least
 if none of the present routes is the "cheapest") and may be chosen
 according to the route choice mechanisms described below.
+Alternative Route Selection#
 Between successive calls of duarouter, the .rou.alt.xml format is used
 to record not only the current best route but also previously computed
-alternative routes. These routes are collected within a route
+alternative routes. By default the fasted route is considered the best but this criterion may be changed with option --eco-measure to instead minimize a pollutant (i.e. CO2).
+This way, a new alternative route may be added in each iteration.
+The total number of alternatives is limited to 5 and the limit may be changed with option --max-alternatives.
+In each iteration, the route usage probability is calculated for each route (see below). 
+When the number of routes for a vehicle is larger than the defined amount, the route with smallest probability is removed.
+These best routes are collected within a route
 distribution and used when deciding the actual route to drive in the
 next simulation step. This isn't always the one with the currently
 lowest cost but is rather sampled from the distribution of alternative
@@ -299,9 +310,9 @@
 The input for each of the methods is a weight or cost function (w) on
 the edges of the net, coming from the simulation or default costs (in
 the first step or for edges which have not been traveled yet), and a set
-of routes  where each route  has an old cost  and an
-old probability  (from the last iteration) and needs a new cost
- and a new probability .
+of routes  where each route  has an old cost  and an
+old probability  (from the last iteration) and needs a new cost
+ and a new probability .
 Gawron (default)#
 The Gawron algorithm computes probabilities for choosing from a set of
 alternative routes for each driver. The following values are considered
@@ -311,8 +322,6 @@
 
the sum of edge travel times for a set of alternative routes
 the previous probability of choosing a route
 
-Number of Routes in each traveller's route set#
-The maximum number of routes can be defined by users, where 5 is the default value. In each iteration, the route usage probability is calculated for each route. When the number of routes is larger than the defined amount, routes with smallest probabilities are removed.
 Updates of Travel Time#
 The update rule is explained with the following example. Driver d chooses Route r in Iteration i. The travel time Tau_d(r, i+1) is calculated according to the aggregated and averaged link travel times per defined interval (default: 900 s) in Iteration i. The travel time for Driver d's Route r in Iteration i+1 equals to Tau_d(r, i) as indicated in Formula (1). The travel times of the other routes in Driver d's route set are then updated with Formula (2) respectively, where Tau_d(s, i) is the travel time needed to travel on Route s in Iteration i and calculated with the same way used for calculating Tau_d(r, i) an T_d(s, i-1). The parameter beta is to prevent travellers from strongly "remembering" the latest trave time of each route in their route sets. The current default value for beta is 0.3.
 T_d(r, i+1) = Tau_d(r, i) ------------------------------------(1)
@@ -324,10 +333,10 @@
 the new probability. It ignores old costs and old probabilities and
 takes the route cost directly as the sum of the edge costs from the last
 simulation.
-
+
 The probabilities are calculated from an exponential function with
-parameter  scaled by the sum over all route values:
-
+parameter  scaled by the sum over all route values:
+
 
 Caution
 It is recommended to set option --convergence-steps (i.e. to the same number as -last-step) to ensure convergence. Otherwise Logit route choice may keep oscillating, especially with higher values of --logittheta.
@@ -374,6 +383,20 @@
 duarouter and the option vtype-output dummy.xml must be used to
 prevent duplicate definition of vehicle types in the generated output
 files.
+Iterative Assignment (Approximating System Optimum)#
+The system optimal condition can be achieved by replacing the path travel time with the path marginal travel time (MTT). There are two ways to calculate the path MTT: 1) global approximation, which represents the changes in the total system travel time caused by an additional vehicle that is added to the path at a certain time interval, and 2) local approximation, which represents the changes in the path travel time caused by an additional vehicle that is added to the route at a certain time interval. duaIterate.py supports an approach where the path MTT is approximated as a summation of the corresponding link MTTs. bBcause the global approximation of MTT is computationally expensive and is not practical for large-scale DTA, the tool implements the local approximation of MTT. 
+Given that SUMO provides the average travel time of each link, it is not possible to directly calculate the additional travel time that one vehicle inflicts on the link. An alternative approach to compute the link MTT is to calculate the average travel time in successive iterations (with a different number of vehicles assigned to each link in each iteration) and compute the difference in link average travel time. Using this method, the average inflicted additional travel time on the link can be calculated. Therefore, a surrogate model of MTT is used to achieve SO as follows:
+
+where 
+ is the surrogate MTT of link a at simulation step i;  
+ and  
+ are, respectively, the travel time (cost) of link a at simulation steps i-1 and i-2 ; and 
+ and  are, respectively, the traffic flow of link a at simulation steps i-1 and i-2. 
+The Dynamic System Optimal traffic assignment can be activated by setting optons --marginal-cost, --marginal-cost.exp, in duaIterate.py. As the MTTs in the proposed algorithm are calculated based on a local approximation, it may lead to its overestimation. Therefore, it is recommended to use the second term of the MTT equation for calibration (option --marginal-cost.exp)
+For more information about dynamic system optimal modelling in SUMO please refer to https://doi.org/10.52825/scp.v3i.119. 
+Iterative Assignment (Mixing DUE and SO)#
+If traffic consists of a mix of human driven vehicles and computed controlled vehicles one migh assume that the former follow an "egoistic" routing approach (DUE) whereas the latter may be configured to route according to system optimum considerations. 
+The tool duaIterateMix.py can be used to compute the Multiclass Simulation-based Traffic Assignment Problem for Mixed traffic flow. This problem involves a dynamic Traffic Assignment Problem with two vehicle classes: one class follows the System Optimum (SO) principle, while the other class follows the User Equilibrium (UE) principles. The objective is to achieve a multiclass traffic assignment where the travel time for UE-seeking vehicles and the marginal travel time for SO-seeking vehicles between the same origin-destination (OD) pair are equal and minimized. For detailed information on solving the multiclass traffic assignment problem using SUMO, please refer to the following link: https://doi.org/10.48550/arXiv.2301.11083 
 oneShot-assignment#
 An alternative to the iterative user assignment above is incremental
 assignment. This happens automatically when using <trip> input directly in
@@ -400,7 +423,7 @@
 
         

           
-            
This page was last edited on: 03 April 2023
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Demand/Further_Ways_to_import_Vissim_Demand_Definitions.html sumo-1.18.0/docs/userdoc/Demand/Further_Ways_to_import_Vissim_Demand_Definitions.html
--- sumo-1.17.0/docs/userdoc/Demand/Further_Ways_to_import_Vissim_Demand_Definitions.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Demand/Further_Ways_to_import_Vissim_Demand_Definitions.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -166,7 +166,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/Demand/Further_Ways_to_import_VISUM_Demand_Definitions.html sumo-1.18.0/docs/userdoc/Demand/Further_Ways_to_import_VISUM_Demand_Definitions.html
--- sumo-1.17.0/docs/userdoc/Demand/Further_Ways_to_import_VISUM_Demand_Definitions.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Demand/Further_Ways_to_import_VISUM_Demand_Definitions.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -178,7 +178,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/Demand/Importing_O/D_Matrices.html sumo-1.18.0/docs/userdoc/Demand/Importing_O/D_Matrices.html
--- sumo-1.17.0/docs/userdoc/Demand/Importing_O/D_Matrices.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Demand/Importing_O/D_Matrices.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -206,7 +206,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -375,7 +375,7 @@
 tazRelation format#
 The tazRelation format defines the demand per OD pair in time slices for
 every a given vehicle type as follows:
-<data xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/datamode_file.xsd">
+<data xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://sumo.dlr.de/xsd/datamode_file.xsd">
     <interval id="car" begin="0" end="1:0:0">
       <tazRelation count="2000" from="1" to="2"/>
       <tazRelation count="500" from="1" to="3"/>
@@ -488,7 +488,7 @@
 The Amitran format#
 The Amitran format defines the demand per OD pair in time slices for
 every vehicle type as follows:
-<demand xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/amitran/od.xsd">
+<demand xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://sumo.dlr.de/xsd/amitran/od.xsd">
    <actorConfig id="0">
        <timeSlice duration="86400000" startTime="0">
            <odPair amount="100" destination="2" origin="1"/>
@@ -751,7 +751,7 @@
 
         
           
-            
This page was last edited on: 03 April 2023
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Demand/Introduction_to_demand_modelling_in_SUMO.html sumo-1.18.0/docs/userdoc/Demand/Introduction_to_demand_modelling_in_SUMO.html
--- sumo-1.17.0/docs/userdoc/Demand/Introduction_to_demand_modelling_in_SUMO.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Demand/Introduction_to_demand_modelling_in_SUMO.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -174,7 +174,7 @@
     

 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 

diff -Nru sumo-1.17.0/docs/userdoc/Demand/Random_Routes.html sumo-1.18.0/docs/userdoc/Demand/Random_Routes.html
--- sumo-1.17.0/docs/userdoc/Demand/Random_Routes.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Demand/Random_Routes.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -165,7 +165,7 @@
     

 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 

@@ -207,8 +207,8 @@
 See Also#
 
 randomTrips.py script for random routes generation
-"bug" random routes only created for timestep 1
-"bug" About Generating random Routes
+"bug" random routes only created for timestep 1
+"bug" About Generating random Routes
 
                 
           
@@ -217,7 +217,7 @@
 
         
           
-            
This page was last edited on: 11 February 2021
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Demand/Routes_from_Observation_Points.html sumo-1.18.0/docs/userdoc/Demand/Routes_from_Observation_Points.html
--- sumo-1.17.0/docs/userdoc/Demand/Routes_from_Observation_Points.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Demand/Routes_from_Observation_Points.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -202,7 +202,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/Demand/Routing_by_Turn_Probabilities.html sumo-1.18.0/docs/userdoc/Demand/Routing_by_Turn_Probabilities.html
--- sumo-1.17.0/docs/userdoc/Demand/Routing_by_Turn_Probabilities.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Demand/Routing_by_Turn_Probabilities.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -175,7 +175,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -252,7 +252,7 @@
 
 
 XML Schema
-edgerelations_file.xsd
+edgerelations_file.xsd
 
 
 
@@ -355,7 +355,7 @@
 
         
           
-            
This page was last edited on: 31 March 2023
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Demand/Shortest_or_Optimal_Path_Routing.html sumo-1.18.0/docs/userdoc/Demand/Shortest_or_Optimal_Path_Routing.html
--- sumo-1.17.0/docs/userdoc/Demand/Shortest_or_Optimal_Path_Routing.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Demand/Shortest_or_Optimal_Path_Routing.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -181,7 +181,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/Developer/CodeStyle.html sumo-1.18.0/docs/userdoc/Developer/CodeStyle.html
--- sumo-1.17.0/docs/userdoc/Developer/CodeStyle.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Developer/CodeStyle.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -212,7 +212,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -250,7 +250,7 @@
 macOS and Linux, and Visual
 Studio 2015 - 2022 on
 Windows. For the
-C++ code we use AStyle to keep
+C++ code we use AStyle to keep
 indentation and other whitespace usage consistent throughout the
 project. In order to make your code appear same as the original SUMO
 code use the following call to AStyle (or execute
@@ -335,7 +335,7 @@
 Throw-declarations#
 
 We are not using throw-declarations, see:
-  http://www.gotw.ca/publications/mill22.htm (thanks to Björn
+  https://www.gotw.ca/publications/mill22.htm (thanks to Björn
   Hendriks); we'll remove the existing ones subsequently.
 
 Object Handling#
@@ -372,7 +372,7 @@
   lists / vectors.
 
 Python Code#
-We try to adhere to the PEP 8 Style
+
We try to adhere to the PEP 8 Style
 Guide and use
 autopep8 and
 flake8 to check this. If you have
@@ -422,7 +422,7 @@
 
 
For further information about possible error sources and difficulties
 resulting in Python 3 compatibility see also
-http://python3porting.com/ and
+https://python3porting.com/ and
 https://docs.python.org/3/howto/pyporting.html
 Template#
 Use the following template for your files:
@@ -452,7 +452,7 @@
 
         
           
-            
This page was last edited on: 16 November 2022
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Developer/CppFileTemplate.html sumo-1.18.0/docs/userdoc/Developer/CppFileTemplate.html
--- sumo-1.17.0/docs/userdoc/Developer/CppFileTemplate.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Developer/CppFileTemplate.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -180,7 +180,7 @@
                   
 
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see <https://eclipse.org/sumo>
+// Eclipse SUMO, Simulation of Urban MObility; see <https://eclipse.dev/sumo>
 // Copyright (C) <YEAR OF CREATION>-<CURRENT YEAR> German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -261,7 +261,7 @@
 
         
           
-            
This page was last edited on: 11 February 2021
+            
This page was last edited on: 22 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Developer/Debugging.html sumo-1.18.0/docs/userdoc/Developer/Debugging.html
--- sumo-1.17.0/docs/userdoc/Developer/Debugging.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Developer/Debugging.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -167,7 +167,7 @@
     

 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/Developer/Docker.html sumo-1.18.0/docs/userdoc/Developer/Docker.html
--- sumo-1.17.0/docs/userdoc/Developer/Docker.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Developer/Docker.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -174,7 +174,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -232,7 +232,7 @@
 hybrid_sumo_jps
 project aims on providing an easy to use docker image for running a
 hybrid simulation that couples SUMO with
-JuPedSim. SUMO is a mighty simulator for all
+JuPedSim. SUMO is a mighty simulator for all
 kinds of transport problems that focuses mainly on motorized traffic.
 While SUMO also provides a pedestrian model for simulating pedestrians
 on sidewalks, crossings or the like, it lacks of the capability to model
@@ -257,7 +257,7 @@
 
         
           
-            
This page was last edited on: 21 June 2022
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Developer/Documentation_Build.html sumo-1.18.0/docs/userdoc/Developer/Documentation_Build.html
--- sumo-1.17.0/docs/userdoc/Developer/Documentation_Build.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Developer/Documentation_Build.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -182,7 +182,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/Developer/ExploringTheStructure.html sumo-1.18.0/docs/userdoc/Developer/ExploringTheStructure.html
--- sumo-1.17.0/docs/userdoc/Developer/ExploringTheStructure.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Developer/ExploringTheStructure.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -179,7 +179,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -212,8 +212,8 @@
                   
 
 Introduction#
-Each night a documentation of the C++ source code is generated with the tool Doxygen.
-The result is accessible via inline code documentation
+
Each night a documentation of the C++ source code is generated with the tool Doxygen.
+The result is accessible via inline code documentation
   (doxygen).
 Looking for a class by name#
 Select either from the menu "Data Structures" the item Data Structure Index or from the tree view on the left "Data Structures" -> "Data Structure Index". You can navigate with the alphabet to the section of all classes starting with that letter.
@@ -238,7 +238,7 @@
 
         

           
-            
This page was last edited on: 11 February 2021
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Developer/FMI.html sumo-1.18.0/docs/userdoc/Developer/FMI.html
--- sumo-1.17.0/docs/userdoc/Developer/FMI.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Developer/FMI.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -177,7 +177,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -227,7 +227,7 @@
 
 Architecture#
 The current architecture to build the functionality for a Functional Mockup Unit (FMU) is as follows (corresponding source code is located in src/fmi).
-
+
 FMU Usage#
 Due to limitations of version 2 of the FMI standard, e.g., output scalar variables cannot be given parameters directly, we implemented a stateful approach.
 For example, if we need the current position of a vehicle, we retrieve the (output) value of the vehicle.getPosition scalar variable.
diff -Nru sumo-1.17.0/docs/userdoc/Developer/Github_Actions_CI_Test.html sumo-1.18.0/docs/userdoc/Developer/Github_Actions_CI_Test.html
--- sumo-1.17.0/docs/userdoc/Developer/Github_Actions_CI_Test.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Developer/Github_Actions_CI_Test.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             

-                                Contact
+                                Contact
                             
                         
 
@@ -168,7 +168,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/Developer/GitStuff.html sumo-1.18.0/docs/userdoc/Developer/GitStuff.html
--- sumo-1.17.0/docs/userdoc/Developer/GitStuff.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Developer/GitStuff.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -171,7 +171,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/Developer/GUI_Testing.html sumo-1.18.0/docs/userdoc/Developer/GUI_Testing.html
--- sumo-1.17.0/docs/userdoc/Developer/GUI_Testing.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Developer/GUI_Testing.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -167,7 +167,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/Developer/HFileTemplate.html sumo-1.18.0/docs/userdoc/Developer/HFileTemplate.html
--- sumo-1.17.0/docs/userdoc/Developer/HFileTemplate.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Developer/HFileTemplate.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -180,7 +180,7 @@
                   
 
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see <https://eclipse.org/sumo>
+// Eclipse SUMO, Simulation of Urban MObility; see <https://eclipse.dev/sumo>
 // Copyright (C) <YEAR OF CREATION>-<CURRENT YEAR> German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -286,7 +286,7 @@
 
         
           
-            
This page was last edited on: 03 April 2023
+            
This page was last edited on: 22 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Developer/How_To/Car-Following_Model.html sumo-1.18.0/docs/userdoc/Developer/How_To/Car-Following_Model.html
--- sumo-1.17.0/docs/userdoc/Developer/How_To/Car-Following_Model.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Developer/How_To/Car-Following_Model.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -168,7 +168,7 @@
     

 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/Developer/How_To/Device.html sumo-1.18.0/docs/userdoc/Developer/How_To/Device.html
--- sumo-1.17.0/docs/userdoc/Developer/How_To/Device.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Developer/How_To/Device.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -205,7 +205,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/Developer/How_To/Extend_Vehicles.html sumo-1.18.0/docs/userdoc/Developer/How_To/Extend_Vehicles.html
--- sumo-1.17.0/docs/userdoc/Developer/How_To/Extend_Vehicles.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Developer/How_To/Extend_Vehicles.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -172,7 +172,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/Developer/How_To/Lane-Changing_Model.html sumo-1.18.0/docs/userdoc/Developer/How_To/Lane-Changing_Model.html
--- sumo-1.17.0/docs/userdoc/Developer/How_To/Lane-Changing_Model.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Developer/How_To/Lane-Changing_Model.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -180,7 +180,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/Developer/How_To/Net_Importer.html sumo-1.18.0/docs/userdoc/Developer/How_To/Net_Importer.html
--- sumo-1.17.0/docs/userdoc/Developer/How_To/Net_Importer.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Developer/How_To/Net_Importer.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -183,7 +183,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/Developer/HowToRelease.html sumo-1.18.0/docs/userdoc/Developer/HowToRelease.html
--- sumo-1.17.0/docs/userdoc/Developer/HowToRelease.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Developer/HowToRelease.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -181,7 +181,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -354,8 +354,8 @@
 copy the folder from S:\Releases to the releases dir scp -r /media/S/Releases/x.y.z delphi@ts-sim-front-ba.intra.dlr.de:docs/releases
 
 
-update the eclipse.org/sumo website
-modify the version number (Version) in config.yaml in the Default Parameters section at the beginning
+update the eclipse.dev/sumo website
+modify the version number (Version) in config.yaml in the Default Parameters section at the beginning
 
 
 make new sourceforge-release
@@ -372,10 +372,10 @@
 if you try this on Windows Linux Subsystem you will also need to do sudo update-alternatives --set fakeroot /usr/bin/fakeroot-tcp
 
 
-unzip the special source release sumo_1.17.0+dfsg1.orig.tar.gz
+unzip the special source release sumo_1.18.0+dfsg1.orig.tar.gz
 copy the debian dir one level up
 modify the changelog, using dch (enter an email address which has write access to the ppa and a valid gpg key)
-run dpkg-buildpackage -S in the sumo dir and dput -f ppa:sumo/stable sumo_1.17.0+dfsg1_source.changes one level up
+run dpkg-buildpackage -S in the sumo dir and dput -f ppa:sumo/stable sumo_1.18.0+dfsg1_source.changes one level up
 
 
 update the flatpak (update version number and commit hash)
@@ -414,7 +414,7 @@
 
         
           
-            
This page was last edited on: 24 April 2023
+            
This page was last edited on: 22 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Developer/HowToUpdateHomebrewFormula.html sumo-1.18.0/docs/userdoc/Developer/HowToUpdateHomebrewFormula.html
--- sumo-1.17.0/docs/userdoc/Developer/HowToUpdateHomebrewFormula.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Developer/HowToUpdateHomebrewFormula.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -166,7 +166,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/Developer/Implementation_Notes/Drawing_in_sumo-gui.html sumo-1.18.0/docs/userdoc/Developer/Implementation_Notes/Drawing_in_sumo-gui.html
--- sumo-1.17.0/docs/userdoc/Developer/Implementation_Notes/Drawing_in_sumo-gui.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Developer/Implementation_Notes/Drawing_in_sumo-gui.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -166,7 +166,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/Developer/Implementation_Notes/Error_Handling.html sumo-1.18.0/docs/userdoc/Developer/Implementation_Notes/Error_Handling.html
--- sumo-1.17.0/docs/userdoc/Developer/Implementation_Notes/Error_Handling.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Developer/Implementation_Notes/Error_Handling.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -189,7 +189,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/Developer/Implementation_Notes/index.html sumo-1.18.0/docs/userdoc/Developer/Implementation_Notes/index.html
--- sumo-1.17.0/docs/userdoc/Developer/Implementation_Notes/index.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Developer/Implementation_Notes/index.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
diff -Nru sumo-1.17.0/docs/userdoc/Developer/Implementation_Notes/Options_Sub_System.html sumo-1.18.0/docs/userdoc/Developer/Implementation_Notes/Options_Sub_System.html
--- sumo-1.17.0/docs/userdoc/Developer/Implementation_Notes/Options_Sub_System.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Developer/Implementation_Notes/Options_Sub_System.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -177,7 +177,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/Developer/Implementation_Notes/Simulation_Loop.html sumo-1.18.0/docs/userdoc/Developer/Implementation_Notes/Simulation_Loop.html
--- sumo-1.17.0/docs/userdoc/Developer/Implementation_Notes/Simulation_Loop.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Developer/Implementation_Notes/Simulation_Loop.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -166,7 +166,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -202,7 +202,7 @@
 sumo and sumo-gui call both the method MSNet::simulationStep. 
 This sketch describes the further communication of this method 
 with the other elements of the simulation and the update cycle for the vehicles.
-
+
 Pedestrian Lifecycle and update Loop#
 Persons in SUMO are modelled by the distinct stages walk, ride, stop and access. 
 The simulation behavior of a person in stage walk is controlled by the pedestrian model configured via option --pedestrian.model.
@@ -211,7 +211,7 @@
 Note
 abstract methods that must be overridden by the model implementation are in italics
 
-L/PLtzz77+0039b3xxitKPctFF13wzjvPW3usbeHCHJkVOc6hQ2/Jv7IsN+HZnkIe9ujx0x07Vqoc07qj2dQrwGV2ytDUzwvYuJSitz8orK883H8mWG/DH/84a8KE4QcOrJbb8B//+FufPp2Nfvfb0+mWtzVuHG+FqpbUr1Yu7403/nLkyJrPP/9/d911/W23DTT65SWghJk335whB5d/mzZtZO7o8qQim2wjL3fkX1mW12fy6qek5D3pMV79yAg3blzfWOt0JeZ5zYVFi06PiWwcuYHTgLg8HVvT7r6rkMJWObJL6b7yylRzOvLypjdpkqZSXbFPWfmNlfU4kT3WO92lzp2q1+mHg+wilWwdxlWrphqrXAbfdj22C3a5PKdzqcydy9CpX4B1M5dzSbvnnhslesnC5Mn3//a3N5n9LoXnct6oT9xoLpdkG3NbUy/gqMo9nsm/L7/8B7M0b7ihz5w5fzRXnTzz07levZRrr7180qTfSy765psPrLtHOnnmT96t/w2vV6+Oxp+/y8LatS+a/fIDyPw7eNlx3brZ5irjLThzldkvLTGxmtw51h5r69KlnVyw+VBuGyPWnzybU8hD86fGyWjHtO5oNvUKcJmdMjT18wI2LqVo1HksPyiMBXmxKL+Ge/b86ZAhvzB63H8mWG/DmjVryFrzodncb0+nW97WuHG8FapaUrnayPbFF2/Jyzhj+bLL2i9d+v07ePLaztzR5UmV2mT7FSueMQ5y9dXdZOHKKy81fv9+8MFseRETuYv1SszzGgvPPPPgRRdd8K9/LTU3tm7gNCAuT8fWtLvvKqSwVY7sUrrduv3YTAsnz1yDSnXFPmXlN1a249h6rHe6tdnq3Kl6nX44JJx5w818KJf3s5/9xFh2GXzb9UResNlsl+d0LpW5cxk69QuwrnI51/HjayVXS9HKsrwyP//8htJjrHIpPGs72yduNJdLcqmBk2dTwFH5Ec++/faDdu0uLChYJk0WTpxYZ64yWnHxm88//6hk3B//OEty+Zo1M627R7Zjx96V4jBKXP6VZWPyZKFKlcrShPFWryybh5LLsB7EPLjtLO7xrE6dWta1siw9xrL6KeShccFGcz+mdUezqVeAy+yUoamfF7BxKcXYf1AYqlWrmpmZ/uCDtxr/Cf9ktJ8J1ttQ9pKNf/ObQXKKoqJXzX7329Pplrc1bhxvha2WXK7Wukth4YprrulZv34d4ymYlydnsf4xkpzX3NHlSZXaJkwYfs89N8rCfffdkpPzO1n44x/vNT5v9uSTvzV6TjpfiXleWRg9+jfyuvPQobesx7du4DQgLk/H1rS77yqksFWO7FK6qam1nabDpbpin7LyGyvbcWw91jvdpc6dqtfph4NsYBtGGVhj2WXwbddju2CXy3M6l3kEl7k76Tx06hdg3czlXJJFH374v80tJW/n5j5tLLsUnst5oz5xo7lcUsIPx9zW1As4Kj/imbS5c/84dOh1d9557bx5T9pW2dpLLz0uWdl9G2lDhvxi/Pi7ZOGxx4bJYY1OSVbWcre2yEOZPbZV7n/cGHmfOM2utce2yvbwrI5pNPUKcJmdMjT18wI2LqVYfj8ozupnwkcfzZXXmr/4RS+5Jc0Xmmd1e0b2GI0bx1thriWXq+3evYO8+Nu1a9XXX79/9Oi75lpbnpFlc5XLkyq1bdy44MILm8rCT3/6I+P9gffem2V8/Kxv366bNi00NnO6EutCXt70Bg1Sjc+qmS1yy8hVLk/H1rS77yqksFWO7FK6LmnZpbqcrkd9yspvrCKP49QTtc5L3bHUHw4JzsnBZfBtJ1K/PKdzqcydrbmUmcsFWDdzOVe/fj9L+CHzuyFcCs/lvFGfuNFcLsm2pa2pF3BUPsWzEyfWXXJJG2nGf8CwrrK1AwrvHUmTBNWyZTNZkH/N4N6168XTpj0cufHJ0g5l9pxzThXrm7OS91y+GqRLl3Zmdj955r1Rlz9EdDqFbcuzOqbR1CvAZXbK0NTPC9i4lGL5/aA4q58JZisoWFa79rnG8lndnpE9RuPG8VaYa8l6tbbfLDVqJH355dvG8urVfzWPYPtrQFk2V7k8KafWtGmj//u/efXr1zHeH5ALSEmpuXv3a9bvCHG6EtvC2rUvNmpUb/bsJ8wdI7eMXOXydGxNu/uuQgpb5cgupevyN2Yu1eV0PepTVn5jFXkcp56ode60o9GsPxwSIv7uTgbWWHYZfNthFX8guJxLZe5srQw/kWybOZ1r3743ZHysb7B/8cVb5oddXQrP6bwuT1zxkoyDRHaaTb2Ao/IpnkU2c1XHjm1mznzsk0+WHTv27tati2+88Ypf/erqqLtLu/DCpjk5vzP+S57RXnvtzxKFn3tubHHxmzKvK1Y806PHT50OZfZkZJz3yitTzXeiJWp36nTRf//3gI0bFxw/vnbnztNfrG9O4cKFOU2apOXlTTc/WWj9jKbiKWxbntUxjaZeAS6zYzu+07K1qZ8XsHEpRad6s64q2w8K9Z8J3bt3WL58ivzcl9tw6tSHOnRobfSf1e0Z2WM0bhxvhaqWXK7W9pulffss+Z14+HD++++/1KpVc/MIEmCaNz/vH//421dfvSP/yrK5yuVJObU77rhm4MAe/ft3N3uuvPLS4cMH/+Y3g8wepyuJXJDfs+ef3/DZZ0c4bWA2ladja9rddxVS2CqrXEpXasbpGxpcqsvppOpTVn5jFbmxU0/UOo/c0emHg2xgG8aVK/9krHIZfNuJFH8guJxLZe5chk7xAmybOZ1L9h08+EpjG7PddFNf43+A5lJ4Tud1eeKKl2QcxHZJ1qZewFFVfDx7++3nrrvu8vPOa5CUVL1FiyYPPfRr659ERzKPMG7csKpVz5F/rYeVcZdBlOgsaf7yyzu9/rr9+6DMZvYsWDBBfr5XqVLZ7DlyZM3o0b/JympWvXq1tLS6tv8ttUTqzMx0idqR33CqeIrILdWPaTT1CnCZHdvxnZatTf28gI1LKTrVm3WV+w+KyB3NpvgzQX4c9+rVsVatGvXqpVxzTc+CgmXmKvXbM7LHaNw43gpVLblcre03y7p1s3/846xq1arKy47Jk++3HlPyT9OmjeQ35gUXnP+3v42RbcxVTk/KqRn/lfrpp7//X8Q++eRv5doWWb69wOlKIhekbd++XK7qiSfucdogssfl6VibdvddhRS24iqn0pU2Y8Yjxv/nQKbD9sX6TtXldFL1KSu/sYrc2Kknap1H7uj0wyHB8p3vclP/9a+jrbs7Db7tRIo/EFzOpTJ3LkOneAGRr7pLPVe7dhfKcJnXY7RXX33W/B+gORWe03ldnrjiJRkHMfeKbOoFHFX5xjNaOTX1CvB2dtTPC9h4W4p6NW4cb4W5lmJv77zzfFZWs8h+TZvL09HuvqOw1acsYGPl/qKf5knzYZDVCzgq4pmWTb0CvJ0d9fMCNt6Wol6NG8dbYa6lsrXBg6/8v/+bd/hw/po1M9u2bfHHP94buY1GTfHpaHffUdjqUxawsfIhOdB8GGT1Ao6KeKZlU68Ab2dH/byAjbelqFfjxvFWmGupbO2558a2aXNBcnJiVlaznJzf2b71O7IllCZys4pqik9Hu/uOwlafsoCNVVzdX0FtPgyyegFHRTzTsqlXgLezo35ewMbbUtSrceN4K8y1RFNv2t13FLb6lDFWtDhs6gUcFfFMy6ZeAd7Ojvp5ARtvS1Gvxo3jrTDXEk29aXffUdjqU8ZY0eKwqRdwVMQzLZt6BXg7O+rnBWy8LUW9GjeOt8JcSzT1pt19R2GrTxljRYvDpl7AURHPtGzqFeDt7KifF7DxthT1atw43gpzLdHUm3b3HYWtPmWMFS0Om3oBR0U807KpV4C3s6N+XsDG21LUq3HjeCvMtURTb9rddxS2+pQxVrQ4bOoFHBXxTMumXgHezo76eQEbb0tRr8aN460w1xJNvWl331HY6lPGWNHisKkXcFSexbMtT0+Qy6L502S0FSvA29lRPy9g420p6tW4cbwV5lqiqTft7jsKW33KGCtaHDb1Ao7Ks3hG87+pVEB5zI7KeQGb8ihFvRo3jleoJZp60+i+o7CNpjJljBUtbptKAUflQTz7+ouv9q9eZ7RVT8+YNyZn1kOPz3xwvFwfrXzbczOjVkC5zI7CeQGbcilFvRo3jkeoJdpZNH3uOwr7P01hyhgrWvw2hQKOyoN4ZpWfn7906dLZs2c/D7/IaMuYy8gXFhba5+OHvJ0d9fMCNt6Wol64cbwV5lqCOu3uOwpbfcoYK8Qh9QIulcfxbP369ZIUc3Nz5bJeQPmTcZbRljGXkS8qKrLPxw95ODtndV7AxsNS1As3judCW0tQp+N9F/LCPqspC/lYIQ6dVQGXyuN4tm3btrVr18oFSWSch/In4yyjLWMuI19cXGyfjx/ycHbO6ryAjYelqBduHM+FtpagTsf7LuSFfVZTFvKxQhw6qwIulcfxTDKiXIqExfz8/Df08fyQh+1dmpBxltGWMZeRP3TokH0+fkhldhSH4qzOC9iolGI5UazwcsKN47kKrKX4VLEVHp90vO8qtrArvIrOasoqdqwCo8InPUjOqoBL5XE8k4uQmChXU1hYuE0fk6v+2N6lCRlnGW0Zcxn5kpIS+3z8kMrsKA7FWZ0XsFEpxXKiWOHlhBvHcxVYS/GpYis8Pul431VsYVd4FZ3VlFXsWAVGhU96kJxVAZfK43imqTkJl9i7woqhQLBR4Qg2Khyxo4pCiEmPK8Sz0yhKE0OBYKPCEWxUOGJHFYUQkx5XiGenUZQmhgLBRoUj2KhwxI4qCiEmPa4Qz07bOGaGvSusGAoEGxWOYKPCETuqKISY9LhCPAMAAACAuEA8AwAAAIC4QDwDAAAAgLhAPAMAAACAuEA8O40PRJoYCgQbFY5go8IRO6oohJj0uEI8O42vEzUxFAg2KhzBRoUjdlRRCDHpcYV4dhpFaWIoEGxUOIKNCkfsqKIQYtLjCvHsNIrSxFAg2KhwBBsVjthRRSHEpMcV4tlpFKWJoUCwUeEINiocsaOKQohJjyvEs9P4QKSJoUCwUeEINiocsaOKQohJjyvEM+1NnDjxZwAAAAA0MXnyZPtr+u8Qz7QnE5wAAAAAQBPdu3e3v6b/DvFMe0Y8u/TSSx9AeTJuJAAAAKDMUlJSiGcBZ8QzyQ8HUZ5kkO1DDwAAAJwN46U78SwKrT8QGZ54ZrwXHLnsD+JZMGh9swNRUeGIHVUUQky6n4yX7hdffHF+fv769eu3bdtWVFR06NAhcwNecZ6m9deJehjPYsw8Me4elfX45X2uSAnEs0DQ+mYHoqLCETuqKISYdD8ZL91/9KMfLV269I033li7dq0ktOLiYnMDXnGepnVREs/8kUA8CwStb3YgKiocsaOKQohJ95Px0r1Vq1azZ8/Ozc2VhLZ+/fqioiJzA15xnqZ1UZYhnr366qtdunSpVatWSkpKdnb2ggULDn4XeEzmxuPHj5eHlStXbtCgwS233LJz506j39jsySefbNGiRZUqVX6wc2nBqXnz5tL/5ptvyvL06dNlecaMGbKcl5cnyxkZGeaW7meMXH7hhReqVasm1yAXY/SUhwTiWSBofbMDUVHhiB1VFEJMup+Ml+5ZWVnPP/+8JLSlS5fm5+cXFhaaG/CK8zSti7IM8axZs2ayy4svvrhjxw5J7XIEo9+aeUxy5DVr1uzZs+eZZ56RtbfddpvRb2x80003yUGsPd/v+UO33367rJXoJctXX321LMu/B78LY3fccYe5pfsZbcvPPvusBLOaNWsaIbOcrFy5skaNGvahh4a0vtmBqKhwxI4qCiEm3U/mHzdKPHvhhRfmzZv3xhtvbNu2zdyAeHaa1h+ILEM8S0lJqVatmpSCRCBrvzX/RCouLpa16enpxkNj448//tjcwH33OXPmyNqf//znu3fvTk5OrlevXlJSUlFRkRHV5s6da9/B4YzW5QkTJlSqVKlp06YS577fzWuSzRo0aLB69Wr70ENDWt/sQFRUOGJHFYUQk+4n4lnwlSGe5eTkSECSvapUqdK+ffvFixcb/db8Y3jttdfk+HXr1q1cubKxVhacNo7ssZIkVr16dUllM2fOlM2kFuVfqcv69etLv6w1NlM8o7FsPIvnnnvO6CwPZDMAAAB4hXgWfGWIZ2LPnj1SCiNGjJB909LSjE5r/jE0adJEel5++eV9+/bt2rXLukHkxpE9Nt27d5cNJBB26NBBHv70pz+9+OKLpadHjx7mNopnNJaXLl2alJQk6W7WrFnmETxENgMAAICHiGfBV4Z4lp2dvWLFCgk/r7/+uuybmZlp9NetW1cefvjhh+aWjRs3lp5Fixbt2LHjjjvuiAxI5pYHS9vdxviYmXjqqafk4YQJE4yHxgfSDIpnNJcXL16cmJhYpUqVZ555xjyIJ8hmAAAA8BbxLPjKEM8k0vTo0aN27dq1atW69NJL8/LyjH7JS/Xq1bOmoOXLl7dp06ZatWrp6elmmjJWWZcNkbvbvPfee7KqatWqn3zyiTzcvn27HFl6pN/cRvGM1uXc3FxJaPJw7NixRk/syGYAAADwHPFMidYfiCxDPIM7slmAaX2zA1FR4YgdVRRCTLqfiGdKtP46UeKZt8hmwab1zQ5ERYUjdlRRCDHpfiKeKdG6KIlnHiKbBZ7WNzsQFRWO2FFFIcSk+4l4pkTroiSeeYVsFgZa3+xAVFQ4YkcVhRCT7ifimRKti9KYY8SuRo0aZLPA0/pmB6KiwhE7qiiEmHQ/Ec+UaP2BSGOOu3fvbl9RJloPBRAVFY5go8IRO6oohJh0PxHPgs/beAYAAACgnBDPgo94BgAAAGiBeBZ8xDMAAABAC8Sz4AttPJNnbe8CAAAA4hjxTInWH4j0Np5pNBTEM5SBRhUOlAEVjthRRSHEpPuJeKZE668T9TaeaTQUxDOUgUYVDpQBFY7YUUUhxKT7iXimROuiJJ4B6jSqcKAMqHDEjioKISbdT8QzJVoXpT/xTE4xderUjIyMunXrDhs27Pjx42b/jBkz0tPTK1WqJA9LSkruvffetLS0hg0byoI8NDb75ptvRo0a1aRJE1klxzE6T5w4MW7cuGbNmtWpU+fWW289fPiwe7+cdOjQoampqZmZmdOmTSOeoQycKhwIBiocsaOKQohJ9xPxTInWRelbPOvVq9dnZ8jCmDFjzP7+/fsXFRUZDyWDydpdZ/To0eORRx4x+h977DG5wk8++WTPnj133nmn0ZmTk5Odnb19+/aDBw8OHjx4+PDh7v2jR482rsE4OPEMZeBU4UAwUOGIHVUUQky6n4hnSrT+QKS38cxpKOQUmzZtMpY3btyYmZlp9u/YscPcLCMjw9xsw4YN5mYXXHCBPDQ3M2RlZW3ZssVY3rt3b9OmTd375WjWgxPPUAZOFQ4EAxWO2FFFIcSk+4l4FnzexjMncopjx44Zy7KQmJho9p88edLcTPpL3czab0pKSkqwqFy5snu/7eAJxDMAAABohXgWfL7Fs82bNxvLmzZtsr579v1Gzu+etWjRIvLds5YtWxYWFto6Tzn3y9HMa9i4cSPxDAAAAHohngWfb/GsT58+xmfPevfubX6ozJaRRowYYX72rGfPniNHjjT6x48fL1dYUFBg/ezZpEmTZGNJXEeOHFm7dm2/fv3c+0eNGmVeg2xAPAMAAIBeiGfB51s8mzp1avPmzVNTUyVfmV/JaMtIx44du/vuuxueIQvm3yJ+/fXXDz/8cHp6eqNGjZ599lmj88SJE1OmTMnKykpOTu7QocOSJUvc++WkQ4YMkQvIyMiQgxDPAAAAoBfimRKtPxDpbTxzGgqyEOLZ0d3FBdNzjx84ZF8RwanCgWCgwhE7qiiEmHQ/Ec+UaP11ot7GM6ehIJ4hzu1fvW5hSvaawaOL3/rIvs7CqcKBYKDCETuqKISYdD8Rz5RoXZTEM8BQOHPF3Cqd51buuKLltVsnvlzqm2lOFQ4EAxWO2FFFIcSk+4l4pkTrovQnngFaOJ3QKnecd07nZc0HLji3e+SbaVQ4go0KR+yoohBi0v1EPFOidVESzwArI6FJJUtbnNZXmvXNNCocwUaFI3ZUUQgx6X4ininR+gORnsczGi1gbd45neXfhSnZu1/J1/pmB6KiwhE7qiiEmHQ/Ec+Cz9t4Bujus0VvzqvSyQhmC5K7LUrttTzzGqePogEAAPiJeBZ8xDPAZGaz3AZ95id3y79xlPsXOQIAAPiJeBZ8xDPAINlsrmSzSh15uwwAAMQn4lnwEc+AU8b/96x2T94uAwAA8Yx4pkTrD0R6G8+0HgqE1tHdxQXTc1XeLqPCEWxUOGJHFYUQk+4n4pmSOTp/nai38UzroQCiosIRbFQ4YkcVhRCT7ifimRKti5J4BqijwhFsVDhiRxWFEJPuJ+KZEq2LkngGqKPCEWxUOGJHFYUQk+4n4pkSrYuSeAaoo8IRbFQ4YkcVhRCT7ifimRKtPxDpbTzTeiiAqKhwBBsVjthRRSHEpPuJeBZ83sYzAAAAAOWEeBZ8xDMAAABAC8Sz4COeAQAAAFogngUf8QwICbnTbQsAAEAvxDMlWn8g0tt4pvVQAFFpXeHu8azUToSN1hWOOEEVhRCT7ifimRKtv07U23im9VAAUXlV4RWShdzjWfnx+XSIhVcVjjCjikKISfcT8UyJ1kVJPAPUeVXhFZJYiGeIyqsKR5hRRSHEpPuJeKZE66IkngHqnCr8xIkT48aNa9asWZ06dW699dbDhw8b/XJzzZw5s3Xr1snJyZ06ddqwYYPRaYq6+4wZM9LT0ytVqmT0GDIzMzdt2mQsy09nY0EOfsEFF8jC1q1bBw0alJqaWrt27YEDBxYXFxsbmKczFz744IPGjRtPmjTJtjbymkVJScmQIUPksBkZGVOnTjW3t3r99dfbt2+flJTUqlWrl1566VRpT9bp8pyO7zQ4KA9OFQ6oo4pCiEn3E/FMidZFSTwD1DlVeE5OTnZ29vbt2w8ePDh48ODhw4cb/XJzDRgwoLCwUELF2LFju3btavZ/v7Pr7v379y8qKrJuLIYOHTpt2jRZ2LVrV82aNb/88ktZlkgzbNgwWWjbtm1eXt7Ro0e/+OKLu+6667bbbjP2Mk9qLCxbtqx+/fqLFy+OXFvqNY8cObJv375FZ/Tu3dv2FAyNGjVasGDBsWPHPv744xtvvNHotG3pdHlOx3caHJQHpwoH1FFFIcSk+4l4pkTrD0R6G8+0HgogKqcKz8rK2rJli7G8d+/epk2bGstyc+3Zs8dYPnLkSFJSktlvLBhcdt+xY4e5mWnJkiXXX3+9LPzhD3+QiDVjxumruu6665YuXWrb8tChQ+np6cayNYD96U9/aty48dq1a80trWtLveaMjAwJXcbypk2bSo1n559//pQpU3bu3GntLHVLg/XynI7vNDgoD04VDqijikKISfcT8Sz4vI1nQDhJhkmwqFy5stFvSybmQ1u/y+4nT560bmn46quvmjRpIgsXXXTR8uXLu3TpIsvSI/2y8P777/fs2bNOnTrG0apUqWLsZZ5UFiQLPfTQQ/85XMTaUvsTExNLSkqM5WPHjtk2M6xbt27AgAF169Zt0aLFypUrjU7blk6X53R8p8EBACCEiGfBRzwDYteyZcvCwkJ7b0QyMR/aPkumuLuV3LNz58695JLTf08i/+bm5vbo0cNYlZmZKT+vDxw48O233x48eNA8iHVh165dF1xwwZNPPmn02NaandaHTu9uRZJIKaExLS3NeBj5wblSL8/p+E6DAwBACBHPgo94BsRu0qRJvXr12rx585EjR9auXduvXz+j3ynq1K9fXzY2+xV3t/rDH/5w3nnnTZkyRZYnT56cnp7+xz/+0VgluUjSWklJSUFBwaBBgyJzl7FQVFQkyefxxx8vda3JfDhixAjzs2F9+vQp9dr69+//4YcfHjt2TOJZo0aNjE7bk3W6PKfjOw0OAAAhRDwLPuIZELsTJ05IUsrKykpOTu7QocOSJUuMfqeok5OTk5KSYj5U3N1q/fr155xzzv79+2V53759svzRRx8Zq1asWCG5q2rVqk2aNJHDRuYuc2HPnj2tWrV69NFHS11reyih64477qhTp07z5s2ffvppOb51M8OiRYvatWuXlJTUvn37vLw8o9P2ZJ0uz+n4ToMDAEAIEc+UaP2BSG/jmdZDAURFhRv++c9/Soiy93qnvI8PJ1Q4YkcVhRCT7ifimRKtv07U23im9VAAUYW8wn/729/u2bNnx44d2dnZ//M//2NfHbPyPj6iCnmFwxNUUQgx6X4ininRuiiJZ4C6kFf4pEmT0tPTGzRocPvttx85csS+OmblfXxEFfIKhyeoohBi0v1EPFOidVESzwB1VDiCjQpH7KiiEGLS/UQ8U6J1URLPAHVS4RXb7BcEeIoaQ+yoohBi0v1EPFOi9QcivY1nWg8FEFXFVji//1DeKrbCEQxUUQgx6X4ingWft/EMQPkhngEAEHLEs+AjngG6IJ4BABByxLPgI54BuiCeAQAQcsSz4COeAbogngEAEHLEMyVafyDS23im9VAAUVVshRPPUN4qtsIRDFRRCDHpfiKeKdH6NZO38UzroQCiqtgKr9izIwyoMcSOKgohJt1PxDMlWhcl8QxQF7XCjx84VDA99+juYvsKL0Q9OxAjagyxo4pCiEn3E/FMidZFSTwD1LlUePFbH71z3cOL6l6+f/U6+zqPuJwd8AQ1hthRRSHEpPuJeKZE66IkngHqIiv8+IFDW3JmLz3/6jmVLpmfeFn5ZbNTpZ0d8BY1hthRRSHEpPuJeKZE6w9EehvPtB4KICprhRe/9dFb1zwwL/Gy+cnd5lXrsqhOdrlms1P8/kP542c4YkcVhRCT7ifiWfB5G8+AwDPfLltQs/vcyh0lMi1IutSHbHaKeAYAQOgRz4KPeAao2/1KvmSkCmz2CwIAAGFCPAs+4hlwVkqKP197++MLanafU+k/kWlVu5sX1+/tw7tnAAAg5IhnwUc8A8rms0WrX2l385zKnSShLWvWn4QGAADKG/FMidYfiPQ2nmk9FEBUkRVufTNtQY2fkdCgtcgKB84WVRRCTLqfiGdKtP5AiLfxTOuhAKJyqfDPFq1+8/K7y/X/ewaUN5cKBxRRRSHEpPuJeKZE66IkngHqolb48QOHCqbnHt1dbF8B6CBqhQNRUUUhxKT7iXimROuiJJ4B6qhwBBsVjthRRSHEpPuJeKZE66IkngHqqHAEGxWO2FFFIcSk+4l4pkTrD0R6G8+0HgogKiocwUaFI3ZUUQgx6X4ingWft/EMAAAAQDkhngUf8QwAAADQAvEs+IhnAAAAgBaIZ8FHPAMAAAC0QDxTovUHIr2NZ1oPBRAVFY5go8IRO6oohJh0PxHPlGj9daLexjOthwKISqMKl/va3gVEo1GFI25RRSHEpPuJeKZE66IkngHqNKpw4hnKQKMKR9yiikKISfcT8UyJ1kVJPAPUaVThxDOUgUYVjrhFFYUQk+4n4pkSrYuSeAao06jCiWcoA40qHHGLKgohJt1PxDMlWn8g0tt4pvVQAFE5VbjcRFOnTs3IyKhbt+6wYcOOHz9u9s+YMSM9Pb1SpUrysKSk5N57701LS2vYsKEsyENjs2+++WbUqFFNmjSRVXIco/PEiRPjxo1r1qxZnTp1br311sOHD7v3y0mHDh2ampqamZk5bdo04hnKwKnCAXVUUQgx6X4ingWft/EMCCe5iXr16vXZGbIwZswYs79///5FRUXGQ8lgsnbXGT169HjkkUeM/scee0zuwU8++WTPnj133nmn0ZmTk5Odnb19+/aDBw8OHjx4+PDh7v2jR482rsE4OPEMAIDgIZ4FH/EMiJ3cRJs2bTKWN27cmJmZafbv2LHD3CwjI8PcbMOGDeZmF1xwgTw0NzNkZWVt2bLFWN67d2/Tpk3d++Vo1oMTzwAACB7iWfARz4DYyU107NgxY1kWEhMTzf6TJ0+am0l/qZtZ+01JSUkJFpUrV3bvtx08gXgGAEDgEM+Cj3gGxE5uos2bNxvLmzZtsr579v1Gzu+etWjRIvLds5YtWxYWFto6Tzn3y9HMa9i4cSPxDACA4CGeKdH6A5HexjOthwKIyqnC5Sbq06eP8dmz3r17mx8qs2WkESNGmJ8969mz58iRI43+8ePHyz1YUFBg/ezZpEmTZGNJXEeOHFm7dm2/fv3c+0eNGmVeg2xAPEMZOFU4oI4qCiEm3U/EMyVaf52ot/FM66EAonKq8IQz39zYvHnz1NRUyVfmVzLaMtKxY8fuvvvuhmfIgvm3iF9//fXDDz+cnp7eqFGjZ5991ug8ceLElClTsrKykpOTO3TosGTJEvd+OemQIUPkAjIyMuQgxDOYju4uLpiee/zAIfuKCE4VDqijikKISfcT8UyJ1kVJPAPUOVU4WQhxbv/qdYvqXr5m8Ojitz6yr7NwqnBAHVUUQky6n4hnSrQuSuIZoM6pwolniH9bnnpxXtUucyt3Wtn6+q0TXy71zTSnCgfUUUUhxKT7iXimROuiJJ4B6pwqnHgGLWx45C9zEy5Z1uTq17rctrB2duSbaU4VDqijikKISfcT8UyJ1h+I9DaeaT0UQFRUOHRnJDR5LbUopWdet98szxxofTONCkfsqKIQYtL9RDwLPm/jGRBsc868rqXRgtSWNe0n/y5Myd79Sr694gEAcYZ4FnzEMwAIj315789PvNTMZvOqX7o4re/mx58v9aNoAIB4QzwLPuIZAISEmc3mVuk8r1rX1X3udf8iRwBAvCGeBR/xDADCQLLZvHM6z6l0CW+XAYC+iGdKtP5ApLfxTOuhAKKiwqGp/avXLajVI+rbZVQ4YkcVhRCT7ifimZI5On+dqLfxTOuhAKKiwqGjo7uLC6bnqrxdRoUjdlRRCDHpfiKeKdG6KIlngDoqHMFGhSN2VFEIMel+Ip4p0booiWeAOiocwUaFI3ZUUQgx6X4ininRuiiJZ4A6KhzBRoUjdlRRCDHpfiKeKdH6A5HexjOthwKIigpHsFHhiB1VFEJMup+IZ8HnbTwDAAAAUE6IZ8FHPAMAAAC0QDwLPuIZAAAAoAXiWfARzwAAAAAtEM+UaP2BSG/jmdZDAURFhSPYYqzwXbt2NWzY0N7r3I9AirGKoCMm3U/EMyVaf52ot/FM66EAoqLCEWwxVviKFSt69+5t73XuRyDFWEXQEZPuJ+KZEq2LkngGqKPCEWwxVvjjjz9+33332Xud+xFIMVYRdMSk+4l4pkTroiSeAeqocARbjBV+/fXXz5o1y97r3I9AirGKoCMm3U/EMyVaFyXxDFBHhSPYnCr8888/b9iwofyyqFGjxmWXXbZ+/Xqjf+/evTfffHO9evUaN248c+bMrKysf/7zny79CAOnKkKAMel+Ip4p0foDkd7GM62HAoiKCkewOVX4n//859mzZx86Y8aMGRdddJF0Hjx4UHLXhAkT9u/f/+mnn/bu3TsxMfHrr7926rcfFAHlVEUIMCbdT8Sz4PM2ngEAAq9OnTry73333Xf//febncuWLWvbtq1LPwAgdsSz4COeAQBcHDhw4KGHHmrdunWtWrUSzmjWrJn0N23a9F//+pe52dNPP/3LX/7SpR8AEDviWfARzwAALrp27Tp69GhJXIcPH5aHkydPHjhwoCxUr179q6++MrY5fvx4ixYtnnrqKZd+AEDsiGfBRzwDALioXbt2Xl7e119//dlnnz399NO1atV67LHHpL9Dhw4PPfSQJLHNmzdfddVV1apVe/XVV136AQCxI54p0foDkd7GM62HAoiKCkewlVrhL730UpMmTSRltWrVKicnR35rrFy5Uvo/+OCDtm3bVq9evU2bNrJNamrq3r17XfqhtaO7iwum5x4/cMi+IkKpVYRgY9L9RDxTovXXiXobz7QeCiAqKhzBRoXDxf7V6xbVvXzN4NHFb31kX2dBFYUQk+4n4pkSrYuSeAaoo8IRbFQ43G1+4vl51brOrdJpZevrt058udQ306iiEGLS/UQ8U6J1URLPAHVUOIKNCkdUHwz5w9xKl6xqd/Pq3vcsTMmOfDONKgohJt1PxDMlWhcl8QxQR4Uj2KhwqJCEJqUibUXLa98ecL/8a30zjSoKISbdT8QzJVp/INLbeKb1UABRUeEINuM1N412Vm1+4qWr2g+WhYUp2btfyefnZAgx6X4ingWft/EMAAAE2/7V6xYkdzPj2dwqnRal9vrng1NL/SgaAG8Rz4KPeAYAABRZs9ncczq/3vX2fW+8b98IQLkhngUf8QwAAKiQbDavahcJZrxdBlQU4lnwEc8AAEBUp983q9mdt8uAikU8U6L1ByK9jWdaDwUQFRWOYKPC4eTo7uKC6bkqb5dRRSHEpPuJeKZkjs5fJ+ptPNN6KICoqHAEGxWO2FFFIcSk+4l4pkTroiSeAeqocAQbFY7YUUUhxKT7iXimROuiJJ4B6qhwBBsVjthRRSHEpPuJeKZE66IkngHqqHAEGxWO2FFFIcSk+4l4pkTrD0R6G8+0HgogKiocwUaFI3ZUUQgx6X4ingWft/EMAAAAQDkhngUf8QwAAADQAvEs+IhnAAAAgBaIZ8FHPAMAAAC0QDxTovUHIr2NZ1oPBRAVFY5go8IRO6oohJh0PxHPlGj9daLexjOthwKIigpHsFHhiF2FVFHfvn2XLFli7y0TDw8VHhUy6aFFPFOidVESzwB1VDiCjQpH7CqkitLS0nbt2mXvLRMPDxUeFTLpoUU8U6J1URLPAHVUOIKNCkfsnKpoz549v/rVr9LT0xs3bvyXv/zF6CwqKrrlllvq1atXs2bNfv36yUPpPHDgQO3atVetWtW1a9ekpKRGjRrNmjXL2H7nzp033HBDgwYNUlJS+vfvv2bNms8//zzB4qmnnpJ9c3Nzf/KTn2RkZHz22WdycPMa9u7dm5qaaixHXo/tUNOmTXO5PPMU5sHDzGnSUR6IZ0q0LkriGaCOCkewUeGIXalVtG/fvmbNmkl22r9//9atWyXzSGdxcXHz5s0ff/xx6fzyyy8feuihPn36SP+7775bvXr16667TrYsKSlZvny5mak6d+48ceJEyVGyi7w2veaaa6RTgtzll19ubCD7yquaLl26vPPOO8eOHVu4cOFVV131n4s4dertt9/u2LHjKYfrsR3K5fKsp/ju2KFW6qSjnBDPlGj9gUhv45nWQwFERYUj2KhwxK7UKho2bNh9991n67znnnsk85gPv/rqq+TkZFmYNWtWmzZtvv32W6O/qKgoJSXFWK5Tp86ECRMKCgpOnjxp7vjYY489+OCDxrLs26RJEzmU8fD+++9/9NFHzS3l5ezNN998yuF6Tv3wUC6XZz0FTjlMOsoJ8Sz4vI1nAAAANuedd95nn31m62zevPmOHTvMh5988sn5558vC6NHjx41apTZv2rVqh49ehjLeXl5vXv3lpAmW86cOdPoHDBgwPz5841l2feBBx4wlk+deZHz97//3Xw4YsSIMWPGnHK4nlM/PJTL5VlPAfiMeBZ8xDMAAFCuEhMTjxw5Yus899xzDx8+bD68//77hw4dKgs33XSTGb3E2LFjbXHoxIkTS5YsqVmzpvFQUlNBQYGxLPvKa1Zzy5SUlH379hnLslfbtm1ffPHFUw7Xc+qHh3K5POspAJ8Rz4KPeAYAAMpV586dx4wZ8+WXX27evPn3v/+90XnFFVeMGjVKOj/99NORI0c2a9Zsz5490n/JJZfk5+eb+1555ZWLFi0yFpYtWybb792795FHHjHfUktKSlq7dq2xLPu+88475r516tT561//WlJSsn379l//+tfVqlV77733Tjlcz6kfHsrl8qynAHxGPAs+4hkAAChXmzZt6tatW40aNdq3b//uu+8anTt37pTEde6556ampt58883mXxtKptq/f7+5b7169YxVS5Ys6dKlS3Jy8nnnnXf77bcXFxcbG4wdOzYlJUVezLz66quyr/l22akzHzZLS0tLTEzs2rXrqlWratWqdeDAgVMO12M7lMvlWU8B+Ix4pkTrD0R6G8+0HgogKiocwUaFI3ZUUWAc3V1cMD33+IFD9hURmHQ/Ec+UaP11ot7GM62HAoiKCkewUeGIHVUUJPtXr1uU2uvVn/7XroV59nUWTLqfiGdKtC5K4hmgjgpHsFHhiB1VFDCS0OYnXSbTuuDc7mv/e3zJ/s/tWzDp/iKeKdG6KIlngDoqHMFGhSN2VFHwSELLTe21oEY3mdw5lTu9ctFNtjfTmHQ/Ec+UaF2UxDNAHRWOYKPCETuqKJCMhLYopefphHamWd9MY9L9RDxTovUHIr2NZ1oPBRAVFY5go8IRO/PlOy3YbWHt01FtQe2eu1/J50eHn4hnwedtPAMAAEDAFC1ePe+czpLH5p7T+ZU2NyxtcvXK1tdvnfiyyvc6wlvEs+AjngEAAMCJkc0W1u75SrubF9TquWbw6OK3PrJvBL8Qz4KPeAYAAIBSFS17a17VrnMrd+TtsjhBPAs+4hkAAAAinf7/ntW9nLfL4grxTInWH4j0Np5pPRRAVFQ4go0KR+yoosA4uru4YHquyttlTLqfiGdK5uj8daLexjOthwKIigpHsFHhiB1VFEJMup+IZ0q0LkriGaCOCkewUeGIHVUUQky6n4hnSrQuSuIZoI4KR7BR4YgdVRRCTLqfiGdKtC5K4hmgjgpHsFHhiB1VFEJMup+IZ0q0/kCkt/FM66EAoqLCEWxUOGJHFYUQk+4n4lnweRvPAAAAAJQT4lnwEc8AAAAALRDPgo94BgAIA/llZ+8CAN0Qz4KPeAYACAPiGYAAIJ4p0foDkd7GM62HAoiKCkewlWuFV3g6KvMFlHnHcCrXKkJ8YtL9RDxTovXXiXobz7QeCiAqKhzBVq4VXuEhp8wXUOYdw6lcqwjxiUn3E/FMidZFSTwD1FHhCLayVbj8EpkxY0Z6enqlSpXk4YkTJ8aNG9esWbM6derceuuthw8fNrYxmXvZDmIuWI8mD2fOnNm6devk5OROnTpt2LDBupdh69atgwYNSk1NrV279sCBA4uLi43+48ePDx06VPozMzOnTZtmnsJpe9lg6tSpGRkZdevWHTZsmOxudNquvNQnaGxpvfLQKlsVQWtMup+IZ0q0LkriGaCOCkewla3C5ZdI//79i4qKjIc5OTnZ2dnbt28/ePDg4MGDhw8fbm72/T7OD21Hk4cDBgwoLCyUFDR27NiuXbt+v8932rZtm5eXd/To0S+++OKuu+667bbbjP7Ro0f36tXrs88+27VrV48ePcxTOG0vGxjbC1kYM2aM2W8sGFyeoPXKQ6tsVQStMel+Ip4p0booiWeAOiocwVa2CpdfIjt27DAfZmVlbdmyxVjeu3dv06ZNzc3MbVwe2o4mD/fs2WMsHzlyJCkpyVxVqkOHDqWnpxvLmZmZmzZtMpY3bNhgO6PBur1sYG6/ceNG2d3sNxYMLk/QeuWhVbYqgtaYdD8Rz5Ro/YFIb+OZ1kMBREWFI9jKVuHyS+TkyZPmQ0lQCRaVK1c2NzO3cXloO5rTZlbvv/9+z54969SpY5yxSpUqRn9iYuKxY8eMZVkw93XaXpat28vuZr+xYHB5gtYrD62yVRG0xqT7iXgWfN7GMwBA2NjSS8uWLQsLC609BtsnsiT8HDlyxFjes2ePeRDb0dwfGjIzM+U1yoEDB7799tuDBw+a20j/5s2bjeWNGzda+0vdXhbM7Tdt2mS+e2a7cqcnWOq1AYC3iGfBRzwDAMTCFksmTZrUq1cvyTmSvtauXduvXz+jv379+mb4EV27dh07duzhw4e3b98u28QSz9LS0nJzc0tKSgoKCgYNGmRuM2rUqD59+pifJTP7nbaXBXP73r17P/LII0a/7cqdnmCp1wYA3iKeBR/xDAAQC1ssOXHixJQpU7KyspKTkzt06LBkyRKjPycnJyUlxdx4w4YNnTp1km1atWo1c+bMWOLZihUrWrZsWbVq1SZNmsipzW0kgA0ZMiQ1NTUjI+PZZ581+522TzjzzY3NmzeXXe68807Z3ei3XbnTEyz12gDAW8Sz4COeAQAUHT9wqGB67tHd//km+oAhXwGIf8QzJVp/INLbeKb1UABRUeEINpcK3/HCirzsYYvqXr5/9Tr7uqAgnnnCpYoQVEy6n4hnSrT+OlFv45nWQwFERYUj2CIr/GjR/jU3jZqfdNmcSpcsqPGzAGezU8Qzj0RWEQKPSfcT8UyJ1kVJPAPUUeEINmuF73hhxYqW182p1FE6V7a8dnH9PsHOZvAKPydDiEn3E/FMidZFSTwD1FHhCDap8O/fLku4xGivd/5vshnU8XMyhJh0PxHPlGhdlMQzQB0VjmCTCp+f3M0MZjRa2Zq9sBB0TLqfiGdKtP5ApLfxTOuhAKKiwhFsUuHHDxzaOvHlZc0HLEzpOa9qF3nVJf8uqt2Td8+giJ+TIcSk+4l4FnzexjMAQDAUv/XRO9c9PD+p28KU7LnndCahAUA8IJ4FH/EMAODEfDNtTqWO8xMvI6EBQMUingUf8QwAEFXxWx/l3zgy2P/fMwCIf8Sz4COeAQAUHT9wqGB67tHdxfYVAABfEM+UaP2BSG/jmdZDAURFhSPYqHDEjioKISbdT8QzJVp/nai38UzroQCiosIRbFQ4YkcVhRCT7ifimRKti5J4BqijwhFsVDhiRxWFEJPuJ+KZEq2LkngGqKPCEWxUOGJHFYUQk+4n4pkSrYuSeAaoo8IRbFQ4YkcVhRCT7ifimRKtPxDpbTzTeiiAqKhwBBsVjthRRSHEpPuJeBZ83sYzAAAAAOWEeBZ8xDMAACqK/Aq2dwGAM+JZ8BHPAABa0zrhaH3xAPxHPAs+4hkAoAw0yhWxX2rsR3BS5iOXeUcAWiOeKdH6A5HexjOthwKIigpHsJ1VhWsUD2K/1NiP4KTMRy7zjuXtrKoIwcCk+4l4pkTrrxP1Np5pPRRAVFQ4gs2pwl9//fX27dsnJSW1atXqpZdeOnUmG5iMbUpKSu699960tLSGDRvKgjw0+mWDGTNmpKenV6pUSR6eOHFi3LhxzZo1q1Onzq233nr48OHvTvI92WXq1KkZGRl169YdNmzY8ePHjX6XU5gLM2fObN26dXJycqdOnTZs2GB02i7V6Rpsl2qKPILTlVht3bp10KBBqamptWvXHjhwYHFxsdEvT2fo0KHSn5mZOW3aNPOYTtsnlDYakZd0tk+q/DhVEQKMSfcT8UyJ1kVJPAPUUeEINqcKb9So0YIFC44dO/bxxx/feOONRqcZDAyjRo3q1avXrjN69OjxyCOPmJv179+/qKjIeJiTk5Odnb19+/aDBw8OHjx4+PDh3x/iO7KLHOqzM2RhzJgxRr/LKcyFAQMGFBYWSjgZO3Zs165dbRsYnK7BdqlWik/Wqm3btnl5eUePHv3iiy/uuuuu2267zegfPXq08eyMfc0jO23vNBqxP6ly4lRFCDAm3U/EMyVaFyXxDFBHhSPYnCr8/PPPnzJlys6dO62dtniQkZGxadMmY3nDhg2ZmZnGsmy2Y8cOc7OsrKwtW7YYy3v37m3atKm5yiS7mIfauHGjeSiXU5gLe/bsMZaPHDmSlJRk28DgdA22S7VSfLJODh06lJ6ebizLxtZ9bUc2WLd3Go3Yn1Q5caoiBBiT7ifimRKti5J4BqijwhFsThW+bt26AQMG1K1bt0WLFitXrjQ6bfEgMTHx2LFjxrIsyENjWTY7efKkuZlEpgSLypUrm6tM0l/qoVxOYVtw73e6hoQfXqqV7QhOV2L1/vvv9+zZs06dOsZZqlSpYvTb9jWP7LR9gsNo2C6pDE+qnDhVEQKMSfcT8UyJ1h+I9DaeaT0UQFRUOILNvcLlVf7y5cvT0tKMh7bPMjm9oWRLES1btiwsLLT2RJJdNm/ebCzLMc/q3TNjwfbQdqlO12Db3UrxyVpJp7xyOnDgwLfffnvw4EHz4NJvPruNGzda+0vd3mk0Yn9S5cS9ihBITLqfiGfB5208AwAET//+/T/88MNjx45JPGvUqJHRWb9+fTM2iBEjRpgfx+rZs+fIkSONfls8mDRpkmwmOx45cmTt2rX9+vWzrjXILn369DE+bdW7d2/zk11RT+EUz2yX6nQNLklG8claSY7Nzc0tKSkpKCgYNGiQefBRo0aZz04OYvY7be80GrE/KQA6Ip4FH/EMAOBu0aJF7dq1S0pKat++fV5entGZk5OTkpJivvqX8Hb33Xc3PEMWzL/Hs8WDEydOTJkyJSsrKzk5uUOHDkuWLLGuNSSc+a7C5s2bp6am3nnnneb3IkY9hVM8s12q0zW4JBnFJ2u1YsWKli1bVq1atUmTJnI6c195OkOGDJGnlpGR8eyzz5r9Tts7jUbsTwqAjohnwUc8AwDEFRKFFaMBwIp4FnzEMwBAXCGQWDEaAKyIZ0q0/kCkt/FM66EAoqLCEWxxUuEEEivtRiNOqgh+YtL9RDxTovXXiXobz7QeCiAqKhzBRoUjdlRRCDHpfiKeKdG6KIlngDoqHMFGhSN2VFEIMel+Ip4p0booiWeAOiocwSYVXrHNfkHQEPMYQky6n4hnSrQuSuIZoI4KR7BVbIVX7NnhFeYxhJh0PxHPlGj9gUhv45nWQwFERYUj2Cq2wnmFFwwVW0WoEEy6n4hnwedtPAMAoGyIZwAQFfEs+IhnAIB4QDwDgKiIZ8FHPAMAxAPiGQBERTwLPuIZACAeEM8AICrimRKtPxDpbTzTeiiAqKhwBFvFVjjxLBgqtopQIZh0PxHPlGj9G8XbeKb1UABRUeEItqgVfvzAoYLpuUd3F9tXeCHq2aEF5jGEmHQ/Ec+UaF2UxDNAHRWOYHOp8N0r3lnd+55FdS/fv3qdfZ1HXM4OjTCPIcSk+4l4pkTroiSeAeqocARbZIUfP3Bo3d0TFtbuOafSJQuSu5VfNjtV2tmhI+YxhJh0PxHPlGhdlMQzQB0VjmCzVvjuFe/8vcOv5lTpJJ1Lz7tqcf3e5ZrNTnF/BQXzGEJMup+IZ0q0/kCkt/FM66EAoqLCEWxS4Za3yzrKSy5pK7Ou9SGbneIVXlDwczKEmHQ/Ec+Cz9t4BgDQ1+5X8o1IVlHNfkEAgB8ingUf8QwAYDp+4NCWp15cct5V85O7GZFpYc2fLUrN9uHdMwBAVMSz4COeAQAiFb/10f+7+nfzql8qbX7SpSQ0AIgHxLPgI54BAJyYb6bNqXTJ/KTLSGgAULGIZ0q0/kCkt/FM66EAoqLCEWwuFV781kdvD3qwXP+/ZwgGlypCUDHpfiKeKdH608zexjOthwKIigpHsEWt8OMHDhVMzz26u9i+AvhO1CpC8DDpfiKeKdG6KIlngDoqHMFGhSN2VFEIMel+Ip4p0boojTlOSUn5mRd+kXCevQsIECocwUaFI3ZUUQgx6X6SF+3Es+gCEM8AAAAAaIF4FoXWH4icPHly9+9cfPHFMtmtWrXKysr6UZl0b5Bp7wIChApHsFHhiB1VFEJMuv/+67/+i3gWCvn5+UuXLp09e/bzAAAAAOKYvGiXl+7yAr6wsNB8PU88C5T169dL/s7NzZXJfgEAAABAXJKX6/KiXV66ywv4oqIi8/U88SxQtm3btnbtWplmCeLzAAAAAMQlebkuL9rlpbu8gC8u/v7/d0I8CxRJ3jLBEsHz8/PfAAAAABCX5OW6vGiXl+7yAv7QoUPm63ni2WlafzWIlUythG+Z48LCwm1l8o+7/2DvAgKECkewUeGIHVUUQkx6hZCX6/KiXV66ywv4kpIS8/U88ew0rb9Y31sMBYKNCkewUeGIHVUUQkx6XCGenUZRmhgKBBsVjmCjwhE7qiiEmPS4Qjw7jaI0MRQINiocwUaFI3ZUUQgx6XGFeHYaRWliKBBsVDiCjQpH7KiiEGLS4wrx7LTAfDVI7BgKBBsVjmCjwhE7qiiEmPS4QjwDAAAAgLigFM8mTpz4MwAAAABAzCZPnmxPXN9RimdyiAQAAAAAQMy6d+9uT1zfOYt4dumllz6AUDJqCAAAAEAsUlJSPItn8jL9IEJJZt9eE4Ce+PQzgo0KR+yoohBi0v1kBCvimQeMNyLtvZ7y4RRlQzxDYPDdwQg2Khyxo4pCiEn3kxGsLr744vz8/PXr12/btq2oqOjQoUPmBkovu4lnB2POTiq7q2xTIYhnCAx+AyHYqHDEjioKISbdT0aw+tGPfrR06dI33nhj7dq1ktCKi4vNDZRedhPPDsacnWLcvWIRzxAY/AZCsFHhiB1VFEJMup+MYNWqVavZs2fn5uZKQlu/fn1RUZG5gdLL7jLEMyONTJ8+PSsrq3r16q1bt547d+6IESPS0tISExN/8pOf5OXlGVv++9///uMf/3jhhRcmJSW1aNHiiSeekJ6CggLZrEqVKh9//LGx2ebNmytXriydsurAgQOTJk2SYyYnJ8suTz75pPR8f24L4zKmTZvWrl27GjVqyMaTJ08217ofR1bJVclesq8cwZqvXHZ89dVXu3TpUqtWrZSUlOzs7AULFhz87jJMxpbGsuwrR5BnavYYa8X48ePloTzrBg0a3HLLLTt37rTu+Kc//UlitwzaRRddtGrVKnOv8pBAPENQ8BsIwUaFI3ZUUQgx6X4ygpVEpOeff14S2tKlS/Pz8wsLC80NlF52lzme3XTTTXKyF1980fpQriPhTGQ0tnz88cfl4ZAhQ2TVHXfcIcuS0KT/l7/8pSyPHTvW2GzMmDHyUFKKLE+YMEGWr7/++h07dtx3332y/PTTT//nxD9knLd3796S7rZs2SILCWeCjbHW5TiS4owdPz7D2DHhu+zksmOzZs3koTxlWSWBWIbO6Lfubu2RMZEtS91GBnzNmjV79ux55plnpP+2226zbnbDDTfIiEkAlmWJkeZenlu5cqVkVHtNAHri088INiocsaOKQohJ95P5x40Sz1544YV58+a98cYb27ZtMzco33gmoUiWJWAYDzdt2nTwzNtlCWfeFDK2bNGihTzcuHGjLG/YsEGWpUeW33777QRLipMFefjOO+/IsqQRWf7ggw9kWSKKLLds2dLYzMY479q1a42HsmA9pstxJNFG7pjwXXZy2TElJaVatWoyyvKsjR6DdXdrj/n2oNlj2eQ/iouLpT89Pd14aGxmDOa+ffsSLIPpOclmDRo0WL16tb0mAAAAAJylCo5nKg8TExNlWWKGLO/du1eWk5KSjFWXXXaZPJRs8Oabb8pCt27djP7q1asbRzBVrVrVWGVjrDWTkhEUzeO7HEe2idwx4btrdtkxJycnOTlZeqpUqdK+ffvFixcb/cZmxrJKz2uvvSbDXrduXYleRr+ZwWw7Rh7HK2QzAAAAwEMaxLPMzMyE0t49E7NmzZKHd95555AhQxLO/MWg0d+0adOE794+cmecyOndM5fjtGzZMnJH85pddjx4JsvJKI8YMUK2SUtLMzqtu6v0NGnSRJZffvllCa67du2yrrLtaHvoFbIZAAAA4C0N4tnIkSMTznz2bMeOHcZnzx5//HFj1b///W9JKfXr169Xr54kInlo9BsfV7vmmmv+9a9/bd26VWJb586djVU2xomMj5Bt2bKlT58+8vCZZ54x1rocZ+LEieaOkZ89c9kxOzt7xYoVEqhef/112UbCp9Fft25defjhhx8aDw9GjImtp3HjxrK8aNEic1jMVbYdbQ89QTYDAAAAPKdBPNu/f/+IESMkxiQmJl5wwQXjx483Y5gYN26csbEsmJ1ixowZ7du3r1mzpoS3K6+8UhKRda3J2Hfq1Klt2rRJTk6W49u+RMTlODk5OS1atEhKSpJ95Qi2p+C04+LFi3v06FG7du1atWpdeuml5hdUTpgwQUKm9SC2A9p6li9fLuetVq1aenq68U0kTjtGHidGZDMEGJ9+RrBR4YgdVRRCTLqfKiyexQnPo0vgzX36WbIZAozvDkawUeGIHVUUQky6n4hnxLOzsHLlytqVqpHNEGD8BkKwUeGIHVUUQky6n4hnxDNVxt80PpLQyj79QIDwGwjBRoUjdlRRCDHpfgp7PIMi8/Nm3J8INiocwUaFI3ZUUQgx6X7yMp4hwGrUqGH8TSOfDUWwUeEINiocsaOKQohJ95OX8ax79+72FQAAAAAANcQzAAAAAIgLxDMAAAAAiAvEMwAAAACIC8QzJXwg0sRQINiocAQbFY7YUUUhxKT7iXimhK8TNTEUCDYqHMFGhSN2VFEIMel+Ip4poShNDAWCjQpHsFHhiB1VFEJMup+IZ0rirSj79u27ZMkSe68vKnYoKvCJIyQqtsKB8kaFI3ZUUQgx6X4inimJt6JMS0vbtWuXvdcXFTsUFfjEERIVW+FAeaPCETuqKISYdD8Rz5Q4fSDy3//+97Bhw5o1a3buuedeccUVO3fuNPr/9re/dezY8cSJE8bDcePGyRD/+4xSt9+zZ8+vfvWr9PT0xo0b/+Uvf5Gezz77rF69esZasXfv3tTUVFn4/PPPEyymTZvmdEzTgQMHateuvWrVqssuuywpKUkSjlyehJzrr7++Zs2aDRs2fPHFF40ti4qKbrnlFjmv9Pfr108eSqdsIBdjHu2l/37w/PPP/+qrr045PH3107nv3rVrV9m9UaNGs2bNOlXaE5ftb7jhhgYNGqSkpPTv33/NmjXmRQJl5nSzA8FAhSN2VFEIMel+Ip6VnQSGrKys+++/f/fu3YcOHXrggQf69OljrDp58mSHDh0kQsiy/JuZmSnbOG2/b98+iShPPfXU/v37t27dKgFJOhcuXHjVVVeZ53r77bcl7xnLEl0uv/xyY9npmFbvvvtutWrVBg4cuHnz5qNHj06ePLlGjRo9evR47bXXjhw5IrNu5MDi4uLmzZs//vjjchlffvnlQw89ZByqd+/ey5YtMw71zTffXHTRRYsWLTrlfGrF07nsXr169euuu06GoqSkZPny5UYuPfXDJy46d+48ceJEOY5csJTvNddcY64CAAAAdEQ8K7vhw4f/5je/MR9K9khOTjYf5ufn16lTZ9KkSeeff/727dtdth82bNh9991n9hsktzz66KPmQ5mem2++2Vh+7LHHHnzwQWPZ6ZhWs2bNkgmWZGU83Lt3b6VKlSQ7GQ/37NlTs2ZNWbjnnnskkpl7ffXVV8ahrFfyxBNPXH311cay06kVT+eye5s2bb799lujv6ioKCUlxVi2PnEhwzthwoSCggIJw2YnAAAAoC/iWdk1adLE+ud2QgKDuXb58uWJiYlVqlTZtGmT+/bnnXee9a8HDTKkf//7382HI0aMGDNmjLE8YMCA+fPnG8tOx7QaPXr0qFGjzId5eXmdOnUyH7766qvdunWThebNm+/YscPs/+STTyRYysLs2bMHDhwoCxIy69evb27jdGrF0ynuvmrVqh49ehjL1id+6syRe/fuLXvJdc6cOdPsBwAAADRFPCu7pKSkI0eO2HvPeP/99xs0aJCfn3/hhRe+/PLLRqfT9pLiIvtTUlL27dtnLJ84caJt27bmR7YkjRQUFBjLTse0uummm6zpZfz48cOHDzcfPvroo7///e9l4dxzzz18+LDZf//99w8dOlQWNm/e3KxZs1NnvjXxqaeeMjdwOrXi6RR3Hzt27AMPPGAsW5+4SQZnyZIlxjtyAAAAgNaIZ0pK/UBkz549f/e73+3du1dSzbp1626//Xbjyy0kQjRu3HjFihWyLMkhIyPj+PHjLtt37tx5zJgxX375pQQhI7qcOvOXe3/9619LSkq2b9/+61//ulq1au+9956xSoLN2rVr3a/B6pJLLpGgaD78+c9/bn0P6sorr1y4cKEsXHHFFaNGjZLL+PTTT0eOHCmRbM+ePafO5J8aNWr8+c9/loj4zTffmEPhdGrF0ynuLtsbH3U79cMnLv3Lli2Tq5UjPPLII+Y7bECMSr3ZgcCgwhE7qiiEmHQ/Ec+UlPp1ort27br22mvr169fs2bNbt26LV++/NSZL9ho0aLF9OnTzc2ys7MnT57stL3YtGmTPJQI1L59+3fffdfolPlIS0tLTEzs2rXrqlWratWqdeDAAWPV2LFjU1JSZMBfffVVp2NaSdLbv3+/+bBevXrW76aXh8afVko6ksxz7rnnpqam3nzzzda/t+zYsWP16tWN1GQOhdOpFU+nvrt5JdYnLrm3S5cuycnJ5513nkQ7GXZzFyAWpd7sQGBQ4XBydHdxwfTc4wcO2VdEoIpCiEn3E/FMCUVpYigQbFQ4go0Kh4v9q9ctrJO9ZvDo4rc+sq+zoIpCiEn3E/FMCUVpYigQbFQ4go0Kh7uC6YvnVuk8t3LHla2u2zrx5VLfTKOKQohJ9xPxTAlFaWIoEGxUOIKNCkdUpxNa5Y7zEy9d0fK6BTV7RL6ZRhWFEJPuJ+KZEj4QaWIoEGxUOIKNCocKI6HJK3Jpy5oNWNL4KuubaVRRCDHpfiKeKTF+QtFoNBqNRqOFsM1PvFT+XZiSvfuV779dGUB5IJ4BAADge0VL/9+8czobwWxe1S4LU3ouaz7A6aNoALxFPAMAAMB/mNlsYUr2/KRu71z3sPsXOQLwFvEMAAAAp0k2m1ul05xKHXm7DKgoxDMlfCDSxFAg2KhwBBsVDhen/79ntXtEfbuMKgohJt1PxDMlc/g60e8wFAg2KhzBRoXDydHdxQXTc1XeLqOKQohJ9xPxTAlFaWIoEGxUOIKNCkfsqKIQYtL9RDxTQlGaGAoEGxWOYKPCETuqKISYdD8Rz5RQlCaGAsFGhSPYqHDEjioKISbdT8QzJXwg0sRQINiocAQbFY7YUUUhxKT7iXgGAAAAAHGBeAYAAAAAcYF4BgAAAABxgXgGAAAAAHGBeKaED0SadBkKKUh7V9xzuubx48dfddVV9t744HTN5arUk5baWQYxVnjUy4i6QRzq27fvE088Ye+FnmKscOAUVRRKTLqfiGdK+DpRU5wMRdTXuFE3iEOlXvPhw4fr1atnvSdjUeopYuH5AVWUetJSO8sgxgqPehlRNzhbUQ8YdYOoPv744/r16x89etS+AhqKscKBU1RRKDHpfiKeKaEoTWUbCimP1q1bnzx50uyR5VatWpkvHL/44osHH3ywRYsWSUlJ6enpv/jFL95++21zX3MvdWXbq2KVes0zZ87s16+fvVdZqcf0UHkfv1SlnrTUzjIoW4Wbol5GqRuU2mlyX1t+rOft27fvyy+/bFkJXcVY4cApqiiUmHQ/Ec+UUJSmsg2FlEeHDh2WLl1q9uTm5kqP+fqvT58+t99+u1ReSUlJYWHhiy++2LFjR3Nfcy91Knu1a9du4sSJ+/bts6+oIKVe87XXXjtr1ix7r7JSj+mh8j5+qUo9aamdZVC2CjdFvYxSNyi10+S+tvxYz/vcc8/deOONlpXQVYwVDpyiikKJSfcT8UwJRWkq21BIeUhtde3a1ezp1KnT/Pnzzdd/SUlJX3zxhbnWqtTXpmanLMycObN169bJyclyzA0bNtg2+OCDDxo3bjxp0iTjodXrr7/+y1/+snbt2ldfffWCBQuOHz9u20Cy4r333puWltawYUNZkIdGvxx86tSpGRkZdevWHTZsmLnjiRMnxo0b16xZszp16tx6662HDx82ty/1ImXHoUOHpqamZmZmTps2rdRn2rx5808++cR8eFaXlGBhbhb1OKVe6tatWwcNGiSXKsM1cODA4uJi2wGd2DYwH8rgt2/fXua9VatWL730ktHpNIAqA5VQ2ghcdtll1vd8Pv3000aNGtkqTXaUY7Zp00YuRn4UjkloJVGkRYsWiYmJMgIff/yxsZnTiDldm9Nzcbp4YyFyWP4zf2eYG8+YMSM9Pb1SpUrWfRNKGwHbBqVOrjyXIUOGyFOQfeUI1u2NBSG/FeQJmg+hr7L9DAesqKIQYtL9RDxTwgciTWUbCikPebUqL3nfeecdefjmm2/KsvSYr//69u173XXXvf3225Gfb7G+RozslIUBAwYUFhbKy9+xY8eaCdDYYNmyZfXr11+8eLG5Y6SvvvpKXo736NFDXtTK6+z33nvPXDVq1KhevXrtOkM2eOSRR4x+Obj0f3aGLIwZM8boz8nJyc7O3r59+8GDBwcPHjx8+HBz+1IvcvTo0cZxjOOX+kzllfqRI0fMh2d7SbZjmg9djlPqpbZt2zYvL09mR7LNXXf9f/buBC6rKv8fOOiYgKkgixsioCQ4Ltm42wYohrjmz1JzmnFKs6xfZouZW1ZoU7lWWlo6g+WeuI81Rf7H0gZT64cLZoilLEpQFIJaxP/Lc+p0O889z3PhuTze5fN+PS9f55577rn3nvMFztfL8/DgvffeK3QoI7sASpMoJa6oqKD8hz+WkQ2gloFSHYE9e/ZQnkORxtrcc889zz///O8OcxyYkpJCOTDdcmpqaqOGfkOHDs3JyWGb9M2NNZONmOzaZPciu3hWUB0W5zEcNmxYXl6esFd1BIQGqpM7c+ZM+gLMc0hKSlK2Z4Uqx3sgKRT5JphX7b6HAyghimwIk+5NSM/AG9g67/XXX2dvoxo4cOCKFSt4PSktLaXlb9euXf38/KKjox977DH+iMP1cpYKBQUFrExpDF9BUv0rr7zSqlWrzMxMVuPWf/7zn/DwcOXp6EqOHTvGyllZWfzpAbXh9UePHuX1sbGx2dnZrFxYWNi2bVtWll0kHajsX/VOaUCU6VlNL0nok2+66Ef1UpVosmigWFn1mpVkF9CmTZulS5d+/fXXyr2yAdQyULIR6NGjB3sMRd/XWrdurRxMhg7Mz89nZdorGwHZiMmuTXYvqhfPqQ6L8xieOXNGuckLqiOgbCC7Nf6QkHpQvUJqHxAQINYCAACA3pCegTewBd+lS5datmy5du1a+pf9bpjzQrCyspJWln/5y1/4R8k7t1FWOq9ceYEWndOnTxf2MsrKH374gaI/ISEhODh40qRJBw4c4LsoNaqoqGBlKtAmK1MPqvW03uWnIPXq1ePtWUHYFPoXmjFRUVGnTp3imzW9JI2ndtv+4MGDNERBQUHs1urXry80kJF1eOjQoeHDh9OYx8TE7N69m1XKBlDLQPlIRmDr1q0dOnT46aefxowZQ5nPbwf8SnaFwqZsxGTXJrsX1YvnVIfF+ZKUn7LD9/pIRkDZgBWETWrJf1dTNrz0U4G+oMRaAAAA0BvSM/AGvuCbP3/+H/7wB/4LZqoLQfLtt982btyYlVXbuF1xUuHs2bPt27d/4YUXlA2U3n///bvvvrtp06aUClLo8xUqJ3tgQp0fP36clakBr6c0IDc3l5WVZBdJB/J+KClVvdNRo0bRFyffrOklsbcncfwULvphBWGTGtA3iOLiYspzSkpKZOPvzE/x9K+goEBoT2nGzp07W7RowTZlA6hloGQjQKfo0qXL448/HhkZ6TzFVU63INuUjZjs2mT3onrxAmFYZJMobMpGQDZZyltz+/Rs9erVo0ePFmsBAABAb0jPwBtUF3xVivpevXqtWbMmJyfn8uXLp0+fvu+++5KTk4U2Sm5XnKyQl5dHq+R58+Yp23C0al+wYEFhYaG441czZszgbzdKSEiYOXMmq6fOBw4cyN7kk5SUxN+GtHjxYmpPS2RKSDIzM/kH4ssuctasWbwfOlD1TunLcvDgwXyzppcUGhrKl+ysGSu46Ic3Vm5SqpCenk7pDc3RyJEjVcdf9fr79es3d+7csrIymlYaEN5m2LBhhw8frqiooDykZcuWrFI2gFoGSjYCZP369bT3jTfeUDT/jeyWhU3ZiMmuTXYvqhfPqQ6LbBKFTdkIqE6WcpNujb/3jHpQvcKUlBT+CS4AAABQd5CeaYI3RHJuh+JycWnOivTy/F8+2Y9RXfBVKeo//vjjO+64o3Xr1n5+flFRUZMnTy4uLuZtBMoDeUHY5IWCgoK4uLhnnnnmt0aa0Sr5oYceau5ABf6bYz6Oj8ij62zWrNn999/Pn8lUVlYuXbo0NjY2ICCge/fu27Zt4+1ZQdhUfmLe8uXLhWYMLe5DQkJOnjzJNmt6SZR/BgYGOg+Li35YQdjctWsXJboNGjSIiIige3Tu8KOPPlJ+MieXlZXVu3dvGhCahbS0NN5+y5YtXbt29ff379atW0ZGBquUDaCWgZKNANm0aVNMTMyPP/6oaP4b2S0Lm7IRk12b7F5UL55THRbZJAqbshFweyDdy8SJE4OCgujYhQsX0iwrm5Hs7Gz8WWrLcPs9HMAtRJENYdK9CemZJvg4Uc7FUBTt+2z/6Jlbggdc2HtI3GctrlfYups3b96gQYPE2t/z8iU5i4+P5+mE0QwZMmTt2rVirYSLCDc4XWLg888/pyRNqKTwmz9/vlAJJmXeCAfjQBTZECbdm5CeaYKg5JyH4nJx6clF63ZEDlvv22uT302Wz82qdFoH68uAl2QElZWVr7/+eqdOnfhn67vlHOFm4UkMTJkypaCg4MyZM4mJiY888oi4GyzEvBEOxoEosiFMujchPdMEQckph6Jo32cf3/HUJv+b3mmasPEPfbYEJtghN6vybB1cRwx4SUZAwxIZGXnw4EFxh5x5v9g9iYHFixeHh4eHhYVNmDDB+W8PgJWYN8LBOBBFNoRJ9yakZ5ogKDkaCv64zJGV9aWaTdf0tU9uBtaGL3awNkQ4eA5RZEOYdG9CeqYJ3hDJHRg3e1PAzfRVihdeeOGFF1542fCFRZENYdK9CekZ1FhFftEnf56jTNL+3Wv81tAkPD0DAAAAAPAE0jOovTNv7dkdd+d6316Uoe267n+QoQEAAAAAeALpGXjqt4dpvj03N7oFGRoAAAAAQO0gPQPdnHlrT0big3b4u2cAAAAAAHUB6ZkmeEMk53YoLheX5qxIL88vEncAmIHbCAcwNUQ4eA5RZEOYdG9CeqbJenyc6K8wFGBtiHCwNkQ4eA5RZEOYdG9CeqYJgpLDUIC1IcLB2hDh4DlEkQ1h0r0J6ZkmCEoOQwHWhggHa0OEg+cQRTaESfcmpGeaICg5DAVYGyIcrA0RDp5DFNkQJt2bkJ5pgjdEchgKsDZEOFgbIhw8hyiyIUy6NyE9AwAAAAAAMASkZwAAAAAAAIaA9AwAAAAAAMAQkJ6BmVCYiVVXSWFhYXBwsFjr4OIiXRylXWpqakpKilhrDC7uve6onlS10vvcXobbBgaUnJw8f/58sRYAAAD0gPRME7whksNQMO+++258fLxY6w4dlZCQINbWRFlZWUhIiPJL1BO65wa6d6iF6klVK7XQN8LdXobbBjXltkO3Ddw6ceJEaGhoeXm5uAPMQN8IB3tCFNkQJt2bkJ5pgo8T5ep6KJKTk7dt2ybWGs8LL7wwZcoUsdad2h2llJaWNnToULFWM8+X5q7Vdf+qVE+qWqmFvhHu9jJUG6hWcq731h3leenrdN26dYqdYBr6RjjYE6LIhjDp3oT0TBMEJVfXQ9GiRYuzZ8+KtcYzbty4VatWibXu0FGrV68Wa2ti1KhRa9asEWs1q+uVfV33r0r1pKqVWugb4W4vQ7WBaiXnem/dUZ6XwnjMmDGKnWAa+kY42BOiyIYw6d6E9EwTBCVXi6EoLi5u2rRpenr6n/70p+joaKr55ptvJk+eHBkZee211952221ff/01VX777bc+Ci+++KLyKOqkSZMmrEPVw5s3b37u3Dl+0v3797dp0+aHH36QtVeqxbGdO3emL5hhw4bRVYWEhLz55ptVjjvlF1lQUPCXv/wlPDy8VatWr7/+Oj/q0KFDLrqlwujRo8PCwgIDA6nzAwcOsHouKirqyy+/5JuXLl16+OGHKaelW6ACbbJ6GsBXX32Vxi04OJhOdPnyZVbJ8WZu+0lLS+vYsWNAQEDv3r2zsrJY/cmTJ0eOHNmsWTOaoxEjRhQVFQkdyggN+Ob777/frVs3f3//uLi4t99+m1VWVlY+++yzNEpBQUHjx48vKytj9XQ7DzzwAJ29Xbt2y5YtUz2pj9oI3HTTTcpnPl999VXLli2/++673w5zHEh9durUiS6GvjPu27ePUpGYmBg/Pz8agRMnTrBmshGTXZvsXmQXzwrOw/LL/DnwxitXrqRI8/X1VR7rozYCQgPVyaV7mTRpEt0CHUs9KNuzAqEfEnSDfBNMpBbfwwEEiCIbwqR7E9IzTRCUXC2G4pNPPqHw6Nu378cff1xRUUFpWGxs7BNPPJGfn19aWjpt2rSBAweylnv27BkwYIDqUbRJeVqVI4tTPTwpKWnHjh3s2B9//JESoS1btrhor1TTY69cudKgQYP4+PjMzEy6tp07d9Kau8pxzewiz58/TwtxyjAvXLhAmczdd9/NjqJ1Nq19Zd2SPn36LFq0iBrQgfQ1efvtt7N6jnq4ePEi35w1a1b//v3POtD1zJ49m9XT0FH9OQcqPP3007yeH6vcdNHP8OHDc3NzKZ2YO3duv379WH2XLl0yMjLKy8spt3nwwQfvvfdeoUMZ2QVQmrR582YaTMp/+GOZBQsWJCYmnj59uqSkZNy4cVOnTmX1c+bMYXfHrlb1pKojQAFGeQ5lSqzNPffc8/zzz//uMMeBKSkplAPTLaempjZu3Hjo0KE5OTlsk77XsWayEZNdm+xeZBfPCqrD4jyGlMnn5eUJe1VHQGigOrkzZ85MTk7Oc6AvDWV7VqhyvAeSQpFvgonU4ns4gABRZEOYdG9CeqYJ3hDJ1WIo1qxZExERwR5GEVqY3nfffXwvJRsBAQGs/Nxzzz355JOsLBxFm3feeWeV/HDKdp555hlWOX/+/CFDhrCyrL1STY/97LPPmjZtyp+60Co2MDCwSnGRkydPfuyxx/iBDB3VsWPHKnm3hNK8l156iZKBn3/+mTdQ8vPzU6Zn0dHRx44dY+WsrCz+QIO+Hnn90aNHlfWsIGy66KegoICV6byqK3LKMMPDw1lZNdlQkl1AmzZtli5dKjzYpCQ2OzublQsLC9u2bcvKdHnKq1U9qWwEevTowR5D0be51q1bKweToQMpbWZl2isbAdmIya5Ndi+qF8+pDovzGJ45c0a5yQuqI6BsILs1/pCQelC9QtWvIzCFWnwPBxAgimwIk+5NSM+gzs2ZM2fatGl8k5Iun99jj57I8OHDN23apHoUbc6cOdPF4WvXrh0xYgQVTp8+HRoayhessvZKNT02LS1t9OjR/PA9e/awT3HkF0nr/nOK35Zk6Cj2AETWLcnIyEhKSqJNWpdT+98d7xAVFXXq1Cm+SdlaRUUFK1OBNlmZ+pTVs4Kw6aIfVhA2Dx48mJCQQNfJrr9+/fpCAxlZh4cOHaLZDw4OjomJ2b17N6ukhIH1z9SrV4/VC1erelIfyQhs3bq1Q4cOP/30E80FZT6/HfAr2RUKm7IRk12b7F5UL55THRbnS1Im83yvj2QElA1YQdiklvx3NWXDSz8k2C8qAwAAgL6QnkGdGzt2LIUX3xR+PU+JcpKcnBxWFo7im7LDjx8/HhkZWeX4TLkXX3yR18vaK9X02EcffVT5d5/mzp3LMkl+kcIzLoYfJeuWq6ys3LZtW+PGjcUdjo8GUQ6L7BkOfT3STbEyNeD17O1JHF95u+iHFYRNakDfL4qLiynPKSkpka34nSlHpqCgQGhPacbOnTtbtGjBNimPys3NVTZg6Oz87o4ePap6UtkI0Cm6dOny+OOP04zzJERJdsvCpmzEZNcmuxfVixcIwyKbRGFTNgKyyVLemtunZ6tXr1b+DwUAAADoBekZ1LmePXt+/PHHfDMhIYESlcLCwrKyskOHDk2YMIH/7hblLZmZmapH8U3Z4ZTSNGrU6LXXXqPF948//sgPlLVXqumxAwYM4I8yyKBBg9h71fhF9unT5+mnn/7+++9pfUyZAGvGj5J1S/3s2LGDjqJds2fPVv27avRVOnjwYL45Y8YM/g4o6pY9u6tyLLUHDhzI3neUlJTE3xkVGhrKl+ysGSu46Ic3Vm5SqpCenk7pDaXTI0eOVF3xqy7r+/XrR9ks3fjp06eHDh3K2wwbNuzw4cMVjjfytWzZklUuXryYrooumDI6Cgz+FwVmzZrF744aqJ5INgJk/fr1tPeNN95QNP+N7JaFTdmIya5Ndi+qF8+pDotsEoVN2QioTpZyk26Nv/eMelC9wpSUFP4JLgAAAKAjpGegs8vFpTkr0svzf/kovyrH+6nOnz/PN2k5O2rUKFpiNm7c+Oabb6Z1J99FC/fAwECKpffee084im+6OLxXr14NGzbcv38/r6ly2V6pRseGhYWdU/zuYkhICNvkF3ns2DFqTylft27dPvnkE+EoWbfbtm3r27dvQEBA69atKWfjH4eoRIt7Ot3JkyfZJi3cH3rooeYOVOC/zObj+NS+qKioZs2a3X///fwx0YIFC9gI82Zu+2EFYXPXrl0dOnRo0KBBRETE0qVLnTv86KOP+EdNKGVlZfXu3ZvuMS4uLi0tjben/LZr166Un9OIZWRksEpKm6nz2NhYat+9e3f+B/GUHy24fPly1fxBNgJk06ZNMTExyjxcSXbLwqZsxGTXJrsX1YvnVIdFNonCpmwE3B5I9zJx4kQKZjp24cKFNMvKZiQ7Oxt/lhoAAKCOID3TBG+I5FwMRdG+zw7cNXtL8IALe6s/Ox7qyLx58wYNGiTW/p7rRb8XxMfH83TCaIYMGbJ27Vqx9lcuItxcdImBzz//nJI0oZLCT/nLvWAulolwuIoQRTaESfcmpGea4ONEOeehuFxcenLRup0xI9f79trkdyNyMyPQZWluPZWVla+//nqnTp34Z+s7c45wk/IkBqZMmVJQUHDmzJnExMRHHnlE3A1mZpkIh6sIUWRDmHRvQnqmCYKSUw4Fe1y2qdEt21oP3lCv1zuNb0VuZhCeLM0tjIYlMjLy4MGD4g4Fy3yxexIDixcvDg8PDwsLmzBhguuPsQHTsUyEw1WEKLIhTLo3IT3TBEHJ0VDwx2XpoUnvNE2gGuRmYBn4YgdrQ4SD5xBFNoRJ9yakZ5ogKDkaik2NbqF/1/v2qv4XL7zwwgsvvPCy2UtcHIDVYdK9CemZJnhDJEdDUXrs9P9LnrKhQV/+bfo/g6duDRuIp2dgAfhiB2tDhIPnEEU2hEn3JqRnUEs/V1Zmv/DWtjZD1vtUP0Z7r/tfkKEBAAAAAHgC6Rl46reHab69Nje6BRkaAAAAAEDtID0DfbCHaRnxD+DvngEAAAAA1A7SM9DZ5eLSnBXp5flF4g4AAAAAAHAJ6ZkmeEMkh6EAa0OEg7UhwsFziCIbwqR7E9IzTfBxohyGAqwNEQ7WhggHzyGKbAiT7k1IzzRBUHIYCrA2RDhYGyIcPIcosiFMujchPdMEQclhKMDaEOFgbYhw8ByiyIYw6d6E9EwTBCWHoQBrQ4SDtSHCwXOIIhvCpHsT0jNN8IZIDkMB1oYIB2tDhIPnEEU2hEn3JqRnAAAAAAAAhoD0DAAAAAAAwBCQngEAAADAVXb27NnmzZuLtQD2g/QMAAAAAK6yXbt2JSUlibUA9oP0TBO8IZLDUIC1IcLB2hDh4Lk6iqJ58+Y99thjYu3vJScnb9u2TaytOY39aGxmB3U06aAK6Zkm+DhRDkMB1oYIB2tDhIPn6iiK7rzzzjVr1oi1v9eiRYuzZ8+KtTWnsR+NzeygjiYdVCE90wRByWEowNoQ4WBtiHDwnGoUnTt3LiQkhG8WFhY2a9aMCvn5+VR4++23O3fu3LBhwy5dunz66ae8zV133UVHtWrVKi0tLTY29vPPP6f6b7/9tnnz5rSwbNSo0U033XTkyBFW6aOwbNmyb775ZvLkyZGRkddee+1tt9329ddf87NzVDl69OiwsLDAwMBhw4YdOHDAuR8dT2dhqpMOdQTpmSYISg5DAdaGCAdrQ4SD51Sj6J133klJSeGbH330Ua9evaiwffv2a665ZuTIkUePHv3hhx9mzpzZvXt3qi8pKaF87KWXXrpw4cJXX32VlJTk5+d35coV2vXaa6+tXbu21GHlypWU17E+9+zZM2DAAFam9IkOf+KJJyj9o2bTpk0bOHDgL+dW6NOnz6JFi6gxnYVWurfffnvV7/up0vV0FqY66VBHkJ5pgqDkMBRgbYhwsDZEOHhONYoodXnmmWf4Ji0r77rrLirMmTOnR48eP//8M6unDI3SMCo89thjdAhvv2PHji5duvBNpaCgIFZ47rnnnnzySVaeOnXqfffdx9tcvHgxICCAb3J0LGWAOTk5/AKqft+PM09OZ2Gqkw51BOmZJnhDJIehAGtDhIO1IcLBc6pRREvBd999l2/OmDHj6aefpsLgwYNpfcnrs7Oz27ZtSwX699SpU7x+4cKFf/7zn6lQXFw8ffr0jh07NmnShP1iYWRkJGszfPjwTZs2sXJERMSvv3j4C55WKWVkZCQlJdGuNm3apKWlsUplP/qezsJUJx3qCNIzAAAAAPBIYGDg+fPnWbmysrJLly5vvfUWlVu2bHngwAHebOrUqY8++igVGjZs+MMPP7DKy5cvx8TEvPjii1Tu16/fnDlzKHMrKyujzSVLlowYMYI1oxQrJyeHlf39/S9evMjKbtH1bNu2rXHjxmxT2U9dnA7AQ0jPAAAAAMAjQUFBb7zxxqVLl06fPv23v/3tmmuu+e9//5ufn0+FoUOH5uXlXbhwgRKwDh06lJSUUPvu3btPnz6dMrTjx4+npKRQs/fee4/qmzZtmpGRceXKlXPnzi1cuLBJkybPPfccOwXlSJmZmayckJBAaV5hYSGlVYcOHZowYYLzZ3UMGjRox44d33//PTWbPXt2fHw8q1f2o+PpAPSC9AwAAAAAPELryBYtWvj5+fXr12/Pnj2U5xQXF2/fvj0pKSk1NTU4ODgkJOSuu+6iDIe1//TTT7t06dKwYcNOnTq9/fbbzZo1Y7uoHBERQdlaXFzcggULaIW5e/dudsjcuXMDAwNpwUmJ3NmzZ0eNGhUaGtq4ceObb755586d/Eq4bdu29e3bNyAgoHXr1pRQFRUVsXplPzqeDkAvSM8AAAAAQH9z5sx56qmnxFowjPL8opwV6ZeLS8UdcFUhPdMEb4jkMBRgbYhwsDZEOHhOexQNHjx4y5YtYi0YyYW9h7Y06/9utz+f+ecucZ+C9kkHzyE90wQfJ8phKMDaEOFgbYhw8Jz2KGrZsiXeo2V8lKFt8r+ZpnWT/037x8wsz7sgtqjJpIPnkJ5pgqDkMBRgbYhwsDZEOHgOUWQ9lKGlBw94p2kCTe563167OowSHqZh0r0J6ZkmCEoOQwHWhggHa0OEg+cQRZbEMrStYQOrMzTHS/kwDZPuTUjPNEFQchgKsDZEOFgbIhw8x5fveFn7tbXFbfTvO00T8v+1fz2+dXgR0jNN8IZIDkMB1oYIB2tDhIPnEEWW9PXG9zfW701p2Ca/m/7dc/yOqOG7O955ctE69rmOmHRvQnoGAAAAAGBfLDfb2vy293r89Z2mCQfGzSna95nYCLwF6RkAAAAAgE3lbft/G6/pt6FeL+XjMriKkJ4BAAAAANhR9d89Cx6Ax2WGgvQMAAAAAMB2yvOLclak43GZ0SA90wRviOQwFGBtiHCwNkQ4eA5RZEOYdG9CeqYJPk6Uw1CAtSHCwdoQ4eA5RJENYdK9CemZJghKDkMB1oYIB2tDhIPnEEU2hEn3JqRnmiAoOQwFWBsiHKwNEQ6eQxTZECbdm5CeaYKg5DAUYG2IcLA2RDh4DlFkQ5h0b0J6pgneEMlhKMDaEOFgbYhw8ByiyIYw6d6E9AwAAAAAAMAQkJ4ZGo2qWGUAhYWFwcHByoKJpKampqSkiLXGcFWmW/WkqpUG581r9sK53J7CbQOQSU5Onj9/vlgLAABgDEjPoMbefffdhIQEVoiPjxd3G1hZWVlISIgyvj2h+/pY9w61UD2paqXBefOavXAut6dw28CqPL/xEydOhIaGlpeXizsAAAAMAOmZiSUnJ2/btk2srXsvvPDClClTlIWrqEaDkJaWNnToULFWM8/Xha7Vdf+qVE+qWnnVub4q13v15YVzuT2FagPVSk+47dBtA8/pdQplP/R9Y926dYqdAAAARoH0TBNjviGyRYsWZ8+eFWvrGA3FuHHjVq9eTWUqrFq1SmzhXTUahFGjRq1Zs0as1UyvZaJMXfevSvWkqpVXneurcr1XOy1f7HqdywW3p1BtoFrpCbcdum3gOb1OoeyHvoONGTNGsdNGtEQ4gGuIIhvCpHsT0jNNavFxosXFxU2bNk1PT//Tn/4UHR1NNd98883kyZMjIyOvvfba22677euvv2YtT548OWDAAKrs2rXr9u3bW7VqxQ5v0qQJa0AtR48eHRYWFhgYOGzYsAMHDnz77bc+CsuWLVPt3PkalPz8/Piv96xYseLGG29k5e+//57O9eWXX9JZmjdvTv03atTopptuOnLkSJVjKDp37nzo0CEq88JPP/2UmppKR61du/aX3h1Ur4r6PHfuHG+zf//+Nm3a/PDDD7L27C727NnTr18/f3//li1bshTLeRCcB4qfhYmKiqL74puXLl16+OGHKcGjS6ICbbJ66u3VV1+lEQsODqbruXz5MqvkeDO3/aSlpXXs2DEgIKB3795ZWVmsnmZ85MiRzZo1o/saMWJEUVGR0KGM0IBvvv/++926daPBiYuLe/vtt1llZWXls88+S4MZFBQ0fvz4srIyVk+388ADD9DZ27VrR4OmelIftRGgGFA+cPjqq69oLr777rvfDlM7KU1fSEhISUkJb0M1NEdU49yYNVAdt99GX+2CqyTXXCUfbdmg3eET7nxJGgeNdnXq1In6pG+p+/btoxwgJiaGvtDoLk6cOMGayaJFdgoXo8QKSrzSR20Mq+Rnl7V33eGvE1KNNXNxtStXrgwPD/f19a2ST8qPP/44a9asiIgIukKaTdVTKAvOl1TluMdJkyZR5xQM1InzgYR+yNE4801bqcWPMwABosiGMOnehPRMk1oE5SeffEJj0rdv348//riiooJyidjY2CeeeCI/P7+0tHTatGkDBw6kZrRJyclbb71F+QktL7p06TJkyBB2OOVUrKs+ffosWrSIerhw4QLN0+23306VlK5QUscayDoXroE15igPZGkSLZfpGmgdyeqfe+65v/3tb1R47bXXKN0qdaClFSVjVPm2Tw9afdIC6MqVK1SgbinhoSvs37+/8BRLdlVJSUk7duxgbWg1Rt1u2bLFRXu6i4YNG95xxx20pKPz7ty5kxZe7HDlIFRJBkqJLvjixYt8kxaC7LJJfHz87NmzWT0NGtWfc6DC008/zev5scpNF/0MHz48NzeXFqlz586l9JLV0yxnZGRQbky5zYMPPnjvvfcKHcrILoDSpM2bN9NcUA7AnwksWLAgMTHx9OnTlAiNGzdu6tSprH7OnDns7tjVqp5UdQRotCmTofU3a3PPPfc8//zzvztMclJaKytbzp8/n/1OrGrjKvm4qV4qp3rNVfLRlg1aJ58mzpekcdBSUlLoy4EuOzU1tXHjxkOHDs3JyWGb9E2SNZNFi+wULkaJFZR4pWwMZWeXtXfboXAZLq522LBheXl5bFM2KfTNh36O0BgWFBTcf//9/FhWEDZllzRz5szk5OQ8B/puo2zPClWOt6HSdwO+aSu1+HEGIEAU2RAm3ZuQnmlSi6Bcs2ZNREQEeyhEaJly33338b2UJAQEBFBh8uTJtCzj9Q899BBbVtLhd955J6sMCgp66aWXaJ33888/85a0jnnyySdZWda5cA2CTp06ff7551SgYymrCQkJqXI8OmvevDmtrsTWjsugf//u06ljx45U+Oyzz2ix/vrrr9OBdLjy2hjZVVEC9swzz7BKWqmzdNRFe7oLutSffvqJ1dOSKzAwkJWVg1AlGSglPz8/ZXoWHR197NgxVqbcmP9vOgUzrz969KiynhWETRf90CqTlem8qstBSkTDw8NZWejfmewCKLteunQpfx7LUK6bnZ3NyoWFhW3btmVlujzl1aqeVDYCPXr0YA+a6HtE69atlYPJqJ6U8h+KQ0rFqxwJeVRU1JkzZ2SNq+TjpnqpnOyalZSjLRu0hT5dWLkWg5afn8/KdNmyu5BFi+wULkaJFVTV9Oyy9vwsbhswLq6WTboz5aS0b9+ePwTjhFO4vSS6R/6skm5WdaD4txcbqsWPMwABosiGMOnehPRMk1oEJSVd06ZN45u0PPX5PZbt0LqE/48yueOOO9iTJTp85syZrDIjIyMpKYna04IyLS2NVQ4fPnzTpk2sLOtcuAYBzdqHH3746aef3nDDDZT80EKqoqIiNTWV/U92cXHx9OnTKRNr0qQJ6zMyMpLqJ/tEs0cNdCU9e/akvcuWLRN6ZmRXtXbt2hEjRlCBksDQ0FC+aJO1p7uYNWsW73bPnj384yKVg1AlGSglSgxOnTrFNylb4w8VqUCbrEynltWzgrDpoh9WEDYPHjyYkJBA18lus379+kIDGVmHhw4doqEIDg6OiYnZvXs3q6TVKuufqVevHqsXrlb1pD6SEdi6dWuHDh0oWigGKLf57YBfyU6anJy8fv16Kqxbt27s2LGuG/tIbtO5nuGbqtcsG+26GDQtm7JokZ1Cdkmq18DV9Oyy9s4F1/Uurlb5nyaySVFeHiecgm/K6qkT/kubssmiH3LOv+9tE7X4cQYgQBTZECbdm5CeaVKLN0TSGpTGlG8Kv1bHNWzYkL8BjDIiWq+w/4AXDq9yvKlj27ZtjRs3ZpuUgeTk5LCyrHPnTpQoR6Lcpnfv3h9//HGV4zcDs7KyWrZsmZubS5v9+vWjvIiSGfbukSVLlrCc6q99k9ifDHr00Uep8J///IdSLNaDQHZVx48fZ5keLdlffPFFXi9rT3ehzLXmzp3Lc07lIHDCQCmNGjVKOSAuniTQRbIyNeD17G0zHF/2ueiHFYRNakBfbDTdlOeUlJTIlpvO/BRP/woKCoT2tPzduXNnixYt2CblUWwqBXR2fndHjx5VPalsBOgUXbp0efzxx2kG+QpYSXbSd999lwKMChRvhw8fZpWyxrJxE8ZfILtm2WgzzoP27hTxNzarNA+alk1ZtMhOoXGUBDU9u6y9c0HYFCZF49XKJoVSZeenZ7KvO9klaXl6tnr16tGjR4u19lCLH2cAAkSRDWHSvQnpWV3p2bOnMmlJSEigfKawsJCynUOHDk2YMIH9VtWf/vSnv//976zyxhtvZJ8Lojx80KBBO3bs+P777+nY2bNn8wdHlMxkZma67ly4BsE999xDa2X6l22OHDly2LBhEydOZJtNmzbNyMi4cuXKuXPnFi5c2KRJk+eee47qBwwYwB418AKtvMPCwj799NNf+v2V7KoofWrUqNFrr71GC332C2+u29NdkOOcpAAAgABJREFU7N+/nzejAWHvVav6/SDIBkqJQnzw4MF8c8aMGfx9OHR2/riSgnngwIHsXUxJSUn8/TmUiPIFNGvGCi764Y2Vm5QMpKenU3pDuSUNu+pyU3VNSTkzZac0PqdPnx46dChvQxNHOU9FRQVlGpRgs8rFixfTVdEFU0ZHo8T/osCsWbP43VED1RPJRoCsX7+e9r7xxhuK5r+RnZTQd5mlS5fSXreNZeMmjL9Ads2y0a6LQdOyKYsW2Slkl6R6DVxNzy5r71wQNoVJ0Xi1sklJTU2lnyNUqXzvmezrTnZJdI/8vWc0pKoDlZKSwj8PBgAAwFCQntWVoKCg8+fP801aDI0aNYrWGY0bN7755ptpRcjq//vf/8bGxvr5+dFSafr06XfccYdw+LZt2/r27RsQENC6dWvKWPhHnNEyPTAwkIb9vffek3UuXIPgiSeeaNasGe/wf//3f6+55pqvvvqKbdLaJSIigmri4uIWLFhAU8ySMcrEzjk+UIQXqhy/80brLeG/vWVXRXr16tWwYUNl0lUlb093ceHCBd4sJCSEn1c5CLKBUqIlIx1+8uRJtklL84ceeqi5AxX4b1X5OD4DMCoqisaH1oj8MRGNAzsdb+a2H1YQNnft2tWhQ4cGDRrQCFPG4tzhRx99xD/nQIlGmDJqukealLS0NN6e8tWuXbtSstqtWzdKqlklpcHUOUUXte/evTv/63DKz7Vbvny56uJVNgJk06ZNMTExyrxaSXZSsnLlynr16lEy77axbNyE8RfIrlk22nUxaFo2ZdEiO4XsklSvgavp2WXtnQvCpjApGq9WNilXrlx56qmnwsPDKWGmQWCVsq872SXRTU2cOJG+b1AwLFy4kM6ibEays7PxZ6kBAMCwkJ7p43Jxac6K9PJ8lZRAu4EDB6q+Ywp0NG/evEGDBom1vycs+7wvPj6eJwxGM2TIEOHPJwAY1ueff05JmlBJ3wHYb2gDAAAYENIzT516ZVNG/ANbggdc2Fv9F8BqpKio6JFHHikoKMjPz3/44Ye7desmeygB3nTV0zNjqqysfP311zt16sQ/Wx/AmKZMmULfV8+cOZOYmEjfY8XdAAAABob0TBPnN0T+cOrsvuGPb2zYb71vz82NbqlFblbl+JBxyspCQ0Nbtmx59913u/hFRONwHgrrQXqmysfx6Z0HDx4Ud1iLHSLc8hYvXhweHh4WFjZhwgTVDxyyM0Q4eA5RZEOYdG9CeqaJ8uNET72yaUfk8PW+vahyT9e7toYNrF1uZlL4ZFWwNkQ4WBsiHDyHKLIhTLo3IT3ThILyt8dlPj3Za++AB+2Wm1Xh6xOsDhEO1oYIB88himwIk+5NSM80oaDc1OgWnpjhhRdeeOGFF1542fYlrpPA6jDp3oT0TBMKysvFpScXrdvZ7vYtwQM2O1K1DfV6vdMkHk/PAKwEEQ7WhggHzyGKbAiT7k1IzzRRviGyaN9n+8fM2hRwS3rYbTbM0PDeULA2RDhYGyIcPIcosiFMujchPasl/jBtvW+vTX432SpDAwAAAACAuoD0zFNF+z47cNfs2v3dMwAAAAAAAA7pmT4uF5fmrEgvzy8SdwAAAAAAAGiD9AwAAAAAAMAQkJ5pgjdEchgKsDZEOFgbIhw8hyiyIUy6NyE90wQfJ8phKMDaEOFgbYhw8ByiyIYw6d6E9EwTBCWHoQBrQ4SDtSHCwXOIIhvCpHsT0jNNEJQchgKsDREO1oYIB88himwIk+5NSM80QVByGAqwNkQ4WBsiHDyHKLIhTLo3IT3TBG+I5DAUYG2IcLA2RDh4DlFkQ5h0b0J6BgAAAFAbtPgRqwAAPIP0DAAAAKA2kJ4BgO6QngEAAIAh+KgRGynQ3ttuu+3nn38WKpWbGglHCdcg7OVk9QAAtYb0DAAAAIxFY9pDzcaMGfPyyy8LlcpNjYSjNHaisRkAgHZIzzTBGyI5DAVYGyIcrK12EU4/4pctW9apUyd/f39aMezbt2/16tUxMTF+fn69e/c+ceIEa3bp0qWHH364RYsWzZs3pwJtFhcXh4SElJSU8K6oJiwsjGoqKyufffbZyMjIoKCg8ePHl5WV8TZVTmmPc8+82bfffnvdddcdP36cN+bHqp5i0qRJq1at4o3ffPPN+++/30dB6ERw+fLlBx54oFmzZu3ataMx4c3okqhnqo+Ojn711VddX4PZ1S6KwNQw6d6E9EwTfJwoh6EAa0OEg7XVLsLpR3xKSsqXX35J2UVqamrjxo2HDh2ak5PDNmkNwJrNmjWrf//+Zx3i4+Nnz55d5UiHnn/+ed7V/Pnzp0yZQoUFCxYkJiaePn2aUrVx48ZNnTqVt6lyyo5Ue+bNPvzww+7du1+5ckVZWSU5BTW7+eabN2zYQGX6l8rsQOGMsvRszpw5dCXnzp1jV8KbzZw5Mzk5Oc8hKSnJ9TWYXe2iCEwNk+5NSM80QVByGAqwNkQ4WFvtIpx+xOfn57PyxYsXabOgoIBv+vv7s3J0dPSxY8dYOSsrq127dlQ4ceJERETEjz/+SGX6Nyoq6syZM1SOjY3Nzs5mjQsLC9u2bcvKjJAdqfZcpWj22GOPTZ8+XaiUnYLKdBlPPvkk/UtlVumcnglYPZ1aeSW8nq6QP0WkBrxedg2mVrsoAlPDpHsT0jNNEJQchgKsDREO1la7COfJhutNPz+/iooKVqYCbbJycnLy+vXrqbBu3bqxY8eySkrqFLmPT7169Vg9I5xC1jNvdvny5RtuuGHfvn3KShenmD17NtW89NJLvEY4o7DJCVfCm1E9/5VLZb2LazCv2kURmBom3ZuQnmmCoOQwFGBtiHCwttpFuOvUhW/KnnG9++67ffr0oULv3r0PHz7MKjt06JCbm8vKzoRTyHpWNjt69GhcXFxpaSmvlJ3is88+Cw8P37JlS6tWrU6dOsUqfX19lW2EC+Do1Px9bnRG5b2rPj2TXYOp1S6KwNQw6d6E9EwTvCGSw1CAtSHCwdpqF+GyfEzYnDFjBn+HWEJCwsyZM3kbWmcsXbqU9vKaxYsX0yalOhcvXszMzBw6dCjfVeV0ClnPQjPq8y9/+QuvVD1FWVlZ586d9+7dS+UdO3bccMMN5eXlVA4NDVX9fBHBrFmzBg4ceM6BOlfeO3/vGTVwfQ1mV7soAlPDpHsT0jMAAABwRZaPCZsVFRUPPfRQcwcq8F8CJCtXrqxXr967777LayorKylhi42NDQgI6N69+7Zt2/iuKqdTyHoWmv3888/K1Ej1FHffffeKFSv4IQsXLhw/fnyV4zM8AgMD+bE+Tli98hMaly9fzuvpkiZOnBgUFBQVFUV9NmjQgNWrXgMAgAtIzwAAAOAXl4tLc1akl+cXiTtAs88//5ySNLEWAEAbpGcAAABQdfadjA/7P7gleMCFvYfEfaDBlClTCgoKzpw5k5iY+Mgjj4i7AQC0QXoGAABgX5fOl2Te89zma29Z79tzc6NbkJvV2uLFi8PDw8PCwiZMmHDx4kVxNwCANkjPNMEbIjkMBVgbIhysTRnhZ9/J+Ffnsevr9V7v03Nn1LCtoUnIzUALfJ+0IUy6NyE90wQfJ8phKMDaEOFgbRThvz0u8+nJXu9efxdyM9AO3ydtCJPuTUjPNEFQchgKsDZEOFgbRfimgJt5YoYXXrV7iYEFVodJ9yakZ5ogKDkMBVgbIhysjSL8cnFp9sK12yOGbG586wbHbzZu9rtxS2Ainp6BRvg+aUOYdG9CeqYJgpLDUIC1IcLB2pQRXrTvs49GPrnR76ZNjW7ZeE1fZGigEb5P2hAm3ZuQnmmCN0RyGAqwNkQ4WJtzhPOHaet9e27yuwkZGrjlHEVgeZh0b0J6BgAAANUP0z6+cwb+7hkAwNWF9AwAAAB+cbm4NGdFenl+kbgDAAC8AukZAAAAAACAIeiZngUGBt4CAAAAAAAAtUIplW7pGQAAAAAAAHjI0/RsyZIlt/7q+uuvp+7i4uJiY2P/aBX/49NarLIrDAVYGyIcrA0RDp5DFNkQJt37/vrXv3qUnint379/+/bta9eu/YeFrPfpKVbZFYYCrA0RDtaGCAfPIYpsCJN+tVBKRYkVpVe5ubk826pxenbkyBHK8NLT06m7f1oFBaVYZVcYCrA2RDhYGyIcPIcosiFM+lVByRSlVJRYUXqVl5fHs60ap2dffPFFZmYmdUSp3karoKAUq+wKQwHWhggHa0OEg+cQRTaESb8qKJmilIoSK0qviop++3snNU7PKLejLijJ279//wdWseMvT4lVdoWhAGtDhIO1IcLBc4giG8KkXxWUTFFKRYkVpVelpaU826pxekYHU3pHveTm5n4BAAAAAAAANUTJFKVUlFhRenXp0iWebdU4PQMAAAAAAIC6gPQMAAAAAADAEJCeAQAAAAAAGALSs2pHn14pVtkVhgKsDREO1oYIB88himwIk24oSM+qrffpKVbZFYYCrA0RDtaGCAfPIYpsCJNuKEjPqiEoOQwFWBsiHKwNEQ6eQxTZECbdUJCeVTN1UC5atOgW/fyPT2uxCsBCEOFgbYhw8JxZomjJkiXikghqy9QrYetBelbN1EFJ36F8AAAAAOzk1ltvFZdEUFumXglbD9KzaqZ+QyRLz2688cZpAABq2DoG7GBQZBexCqCGjB9FgYGBSM/0ZeqVsPUgPTM9lp7RCqwEAEANfYsQv3EAAJgWW/kgPQOrws9s0/NOesZ+kUCsdXCxi9PSpk554QK8cAoDcn3XrvfWES+c1Aun0JcP0jMAsBC28rn++uv3799/5MiRL774Ii8vr7S0VGwHYE74mW16SM+00HgBGpup0nisxmY6qtMzKjt3PpFzjRd4eFIth2tpYyg+SM8AwELYyuePf/zj9u3bP/jgg8zMTMrQioqKxHYA5oSf2aZ31dMzLTw83HMaL0BjM0944RQCr53R+UTONV7g4Uk9PNyYfJCeAYCFsJVPXFzc2rVr09PTKUM7cuRIXl6e2A7AnPAzu5qp3xBZo/QsJyfHz8+vfv36J06cYDXHjx+vV68eVdKu4uLixYsXd+zYMSAgICYm5oUXXqAa1oytWV955ZU//vGP/v7+nTt33rNnj3IXK5NVq1bdcMMNTZo0iYqKWr58uXMbF2cRCD0rN1l52bJlXbt2bdSoEfWzZMkS3pLQKa677jraRQ2omdBVamoqbdKNh4WF3X333V9//XXJr31yrGXtrpaVnYfrt94dWGMXp2DNqIbqadZYperFM86D/7vz/XrG9957r2/fvtQsMDAwMTFx8+bNvAeOeqD2H374IZVXrFhB5ZUrV1I5IyODytHR0awZ71Zxkl9qeKXzODhjLWUT6mKISlzOtYsDVQeBHcuxlqysnAXl3hL5jLBmqreveva644P0zDZM/eMMDML4UcRWPrGxsf/4xz8oQ9u+ffv+/ftzc3PFdqCZ8SfdVvAzu5qpP060RukZ+fOf/0zt586dyzaffvpp2qQ1JZVfeuklKt95551nzpx57LHHqLxw4ULWjC00R48eTd/+2GKdFsTKXaz8/PPP+zjerft///d/R48enThxonMbF2cR0C5fX1/lJu+ElZOSkii9zM7OpoKPYx3M9tLKnu094cD28mMJDdeBAwcKCgpefvllqr/33nuV3fJmJTW8Wn4sK7sdLsbFKVjjsWPH0i7eXnbxWgafiYyMpJq33nqLuk1PT6cQUu5lJkyYQG0o8aDykCFDqEz/lvyaiqh27nwiVqM6DgLWUjahLobI9Vy7OFA2CMrDlTXKWRDayGaENVO9fdnZ68Lu3bspdxW/cYBFmfrHGRiE8aOI/3IjpWf//Oc/N27c+MEHH3zxxRdiO9DM+JNuK0jPqpk6KGuann300Uc+jl8JYJtUoM2PP/6YyrR2pPKnn35KZVpQUrlDhw6sGVtoHjt2jMrnz5/3cTwrUO5i5bZt21L5k08+YZucso2LswhoF39kxDZ5J6ycmZnJNqngo7ip2NhY5738WKWioiKqDw8PZ5vOzWp0tfxYVnY7XIyLU7DG/FGnQLh4LYPPBAYGXnPNNfTDjDIKZb3S+vXr6ajBgwfn5+cHBASEhIT4+/vn5eWxVG3Dhg2smbJz5xOxGtVxELCWsgl1MUSu59rFgbJBUB6urFHOgnMbRjWcVG9fdnbdUW4WFha2d+9e8RsHWJSpf5yBQRg/ipCe6c74k24rSM+qmTooa5qekZtuuokOoRXbhx9+SIWbb76Z1Tds2JAtKLkGDRqwXWyT96DcVJb/8Ic/UNl5xals4+IsAh936Rk/ERVok/IHtkkF57382H//+980aMHBwbRWZvUucqcaXa2P2pi43lXi8hRsU9nYxcVrGXxmwYIFlHH5OIa3W7duW7duVe5lKBOjC6OsLC0tjVrSDz/6l34QhoaGUj3tZc2UnTufSKhxbsCxXbIJdTFErufaxYGyQWDNWFlLjYsZEQ5UbsrOri/kZjZk6h9nYBDGjyKkZ7oz/qTbCtKzaqYOylqkZ2vWrKFD7r///kmTJvk4fsOK1bPHL+w/+wUuFprKspYHOC7OImDr3W+++YbK1N75pLKHLR06dHDey4+NiIig8rp1686fP3/27FnnblmZ0X61LvpxsavE5SmcG7u4eC2Dz1EaQz/MZsyYQbtatGgh7GVuvfVW2kvJQ/fu3WmzR48e119/PdXEx8fzNsrOnU8k1Dg34Ngu2YS6GCLXc+3iwBLJICgP11LjYkaEA4VN1bPrCLmZPZn6xxkYhPGjCOmZ7ow/6baC9Kyaqd8QWYv0jBIeWlOGhoaGhITQ+pXlP2TevHnU1e23337q1KmTJ09S2tanTx+2y8VCU1lmb3+i5XtWVhatif/2t785t3FxFgH7zbRVq1bl5uaOHTvW+aTsHUfZ2dkDBw6kzZdffpntXbRoEd/r/H6kVq1aUXnLli1nzpyZOHGicldwcDCVDx8+zDZLanK1yn6UZWGzRqcQ+ilxefGywXc+Y2Ji4q5duyiXeP/992lXu3bt+C4l9jYz8uKLL5b8+j4un1/fkMYoL8D5RMq9zptKbJdsQl0Mkeu5dnGgbBDc3oVQ42JGhAOVm7Kz6wW5mW2Z+scZGITxowjpme6MP+m2gvTM9GqRnpFnn32WLRapoKxfuXJlt27dGjduTMnboEGDaAXJ6l0sNIVdb7755g033EA9REdHv/7666ptZGcR7Nmzp3Pnzn5+frGxsexDF4STvvrqq506dQoICGjfvr3wiR0LFiyIiYnx9/enBtRMeezOnTup8pprrgkPD+cpB9tFm5SyKmtKNF+t8iihh1qfQmhW4vLiSySD73zGrVu3UhbXtGnTJk2a3HjjjRkZGbwHpf/+978+jt8G/PLLL2nz9OnTdF6qoXreRtmt84mUZedNJbbLxYTKhqjE5Vy7OFA2CG7vQqhxMSPCgcpN2dl1gdwMAKwN6RlYG9Iz06tdemZ2wsIXzA4TqhfkZgBgeUjPwNqQnpke0jOwAEyoLpCbAYAdID0Da0N6ZnpIz8ACMKGeQ24GADaB9AysDelZNVO/IdKe6RkAKCE3A8bUP87AIIwfRUjPdGf8SbcVpGfVTP1xouybFADYWaNGjZCbQZXJf5yBQRg/ipCe6c74k24rSM+qmToo2TepW2+9VdxRK6YeCgC3EOFgbYhw8Jzxowjpme6MP+m2gvSsmqmDEukZgHaIcLA2RDh4zvhRhPRMd8afdFtBelbN1EGJ9AxAO0Q4WBsiHDxn/ChCeqY740+6rSA9q2bqN0Tqm56ZeigA3EKEg7UhwsFzxo8ipGe6M/6k2wrSM9PTNz2ToVOIVV5nhGtwKzU1NSUlhZV1v+Dk5OT58+eLtQAAAHaC9AysTeflI3gf0jNP6NtnWVlZSEgI/wmhb+fkxIkToaGh5eXl4g4AAADbQHoG1qbz8hG8z0Tpmc+vmjdvfvfdd3/zzTdiC5dqdw21O6p20tLShg4dyjfr4tTJycnr1q0TawEAAGwD6RlYm/7LR/Ayc6VnrHDu3LlRo0aNHTv29/vdqN011O6o2qGbWrNmDd+si1OvXr16zJgxYi0AAIBtID0Da9N/+WhGpn5DpL7pmWwo6BRpaWkdO3YMCAjo3bt3VlYWqz958uTIkSObNWvWtGnTESNGFBUVsfr333+/W7du/v7+cXFxb7/9Nu+EFUhhYWFwcDArV1ZWPvvss5GRkUFBQePHjy8rK2P1ly9ffuCBB6jzdu3aLVu2jB8ua+98Uh8F1oYKK1euDA8P9/X1ZZusXnYjsht3PheJior68ssvWZkdywo17Vx2g4R+/NBo8E2oKVmEA1gDIhw8Z/woQnqmO+NPuq0gPatm6o8T1Tc9kw0FnWL48OG5ubmUKsydO7dfv36svkuXLhkZGeXl5d99992DDz547733svqWLVtu3ry5oqLixIkT/GkPT1fI+fPnQ0JCWHnBggWJiYmnT58uKSkZN27c1KlTWf2cOXP69+9/7ty5s2fPxsfH88Nl7d2elG0OGzYsLy9P2Cu7EdmNq56LsrWLFy+yMjuWFWrauewGqxxvb6Oz8E2oKVmEA1gDIhw8Z/woQnqmO+NPuq0gPatm6qD0WnpWUFDAypSBqGYIpaWl4eHhrNymTZulS5d+/fXXygY8XaHsaLQD24yNjc3OzmblwsLCtm3bsnK7du2OHTvGyllZWfxwWXvXJ+WbZ86cUW4qdv5CeSOyG1c9l5+fn2p6pqSlc9kNsmYBAQF8E2pKFuEA1oAIB88ZP4qQnunO+JNuKyrLRxsydVB6LT1T3Tx48GBCQkJQUJCPQ/369Vn9oUOHhg8fHhwcHBMTs3v3bn4UExYWdtddd124cIHVU1rCd5F69eqxesp2KioqWJkKPr+eVNZedlJW4Js///yzcpMVZDfifDgrqJ4rKirq1KlTzo1r2rnsBqscv9wYHR3NN6GmZBEOYA2IcPCc8aMI6ZnujD/ptoL0rJqpg/Lqpmft2rWj74zFxcU//fRTSUmJ0IwSoZ07d7Zo0YJtCnu5Dh065ObmirWOzo8fP87KR48e5YfL2jPCSdl7zLia3oisPSOca9SoUfSjgu+tdecubnD16tX8qSPUgizCAawBEQ6eM34UIT3TnfEn3VbUl8t2Y+o3ROqbnsmGQpZIUGaSnp5+6dKlnJyckSNH8vphw4YdPny4oqKCspeWLVsKRwkWL17cv39/ysQuXryYmZnJP5t+1qxZAwcOPOdADfjhsvaqJw0NDeU5XpXTNbi9EVl71XPRD4nBgwc7N65p57IbJCkpKfyTSKAWZBEOYA2IcPCc8aMI6ZnujD/ptqK+XAYT0Tc9k5ElErt27erQoUODBg0iIiKWLl3K67ds2dK1a1d/f/9u3bplZGQIRwkqKyvp2NjY2ICAgO7du2/bto3VUz4zadKkZs2aRUdHL1++nB8ua6960gULFgQGBrrNiGQ3Imuvei7KpkJCQk6ePCk0rmnnshvMzs7Gn6UGAACbQ3oG1qa+XAYT8U56BhrNmzdv0KBBYq1OqOf58+eLtQAAAO6U5xflrEi/XFwq7jAhpGdgbUjPTA/pGQAAALh1Ye+hdwITD4ybU7TvM3GfqSA9A2tDemZ6SM8AAABAizNrdm+o32dDvV67Oow6uWidSR+mIT0Da0N6Vs3Ub4jUNz0z9VAAuIUIB2tDhINb1RlavV4b/9BnR+Twzdfe6vwwzfhRhPRMd8afdFtBelbN1B8nqm96ZuqhAHALEQ7WhggHLViGRtFCr61ht21tfpvyYZrxowjpme6MP+m2gvSsmqmDUvf0DC+88MILL7zwstVr4x/60L/vBCbm/2v/esMvipCe6c74k24rSM+qmToodU/PxCoAC0GEg7UhwkGLs+9kbKzfmyVmmxvdsiV4wM52t+PpmZ0Zf9JtBelZNVMHJdIzAO0Q4WBtiHBwi+dm6c2TNwXcsn/MLOG9Z8aPIqRnujP+pNsK0rNqpn5DpL7pmamHAsAtRDhYGyIcXKPcbAPlZr69lI/LBMaPIqRnujP+pNsK0jPT0zc9AwAAAEuq/rtnTROcH5eZDtIzsDakZ6aH9AwAAABcK88vylmRrvq4zHSQnoG1IT0zPaRnAAAAYB9Iz8DakJ6ZHtIzAAAAsA+kZ2BtSM+qmfoNkfqmZ6YeCgC3EOFgbYhw8Jzxowjpme6MP+m2gvSsmqk/TlTf9MzUQwHgFiIcrA0RDp4zfhQhPdOd8SfdVpCeVTN1UCI9A9AOEQ7WhggHzxk/ipCe6c74k24rSM+qmTookZ4BaIcIB2tDhIPnjB9FSM90Z/xJtxWkZ9VMHZRIzwC0Q4SDtSHCwXPGjyKkZ7oz/qTbCtKzaqZ+Q6S+6ZmphwLALUQ4WBsiHDxn/ChCeqY740+6rSA9Mz190zMZOoVY5SCrd612RzGeHKuL1NTUlJQUVtb9YpKTk+fPny/WAgAAwK+QnoG16by4BO9DeuahGnVYVlYWEhLCfwbU6FgtTpw4ERoaWl5eLu4AAAAAB6RnYG06Ly7B+2yenv3973+vX7/+iy++qKwU2vg4+Pr6NmnS5Prrr582bdqFCxeUDVwQukpLSxs6dCjf9ORGZJKTk9etWyfWAgAAgAPSM7A2/ReX4GV2Ts8qKyujo6Nffvll+pfKqm2Um2VlZYcOHfrf//3fVq1a5ebmKtvICF2NGjVqzZo1fNOTG5FZvXr1mDFjxFoAAABwQHoG1qb/4tKMTP2GSH3TM9lQ0CleffVVyoKCg4MnT558+fJlXs8Kly5devjhh1u0aNG8eXMq0Car//HHH2fNmhUREUG7qAfhqE8//ZQypcWLF1c5cq1nn302MjIyKCho/PjxlEqxNnSuBx54oFmzZu3atVu2bJkyI9q5c+cNN9xAhR49euzatYtV+ijwGn4IQ5c0btw4VuZ733///W7duvn7+8fFxb399ttsl9BVVFTUl19+ycrKY0+ePDly5Ei6yKZNm44YMaKoqIg3SEtL69ixY0BAQO/evbOysli97GYJ/YChO+WboC9ZhANYAyIcPGf8KEJ6pjvjT7qtiMtWezL1x4nqm57JhoJO0b9//3MOVHj66ad5PStQwkP1Zx3i4+Nnz57N6p977jm6NkppCgoK7r//fuVRO3bsCA0N3bp1K6tcsGBBYmLi6dOnS0pKKHeaOnUqq58zZw47NeuZn7HK8XuAq1atqnI8ceIf11HllI8Jm+Srr76idJGV+d6WLVtu3ry5oqLixIkT/PmVcCwlbxcvXuSbfG+XLl0yMjLKy8u/++67Bx988N577+UNhg8fnpubSwnY3Llz+/Xrx+plN1vleMRHZ+GboC9ZhANYAyIcPGf8KEJ6pjvjT7qtiMtWezJ1UHotPTt27BgrHz16lD/e4flJdHQ0b5CVlcUbtG/fnj8y4uioV155pVWrVpmZmbwyNjY2OzublQsLC9u2bcvK1JWyZ37GnJwcyu4om6Iy/UtlynbYLrfp2ZUrVxo0aMDKfG+bNm2WLl369ddf/9bO6Vg/Pz/V9EyptLQ0PDyclakB5aWsTAfyvEt2s6xZQEAA3wR9ySIcwBoQ4eA540cR0jPdGX/SbUVlcWlDpg5Kr6VnLBGqcuRClKXwelagGtUGynqOjqJ0bvr06cpKSl18FOrVq8fqhZ75GR977DFle/L444+zXbyN6maV4+lZy5YtWZnvPXTo0PDhw4ODg2NiYnbv3i3sZaKiok6dOsU3+d6DBw8mJCQEBQWxK6lfv77QQNiU3WyV45cbaXD4JuhLFuEA1oAIB88ZP4qQnunO+JNuK+Ky1Z5MHZReS8+OHz/OyseOHdP+9IxSHdWnZ2fPnm3fvv0LL7zAKzt06KD6cR3UFT/10aNH2RnZ4zJle+XDNF9fX15f5ZQjVTl+FfPPf/4zKwt7f/755507d/JffRS6GjVqFP0w4Jv8WLpI+glRXFz8008/lZSU8Hqhc74pu9kqxy9qjh49WqwFncgiHMAaEOHgOeNHEdIz3Rl/0m1FXLbak6nfEKlveiYbCjrFwIED2XvPkpKS+FvLeL4xY8YM/t6zhISEmTNnsvrU1FS6NsqdnN97lpeXR1nKvHnzWOXixYupB8rELl68mJmZyT+/nlIpfmpqwI6lHGbw4MGsAZecnMxyJ8rTeEZXpbhI6vnw4cMPP/yw8pMb+d5hw4bRXkrwKD3jz9aErujHgPK8/FhK59LT0y9dukR3OnLkSLfpmexmSUpKCvtgEqgLsggHsAZEOHjO+FGE9Ex3xp90W0F6Znr6pmcyPo5PboyKimrWrBllWfyDGXm+QVnNQw891NyBCvzXEa9cufLUU0+Fh4dTwrN8+XLhKMrZ4uLinnnmmSrHhxkuXbo0NjY2ICCge/fu27ZtY23oXJMmTaLzRkdHUw/sWGrAf/+Q2759e48ePaocH7wRGBiozJF8HH/37Nprr+3atesTTzxx/vx5fhRvtmXLFtrr7+/frVu3jIwMVil0RdlUSEjIyZMnhWN37dpFqWaDBg0iIiLoLpSnZgVhU3az2dnZ+LPUAACgu/L8opwV6ZeLS8UdJoT0DKwN6ZnpeSc9A27evHmDBg0Sa3VCPc+fP1+sBQAA8NiFvYe2NOt/YNycon2fiftMBekZWBvSM9NDegYAAABanHpl44Y/9NlQr9fuuDtPLlpn0odpSM/A2pCemR7SMwAAANDo1MsbN/j2fKfxrf/qPHZzk3gzPkxDegbWhvSsmqnfEKlvembqoQBwCxEO1oYIBy1Yhrbep+eGer13x925vc0Q5cM040cR0jPdGX/SbQXpWTVTf5yovukZDQVeeOGFF1544WWr1ztNbq3+NzAx/1/71xt+UYT0THfGn3RbQXpWzdRBqXt6JlYBWAgiHKwNEQ5aFPxr/8YGfVlitqFe782Nb90eMSR74Vr29Mz4UYT0THfGn3RbQXpWzdRBifQMQDtEOFgbIhzc4rnZpka3bPS76aORTwrvPTN+FCE9053xJ91WkJ5VM3VQIj0D0A4RDtaGCAfXKDfbUL/3et+eysdlAuNHEdIz3Rl/0m0F6Vk1U78hUt/0zNRDAeAWIhysDREOLlzYe2hzk3jnx2UC40cR0jPdGX/SbQXpmenpm54BAACA9ZTnF+WsSFd9XGY6SM/A2pCemR7SMwAAALAPpGdgbUjPTA/pGQAAANgH0jOwNqRnpof0DAAAAOwD6RlYG9KzaqZ+Q6S+6ZmphwLALUQ4WBsiHDxn/ChCeqY740+6rSA9q2bqjxPVNz0z9VAAuIUIB2tDhIPnjB9FSM90Z/xJtxWkZ9VMHZRIzwC0Q4SDtSHCwXPGjyKkZ7oz/qTbCtKzaqYOSqRnANohwsHaEOHgOeNHEdIz3Rl/0m0F6Vk1Uwcl0jMA7RDhYG2IcPCc8aMI6ZnujD/ptoL0rJqp3xCpb3pmkKGgOxKrNKjdUS6kpqampKSwsu6dJycnz58/X6yFOmaQCAeoI4hw8Jzxowjpme6MP+m2ovOKE7xP3/TMIGqXC6kepVqpRVlZWUhICP92X+t+ZE6cOBEaGlpeXi7uAAAAADmkZ2BtOq84wftMlJ4JGY7Pr3x9fZs3bz569OizZ8+qttSodkfJpKWlDR06lG/q2zmTnJy8bt06sRYAAADkkJ6Btem/4gQvM3V6xgqVlZV5eXmPPvrojTfeKOyqkdodJTNq1Kg1a9bwTX07Z1avXj1mzBixFgAAAOSQnoG16b/iBC/zTnpGp0hLS+vYsWNAQEDv3r2zsrJYPWVWzz77bGRkZFBQ0Pjx48vKyqhy0qRJq1at4se++eab999/v+M52S94n7wN+e677/z9/YVdly5devjhh1u0aNG8eXMq0Car//HHH2fNmhUREUG7Xn31VeGoTz/9tFWrVosXL1ZWym6B+qQLbtasWXR0NHXF20dFRX355ZeszA5nhZMnT44cOZLaN23adMSIEUVFRbyBav+qQ8TQz5J27drxTQAAAHAL6RlYG9KzaqZ+Q6S+6ZlsKOgUw4cPz83Npexi7ty5/fr1Y/ULFixITEw8ffp0SUnJuHHjpk6dSpVXrly5+eabN2zYQGX6l8pUwzpRdPnbJiUwBQUF06ZNo3sRdlEO1r9//7MO8fHxs2fPZvXPPfcc3TKlT3Qg5X7Ko3bs2BEaGrp161ZlJSuo3sLMmTOTk5PzHJKSknh7yhUvXrzIyuxwVujSpUtGRkZ5eTnlkw8++OC9997LG6j2rzpEDLXkGSl4hyzCAawBEQ6eM34UIT3TnfEn3VaQnlUz9ceJ6pueyYaCTkGJECtT0sKTitjY2OzsbFYuLCxs27YtL0dFRT355JP0L5VZpXN6phQUFHT06FGhZXR09LFjx1g5KyuLP2tq3749fzzF0VGvvPJKq1atMjMzlZW8oHoLdIoTJ06wMp2Lt/fz81NNz5RKS0vDw8NZWda/bIhYs4CAAL4JXiCLcABrQISD54wfRUjPdGf8SbcVlRWnDZk6KL2WnqluUhLyS3blUK9ePd5m9uzZVPPSSy/xGlkn5MKFCzNmzEhISBB2UY5UUVHBylSgTed6jo6iXGv69OlCpVAQNqkr/juT1Cevp8Ty1KlTrFylaH/w4EG6Tkom2S3Xr19faCBsuhgi+llCF8w3wQtkEQ5gDYhw8Jzxowjpme6MP+m2gvSsmqmD8uqmZx06dMjNzVXuYj777LPw8PAtW7a0atWKJzm+vr7KNkKf33//vfN7z2RPz2JiYlSfnp09e7Z9+/YvvPCCslIoCJuyp2ejRo2i7/usXKVoT9dAPwyKi4t/+umnkpISt/3LhqjK8dEgo0ePFmuhLskiHMAaEOHgOeNHEdIz3Rl/0m0F6Vk1Uwfl1U3PFi9e3L9//+PHj1+8eDEzM5N9En1ZWVnnzp337t1b5Xgn2A033MD+uldoaCi1dO6EfPPNN7Nmzerdu7ewa8aMGfy9ZwkJCTNnzmT1qampdMs5OTnO7z3Ly8ujjGjevHnKSmVB2KRT8PeeDRw4kNfTd/zBgwc7t2/RokV6evqlS5fo7CNHjnTbv+oQMSkpKW+//TbfBC+QRTiANSDCwXPGjyKkZ7oz/qTbCtKzaqZ+Q6S+6ZlsKGS5R2Vl5dKlS2NjYwMCArp3775t2zaqvPvuu1esWMEbL1y4cPz48VWOD8kIDAxU5jNcs2bNKG/hn5TI21RUVDz00EPNHajAf6HxypUrTz31VHh4eMuWLZcvXy4cRTlbXFzcM888o6yU3QL1OXHixKCgoKioKLrUBg0asHrKpkJCQk6ePCm037VrF6V/1CwiIoLu3W3/qkNEsrOz8WepvU8W4QDWgAgHmfL8opwV6ZeLS8UdTowfRUjPdGf8SbcVpGemp296ZnOff/45JWl8c968eYMGDVLs1xP1PH/+fLEWAACgblzYe2hL8IAD4+YU7ftM3GcqSM/A2pCemR7SM89NmTKloKDgzJkziYmJjzzyiLgbAADAErJffGtjg74b6vXe3fHOk4vWaXmYZkBIz8DakJ6ZHtIzzy1evDg8PDwsLGzChAnKD9MHAACwmKNPr9zg03N7m8H/7nPvO00TzfgwDekZWBvSM9NDegYAAADasQxtvU/Pd5rEf3DTxB3RI8z1MA3pGVgb0rNqpn5DpL7p2XrH92u88MILL7zwwss+r+0RQ+jfdwIT8/+13/iLIqRnujP+pNsK0rNq6838caK6p2diFYCFIMLB2hDhoMX5jIObGt7Ic7ONfjdubZF8fP4/2NMz40cR0jPdGX/SbQXpWTVTByXSMwDtEOFgbYhwcIvnZhv+0GfjNf323vaw8N4z40cR0jPdGX/SbQXpWTVTByXSMwDtEOFgbYhwcI1yM8rK1vv2VD4uExg/ipCe6c74k24rSM+qmTookZ4BaIcIB2tDhIMLF/Ye2twk3vlxmcD4UYT0THfGn3RbQXpWzdRviNQ3PTP1UAC4hQgHa0OEg0x5flHOinTVx2UC40cR0jPdGX/SbQXpmenpm54BAAAAGBnSM7A2pGemx75JBQYG3gIAAABgdbTmQXoGFob0zPRucaRnAAAAAPaB9AysCumZ6S1ZsuTWX11//fX03SouLi42NvaPAAAAABb117/+FekZWBLSs2qWeUPk/v37t2/fvnbt2n/U1lvDJ4tVABaCCAdrQ4SD58wVRbTmoZUPrX9yc3PFVRFoZpmVsDUgPatmmY8TPXLkyAcffJCenk7frf5ZKzQUYhWAhSDCwdoQ4eA5E0URrXZozUMrH1r/5OXliasi0MwyK2FrQHpWzTJB+cUXX2RmZtL3qe3bt2+sFRoKsQrAQhDhYG2IcPCciaKIVju05qGVD61/ioqKxFURaGaZlbA1ID2rZpmgzMvLo+9QR44c2b9//we1QkMhVgFYCCIcrA0RDp4zURTRaofWPLTyofVPaan7P+kGMpZZCVsD0rNqlglK+t5UVFRE36Ryc3O/qBUaCrEKwEIQ4WBtiHDwnImiiFY7tOahlQ+tfy5duiSuikAzy6yErQHpWTW8IZLDUIC1IcLB2hDh4DlEkQ1h0g0F6RkAAAAAAIAhID0DAAAAAAAwBKRnAAAAAAAAhoD0DAAAAAAAwBCQnlXDGyI5DAVYGyIcrA0RDp5DFNkQJt1QkJ5VM/XHiS5atOgW/fyPT2uxCsBCEOFgbYhw8ByiyIYw6d63ZMkScU3/K6Rn1UydntEE+wAAAAAAgEnceuut4pr+V0jPqlkgPbvxxhungRMW/QDc//i0FqsALAQRDp5DFNkQJt2bAgMDkZ65Z4H0jFKREnBCIyOOF9ibqb/YAdxChIPnEEU2hEn3JrZ0R3rmhqnfEIn0zAWkZyAw9Rc7gFuIcPAcosiGMOnexJbu119//f79+48cOfLFF1/k5eWVlpbyBli8mh7SMxeQngEAAACAcbCl+x//+Mft27d/8MEHmZmZlKEVFRXxBli8mp7X0jPH+xh9xNpa0bEr15CeAQAAAIBxsKV7XFzc2rVr09PTKUM7cuRIXl4eb4DFq+khPXMB6RkAAAAAGAdbusfGxv7jH/+gDG379u379+/Pzc3lDbB4Nb1apGfffPPN3//+9+uuu87f3z8mJmb+/PlUw3YJiRPfZAVOuXfZsmVdu3Zt1KgRdbVkyRLnY4VNVuB4A93t2LGDrkocLwAAAACAq4T/ciOlZ//85z83btz4wQcffPHFF7wB0rNqpn5DZC3Ss3nz5tEhkyZNokx94sSJVKYMje2isq+vL2+pzKCcsylWk5SUdPz48ezsbCrQ5iuvvML3au9Kd5SbhYaG7t27VxwvsDdTf7EDuIUIB88himwIk+5NSM80MfXHidYiPYuJiaFDjh49SuWsrCwqUw3bReX69evzlq5zKlaTmZnJNqng4/hVWr5Xe1f6Qm4GMqb+YgdwCxEOnkMU2RAm3ZuQnmli6qCsRXrm5+dHh5w/f57KhYWFVPb392e7apRTsZqCggK2SYVad6Uj5Gbggqm/2AHcQoSD5xBFNoRJ9yakZ5qYOihrkZ61a9fOR/L0rF69erTJ3op27Ngx1zkVq5E9PatRV3pBbgaumfqLHcAtRDh4DlFkQ5h0b0J6pompg7IW6dnMmTN9HO89O3PmDHvv2bx589iu6667jjZXrVqVm5s7duxYZR4VHBxM5cOHD/N+2N6kpKQTJ05kZ2cPHDiQNl9++eVadKUL5Gbglqm/2AHcQoSD5xBFNoRJ9yakZ5qY+g2RtUjPLly4MGPGjHbt2vn5+bVv3z41NZV/cuOePXs6d+5M9bGxsZRoKXOql156KSQkRFnDyq+++mqnTp3+P3v3Al5Fde99nECR7CCaC+Si4RZKCVShtBQCsVZICCIeSL0rFA99C6LUI1JatYRLito+1WBMD3gKvZwTpIIgMYhUW0vpEdGmgvBGbtVcyiUJxETSJoTYhrzLrNfFdJLZe7JnZ5KZ+X6ePD5r1l577dlr/QnzezazjYiIEFOtWbNGPtTRqawjm8EMR/9hBwKiwmEdVeRBbLqdiGfuF0Q8C5XQ5isryGYAAADo/ohn7kc8I5sBAADAEYhn7ufxeEY2AwAAgFMQz9xP7rFn9e3bl2wGAAAARyCemeLoGyLlHt9www36B4Li6KUAAqLC4W5UOKyjijyITbcT8cwUR3+daGjjmaOXAgiICoe7UeGwjiryIDbdTsQzUxxdlMQzwDwqHO5GhcM6qsiD2HQ7Ec9McXRREs8A86hwuBsVDuuoIg9i0+1EPDPF0UVJPAPMo8LhblQ4rKOKPIhNtxPxzBRH3xAZ2njm6KVwFrFr+i6P6ZIVoMLhblQ4rKOKPIhNtxPxzP1CG8+6M6OreaP+bs6hpx1CrAAAAPAa4pn7dc94prvy7vGZuLi4uXPnfvTRR9pHO6q7XdYbvVlF+6hi1G8b3QmcO3fu0UcfHT58uM/nS0xMvO222/bu3asdEHJdvgIAAAA2I565n1PimWycOnXq9ttvv+eee7SPdlR3u6w3erP+mRzWeXQnMG3atPnz54vfDhcuXCgrK3v++ecnTJigHRByXb4CAAAANiOeuZ898Uxcsi9cuDA6OjopKWnt2rXqwrq5uXn16tVDhgyJioqaN29efX19y79+fCSHaS/Eq6qqYmJiZFtM+9BDD8XHx8fFxYmGOJT9b7zxxtixY30+38iRIzdt2iQ75SR+JjeaTQzIz88fNWpURERESkpKcXGx7DcSwjer1dTU9MADD4hphw0btm7dOu1pm385Pzo0T9vTFqt97tw5NZuWGCMmFNOKjVu0aJF4I7K/3Zn99ButAAAAgEcQz0xx9A2RoY1nRkuRlZU1ffr0060yMjLUhXVOTk5aWlppaWltbe2cOXOWLFki+3VX3trDM2fO9O/fX7aXL1+enp5+stXkyZNXrFgh+xMSErZt29bY2Hj06NG7775bdqpJjCY3mk0MyMzMLCsrEzkhOzs7NTX10pPbE8I3q7Vy5UpxeqdOnZKnp4Z19OWMdHQe3XmK595xxx179+49f/68tr+ldaQ8c0E0Vq1aJfuNZjbqN1oBOxlVOOAOVDiso4o8iE23E/HMFEd/nWho45nRUiQlJYmkJNuHDx9WF9bJycnHjh2T7aqqqsGDB8u2UWIRyeGuVvJQTCtmk+3i4uJhw4bJ9sCBA/Py8k6cOCEPJTWJ0eRGs4kBlZWVst3Q0ODz+WTbiPU3qyP7xfloT0/1d/TljHR0HjVAqqurE/l2zJgx4eHhYqqlS5eqD9PESHXm77//vlpYo5mN+o1WwE5GFQ64AxUO66giD2LT7UQ8M8XRRWlPPBOX7OrfCjY2NqoLaxF1VAgRevbsKft1V95qQGxs7OzZs8+ePSv7xbRiNtkWDXEo2/v378/MzIyJiRk+fPiuXbvUJLqG7tBoNqPxRqy/We2hojs97Wl36OWMdHQeNUCnublZZLB77713xowZskeMbHdhjWY26jdaATsZVTjgDlQ4rKOKPIhNtxPxzBRHF6U98czok5kRI0aUlZWpYUpYWJj20OhC3OjzLunixYs7d+6Mj4+Xh2oSo8mNZtO9utHJKJ30ZsX5HDlyRLZF/tGedodezkhH59Gdts7HH3/cr18/2RZTqTMXM6uFNZrZqN9oBexkVOGAO1DhsI4q8iA23U7EM1McXZT2xLNly5ap+5qmTZumLqxzc3PT09PFNXdDQ0NRUdHMmTNl/4ABA9SFeItxYhHTqrvFpkyZkpWVJftnzZp14MCBxsZGEc8SEhJkp5rEaHKj2fzEs3ZPrJPe7PLly8Vs6g4u7Wl36OVaDF6io/PoTnvChAkbN24sKSlpamoqLS297777xGzyITGVOvOMjAx1U5/RzEb9RivQYvCOWow3y2h8QEYVDrgDFQ7rqCIPYtPtRDwzxdE3RIY2nhkthUhKCxYsiIqKGjp06Jo1a3r37i37m5ub8/LykpOTIyIixo0bV1hYKPtzcnIiIyPVNbTRxbSY9sEHH4xrJRrqX75t3759zJgxPp9v7Nixu3fvlp1qEqPJjWbTvbo63Lt3b7tfE2L9zerIfu03Kz733HOqv6Mv10mn/dZbb91xxx1XX311eHi4mGHRokU1NTXyoR6t39woOsXJ33///eqfUBrNbNRvtAJG76jFOJJp2x1iVOGAO1DhsI4q8iA23U7EM/cLbTwz49ChQ+JKXd/rQJMnT1bZz4jNb9bMy9l/2kFnIZPMvCP/zldUl6wvaKqp0z8AAADQnRDP3M+2eLZ48eLKysry8vK0tLSHH35Y/7C72PxmQ/VyoZpHp7PjWUic3bN/W7/Jv//6wrN7DugfAwAA6B6IZ+5nWzzLzc1NTEyMjY2dP39+Q0OD/mF3sfnNhurlQjWPjiPiWUtrQnux96TNPcYX9M8oXrGeD9MAAEB3QzxzP9viGdD9ffoZmu9rIqFtDpuwpfckPkwDAADdCvHMFEffEBnaeObopQBatAmt9WfL5yZqP0yjwuFuVDiso4o8iE23E/HMFEd/nWho45m6qOWHH3f8iHi2a9SdovFSZFrFb/ZtdvIfdiAgKhzWUUUexKbbiXhmiqOLMuTxTN8FOMp7i9fIYLZj4M1/vOnhV79wm4hnx595QX56RoXD3ahwWEcVeRCbbifimSmOLkriGaCIbLalx/hdI+/YPeWBlyLT3p6zsvrNg9oBVDjcjQqHdVSRB7HpdiKemeLooiSeAdKRH/33i5elbumVov24TIcKh7tR4bCOKvIgNt1OxDNTHH1DZGjjmaOXAl52ds/+7TFT235cpkOFw92ocFhHFXkQm24n4pn7hTaeAU50vqK6ZH1Bux+XAQAAdB/EM/cjngEAAACOQDxzP+IZAAAA4AjEM/cjngEAAACOQDwzxdE3RIY2njl6KYCAqHC4GxUO66giD2LT7UQ8M8XRXyca2njm6KUAAqLC4W5UOKyjijyITbcT8cwURxcl8QwwjwqHu1HhsI4q8iA23U7EM1McXZTEM8A8KhzuRoXDOqrIg9h0OxHPTHF0URLPAPOocNuI30v6Lo/pkhWgwmEdVeRBbLqdiGemOPqGyNDGM0cvBRBQd65wo6t5o/5uzqGnHUJdsgLducLhFFSRB7HpdiKeuV9o4xkAM3RX3j0+ExcXN3fu3I8++kj7aEd1yWW9H0ZvVtE+qhj120Z3AufOnXv00UeHDx/u8/kSExNvu+22vXv3ageEXJevAACgGyKeuR/xDLCf7spbHZ46der222+/5557tI92VHe7rDd6s/6ZHNZ5dCcwbdq0+fPni7//Lly4UFZW9vzzz0+YMEE7IOS6fAUAAN0Q8cz9iGeAdeKSfeHChdHR0UlJSWvXrlUX1s3NzatXrx4yZEhUVNS8efPq6+tb/vXjIzlMeyFeVVUVExMj22Lahx56KD4+Pi4uTjTEoex/4403xo4d6/P5Ro4cuWnTJtkpJ/EzudFsYkB+fv6oUaMiIiJSUlKKi4tlv5EQvlmtpqamBx54QEw7bNiwdevWaU/b/Mv50aF52p62WO1z586p2bTEGDGhmFZs3KJFi8Qbkf3tzuyn32gFAABQiGfuRzwDrMvKypo+ffrpVhkZGerCOicnJy0trbS0tLa2ds6cOUuWLJH9uitv7eGZM2f69+8v28uXL09PTz/ZavLkyStWrJD9CQkJ27Zta2xsPHr06N133y071SRGkxvNJgZkZmaWlZWJnJCdnZ2amnrpye0J4ZvVWrlypTi9U6dOydNTwzr6ckY6Oo/uPMVz77jjjr17954/f17b39I6Up65IBqrVq2S/UYzG/UbrQAAAArxzBRH3xAZ2njm6KUAAjKq8KSkJJGUZPvw4cPqwjo5OfnYsWOyXVVVNXjwYNk2SiwiOdzVSh6KacVssl1cXDxs2DDZHjhwYF5e3okTJ+ShpCYxmtxoNjGgsrJSthsaGnw+n2wbsf5mdWS/OB/t6an+jr6ckY7OowZIdXV1It+OGTMmPDxcTLV06VL1YZoYqc78/fffVwtrNLNRv9EK2MmowgHzqCIPYtPtRDwzxdFfJxraeObopQACMqpwccmu/q1gY2OjurAWUUeFEKFnz56yX3flrQbExsbOnj377Nmzsl9MK2aTbdEQh7K9f//+zMzMmJiY4cOH79q1S02ia+gOjWYzGm/E+pvVHiq609OedodezkhH51EDdJqbm0UGu/fee2fMmCF7xMh2F9ZoZqN+oxWwk1GFA+ZRRR7EptuJeGaKo4uSeAaYZ1ThRp/MjBgxoqysTA1TwsLCtIdGF+JGn3dJFy9e3LlzZ3x8vDxUkxhNbjSb7tWNTkbppDcrzufIkSOyLfKP9rQ79HJGOjqP7rR1Pv744379+sm2mEqduZhZLazRzEb9RitgJ6MKB8yjijyITbcT8cwURxcl8Qwwz6jCly1bpu5rmjZtmrqwzs3NTU9PF9fcDQ0NRUVFM2fOlP0DBgxQF+ItxolFTKvuFpsyZUpWVpbsnzVr1oEDBxobG0U8S0hIkJ1qEqPJjWbzE8/aPbFOerPLly8Xs6k7uLSn3aGXazF4iY7OozvtCRMmbNy4saSkpKmpqbS09L777hOzyYfEVOrMMzIy1E19RjMb9RutQIvBO2ox3iyj8QEZVThgHlXkQWy6nYhnpji6KIlngHlGFS6S0oIFC6KiooYOHbpmzZrevXvL/ubm5ry8vOTk5IiIiHHjxhUWFsr+nJycyMhIdQ1tdDEtpn3wwQfjWomG+pdv27dvHzNmjM/nGzt27O7du2WnmsRocqPZdK+uDvfu3dvu14RYf7M6sl/7zYrPPfec6u/oy3XSab/11lt33HHH1VdfHR4eLmZYtGhRTU2NfKhH6zc3ik5x8vfff7/6J5RGMxv1G62A0TtqMY5k2naHGFU4YB5V5EFsup2IZ6Y4+obI0MYzRy8FEJCZCj906JC4Utf3OtDkyZNV9jNi85s183L2n3bQWcgkM+/Iv/MV1SXrC5pq6vQPtGGmwgH/qCIPYtPtRDxzv9DGM8CzFi9eXFlZWV5enpaW9vDDD+sfdheb32yoXi5U8+h0djwLibN79m+7YvIfZyypfvOg/jEAgHMQz9yPeAaERG5ubmJiYmxs7Pz58xsaGvQPu4vNbzZULxeqeXQcEc+Eqt/9aUuviZvDxhdeddPRn2w082EaAKC7IZ65H/EMADxCJLStfVI39xi/pXfqi32u48M0AHAc4pn7Ec8AwDtUQpM/W31f48M0AHAQ4pkpjr4hMrTxzNFLAQSkLmr54cc1Py8nTBf/fSkyreI3+/gdDuuoIg9i0+1EPDNls5O/TjS08czRSwEERIXD6Y48+astYZ+msq2+6383Yd4rQzN3jbrz+DMvyE/PqHBYRxV5EJtuJ+KZKY4uSuIZYB4VDkeT2awwfvpvvzrvpSunvD1npe7eMyoc1lFFHsSm24l4Zoqji5J4BphHhcO5juc8/+LnJm3pOUH7cZkOFQ7rqCIPYtPtRDwzxdFFSTwDzKPC4VBn9+zfHp3e9uMyHSoc1lFFHsSm24l4Zoqjb4gMbTxz9FIAAVHhcKLzFdUl6wva/bhMhwqHdVSRB7HpdiKeuV9o4xkAAACATkI8cz/iGQAAAOAIxDP3I54BAAAAjkA8cz/iGQAAAOAIxDNTHH1DZGjjmaOXAgiICoe7UeGwjiryIDbdTsQzUxz9daKhjWeOXgogICoc7kaFwzqqyIPYdDsRz0xxdFESzwDzqHC4GxUO66giD2LT7UQ8M8XRRUk8A8yjwuFuVLgTib/E9V1diiryIDbdTsQzUxxdlMQzwDwqHO7WnSvcKIQY9XtHd1uB7lxF6CRsup2IZ6Y4+obI0MYzRy8FEBAVDncLVYXrAkOPz8TFxc2dO/ejjz7SPtpR3S2N6M7n3Llzjz766PDhw30+X2Ji4m233bZ3717tgJDrbgsSqiqCg7DpdiKeuV9o4xkAAG3jmWycOnXq9ttvv+eee7SPdlR3SyO685k2bdr8+fPFpdKFCxfKysqef/75CRMmaAeEXHdbEACdinjmfsQzAIB/ImksXLgwOjo6KSlp7dq1Kg80NzevXr16yJAhUVFR8+bNq6+vb9F8VqaGafNDVVVVTEyMbItpH3roofj4+Li4ONEQh7L/jTfeGDt2rM/nGzly5KZNm2SnnMTP5EaziQH5+fmjRo2KiIhISUkpLi6W/UYsvllx2ufOnVOzaYkxYkIxrViBRYsWNTU1yf52Z/bTL574wAMPiDMcNmzYunXr1EsD8ALimfsRzwAA/mVlZU2fPv10q4yMDJUHcnJy0tLSSktLa2tr58yZs2TJEtmvCwzawzNnzvTv31+2ly9fnp6efrLV5MmTV6xYIfsTEhK2bdvW2Nh49OjRu+++W3aqSYwmN5pNDMjMzCwrKxPxJjs7OzU19dKT22PxzYrn3nHHHXv37j1//ry2v6V1pDjDU61EY9WqVbLfaGaj/pUrV8p55DslngGeQjxzP+IZAMC/pKQkkZRk+/DhwyoPJCcnHzt2TLarqqoGDx4s20YJSgSeu1rJQzGtmE22i4uLhw0bJtsDBw7My8s7ceKEPJQCxjOj2cSAyspK2W5oaPD5fLJtxOKbraurE0FxzJgx4eHhYqqlS5eqD9PESHWG77//vjpDo5mN+sUTte+UeAZ4CvHMFEffEBnaeObopQACosLhbkYVLpKG+reCjY2NKg+IqNNDo2fPnrJfFxjUgNjY2NmzZ589e1b2i2nFbLItGuJQtvfv35+ZmRkTEzN8+PBdu3apSXQN3aHRbEbjjVh8s0pzc7PIYPfee++MGTNkjxjZ7hkazWzUr3unPQxOoKsYVRFcjE23E/HMFEd/nWho45mjlwIIiAqHuxlVuNEHSiNGjCgrK1PDlLCwMO2hUX4w+rxLunjx4s6dO+Pj4+WhmsRocqPZdK9udDKKxTer8/HHH/fr10+2xVRHjhyRbTGzOkOjmY36xRPVPCIBBnxHNjOqIrgYm24n4pkpji5K4hlgHhUOdzOq8GXLlqnbsaZNm6byQG5ubnp6uogKDQ0NRUVFM2fOlP0DBgxQ+aHFOBGJadXdYlOmTMnKypL9s2bNOnDgQGNjo4hnCQkJslNNYjS50Wx+4lm7J2bxzU6YMGHjxo0lJSVNTU2lpaX33XefmE0+JKYSE8p7zzIyMtTdcUYzG/UvX75czSMGBHxHLcbv2mi8FUZVBBdj0+1EPDPF0UVJPAPMo8LhbkYVLpLSggULoqKihg4dumbNmt69e8v+5ubmvLy85OTkiIiIcePGFRYWyv6cnJzIyEh16W+UAcS0Dz74YFwr0VD/YG/79u1jxozx+Xxjx47dvXu37FSTGE1uNJvu1dXh3r172/2aEItv9q233rrjjjuuvvrq8PBwMcOiRYtqamrkQz1av7lRdEZHR99///3qn1AazWzUr/1uyeeeey7gO2oxjmRGW2OFURXBxdh0OxHPTHF0URLPAPOocLibmQo/dOiQCBj6XgeaPHmyyn5GQvtmOyMLaZl5RzYwU0VwhPMV1SXrC5pq6vQPtMGm24l4Zoqjb4gMbTxz9FIAAVHhcDc/Fb548eLKysry8vK0tLSHH35Y/7C7dNKb7ex41k34qSI4ztk9+1+KTt+T8R/Vbx7UP6bBptuJeOZ+oY1nAABXys3NTUxMjI2NnT9/fkNDg/5hd+mkN+uReAaXEQlta5/rNvcY/3LcjUce/5WZD9PQqYhn7kc8AwAAgJFPP0O7YvKWnhM295q45bLUP0x90P+HaehUxDP3I54BAADAj0sJrcd48fPiZal8mNZViGfuRzwDAEjywosffvjhx+TPtiumVPxmn/5XCToT8cwUR98QGdp45uilAAKiwuFuVDiso4pc6czuP28N//QOtE8jWd+vb4+ZuvPztxx/5gX56RmbbifimSmbnfx1oqGNZ45eCiAgKhzuRoXDOqrIfVQ2ezlu+taIr++7e7nu3jM23U7EM1McXZTEM8A8KhzuRoXDOqrIZUQ2e7H3pM1hE7Qfl+mw6XYinpni6KIkngHmUeFwNyoc1lFFbnJ2z/7t0eltPy7TYdPtRDwzxdFFSTwDzKPC4W5UOKyjilzjfEV1yfqCdj8u02HT7UQ8M8XRN0SGNp45eimAgKhwuBsVDuuoIg9i0+1EPHO/0MYzAAAAAJ2EeOZ+xDMAAADAEYhn7kc8AwAAAByBeOZ+xDMAAADAEYhnpjj6hsjQxjNHLwUQEBUOd6PCYR1V5EFsup2IZ6Y4+utEQxvPHL0UQEBUONyNCod1VJEHsel2Ip6Z4uiiJJ4B5lHhcDcqHNZRRR7EptuJeGaKo4uSeAaYR4XD3ahwWEcVeRCbbifimSmOLkriGWAeFQ5369QKF3/X6LvgRp1aReie2HQ7Ec9McfQNkaGNZ45eCiAgKhzu1qkVTjzziE6tInRPbLqdiGfuF9p4BgDwGvGXyIYNGxITE8PCwsRhc3Pz6tWrhwwZEhUVNW/evPr6ejlGUc/STaIa2tnEYX5+/qhRoyIiIlJSUoqLi7XPAgCvIZ65H/EMAGCF+Etk1qxZp0+floc5OTlpaWmlpaW1tbVz5sxZsmSJGnbpOcaHutnEYWZmZllZmYh52dnZqampl54DAN5DPHM/4hkAwArxl0h5ebk6TE5OPnbsmGxXVVUNHjxYDVNj/BzqZhOHlZWVst3Q0ODz+dRDAOBBxDP3I54BAKwQf4lcvHhRHYoE1UOjZ8+eapga4+dQN5vRMADwJuKZKY6+ITK08czRSwEERIXD3YKrcF1kGjFiRFlZmbZHkveSKeHh4Q0NDbJdWVmpjWeXBgU6RDcUXBXB0dh0OxHPTHH014mGNp45eimAgKhwuFtwFa6LTLm5uenp6UeOHBHpq6ioaObMmbJ/wIABolMNS01Nzc7Orq+vLy0tFWOIZ64RXBXB0dh0OxHPTHF0URLPAPOocLhbcBWui0zNzc15eXnJyckRERHjxo0rLCyU/Tk5OZGRkWpwcXFxSkqKGDNy5Mj8/HzimWsEV0VwNDbdTsQzUxxdlMQzwDwqHO4WsMKbaupK1hecr6jWPwB8JmAVwX3YdDsRz0xxdFESzwDzqHC4m58KP7vnwB9nLNkeM/Xsnv36xwANP1UEt2LT7UQ8M8XRN0SGNp45eimAgKhwuFvbCm+qqStesb6gf8bmsPHbIq4nmyGgtlUE12PT7UQ8c7/QxjMAgDuc3XPg919fuKX3pM1hE7ZHpRfwuRkAdAPEM/cjngEAFPVx2ZbPTdzcY7z42XHVTWQzAOgmiGfuRzwDAEgVv9m3NeJ6mcr44Ycffkz+6H+VoDMRz9yPeAYAUJpq6t7P/nlB7LRP/1lj64XXy3E38ukZAHQTxDNTHH1DZGjjmaOXAgiICoe7aSu8+n/f2z3lgdZ7z1JeunIKCQ0m8XvSg9h0OxHPTHH0p7qhjWeOXgogICoc7ta2wtWHaZvDxm/lmxthQtsqguux6XYinpni6KIkngHmUeFwNz8VXv2/7/3vzd/l/3uGgPxUEdyKTbcT8cwURxcl8QwwjwqHuwWs8KaaupL1BecrqvUPAJ8JWEVwHzbdTsQzUxxdlMQzwDwqHO5GhcM6qsiD2HQ7Ec9McfQNkaGNZ45eCiAgKhzuRoXDOqrIg9h0OxHP3C+08QwAAABAJyGeuR/xDAAAAHAE4pn7Ec8AAAAARyCeuR/xDAAAAHAE4pkpjr4hMrTxzNFLAQREhcPdqHBYRxV5EJtuJ+KZKY7+OtHQxjNHLwUQEBUOd6PCYR1V5EFsup2IZ6Y4uiiJZ4B5VDjcjQqHdVSRB7HpdiKemeLooiSeAeZR4XA3KhzWUUUexKbbiXhmiqOLkngGmNepFS7+JOq7AHt1aoXDI6giD2LT7UQ8M8XRN0SGNp45eimAgDq1woln6HKdWuHwCKrIg9h0OxHP3C+08QxAW+KP2IYNGxITE8PCwsRhc3Pz6tWrhwwZEhUVNW/evPr6ejlGUc/STaIa2tnEYX5+/qhRoyIiIlJSUoqLi7XPAgAAbkI8cz/iGdDZxB+xWbNmnT59Wh7m5OSkpaWVlpbW1tbOmTNnyZIlatil5xgf6mYTh5mZmWVlZSLmZWdnp6amXnoOAABwF+KZ+xHPgM4m/oiVl5erw+Tk5GPHjsl2VVXV4MGD1TA1xs+hbjZxWFlZKdsNDQ0+n089BAAAXIZ45n7EM6CziT9iFy9eVIciQfXQ6Nmzpxqmxvg51M1mNAwAALgP8cwUR98QGdp45uilAAIKrsJ1kWnEiBFlZWXaHkneS6aEh4c3NDTIdmVlpTaeXRoU6BDokOAqHNCiijyITbcT8cwUR3+daGjjmaOXAggouArXRabc3Nz09PQjR46I9FVUVDRz5kzZP2DAANGphqWmpmZnZ9fX15eWlooxxDPYILgKB7SoIg9i0+1EPDPF0UVJPAPMC1jhTTV1JesLzldUazt1kam5uTkvLy85OTkiImLcuHGFhYWyPycnJzIyUg0uLi5OSUkRY0aOHJmfn088gw0CVjgQEFXkQWy6nYhnpji6KIlngHl+Krz6zYNv3vLI9pipZ/fs1z8GOISfCgdMooo8iE23E/HMFEcXJfEMMK9thTfV1B39ycbCq27aHDZ+q+9rZDM4WtsKBzqKKvIgNt1OxDNTHH1DZGjjmaOXAghIW+HVbx7844wlL/a5bkvv1K0RXyuITiebwen4HQ7rqCIPYtPtRDxzv9DGM8D11MdlW31f29xjvPh56YrJZDMAAGAD4pn7Ec8A8yp+s29rxPUylfHDj/t+9BUPAOhmiGfuRzwDOqSppu7A4mdeikzb3HOCvKJ9dfitBf0z+PQMAAB0NuKZ+xHPgOBUvvbOb8fP29JrokhohQk3kdAAAEBnI56Z4ugbIkMbzxy9FEBAbSv80odpYeO3RVxPQoOjta1woKOoIg9i0+1EPDPF0f9eP7TxzNFLAQTkp8IrX3tnz7T/4P97BkfzU+GASVSRB7HpdiKemeLooiSeAeYFrPCmmrqS9QXnK6r1DwBOELDCgYCoIg9i0+1EPDPF0UVJPAPMo8LhblQ4rKOKPIhNtxPxzBRHFyXxDDCPCoe7UeGwjiryIDbdTsQzUxx9Q2Ro45mjlwIIiAqHu1HhsI4q8iA23U7EM/cLbTwDAAAA0EmIZ+5HPAMAAAAcgXjmfsQzAAAAwBGIZ+5HPAMAAAAcgXhmiqNviAxtPHP0UgABUeFwNyoc1lFFHsSm24l4Zoqjv040tPHM0UsBBESFw92ocFhHFXkQm24n4pkpji5K4hlgHhUOd6PCYR1V5EFsup2IZ6Y4uigdFM/Eeeq7AHt1aoUDXY4Kh3VUkQex6XYinpni6KIkngHmdWqFA12OCod1VJEHsel2Ip6Z4ugbIkMbz4JbCnECGzZsSExMDAsLE4fNzc2rV68eMmRIVFTUvHnz6uvr5RhFPUs3iWpoZxOH+fn5o0aNioiISElJKS4u1j4L6JDgKhxwCioc1lFFHsSm24l45n6hjWfBEScwa9as06dPy8OcnJy0tLTS0tLa2to5c+YsWbJEDbv0HOND3WziMDMzs6ysTMS87Ozs1NTUS88BAAAAnIN45n7dJJ6Vl5erw+Tk5GPHjsl2VVXV4MGD1TA1xs+hbjZxWFlZKdsNDQ0+n089BAAAADgI8cz9ukk8u3jxojoUCaqHRs+ePdUwNcbPoW42o2EAAACAsxDP3K+bxDPt4YgRI8rKyrQ9kryXTAkPD29oaJDtyspKbTy7NCjQIQAAAOAUxDNTHH1DZGjjWXBLoYtMubm56enpR44cEemrqKho5syZsn/AgAGiUw1LTU3Nzs6ur68vLS0VY4hnsEFwFQ44BRUO66giD2LT7UQ8M8XRXyca2ngWcCmaaupK1hecr6jWduoiU3Nzc15eXnJyckRExLhx4woLC2V/Tk5OZGSkGlxcXJySkiLGjBw5Mj8/n3gGGwSscMDRqHBYRxV5EJtuJ+KZKY4uStviWfWbB/fdlbU9ZurZPfv1jwEO4afCARegwmEdVeRBbLqdiGemOLooOzueNdXUHX/mhR2DZ20Om7A1/GtkMzha2woH3IQKh3VUkQex6XYinpni6KLsvHhW/ebBvbc/ttX3tW1XTHnxcxO3R04hm8HpHP2HHQiICod1VJEHsel2Ip6Z4ugbIkMbz8RSqI/LXrpy8pbPTRJ/YrdeNolsBndw9B92ICAqHNZRRR7EptuJeOZ+oY1nFb/ZtzXiehHJ+OHHlT/6igcAALAR8cz9QhvPhMaK6nfmrtra91JI+934eS8PyODTMwAAAMAK4pn7hTyeKX/d9NqukXduDpsgEtqrw28loQEAAABWEM/cr/PimXTpw7Sw8dv6fp2EBgAAAASHeGaKo2+IDG0887MUf9302h/SvsP/9wyO5qfCARegwmEdVeRBbLqdiGemOPoLA0IbzwIuRVNNXcn6gvMV1foHACcIWOGAo1HhsI4q8iA23U7EM1McXZQ2xzPA0ahwuBsVDuuoIg9i0+1EPDPF0UUp9zgyMvLroXBbj6v1XYCLUOFwNyoc1lFFHsSm20lctBPPAnNBPAMAAADgCMSzABx9Q+Szzz57w2e+9KUvic0eOXJkcnLyF4NyQ+wwfRfgIlQ43I0Kh3VUkQex6fb793//d+KZJ+zbt2/Hjh2//vWv/xsAAABANyYu2sWlu7iALysrU9fzxDNXee+990T+LigoEJv9PwAAAAC6JXG5Li7axaW7uIA/ffq0up4nnrnKX/7yl6KiIrHNIoi/CAAAAKBbEpfr4qJdXLqLC/jq6kv/zyrimauI5C02WETwffv2/R4AAABAtyQu18VFu7h0FxfwdXV16nqeePYpR381iJbYWhG+xR6XlZX9JSh/fPDH+i7ARahwuBsVDuuoIg9i07uEuFwXF+3i0l1cwF+4cEFdzxPPPuXoL9YPLZYC7kaFw92ocFhHFXkQm96tEM8+RVEqLAXcjQqHu1HhsI4q8iA2vVshnn2KolRYCrgbFQ53o8JhHVXkQWx6t0I8+xRFqbAUcDcqHO5GhcM6qsiD2PRuhXj2Kdd8NYh1LAXcjQqHu1HhsI4q8iA2vVshngEAAABAt0A8AxAazzzzzNcBAAAQyLPPPqu/kPoM8QxAaIjfNT0AAAAQyA033KC/kPoM8QxAaMh4dt111z2CEJG/vgEAgGtERkYSzwLjhkiFpUDQZDwToaIWISLWU7/KgF/8Dod1VJEHsel2ktdLxLMA+DpRhaVA0IhnIUc8Q0fxOxzWUUUexKbbSV4vfelLX9q3b9977733l7/85fTp03V1dWoAf/d/iqJUWAoErQvjmfxn3PreUNDO3HmvYoR4ho7idziso4o8iE23k7xe+uIXv7hjx47f//73RUVFIqFVV1erAfzd/ymKUmEpEDTiWcgRz9BR/A6HdVSRB7HpdpLXSyNHjvz1r39dUFAgEtp77713+vRpNYC/+z9FUSosBYJGPAs54hk6it/hsI4q8iA23U7yeik5Ofm///u/RULbsWPHvn37ysrK1AD+7v8UN0QqLAWCFkQ8q6mpyc3NHTVqVERExPDhw3/yk5+IHvmQzEL/+Z//+cUvftHn81177bWvvfaaeqJ41he+8IW+ffuOGTNm3bp1RsFp6NChov8Pf/iDaK9fv160N2zYINq7d+8W7aSkJDXyiSeeED09e/aMjY2dO3fuiRMnZL92Zm37f/7nfy677LJevXqJc5Y9Ibdz507xBvWrDPjF73BYRxV5EJtuJ/WPG0U8E5cTL7744u9///u//OUvagDxDEBoBBHPnn76afGUO++8s7y8fOnSpaK9Zs0a+ZDMQnfddVdZWZlMViKPyYeeffZZcZiRkXG0lWhog5PW/PnzRb+IXqL9b//2b6It/lv7WRhbsGCBGilO++23366srPzpT38qHvr2t78t+7Uzq/Zzzz0nglm/fv22bdumZggtkc1EUNyzZ49+lQEAgJMRzwDYJIh4JhKXeMq7774r2iKGifaIESPkQzILHT58WLTPnDnTo/WjLflQcnKyOCwqKpKHoqGCk87mzZtF/80331xRUREREdG/f3+fz3f69GkZ1bZs2aJ/Qm1tdXW1eCgxMVEeameWbREpw8LCBg8eLOLcpaeFFNkMAAC3Ip4BsEkQ8axPnz4y8yi9e/eWD8lDNVJ7KCKWaFdWVspD0dANVkQSEy8hUll+fr4YIH4Div+K34YDBgwQ/eJROex3v/udOPmYmBiRAOVUKgpqZ5ZtEfPEf3/1q1/JzpAjmwEA4GLEMwA2CSKeDR48uMdnH5HpaHOR7nDEiBE9zH16Jtxwww3iobFjx44bN04cfvWrX/3Sl74keiZPnqzGDBo0SPS88MILZ86cOXnypHa2tu0dO3aIfCjS3caNG9UMoUI2AwDA3YhnpnBDpMJSIGhBxLMnn3xSPOWWW2754IMPjh8//vzzz0+cOFE+pM1FusNnnnmmh7l7z2o/u81MeOqpp2o/u9utx2c3pElXXXWV6Nm+fXt5efmCBQu0s7Xbfvnll8PDw3v16vXTn/5UTWId2QzW8Tsc1lFFHsSm24l4ZgpfJ6qwFAhaEPFM2LBhw9ixY/v16zdgwICbbrrp1Vdflf3aXNT2MCcnZ/jw4T6f75prrlm7dq3uUa0//elPPVr/zeSHH34oDktLSy+77DLRI/rVGJGLxDyiPzExUeU3+ZBRu6CgQCQ0cZidnS17LCKbIST4HQ7rqCIPYtPtRDwzhaJUWAoELbh4hlqyGUKH3+GwjiryIDbdTsQzUyhKhaVA0IhnwSGbIYT4HQ7rqCIPYtPtRDwzhaJUWAoEjXgWBLIZQovf4bCOKvIgNt1OxDNTuCFSYSkQNPnrBh3St29fshlCiN/hsI4q8iA23U7EMwA2kb9ubrjhBv0DAAAAaEU8A2AT4hkAAIB/xDMANiGeAQAA+Ec8A2AT4hkAAIB/xDNTuCFSYSkQNEfEMyoc7kaFwzqqyIPYdDsRz0zh60QVlgJBc0Q8o8LhblR4aInfafouD6CKPIhNtxPxzBSKUmEpEDTiGdDlqPDQIp7BI9h0OxHPTKEoFZYCQSOeAV2um1d4j/boB2mIR2+88caLFy/qOrWHJumepTsH3aOKUb+7dfMqQmdg0+1EPDOFolRYCgSNeAZ0OadUuMnYI4bdfffdP/3pT3Wd2kOTdM8yOYnJYS7jlCpCCLHpdiKemcINkQpLgaA5Ip5R4XC34Cpc/Mldt27dNddc4/P5xBXDm2+++atf/Wr48OHh4eEpKSlHjx6Vwy5cuPDQQw/Fx8fHxcWJhjisqanp379/bW2tmkr0xMbGip7m5ubVq1cPGTIkKipq3rx59fX1akxLm9jTdmY17OOPP/7CF75w5MgRNVg9t92XWLhw4S9/+Us1+Be/+MX999/fQ0M3iU5TU9MDDzwQHR09bNgwsSZqmDglMbPoT0pKWrt2rf9zcLrgqgiOxqbbiXgGwCaOiGcA2hJ/cmfMmPHhhx+KdPHEE0/069dv5syZJSUl8lD80ZbDli9fnp6efrLV5MmTV6xY0dIah3784x+rqX70ox8tXrxYNHJyctLS0kpLS0VUmzNnzpIlS9SYljbpqN2Z1bA//OEP48aN++STT7SdLQYvIYZdf/31W7ZsEW3xX9GWT9S9olE8W7lypTiTU6dOyTNRw7KysqZPn366VUZGhv9zAAA/iGcAbEI8AxxK/MmtqKiQ7YaGBnFYWVmpDn0+n2wnJSUdPnxYtouLi4cNGyYaR48eHTRo0D/+8Q/RFv8dOnRoeXm5aCcnJx87dkwOrqqqGjx4sGxLunTU7swtmmFLly597LHHdJ1GLyHa4jQeffRR8V/Rlp1t45mO7BcvrT0T1S/OUH2KKAaofqNzAAAjxDMANiGeAQ6lwob/w/Dw8MbGRtkWDXEo29OnT9+8ebNovPDCC/fcc4/sFKFOk3169OzZU/ZLupcwmlkNa2pq+vKXv/zmm29qO/28xIoVK0TP008/rXp0r6g7VHRnooaJfvVPLrX9fs4BANpFPANgE+IZ4FD+o4s6NPqM6/XXX584caJopKSkHDhwQHaOGDGirKxMttvSvYTRzNph77///siRI+vq6lSn0UscPHgwMTFx+/btV1111QcffCA7w8LCtGN0J6CIl1b3uYlX1L73dj89MzoHADBCPDOFGyIVlgJBc0Q8o8LhbsFVuFEe0x0uW7ZM3SE2ZcqUrKwsNUZcZ+Tl5YlHVU9ubq44FFGnoaGhqKho5syZ6qGWNi9hNLNumJjz3nvvVZ3tvkR9ff211167Z88e0X7llVe+/OUvnz9/XrQHDBjQ7veL6CxfvnzatGmnWonJte9d3XsmBvg/B6cLrorgaGy6nYhnpvB1ogpLgaA5Ip5R4XC34CrcKI/pDhsbGx988MG4VqKh/hGgsGHDhp49e77++uuqp7m5WQS25OTkiIiIcePGFRYWqoda2ryE0cy6YRcvXtRGo3ZfYu7cuevXr1dPWbNmzbx581pav8MjMjJSPbdHG7Jf+w2Nzz33nOoXp7RgwYKoqKihQ4eKOXv37i372z0HpwuuiuBobLqdiGemUJQKS4GgEc+ALhewwptq6krWF5yvqNY/ANMOHTokQpq+10UCVhHch023E/HMFIpSYSkQNOIZ0OWMKvyf5y/830fX7r7h/u0xU8/u2a9/GCYsXry4srKyvLw8LS3t4Ycf1j/sIkZVBBdj0+1EPDOFolRYCgSNeAZ0ubYVfvaP7/3+uvmbe6ZsDpuwre/XyWZBy83NTUxMjI2NnT9/fkNDg/5hF2lbRXA9Nt1OxDNTuCFSYSkQNEfEMyoc7qYqXH5ctr1/hrjqEj+7b1j4cuw0shnM4PekB7HpdiKeAbCJI+IZ4HqXPi5rDWbi551vriSbAUA3QTwDYBPiGdDlKn6zb1u/G0Qke7H3JBXP+OGnQz/6qgIQUsQzADYhngHdQVNN3fFnXng1+faXE6YXXjVDXnBz1xkAdBPEMwA2IZ4B3Ur1mwffnrNyW78bdn7+1hd7TyKhAUB3QDwzhRsiFZYCQXNEPKPC4W5tK1x9mLal54St4deR0BBQ2yqC67HpdiKemcK/tFZYCgTNEfGMCoe7+alw+WEa/98zBOSniuBWbLqdiGemUJQKS4GgEc+ALhewwptq6krWF5yvqNY/AHwmYBXBfdh0OxHPTKEoFZYCQSOeAV2OCod1VJEHsel2Ip6ZQlEqLAWCRjwDuhwVDuuoIg9i0+1EPDOFGyIVlgJBc0Q8o8LhblQ4rKOKPIhNtxPxDIBNHBHPAAAAuhDxDIBNiGcAAAD+Ec8A2IR4BgAA4B/xDIBNiGcAAAD+Ec9M4YZIhaVA0BwRz6hwuBsV3n2I34f6LnsFfQJUkQex6XYinpnC14kqLAWC5oh4RoXD3ajwoAUdZoyEcMLgpgruWS1UkSex6XYinplCUSosBYJGPAO6nMUKD/qCPiAnzmxRl59Y0CdgsYrgRGy6nYhnplCUCkuBoBHPgC5nscKDvqAPyIkzW9TlJxb0CVisIjgRm24n4pkpFKXCUiBoxDOgyxlVuPizuWHDhsTExLCwMHHY3Ny8evXqIUOGREVFzZs3r76+Xo5R1LN0k6iGdjZxmJ+fP2rUqIiIiJSUlOLiYu2z5IC2M+tm0I2XjXbPU6vtzBcuXHjooYfi4+Pj4uJEQxz+6zM+9cYbb4wdO9bn840cOXLTpk2yUzvDwoULo6Ojk5KS1q5dqz3ndt/m8ePHb731VjH+yiuv/MY3vlFdXa2bUMvPYN2C6A5ramr69+9fW1urphI9sbGxosfPnGpwhxhVEVyMTbcT8cwUbohUWAoEzRHxjAqHuxlVuPizOWvWrNOnT8vDnJyctLS00tJScXE/Z86cJUuWqGGXnmN8qJtNHGZmZpaVlYn4lJ2dnZqaeuk5n2k7lW4G3aOyYXSeWrrnLl++PD09/WSryZMnr1ixQvuolJCQsG3btsbGxqNHj959992yU82TlZU1ffr0060yMjK077rdtzl69Ojdu3efP3/+3Llz3/nOd7797W/rJtTyM1i3IG3XR4TGH//4x7JH+NGPfrR48eIWv3OqwR1iVEVwMTbdTsQzADZxRDwDvEn82SwvL1eHycnJx44dk+2qqqrBgwerYWqMn0PdbOKwsrJSthsaGnw+n3pIaTuVbgbNg5cOjc5TS/fcpKSkw4cPy3ZxcfGwYcO0j0oDBw7My8s7ceKEtlPNI2YQsU22xVTadx3wbdbV1SUmJsq27sTa0g3WLUjb9RFnNWjQoH/84x+iLf47dOhQ7RipQycAoEsQzwDYhHgGdFviz+bFixfVoYgWPTR69uyphqkxfg51sxkN89Npcgaj89TSPTc8PLyxsVG2RUMcah+V9u/fn5mZGRMTM3z48F27dslONY94ivonkWIG1W90kn/+85+nTJkSFRUlT7JXr166AVp+BusWpN31mT59+ubNm0XjhRdeuOeee2SnnzllA0C3QjwDYBPiGdBt6a7UR4wYUVZWpu2R5J1OiggqDQ0Nsl1ZWakm0c3m/1DSzawbY/RCRueppZvZzKdnksg/O3fujI+Pl4fqRf18eiYbukPxEuICq6am5p///Gdtba3ReMnkYKPD119/feLEiaKRkpJy4MAB2WlyTgDdBPEMgE2IZ0C3pbtSz83NTU9PP3LkiAhFRUVFM2fOlP0DBgwQnWpYampqdnZ2fX19aWmpGGN03e//UNLNrBtj9EJG56mlm3nZsmXq3rMpU6ZkZWVpxv5/s2bNEtmmsbFRxLOEhATZqV5UzKDuPZs2bVrAdy0CXkFBwYULF0pKSm699Vaj8ZLJwX4OxSVdXl6eeI+qx+ScALoJ4pkp3BCpsBQImiPiGRUOdzOqcN2VenNzs7jET05OjoiIGDduXGFhoezPycmJjIxUg4uLi1NSUsSYkSNH5ufnG133+z+UdDPrxhi9kNF5aulmFqHrwQcfjGslGuofOmpt3759zJgxPp9v7Nixu3fvlp3aGRYsWBAVFTV06NA1a9b07t1bN0B3+Oqrr44YMUIMGzRokDhbo/comRzs53DDhg09e/Z8/fXXVY/JOc0zqiK4GJtuJ+KZKXydqMJSIGiOiGdUONyNCg+tQ4cOiZCm73Wm8xXVJesLmmrq9A+0QRV5EJtuJ+KZKRSlwlIgaMQzoMtR4SGxePHiysrK8vLytLS0hx9+WP+wY53ds39bv8l/mPpg9ZsH9Y9pUEUexKbbiXhmCkWpsBQIGvEM6HJUeEjk5uYmJibGxsbOnz9ffWeJO5zZ/ecXPzdR1MnLcTcefvyX7X6YRhV5EJtuJ+KZKRSlwlIgaMQzoMtR4QhIJLSt4deJUtnca+KWy1LbfphGFXkQm24n4pkp3BCpsBQImiPiGRUOd6PCYcalhNb68+JlqdoP06giD2LT7UQ8A2ATR8QzwN3UBTc//HToZ2dSpvjvS5FpFb/Zp68qACFFPANgE+IZADhC8bJ1W1pTWUHM1N033L/z87fsGnXn8WdeaPdWNAChRTwDYBPiGQB0fzKb7Rw6643rFrwUmfb2nJX+v8gRQGgRzwDYhHgGAN3c0Z/kv9h70pZeKXxcBnQV4pkp3BCpsBQImiPiGRUOd6PC4cfZPfu3x0wN+HEZVeRBbLqdiGembObrRD/DUiBojohnVDjcjQqHkfMV1SXrC8x8XEYVeRCbbifimSkUpcJSIGjEM6DLUeGwjiryIDbdTsQzUyhKhaVA0IhnQJejwmEdVeRBbLqdiGemUJQKS4GgEc+ALkeFwzqqyIPYdDsRz0zhhkiFpUDQHBHPqHC4GxUO66giD2LT7UQ8A2ATR8QzAACALkQ8A2AT4hkAAIB/xDMANiGeAQAA+Ec8A2AT4hkAeMfJkyfj4uL0vQACIZ6Zwg2RCkuBoDkinlHhcDcqHNaZrKJXX301IyND3wtnMrnpCAnimSl8najCUiBojohnVDjcjQqHdSar6Mknn1y6dKm+14Tp06cXFhbqe4MSwqk8zuSmIySIZ6ZQlApLgaARz4AuR4XDOpNVdOedd27cuFHfa0J8fPzJkyf1vUEJ4VQeZ3LTERLEM1MoSoWlQNCIZ0CXo8JhnVEVVVVVzZ49u3///ldddVV+fn5ycvKhQ4dE/0cffbRo0aIhQ4ZcfvnlN95444kTJ+R40bjrrrtiY2MjIyNnzZr19ttvf/zxxz00nnrqqSuvvLKgoOArX/lKUlLSqVOnxOTal4uOjpbtysrKe++9NzExUbz0z372M9Gjm2rdunWnT5+eO3eumKFfv34zZ84Uh2JYTU2N9iXU5NAx2nR0BuKZKRSlwlIgaMQzoMtR4bCu3Sqqra0Veezpp58+e/bsX//614yMjPDw8E8++UTEJNH//e9/v6Kioq6u7pFHHpk2bZp8ysSJE5955hkxQDxFXIbecsstovO1116bOnWqHPDOO++IvzUmTZr01ltvNTY2vvTSSzNmzFCvuHfv3gkTJojGmTNnRPYTWU7Mc/z4cZHB5ADtVNXV1UOHDn3yySfFmL/97W+PPfaYPA3dS3w2N/Ta3XR0EuKZKdwQqbAUCJoj4hkVDnejwmFdu1W0dOlSkcHU4SuvvDJ69GjRWLJkyX333af6GxoaIiIiZDsqKkrEuZKSkosXL6oBjz/++KOPPirbGzduHDRo0N///nd5KOb/4Q9/qEaKK9fZs2eLxqJFi9q9yU071X/8x3+ISKYeEnPK09C9BIy0u+noJMQzADZxRDwDAARh8ODBH3zwgTpcs2bNN7/5TdEQ4efSPzFsJVKZHLN79+6MjAxxOHDgwPz8fNmZmZm5detW2V65cuUjjzwi2y2tf4m8/vrr6nDZsmWrVq0SjauvvvrUqVOqX9FONXTo0PLycvXQhx9+KF60pc1LAN0B8QyATYhnAOBWffr0UZ9BNTU1DR8+/KmnnhJtn8/X0NDwL0P/VXNzc2FhYb9+/eShSE0lJSWyfc8994jLUzUyMjLyzJkzsi2eNXr06Oeff160w8PD230J7VSXX355fX29euj73//+Aw880NLmJYDugHgGwCbEMwBwq3Hjxj322GMioR05cmTGjBmXXXbZb3/7W9E/ZcqU7373u1VVVSId7d+/f/78+fKrQW666aZXXnnlb3/7m3hoxYoVkydPlvOIOFdUVCTb48ePf+uttz57hU//MeTPf/7zCxculJaWfutb3xIv8ac//aml9R62VatWianES3/ve99T47VT3XjjjcuXLxdj/vrXv2ZlZQ0ZMqSysrKlzUsA3QHxDIBNiGcA4Fbvvvvu6NGj+/Tpc80112zatCk6OlrkLtF/8uTJ22+/fcCAAf369bv++ut37twpxxcWFk6aNCkiIuLqq68Wma26ulr2Z2dnR0ZGir8sRLoTeUx9XNbSerNZfHx8eHh4amrqa6+9dsUVV9TU1Ij+w4cPi5n79u07duzYd955R43XTiUyoQiEl19+uTix2bNnq38MqXsJoDsgnpnCDZEKS4GgOSKeUeFwNyoc1lFFrnG+orpkfUFTTZ3+gTbYdDsRz0zh60QVlgJBc0Q8o8LhblQ4rKOK3OTsnv3bo9N3T37g7J4D+sc02HQ7Ec9MoSgVlgJBI54BXY4Kh3VUkcuIhLY1/DqxrQX9M4pXrG/3wzQ23U7EM1MoSoWlQNCIZ0CXo8JhHVXkPp9+hnbllC29UjaHTdjSe9Lvv75Q92Eam24n4pkpFKXCUiBoxDOgy1HhsI4qciWZ0F7sPVHsr/jZ8rmJ2g/T2HQ7Ec9M4YZIhaVA0BwRz6hwuBsVDuvk5Ts/rv/59MO0HuO3XTGl4jf7+NVhJ+IZAJs4Ip4BAOBBVb/709Y+qTKYbY9OL4id9uoXbjv+zAvt3oqGTkU8A2AT4hkAAN2QzGZbeqXsGDhza9+vvz1nZfWbB/WDYBfiGQCbEM8AAOhuRDZ7sfekLT0n8HFZN0E8A2AT4hkAAN2K/P+e8XFZt0I8M4UbIhWWAkFzRDyjwuFuVDiso4pc43xFdcn6AjMfl7HpdiKembKZrxP9DEuBoDkinlHhcDcqHNZRRR7EptuJeGYKRamwFAga8QzoclQ4rKOKPIhNtxPxzBSKUmEpEDTiGdDlqHBYRxV5EJtuJ+KZKRSlwlIgaMQzoMtR4bCOKvIgNt1OxDNTuCFSYSkQNEfEMyoc7kaFwzqqyIPYdDsRzwDYxBHxDAAAoAsRzwDYhHgGAADgH/EMgE2IZwDgNVVVVTExMfpe5zt58mRcXJy+1zLxt6S+C95DPANgE+IZAHjN66+/PmXKFH2v87366qsZGRn6XiAUiGemcEOkwlIgaI6IZ1Q43I0Kh3UdqqKf/OQnixcv1vc635NPPrl06VJ9rwnTp08vLCzU93Z7Hdp0WEQ8M4WvE1VYCgTNEfGMCoe7UeGwrkNVNGfOnF/96lf6Xue78847N27cqO81IT4+/uTJk/rebq9Dmw6LiGemUJQKS4GgEc+ALkeFwzqjKqqsrLz33nsTExOvuuqqn/3sZ7Lz2muv3b9/v2h89NFHixYtGjJkyOWXX37jjTeeOHFCDvj444/j4uLE3w59+/b92te+9t5774nOmpqaK6+88rXXXktNTfX5fAkJCW2z0KlTp/r3768Oq6qqoqOjRaOiokI0Nm3aJF66T58+o0ePfvfddy89rZWfMUbnKeafPXu2eEXx7vLz85OTkw8dOuRnvGjcddddsbGxkZGRs2bNevvtt8U77aHx1FNPifdYUFDwla98JSkpSbzlK664Qj436DXpPEabjs5APDOFolRYCgSNeAZ0OSoc1rVbRWfOnBERRUSOs2fPHj9+fO7cuaLzk08+EUHiwoULIm+IPPP9739f5KK6urpHHnlk2rRp8on/9V//9etf/7qu1YYNG0ReEp3vvPOOSE133HGHmEo8fefOnTJ6ab300kszZsxQh3v37p0wYYJo7Nix47LLLrv11lvff//9v//971lZWePGjbv0tFZGY4zOs7a2VvQ//fTT4t399a9/zcjICA8PF+/OaLwwceLEZ555RgwQTxEX2bfccovoFOFq6tSpcoB4j+LvxEmTJr311luNjY3iUOQ0+VDQa9J52t10dBLimSkUpcJSIGjEM6DLUeGwrt0qWrRoUdt7sQ4ePDhq1CjRWLJkyX333af6GxoaIiIiLo3TiIqKEv/duHHjNddc889//lN2nj59OjIy8l/GtbSIUPTDH/5QHYoL2dmzZ4vGypUrv/rVr168eFH2i/QlopQaJhmNMTpP8dbEy6n+V155ZfTo0X7Gt7S+ERHnSkpK1KsIjz/++KOPPirb4j0OGjRIvLQ6vPPOO9VILfNr0nna3XR0EuKZKdwQqbAUCJoj4hkVDnejwmFdu1V09dVXnzp1SteZn59/9913i4bIIZf+VV8rGTlqamoee+wxEeGuuOIK2T9kyJCW1vi0fPlyNc9rr702efJkdSiJv1Nef/11dbhs2bJVq1aJxs033yyuaFX/sWPHBg8erA4lozFG5yke/eCDD9T4NWvWfPOb3/QzXti9e3dGRoY4HDhwoFgH2ZmZmbl161bZFu/xkUcekW15mJWV1WJtTTpPu5uOTkI8A2ATR8QzAEAQwsPDGxoadJ3f/e53f/SjH4mGz+dr+6iQmpoqUodIPvX19eLw2Wef/cY3viEa99xzj4o0QnZ2tjbJSJGRkWfOnJHt5ubm0aNHP//886KdkJDw9ttvq2FLliwRp6EOJaMxRufZp08f9TFXU1PT8OHDn3rqqRbj8Yo4scLCwn79+slDEdVKSkpkW7xHcfGtRqpDK2sCdyCeAbAJ8QwA3GrixImrVq3629/+duTIke9973uyc+rUqbt27RKNKVOmiPxTVVUlIsf+/fvnz58vv0Ljyiuv3L179yeffHLq1Kk1a9ZcccUVjz/+uOgfP378vn371OQ33XTT9u3b1aEUFRX185///MKFC6Wlpd/61rcuu+yyP/3pTxUVFaIxc+bM06dPnz17VoSoESNG1NbWap/oZ4zReY4bN+6xxx4TCU28uxkzZoin//a3v/UzXpzwK6+8IlZDPLRixQr1MZeIc0VFRbIt3uNbb70l29pDK2sCdyCeAbAJ8QwA3Orw4cPXX3993759x44d+84778jO2NhY+S8eT548efvttw8YMKBfv35i2M6dO+WATZs2DRo0SKSdkSNH5uTkiL8mZJwT0UsEp8/mbunfv3/bfzkprlzj4+PDw8NTU1Nfe+01EWNqamp27NiRkZHxxBNPxMTEiGfNnj1bBCTdE/2MMTrPd999d/To0X369LnmmmvEOUdHR8unGI0vLCycNGlSRETE1VdfLTJbdXW17M/Ozo6MjBR/FYp0J96j+vSvpfUty0MrawJ3IJ4BsAnxDADQqVauXPmDH/xA3/uvzIwBuhDxzBRuiFRYCgTNEfGMCoe7UeGwrjtX0c033xzwn/yZGQOd7rzp7kM8M4WvE1VYCgTNEfGMCoe7UeGwrjtXUUJCgvofQxsxMwY63XnT3Yd4ZgpFqbAUCBrxDOhyVDiso4o8iE23E/HMFIpSYSkQNOIZ0OWocFhHFXkQm24n4pkpFKXCUiBoxDOgy1HhsE5UUdf+6E8InY9ltxPxzBRuiFRYCgTNEfGMCoe7UeGwrmuriJzQJbp2072GeAbAJo6IZwCA7ox4BtcjngGwCfEMAGAR8QyuRzwDYBPiGQDAIuIZXI94BsAmxDMAgEXEM7ge8cwUbohUWAoEzRHxjAqHu1HhsK5rq4h41iW6dtO9hnhmCr8LFJYCQXNEPKPC4W5UOKzr2irq2lf3LJbdTsQzUyhKhaVA0IhnQJejwmFdwCpqqqkrWV9wvqJa/0AoBHx1dAaW3U7EM1MoSoWlQNCIZ0CXo8JhnZ8qOvO7oj03PrQ9ZurZPfv1j4WIn1dH52HZ7UQ8M4WiVFgKBI14BnQ5KhzWta2ippq6g9/L2x6Vvjls/LaI6zsvm7W09+qwActuJ+KZKdwQqbAUCJoj4hkVDnejwmGdtorO/K7odyn/Z0uvieLy/eW4Gwv6Z3RqNmshJ3QRfnXYiXgGwCaOiGcAgIAufVzWM0XkJfGzc2imDdmshXgGDyCeAbAJ8QwAXKDiN/tkJOuqH/0JAe5CPANgE+IZALhDU03dkR/9z8sJ018Mv05GpoKoKQXR6TZ8ega4HvEMgE2IZwDgMtVvHvzj9IdevCx1y+cmbut7PQkNsI54Zgo3RCosBYLmiHhGhcPdqHBY17aK1Idpm8PGb/V17jc3oku03XR0HuKZKfxDZ4WlQNAcEc+ocLgbFQ7r/FRR9ZsH38z8fqf+f8/QJfxsOkKOeGYKRamwFAga8QzoclQ4rAtYRU01dSXrC85XVOsfgGMF3HSEEPHMFIpSYSkQNOIZ0OWocFhHFXkQm24n4pkpFKXCUiBoxDOgy1HhsI4q8iA23U7EM1O4IVJhKRA0R8QzKhzuRoXDOqrIg9h0OxHPANjEEfEMAACgCxHPANiEeAYAAOAf8QyATYhnAAAA/hHPANiEeAYAAOAf8cwUbohUWAoEzRHxzDUVLpZa3wW4qMLRhagiD2LT7UQ8M4WvE1VYCgTNEfHMNRVOPEO7XFPh6EJUkQex6XYinplCUSosBYJGPLMT8Qztck2FowtRRR7EptuJeGYKRamwFAga8cxOxDO0yzUVji5EFXkQm24n4pkpFKXCUiBoLo5n4n2tXbs2KSkpJiZm0aJFTU1Nqn/Dhg2JiYlhYWHi8MKFCw899FB8fHxcXJxoiEM57B//+Mfy5csHDRokHhLzyM7m5ubVq1cPGTIkKipq3rx59fX1/vun5CFoAAAhGklEQVTFiz7wwAPR0dHDhg1bt24d8QztCq7CAS2qyIPYdDsRz0zhhkiFpUDQHBHPgqtw8b7S09NPtRKNVatWqf5Zs2adPn1aHooMJh492Wry5MkrVqyQ/Y8//rhYlg8//LCysvL++++XnTk5OWlpaaWlpbW1tXPmzFmyZIn//pUrV8pzkJMTz9Cu4Coc0KKKPIhNtxPxDIBNHBHPgiPe1+HDh2X7/fffHzZsmOovLy9Xw5KSktSw4uJiNezzn/+8OFTDpOTk5GPHjsl2VVXV4MGD/feL2bSTE88AAHAi4hkAm7g7njU2Nsq2aISHh6v+ixcvqmGiv91h2n7F5/P10OjZs6f/ft3kPYhnAAA4EPEMgE3cHc+OHDki24cPH9Z+enZpkPGnZ8OHD2/76dmIESPKysp0nS3G/WI2dQ7vv/8+8QwAACcingGwibvj2bRp0+S9ZxkZGeqmMl1GWrZsmbr3bMqUKVlZWbL/iSeeEMtSUlKivfcsNzdXDBaJq6GhoaioaObMmf77ly9frs5BDCCeAQDgRMQzU7ghUmEpEDRHxLPgKrxH6zc3Dh06NDo6WuQr9ZWMuozU2Nj44IMPxrUSDfVvET/55JMf/OAHiYmJCQkJzz33nOxsbm7Oy8tLTk6OiIgYN25cYWGh/37xogsXLhQnkJSUJCYhnqFdwVU4oEUVeRCbbifimSl8najCUiBojohnASu8qaauZH3B+YpqbSdZCE4RsMKBgKgiD2LT7UQ8M4WiVFgKBM3p8az6zYP/O3Pp9pipZ/fs1z1EPINT+KlwwCSqyIPYdDsRz0yhKBWWAkFzaDxrqqk7/PgvX467cXPY+K2+69tmsxbiGZyjbYUDHUUVeRCbbifimSkUpcJSIGiOi2fVbx78w9QHt1yWurnXxJf63VAQk95uNgMchN/hsI4q8iA23U7EM1O4IVJhKRA0R8QzUeHq47IXRTDrMV78FPSfSjaDO/A7HNZRRR7EptuJeAbAJo6IZxW/2bc14nqZyvjhx30/+ooHAHQzxDMANnFEPGtpvdns//5g3faYqVt6TZRXtDsG3lzQv51vBAEAAAgt4hkAmzglnilndr/7xnULtnxu0mb57xtJaAAAoJMRzwDYxHHxTFIfpm0OG78tov1vbgQAAAgJ4pkp3BCpsBQImiPimZ8KP7P73T/e9HC7/98zwCn8VDhgElXkQWy6nYhnpnA7tcJSIGiOiGcBK7yppq5kfcH5imr9A4ATBKxwICCqyIPYdDsRz0yhKBWWAkFzRzwDHI0Kh3VUkQex6XYinplCUSosBYJGPAO6HBUO66giD2LT7UQ8M4WiVFgKBI14BnQ5KhzWUUUexKbbiXhmCjdEKiwFguaIeEaFw92ocFhHFXkQm24n4hkAmzgingEAAHQh4hkAmxDPAAAA/COeAbAJ8QwAAMA/4hkAmxDPAAAA/COemcINkQpLgaA5Ip5R4XA3KhzWUUUexKbbiXhmCl8nqrAUCJoj4hkVDnejwmEdVeRBbLqdiGemUJQKS4GgeSqeiXeq7+oKHT2Njo6H44SqwuFlVJEHsel2Ip6ZQlEqLAWCRjyzX0dPo6Pj4TihqnB4GVXkQWy6nYhnplCUCkuBoDk6njU3N69evXrIkCFRUVHz5s2rr6+X/eId5efnjxo1KiIiIiUlpbi4WHYqAZ++YcOGxMTEsLAw2aO0O3OLwVQLFy785S9/qZ77i1/84v777297GlpvvPHG2LFjfT7fyJEjN23a1NLeaR8/fvzWW2+Njo6+8sorv/GNb1RXV8v+CxcuiFcU/UlJSWvXrlXj2z03dCtGFQ6YRxV5EJtuJ+KZKdwQqbAUCJoj4plRhefk5KSlpZWWltbW1s6ZM2fJkiWyX7yjzMzMsrIyEUWys7NTU1NV/6Un+336rFmzTp8+rR2sHmp35nan+uSTT66//votW7aItvivaIseOYlmyn+RkJCwbdu2xsbGo0eP3n333bJTN3706NG7d+8+f/78uXPnvvOd73z729+W/VlZWdOnTz/dKiMjQz2r3XNDt2JU4YB5VJEHsel2Ip4BsIkj4pmR5OTkY8eOyXZVVdXgwYNlW7yjyspK2W5oaPD5fKpfNiQ/Ty8vL1fDtIxmNppKtIcOHfroo4+K/4q27PQTzwYOHJiXl3fixAltp5/xdXV1iYmJsp2UlCRCnWwfPnxYPcvo3AAAgEnEMwA2cXQ8E+moh0bPnj1lvy7PqENdv5+nX7x4UTtSMZrZaCphxYoVoufpp59WPbpJtPbv35+ZmRkTEzN8+PBdu3bJTt34P//5z1OmTImKipKv1atXL9kfHh5+4cIF2W5sbFTP8nNuAADADOIZAJs4Op6NGDGirKxM39smz6hD3b1kJp+uZTSz0VQHDx5MTEzcvn37VVdd9cEHH8jOtre06YhwuHPnzvj4eHmoGz9s2DDxF0NNTc0///nP2tpadQ5Gn54ZnRsAADCJeAbAJo6OZ7m5uenp6UeOHGloaCgqKpo5c6bsNwpRAwYMEINVv8mnaxnN3O5U9fX111577Z49e0T7lVde+fKXv3z+/PmWNqehNWvWrAMHDjQ2Nop4lpCQIDt140VsKygouHDhQklJya233qrOYdmyZeres2nTpvk/NwAAYB7xzBRuiFRYCgTNEfHMqMKbm5vz8vKSk5MjIiLGjRtXWFgo+41CVE5OTmRkpDo0+XQto5nbnWru3Lnr169Xg9esWTNv3ryWNqehtX379jFjxvh8vrFjx+7evVt26sa/+uqrI0aM6N2796BBg8SLqn4R6hYsWBAVFTV06FDxWmKA7G/33NCtGFU4YB5V5EFsup2IZ6bwdaIKS4GgOSKeUeEddejQIRHS9L3orqhwWEcVeRCbbifimSkUpcJSIGjEMzdZvHhxZWVleXl5Wlraww8/rH8Y3RUVDuuoIg9i0+1EPDOFolRYCgSNeOYmubm5iYmJsbGx8+fP/3/tnQl0FVWax+PC6sIuIKtsRgVBRgVBBGxQYZR2wQUPTuvoaVzQdtRxxHYatUEHJCg6uIDIokSIYCSgMGpYBnhoNIZj4zl0ujHddscjZmiJsrfG+eDOXItbube+99599eq++v/O/+RUblXde+v7/rdefXnJy969e9XdIKrA4SB94KIYgqSHCcozFjClBKEAKYPyDICsA4eD9IGLYgiSHiYoz1jgDyIlCAVIGVfKs+xKnRAAVsE9HKQPXBRDkPQwQXkGAAgJJ8qz7ILyDAAAAIg5KM8AACGB8iwQlGcAAABAzEF5BgAICZRngaA8AwAAAGIOyjMAQEigPAsE5RkAAAAQc1CescAfREoQCpAyTpRn2XU4yjOQabLrcJAbwEUxBEkPE5RnLPDMJEEoQMo4UZ5l1+HZHR3EAXgMpA9cFEOQ9DBBecYCppQgFCBlUJ4Fkt3RQRyAx0D6wEUxBEkPE5RnLGBKCUIBUiY3yrODu2p3zCne92WNusMGgaMDkCbwGEgfuCiGIOlhgvKMBUwpQShAyrhentVs3Lr52offbDXy6/Xl6j5LGEYHwArwGEgfuCiGIOlhgvKMBf4gUoJQgJRxojzzO/zgrtrtBYtXdLp8yTHnv9FkSOZqsx/x+gcyj9/hACQLXBRDkPQwQXkGAAgJJ8ozLzUbt2688sGixhe+0eSiokaD32zxs4zWZj+iPAMAAABiD8ozAEBIuFKeybfLlp04dOkxA6hkWtZ0SAi12Y8ozwAAAIDYg/IMABASTpRnX65OUI2URakTAgAAAECcQHkGAAgJJ8oz4uD/7P5owpPLTh6+5MhbZ6Q1vce91eaSEN49AwAAAEDMQXnGAn8QKUEoQMo4UZ55HV69YsOafjctOXYgVWgrO49BhQZyANzDQfrARTEESQ8TlGcs8BtHEoQCpIwT5Znf4Z43085f1nQoKjTgNH6HA5AscFEMQdLDBOUZC5hSglCAlHG0PJNUr9iwbuTdGf2/ZwBkGoPDAWACF8UQJD1MUJ6xgCklCAVIGdfLM8HBXbU75hTv+7JG3QGACwQ6HIBA4KIYgqSHCcozFjClBKEAKZMb5RkATgOHg/SBi2IIkh4mKM9Y4A8iJQgFSBlxu2nevPnQCDO6ax+1CYAcAg4H6QMXxRAkPUzoSQnlGQAgDIYeKc8AAAAAAIAZlGcAgIwza9asYf9Pv3796L5zxhln5OfnnwUAAAAAADzcfPPNKM8AAOGRSCRKSkoKCwsXAAAAAACA+qAnJXpeoqemqqoq+RCF8gwAYJ+KiorS0tLi4mK67ywEAAAAAABHQ89I9KREz0v01FRdXS0folCeHQafhyFBKIAVKisry8rK6I5TUlJSFCWWXnuv2gRADgGHg/SBi2IIkp4V6BmJnpToeYmemmpqfvqPPijPDoOPE5UgFMAK1dXVdK+pqKhIJBKlUYIcrjYBkEPA4SB94KIYgqRnBXpGoiclel6ip6ba2lr5EIXy7DCoSSQIBbAC3WVqamrodlNVVVUZJcjhahMAOQQcDtIHLoohSHpWoGckelKi5yV6ajpw4IB8iEJ5dhjUJBKEAuQ2cDjIbeBwkD5wUQxB0iMFyrPDwJQShALkNnA4yG3gcJA+cFEMQdIjBcqzw+DzMCQIBcht4HCQ28DhIH3gohiCpEcKlGcAAAAAAAAAEAlQngEAAAAAAABAJEB5BgAAAAAAAACRAOUZAAAAAAAAAEQClGeHwR9EShAKkNvA4SC3gcNB+sBFMQRJjxQWyrND33y7c12501qSd76/Mfo6tPs7NRk+ks0OJxSccQFQSNaKGRLH4RkSFo4tIuKlaCqLDo+mHFp30TF2dl3ESVl0YpUzym7Sc0kcAwdioTzbeSSpUPj6en25mgwfmcgOZ1wAFDJhRbeEhWMLeAniy6F1B2MLcVKGWEGRFcfAgVgrz7Y/PWPnuiVQONo+cwbTAXazwx8XAAW7VnRLWDh2ibOXIL6cW3cwNj9liBUUQfENHIi18oymVVf3CRSOvlq7hOkAu9nhjwuAgl0ruiUsHLvE2UsQX86tOxibnzLECoqg+AYOBOWZkxIOWDNzbiKRqKioqKysrK6urq2tVXNjOzv8cQFQsGtFt4SFY5c4ewniy7l1B2PzU4ZYQREU38CBoDxzUsIBRY8WlJSUlJaWlpWVkQlqamrU3NjODn9cABTsWtEtYeHYJc5egvhybt3B2PyUIVZQBMU3cCAoz5yUcMCrk54oLCwsLi4mE1CZTjW6mhvb2eGPC4CCXSu6JSwcu8TZSxBfzq07GJufMsQKiqD4Bg4E5ZmTEg5Y9NDUBQsWkAmoTE8kElVVVWpubGeHPy4ACnat6JawcOwSZy9BfDm37mBsfsoQKyiC4hs4EJRnTko4YOnkGeSAhQsXFhUVUY1eWVmp5sZ2dvjjAqBg14puCQvHLnH2EsSXc+sOxuanDLGCIii+gQNBeeak+A6wmx3+uAAo2LWiW8LCsUucvQTx5dy6g7H5KUOsoAiKb+BAUJ45Kb4D7GaHPy4ACnat6JawcOwSZy9BfDm37mBsfsoQKyiC4hs4EJRnkVZeXp6/sS4ZB9jNDn9cABTsWtEtYeHYJc5eclryFU330qZrT03OrbvcMDYnibpj+CnLjVhlRbrgm3dFX1GYPN/AgWS2PKNgDRzYx98+YEBvGcf9+z+YOnXimWd2a9q0cceObceOHbFx4yvydD/+3tKUv899+z547LE7aEqNGzds37716NEXrl07x38iX/4hmNKdyHeAITspiD8uAAoGK+ZZulE0atSwZ8/Ojzxy2969W/y9ZVFYOHaJlZfMs/Ufnzl1797xd797Q35bVDSdJvDGG0/Jlm3blvXo0cl/opScsG7muvbU5Ny6y4qxOT0nJc5ZumP4KctQrGSg/Pg7jJqYkzQcZtglpQsd83T+YVIFBfeTb59++gH/Lq+S7dardM71im/gQDJenuXnd123bq63kUodapSxuOmmf7z++ks++2w5FUWff77q1Ven0BKSp/v7tC5lFHLeoEF9b7llDL3SHDjw4Z//vPqtt54eMuQc/4l8pXwhuhP5DjBkJwXxxwVAwWBFWzcKWrzl5YXDhp17553X+UfJorBw7BIrL3FmG47uuuu6p576F/nt3Xff0Llzu4kTr5ctzz77b95v/ZITDmfmzq27rBib03NS4pylO4afsszFytuP0hJxMSdsOMywS8oQOs7p/MOk+vbtNXfub/r1O92/y6tku/UqnXO94hs4kIyXZ4sXPzFq1GBv42WXDSosfFLGokmTRn/72wb/ueJ0f+NXX73fqlUz7080abtly2Y7d5bSNpVSlEKqs7t16/D443ceOvSR7GrFimcuuODsZs1OPOWUluPHj66pWSfavVDL1KkTr7xyuH9cqRde+HX37h0bNDievr700iOynT8EfZ0z5987dmx7zDHHBPbpn0BdMg4wZCcF8ccFQMFgxTyrN4ovvljdtm0r+a3hnuBdhpWVK2jht2nT4sQTm9IqXrlyluzBsDzrXfJ+YeHYJVZe0s1WvKBIqGX79uJrrvkZvRpSJ1ddNfzrr9fKg1988ZGuXU+lcXv27Ezx8V6m7qL8ogsZOXKg/JaemZ5//uHevXvIFhp01apn6/QzkeN6J5BILGzXrtXs2ZOUA3QBqTNejlfOrbusGJvTc53euqR58x4l89SbDp270k9Z5mLl7cff4l3pBp/r3Ku7OdApr7029eyze9LEKFavvPKod1xd8L3zyTsa8/R0Y4kThXS504WOOQH/YYaxSJ988vrgwf3qjtxwKiqOSrfOePWOK4au98KTmlKe7wHeK76BA8l4efb99x+feWa3rVuXihYK7llndadGGYLTTuuwadN8/7nidH8j6fLLh1CI5bdUu48ZM5Q2Nm58heJOX/fsSdAauOSSC6ZMuUt2RdN4//2Xvv1201//+l833jhq3LjL6h2lT58emzcv8LZ4tXx5AWWF+qmt3UhfaZsWYbJD0LfDh5/3pz+9w+nTe6IU3wGG7KQg/rgAKBisaPdG4X3yMN8TvMuwf//8GTPu27VrPS3DDRvmXXrpBaLdvDx1S14RFo5dYuUl/mxpeqWlL+3du+Wbb/574sTrb7vtKtFOj4BUzKxbN5c6p69durSXJxouyi86hh536Ctt0/MZPf0cOPAhtYinH4rwqae2EXt1M5Hjyo033zwcEzrYf4AuIIbLUeTcusuKsTk9G6y7evVsmY61a+d07tyO4670U5a5WHn78bd4V7rB5zr36m4OdAo52RvGNWtmi12G4CvzUSZsmJ5uLE7uDKHjT8B7mGEs0j33jKPSizZmzXrw3ntvlO0G4xnGDbxwIcOUlJgr4hs4kIyXZ/T19df/Q1rzhhsuXbJkmtxVd+Tu3Lp182uvHfnMM/9KddHf//6x93Q/dUd+5d37M7wRIwaIX3+njbKy12Q73YDk78HTieXlhXKXeAtO7pLtpMaNG9LK8bZ4NWhQX5qw/JaWjSjr65IZgr6Vd426oD69J0rxHWDITgrijwuAgsGKwufp3CjEBj0s0svwxRefd/vtY0WL+Z7gXYYnnXQC7ZXfSpmXp27JK8LCsUusvMSZrV+7d2+kxzixPWTIOSUlP72DR8928kTDRdUrOv7tt58TnVxxxUW0MXr0heL19+OPC+khxn+KdyZyXLHx3HMP9enT4w9/KJEHew/QBcRwOYqcW3dZMTanZ4N1L7qov6wW6o7MgeOu9FOWuVgp/Sgt3pXuleJznXt1N4e8I2+4yW9pekOH/oPYNgRfmY9/wlLK9HRjcXJnCB1/At5dhrEOHiyjuppMS9v0ZN6pU1tqEbsMxvMq2QsXMkzJ4IG6ZAwcSBjl2ffff9y3b68dO1aSaOOHH8rlLqGamnULFjxONW7//vlUl2/Zssh7ul/7939A5hAWp6+0LZJHG8cddyyJEG/10rbsiqbh7UR2roxiLs9atDjZu5e2qUVs84egb8WEhcx9ek+U4jvAkJ0UxB8XAAWDFdO/UQgaNmzQvXvHhx66RfwIvy7onuBdhnQWHTxhwjU0RHX1u7LdvDx1S14RFo5d4uYlw2y9p1RVvX311Re3adNCXIKcHo3i/WUkGleeaLioejVjxn333DOONh544J8KCu6njWnTfiX+3mz69HtFS51+JnJc2pg8eQI9d9bWbvT27z1AFxDD5Shybt1lxdicng3WbdmymS4dBneln7LMxUrpR2nxrnSDz3Xu1d0c6AAljBRYsW0IvjIfZcKG6enGkj0YclenDx1/At7DDGNRLfrww7fKI6neLi6eKbYNxjOMG3jhQoYp5R0dc0V8AwcSRnlGWrp02p13XnfHHdcWFU1XdilavPgJqpXNx5Buv33s1KkTaWPKlLuoW9FIlZXX7l75u5Ityi7zLzf614kuu94WZZfybVJ9CvEdYMhOCuKPC4CCwYqZu1EkdU/YunUpPWuOHTuClqR80ExqefpbhLBw7BJnLxlmO2zYufTw95e/rDl06KN9+z6Qe5V6hrblLsNF1att25b16tWFNs477yzx/sCHH74q/vxs1KjBn322XBymm4l3Y+3aOaec0lL8rZqU/0j/LsPlKHJu3WXF2JyeDdY1VMsGd+nmw09Z5mLl70fXEujzek+s9+aQp68cDMFXBuJPTzcWJ3eKDDYzTMB7mGGsMWOG5h2N/GwIg/EM4wZeuJBhSsqRivgGDiSk8uyHH8rPP783SfwAw7tL0S7Ge0ckqqBOP70rbdBXWbgPHtzv+ecf9h9cV19XsuX444/zvjlL9Z7ho0EGDeora/e6I++NGn4RUTeEcmRSfQrxHWDITgrijwuAgsGKmbtRJHVPkNqxY2WzZieK7aSWp79FCAvHLnH2kne2yivLCSc0+fbbTWJ7/fqXZQ/KbwPSttxluCidunRp/+mnRW3atBDvD9AEmjc/6csv3/N+RohuJspGWdlr7du3Lix8Up7oP9K/y3A5ipxbd1kxNqdng3UNv2NmcJduPvyUZS5W/n50LYE+150o5L055Pl+744CK7YNwVe6Zd4QDGNxcqcohTuScphurJ07Syk+3jfYd+/eKP/Y1WA83biGC2dOSXTib5TiGziQkMozv+SuAQN6L1o05Y9/XLl//we///1b48Zd9otfXBF4OqlXry4FBfeLn+QJvffei1QKz5//WE3NOsrr228/N3z4ebquZEu3bh1Wr54t34mmUnvgwD633nrltm3LDh4s++KLwx+sL1O4fHlB587t1q6dI/+y0Ps3mswhlCOT6lOI7wBDdpT+ddte8ccFQMFgRZ3fvLtSu1Hw7wnDhp27atWzdN+nZTh79qRzzz1TtCe1PP0tQlg4domVlwyzVV5Zzjknn14T9+xJfPTR4jPOOE32QAXMaad12LBh3nffbaavtC13GS5Kp1/+8uqrrhr+858Pky2jR194333jJ0y4RrboZuLfoNfZTp3avvDCr3UHSHEuR5Fz6y4rxubsMliXPKP7hAaDu3SD8lOWuVj5D9a1BPrcf6Lu5kAHKGF8553/FLsMwVcGYt4QDGNxcmcIHXMCymG6sejc8eNHi2OkbrxxlPgHaAbj6cY1XDhzSqITZUpe8Q0cSPbLs02b5l933cgOHU5p0qRRz56dJ036Z++vRPuRPfz2t3c1aHA8ffV2S3GnIFLpTNX8yJED339f/TwoKdmybNkMur8fd9yxsmXv3i2TJ0/Iz+/aqFHDdu1aKf+Wmkrq7t07Uqnt/4RT5hD+I/l9CvEdYMiO0r9u2yv+uAAoGKyo85t3l/lG4T9RinlPoNvxiBEDTj75hNatm1999cU7dqyUu/jL098ihIVjl1h5yTBb5ZWlvLywf//8hg0b0GPHrFkPevuk+qdLl/b0itmjR6d58x6lY+Qu3UXpJH5KPXPmT/8idvr0e2lub3o+vUA3E/8G6fPPV9GsnnzyHt0B/hbD5Xjl3LrLirGZu3TWJc2d+xvxfw4oHcoH6+vcpRuUn7LMxcp/sK4l0Of+E3U3hzzPZ77Ton755cne03XBVwZi3hAMY3FyZwgdcwL+p+56x+rbtxeFS85H6N13X5D/AE1nPN24hgtnTkl0Is/yi2/gQDJbnkEZEt8BdrPDHxcABbtWdEtYOHaJs5fS1+bNC/Lzu/rbHZXhcpxbdzA2P2U5FivzQz9kRSEEmW/gQFCeOSm+A+xmhz8uAAp2reiWsHDsEmcvpabx40d/+mnRnj2JLVsWnX12z2nTfuU/xiExL8e5dQdj81OWY7EKoXKAQggy38CBoDxzUnwH2M0Of1wAFOxa0S1h4dglzl5KTfPnP9a7d4+mTRvn53ctKLhf+dRvv/Lqw39YtsS8HOfWHYzNT1mOxSpS6ytXFUKQ+QYOBOWZk+I7wG52+OMCoGDXim4JC8cucfYSxJdz6w7G5qcMsYIiKL6BA0F55qT4DrCbHf64ACjYtaJbwsKxS5y9BPHl3LqDsfkpQ6ygCIpv4EBQnjkpvgPsZoc/LgAKdq3olrBw7BJnL0F8ObfuYGx+yhArKILiGzgQlGdOiu8Au9nhjwuAgl0ruiUsHLvE2UsQX86tOxibnzLECoqg+AYOBOWZk+I7wG52+OMCoGDXim4JC8cucfYSxJdz6w7G5qcMsYIiKL6BA7FWnm2fOYOmBYUjijbTAXazwx8XAAW7VnRLWDh2ibOXIL6cW3cwNj9liBUUQfENHIi18gwKXxwHZCI7nHEBUMiEFd0SFo4t4CWIL4fWHYwtxEkZYgVFVhwDB2KhPDu0+7uv15cLrZk5t+jRglcnPbHooak0Pyizmr8o0AEZyQ5jXAAUMmJFt4SFYwl4CUpC7qw7GPv/xEgZYgVFVwwDB2KhPPOSSCRKSkoKCwsXgLCgaFPMKfJVVVVqPo7Gbnb44wKgYNeKboGFY5c4ewnwcW7dwdj8lCFWIILwDVwvlsuziooKqhSLi4tpWgtB5qE4U7Qp5hT56upqNR9HYzE7SY0LgIJFK7oFFo51YuslwMfFdRdzYyeVspjHCkSQpAxcL5bLs8rKyrKyMpoQlYxFIPNQnCnaFHOKfE1NjZqPo7GYnaTGBUDBohXdAgvHOrH1EuDj4rqLubGTSlnMYwUiSFIGrhfL5RnViDQVKhYTiUQpyDwUZ4o2xZwiX1tbq+bjaCxmJ6lxAVCwaEW3wMKxTmy9BPi4uO5ibuykUhbzWIEIkpSB68VyeUaToDKRZlNVVVUJMg/FmaJNMafIHzhwQM3H0VjMTlLjAqBg0YpugYVjndh6CfBxcd3F3NhJpSzmsQIRJCkD14vl8gwAAAAAAAAAQGqgPAMAAAAAAACASIDyDAAAAAAAAAAiwf8CcGbO/EwvkxQAAAAASUVORK5CYII=" class="uml" alt="uml diagram" title="" />
+
                 
           
           
diff -Nru sumo-1.17.0/docs/userdoc/Developer/Implementation_Notes/Sumo_Modules.html sumo-1.18.0/docs/userdoc/Developer/Implementation_Notes/Sumo_Modules.html
--- sumo-1.17.0/docs/userdoc/Developer/Implementation_Notes/Sumo_Modules.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Developer/Implementation_Notes/Sumo_Modules.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -166,7 +166,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/Developer/Implementation_Notes/Vehicle_Models.html sumo-1.18.0/docs/userdoc/Developer/Implementation_Notes/Vehicle_Models.html
--- sumo-1.17.0/docs/userdoc/Developer/Implementation_Notes/Vehicle_Models.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Developer/Implementation_Notes/Vehicle_Models.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -176,7 +176,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/Developer/index.html sumo-1.18.0/docs/userdoc/Developer/index.html
--- sumo-1.17.0/docs/userdoc/Developer/index.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Developer/index.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -180,7 +180,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -221,7 +221,7 @@
 Developer/GUI Testing - information about how to set up "interactive" GUI Tests with PyAutoGUI
 Developer/Debugging - information about debugging SUMO
 Developer/Exploring the structure - explore the structure of SUMO with the doxygen documentation
-Inline code documentation (doxygen)
+Inline code documentation (doxygen)
 Developer/Used Tools - tools used for developing SUMO
 Developer/Managing Publications - how to work with the publications bibtex-file
 Developer/FMI - information about the current state of the FMI 2.0 support in SUMO
@@ -285,7 +285,7 @@
 
         
           
-            
This page was last edited on: 29 March 2023
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Developer/Managing_Publications.html sumo-1.18.0/docs/userdoc/Developer/Managing_Publications.html
--- sumo-1.17.0/docs/userdoc/Developer/Managing_Publications.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Developer/Managing_Publications.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -165,7 +165,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -198,7 +198,7 @@
                   
 
 Publications are stored in an extended
-bibtex-file
+bibtex-file
 generated using JabRef.
 Organising#
 JabRef allows not only to enter your
@@ -237,7 +237,7 @@
 
         

           
-            
This page was last edited on: 11 February 2021
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Developer/Maven.html sumo-1.18.0/docs/userdoc/Developer/Maven.html
--- sumo-1.17.0/docs/userdoc/Developer/Maven.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Developer/Maven.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -168,7 +168,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/Developer/Network_Building_Process.html sumo-1.18.0/docs/userdoc/Developer/Network_Building_Process.html
--- sumo-1.17.0/docs/userdoc/Developer/Network_Building_Process.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Developer/Network_Building_Process.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -215,7 +215,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/Developer/Nightly_Build.html sumo-1.18.0/docs/userdoc/Developer/Nightly_Build.html
--- sumo-1.17.0/docs/userdoc/Developer/Nightly_Build.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Developer/Nightly_Build.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -167,7 +167,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/Developer/PythonFileTemplate.html sumo-1.18.0/docs/userdoc/Developer/PythonFileTemplate.html
--- sumo-1.17.0/docs/userdoc/Developer/PythonFileTemplate.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Developer/PythonFileTemplate.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -181,7 +181,7 @@
 
 #!/usr/bin/env python # Leave this one out for non executable python files
 # -*- coding: utf-8 -*- # optional encoding line, use if non-ASCII characters are in the code
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) <YEAR OF CREATION>-<CURRENT YEAR> German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
@@ -223,7 +223,7 @@
 
         
           
-            
This page was last edited on: 11 February 2021
+            
This page was last edited on: 22 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Developer/Tests.html sumo-1.18.0/docs/userdoc/Developer/Tests.html
--- sumo-1.17.0/docs/userdoc/Developer/Tests.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Developer/Tests.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -196,7 +196,7 @@
     

 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -229,7 +229,7 @@
                   
 
 Introduction#
-We use TextTest to test whether the software
+
We use TextTest to test whether the software
 still behaves as expected. TextTest compares an application's file
 output, including the output to stdout and stderr with predefined
 outputs from files.
@@ -243,7 +243,7 @@
 At the moment all our tests run each night
 with the results on this summary webpage.
 Setup#
-We use TextTest 4.x as our testing environment which
+
We use TextTest 4.x as our testing environment which
 is Python based and currently available for Python 3. To install
 it on Linux / MacOS, you can open a terminal and type:
 pip3 install texttest
@@ -252,7 +252,7 @@
 For Windows you should download and run the installer from the
 SourceForge project page.
 It might not pull in all the dependencies, so in some cases you need
-to follow the TextTest installation
+to follow the TextTest installation
 instructions
 and the additional info there.
 For MacOS the following command should install all dependencies:
@@ -275,7 +275,7 @@
 pip3 install -r ***&lt;SUMO_HOME&gt;***/tools/requirements.txt
 Running the Tests#
 Within the  ***&lt;SUMO_HOME&gt;***/tests folder you can find batch files for Windows and shell files for Linux & macOS which start
-TextTest with our test suites. runAllTests.bat (Windows) or runTests.sh (Linux, macOS)
+TextTest with our test suites. runAllTests.bat (Windows) or runTests.sh (Linux, macOS)
 starts TextTest for testing all applications located in the folder,
 runNetconvertTests.bat (Windows) will only show tests for netconvert,
 runDuarouterTests.bat(Windows) only those for duarouter etc. For Linux and macOS you can do this via the
@@ -327,7 +327,7 @@
 
build a configuration file; its name is "config", the extension is
   the application's to test name, so in our case it's
   config.polyconvert. Please consult
-  TextTest documentation about the content,
+  TextTest documentation about the content,
   nonetheless, here are some notes
 do not forget the import of the main config file (config_all)
 name the binary correct
@@ -456,7 +456,7 @@
 
         
           
-            
This page was last edited on: 15 April 2023
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Developer/Translating.html sumo-1.18.0/docs/userdoc/Developer/Translating.html
--- sumo-1.17.0/docs/userdoc/Developer/Translating.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Developer/Translating.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -170,7 +170,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/Developer/Unit_Tests.html sumo-1.18.0/docs/userdoc/Developer/Unit_Tests.html
--- sumo-1.17.0/docs/userdoc/Developer/Unit_Tests.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Developer/Unit_Tests.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -167,7 +167,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/Developer/Used_Tools.html sumo-1.18.0/docs/userdoc/Developer/Used_Tools.html
--- sumo-1.17.0/docs/userdoc/Developer/Used_Tools.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Developer/Used_Tools.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -180,9 +180,9 @@
                   
 
 
-TextTest An acceptance test framework.
-UMLet Free UML diagrams drawing tool.
-Doxygen A class documentation utility.
+TextTest An acceptance test framework.
+UMLet Free UML diagrams drawing tool.
+Doxygen A class documentation utility.
 gtest (googletest) A unit-test framework.
 
                 
@@ -192,7 +192,7 @@
 
         
           
-            
This page was last edited on: 24 August 2021
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Developer/VisualStudioCode.html sumo-1.18.0/docs/userdoc/Developer/VisualStudioCode.html
--- sumo-1.17.0/docs/userdoc/Developer/VisualStudioCode.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Developer/VisualStudioCode.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -195,7 +195,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/Developer/XML_Validation.html sumo-1.18.0/docs/userdoc/Developer/XML_Validation.html
--- sumo-1.17.0/docs/userdoc/Developer/XML_Validation.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Developer/XML_Validation.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -168,7 +168,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -242,11 +242,11 @@
 files which are using Python. It seems as two are majorly used:
 
 lxml
-XSV
+XSV
 
 further candidates:
 
-xmlproc
+xmlproc
 minixsv
 
 A short comparison:
@@ -284,7 +284,7 @@
 
         
           
-            
This page was last edited on: 06 February 2023
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/dfrouter.html sumo-1.18.0/docs/userdoc/dfrouter.html
--- sumo-1.17.0/docs/userdoc/dfrouter.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/dfrouter.html	2023-06-28 22:08:56.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -193,7 +193,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -251,7 +251,7 @@
 Options#
 You may use a XML schema definition file for setting up a dfrouter
 configuration:
-dfrouterConfiguration.xsd.
+dfrouterConfiguration.xsd.
 Configuration#
 All applications of the SUMO-suite handle configuration options the
 same way. These options are discussed at Basics/Using the Command Line
@@ -662,7 +662,7 @@
 
         

           
-            
This page was last edited on: 24 April 2023
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/DiplomStudArb.html sumo-1.18.0/docs/userdoc/DiplomStudArb.html
--- sumo-1.17.0/docs/userdoc/DiplomStudArb.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/DiplomStudArb.html	2023-06-28 22:08:56.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -264,7 +264,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -304,7 +304,7 @@
 Die meisten der folgenden Themen lassen sich sowohl im Rahmen einer
 Master- oder Diplomarbeit als auch in reduziertem Umfang in einer
 Studien- oder Bachelorarbeit behandeln. Alle stehen mehr oder weniger
-direkt im Zusammenhang mit SUMO.
+direkt im Zusammenhang mit SUMO.
 Alle Themen sind ausdrücklich nur als Vorschläge gedacht. Falls jemand
 nach Kennenlernen der Software und der Anwendungsgebiete eigene
 Vorschläge zur Verbesserung und Erweiterung hat, die er/sie selbst
@@ -468,7 +468,7 @@
 
         

           
-            
This page was last edited on: 15 February 2021
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Downloads.html sumo-1.18.0/docs/userdoc/Downloads.html
--- sumo-1.17.0/docs/userdoc/Downloads.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Downloads.html	2023-06-28 22:08:56.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -160,7 +160,7 @@
     
         
             Contents
-            SUMO - Latest Release (Version 1.17.0)
+            SUMO - Latest Release (Version 1.18.0)
                 
                     • Windows
                 
@@ -214,7 +214,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -246,22 +246,22 @@
                   
                   
 
-SUMO - Latest Release (Version 1.17.0)#
-Release date: 25.04.2023
+SUMO - Latest Release (Version 1.18.0)#
+Release date: 29.06.2023
 Windows#
 Binaries (64 bit), all dlls needed, the examples,
 tools, and documentation in HTML format. For an explanation of the contents and the
 licensing (especially concerning the "extra" build which contains GPL code to support GeoTIFFs, shapefiles and 3D models), see the notes below.
 
-64-bit installer: sumo-win64-1.17.0.msi
-64-bit zip: sumo-win64-1.17.0.zip
-64-bit installer with all extras (contains GPL code): sumo-win64extra-1.17.0.msi
-64-bit zip with all extras (contains GPL code): sumo-win64extra-1.17.0.zip
+64-bit installer: sumo-win64-1.18.0.msi
+64-bit zip: sumo-win64-1.18.0.zip
+64-bit installer with all extras (contains GPL code): sumo-win64extra-1.18.0.msi
+64-bit zip with all extras (contains GPL code): sumo-win64extra-1.18.0.zip
 
 
 SUMO is also available via winget so winget install --name sumo should give you the latest release (but not the extra version).
 SUMO-Game#
-Windows binaries: sumo-game-1.17.0.zip
+Windows binaries: sumo-game-1.18.0.zip
 
 Linux#
 The community maintains several repositories notably at the 
@@ -290,28 +290,27 @@
 At the moment there is no documentation included in the packages. The
 repositories include a nightly build as well (called sumo-git).
 
-openSUSE Leap 15.2 repository
-openSUSE Leap 15.3 repository
-openSUSE Leap 15.4 repository
-openSUSE Tumbleweed repository
-Fedora 34 repository
-Fedora 35 repository
-Fedora 36 repository
-Fedora 37 repository
-Fedora Rawhide repository
-CentOS 7 repository
-CentOS 8 repository
+openSUSE Leap 15.2 repository
+openSUSE Leap 15.3 repository
+openSUSE Leap 15.4 repository
+openSUSE Tumbleweed repository
+Fedora 36 repository
+Fedora 37 repository
+Fedora 38 repository
+Fedora Rawhide repository
+CentOS 7 repository
+CentOS 8 repository
 
 Examples#
 Adding the repository and installing (the quick and dirty way without checking GPG keys!) looks like this, for yum on CentOS 7:
 yum-config-manager --add-repo=https://download.opensuse.org/repositories/science:/dlr/CentOS_7/
 yum install -y --nogpgcheck epel-release
-yum install -y --nogpgcheck sumo-1.17.0
+yum install -y --nogpgcheck sumo-1.18.0
 
 
 and like this, for zypper on openSUSE Leap 15.3:
-zypper ar http://download.opensuse.org/repositories/science:/dlr/15.3/ science:dlr
-zypper in sumo=1.17.0
+zypper ar https://download.opensuse.org/repositories/science:/dlr/15.3/ science:dlr
+zypper in sumo=1.18.0
 
 
 I you leave out the version number it will install the latest nightly build.
@@ -347,8 +346,8 @@
 Download the sources, examples, and CMake-files for creating Visual Studio
 solutions or Linux Makefiles. This download does not contain tests. Download as:
 
-sumo-src-1.17.0.tar.gz
-sumo-src-1.17.0.zip
+sumo-src-1.18.0.tar.gz
+sumo-src-1.18.0.zip
 
 
 Python packages / Virtual environments#
@@ -521,7 +520,7 @@
 function getInfo($fname, $type, $nightly){
 switch($type){
     case "r":
-    $file = "/releases/1.17.0/" . $fname;
+    $file = "/releases/1.18.0/" . $fname;
     break;
     case "d":
     $file = "/daily/" . $fname;
@@ -553,7 +552,7 @@
 
         
           
-            
This page was last edited on: 31 March 2023
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Driver_State.html sumo-1.18.0/docs/userdoc/Driver_State.html
--- sumo-1.17.0/docs/userdoc/Driver_State.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Driver_State.html	2023-06-28 22:08:56.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -170,7 +170,7 @@
     

 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/duarouter.html sumo-1.18.0/docs/userdoc/duarouter.html
--- sumo-1.17.0/docs/userdoc/duarouter.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/duarouter.html	2023-06-28 22:08:56.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -197,7 +197,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -280,7 +280,7 @@
 Options#
 You may use a XML schema definition file for setting up a duarouter
 configuration:
-duarouterConfiguration.xsd.
+duarouterConfiguration.xsd.
 Configuration#
 All applications of the SUMO-suite handle configuration options the
 same way. These options are discussed at Basics/Using the Command Line
@@ -812,7 +812,7 @@
 
         

           
-            
This page was last edited on: 05 January 2023
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Editing_Articles.html sumo-1.18.0/docs/userdoc/Editing_Articles.html
--- sumo-1.17.0/docs/userdoc/Editing_Articles.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Editing_Articles.html	2023-06-28 22:08:56.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -219,7 +219,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -437,20 +437,20 @@
 Math#
 In order to insert Mathematical expressions (symbols or equations), you should write them in LaTeX format. Math elements are being displayed as images, using a html <img> element.
 Just replace <HERE> with your math expression in the following html element:
-<img src="http://latex.codecogs.com/gif.latex?<HERE>" border="0" style="margin:0;"/>
+<img src="https://latex.codecogs.com/gif.latex?<HERE>" border="0" style="margin:0;"/>
 Example#
-<img src="http://latex.codecogs.com/gif.latex?R" border="0" style="margin:0;"/>
+<img src="https://latex.codecogs.com/gif.latex?R" border="0" style="margin:0;"/>
 
 
 will display:
-
+
 
 
-<img src="http://latex.codecogs.com/gif.latex?F(x)=\int^a_b\frac{1}{3}x^3" border="0" style="margin:0;"/>
+<img src="https://latex.codecogs.com/gif.latex?F(x)=\int^a_b\frac{1}{3}x^3" border="0" style="margin:0;"/>
 
 
 will display:
-
+
 


 Macros / Variables#
 In order to make writing this Documentation easier, we implemented some Macros. Macros replace some special text with other content.
@@ -463,7 +463,7 @@
 <SUMO_HOME>
 <FILE>
 <STRING>
-1.17.0
+1.18.0
 
 Note
 The full list of available Macros can be found here at the end in the extra section.
@@ -648,7 +648,7 @@
 
         
           
-            
This page was last edited on: 11 July 2022
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/FAQ.html sumo-1.18.0/docs/userdoc/FAQ.html
--- sumo-1.17.0/docs/userdoc/FAQ.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/FAQ.html	2023-06-28 22:08:56.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -486,6 +486,9 @@
                 
                     • How do I combine SUMO with a network simulator?
                 
+                
+                    • Can SUMO simulate V2V / V2X messages?
+                
             Validity
                 
                     • What are publications on SUMO's validity?
@@ -501,7 +504,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 

@@ -571,7 +574,7 @@
 Report bugs (crashes, surprising behavior) or invalid documentation
   at sumo-user
   or at https://github.com/eclipse/sumo/issues
-The main development team at the DLR is always
+
The main development team at the DLR is always
   looking for project partners. Contact us to
   discuss your proposals.
 Make your SUMO simulation scenarios publicly available
@@ -582,7 +585,7 @@
 Contribute to this wiki (contact us, so we can
   give you editing rights)
 Create a video tutorial and tell us about it
-Join us at the annual SUMO User Conference
+Join us at the annual SUMO User Conference
 
 How do code contributions work?#
 We need to make sure that you have the necessary rights on the code
@@ -756,7 +759,7 @@
 
I want to do a project with SUMO can you help me with the implementation?#
 Unfortunately, we do not have the resources to do other peoples
   projects for free.
-  Contact
+  Contact
   us for paid consultancy.
   We try to help out with bugs and give pointers to the relevant
   documentation but this free support is limited to what we can do in
@@ -861,7 +864,7 @@
 and simply type git pull.
 Is there further documentation on Git and Subversion?#
 There are the Git book and the
-  Subversion book and the GitHub help is also worth reading.
+  Subversion book and the GitHub help is also worth reading.
 How to get an older version of SUMO?#
 see
   Alternative download and older releases.
@@ -1158,7 +1161,7 @@
 
For more complex cases (i.e. large temporal gaps or spatial errors)
   the problem is known as Map Matching. Open source
   tools exist to facilitate this
-  (MatchGPX2OSM
+  (MatchGPX2OSM
   graphhopper).
 To exactly reproduce high-resolution trajectories, it is possible to
   map exact vehicle locations (including lateral positioning) and also
@@ -1407,7 +1410,7 @@
 
Building videos from sumo-gui#
 There are several ways to build videos from your SUMO simulation. You
 can use screen capturing tools like VLC Player
-[1]. The disadvantage of this approach is
+[1]. The disadvantage of this approach is
 the requirement of a (very) fast CPU to capture the video in real time,
 it depends on the chosen resolution and screen size of the simulation.
 The second approach needs a sumo-gui version which has support for
@@ -1428,8 +1431,8 @@
 

 
 Next you have to glue the images together. This job can be done
-graphically with virtualdub [2] or via
-commandline with ffmpeg [3]. An example command
+graphically with virtualdub [2] or via
+commandline with ffmpeg [3]. An example command
 for ffmpeg is shown below.
     ffmpeg -r 10 -i images/%d.png -b:v 1500k -vcodec wmv2 sumo.wmv
 
@@ -1445,9 +1448,9 @@
 process.wait()
 mechanism
 Incompatibility with DisplayLink devices#
-Drivers of DisplayLink devices are
+
Drivers of DisplayLink devices are
 incompatibles with Fox Library. If sumo-gui or netedit presents graphics
-problem like this
+problem like this
 during the execution, DisplayLink drivers must be uninstalled.
 Distorted view with green lines all over the network#
 If your sumo-gui looks like this
@@ -1527,9 +1530,13 @@
 As a work-around you can install a .deb package.
 (Communication) Network Simulators#
 How do I use .tcl files with NS2?#
-Questions regarding NS2 should be put to the NS2 mailing list.
+Questions regarding NS2 should be put to the NS2 mailing list.
 How do I combine SUMO with a network simulator?#
-Check out veins.
+Check out veins.
+Can SUMO simulate V2V / V2X messages?#
+Sumo does generally does not model messaging. The best way to do so is by managing the messages with connected code.
+  If you want to simulate the application layer and can work with the assumption that messages "just work", you can often handle the messages with your own (simple) TraCI code. If you need to simulate the physical process, using a network simulator is recommended (see above).
+  Sumo supports a vehicle device to log connectivity events but this is not designed to integrate with an application layer and aims only at logging.
 Validity#
 What are publications on SUMO's validity?#
 
@@ -1568,7 +1575,7 @@
 
         
           
-            
This page was last edited on: 03 April 2023
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Fun.html sumo-1.18.0/docs/userdoc/Fun.html
--- sumo-1.17.0/docs/userdoc/Fun.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Fun.html	2023-06-28 22:08:56.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -165,7 +165,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/Geo-Coordinates.html sumo-1.18.0/docs/userdoc/Geo-Coordinates.html
--- sumo-1.17.0/docs/userdoc/Geo-Coordinates.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Geo-Coordinates.html	2023-06-28 22:08:56.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -173,7 +173,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/GSoC.html sumo-1.18.0/docs/userdoc/GSoC.html
--- sumo-1.17.0/docs/userdoc/GSoC.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/GSoC.html	2023-06-28 22:08:56.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -242,7 +242,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/index.html sumo-1.18.0/docs/userdoc/index.html
--- sumo-1.17.0/docs/userdoc/index.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/index.html	2023-06-28 22:08:56.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -198,7 +198,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -354,6 +354,7 @@
 Safety
 Mesoscopic model
 Lengths and Distances
+Friction
 
 Common Problems#
 
@@ -425,7 +426,7 @@
 
         
           
-            
This page was last edited on: 21 April 2023
+            
This page was last edited on: 08 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Installing/index.html sumo-1.18.0/docs/userdoc/Installing/index.html
--- sumo-1.17.0/docs/userdoc/Installing/index.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Installing/index.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -178,7 +178,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -222,10 +222,10 @@
 package contains the binaries, all dlls needed, the examples, tools, and
 documentation in HTML format.
 
-Download 64-bit installer: sumo-win64-1.17.0.msi
-Download 64-bit zip: sumo-win64-1.17.0.zip
-Download 64-bit installer with all extras (contains GPL code): sumo-win64extra-1.17.0.msi
-Download 64-bit zip with all extras (contains GPL code): sumo-win64extra-1.17.0.zip
+Download 64-bit installer: sumo-win64-1.18.0.msi
+Download 64-bit zip: sumo-win64-1.18.0.zip
+Download 64-bit installer with all extras (contains GPL code): sumo-win64extra-1.18.0.msi
+Download 64-bit zip with all extras (contains GPL code): sumo-win64extra-1.18.0.zip
 
 Within the installation folder, you will find a folder named "bin".
 Here, you can find the executables (programs). You may double click on
@@ -235,7 +235,7 @@
 etc.) have to be run from the command line. To facilitate this there is
 also a start-commandline.bat which sets up the whole environment for
 you. If you feel unsure about the command line, please read
-Basics/Basic_Computer_Skills#Running_Programs_from_the_Command_Line.
+Running Programs from the Command Line.
 If you want a bleeding edge nightly build or need tests or source files,
 you can download them from the Download page.
 For building SUMO from source see building SUMO under Windows.
@@ -256,7 +256,7 @@
 
 
 Precompiled binaries for different distributions like openSUSE and
-Fedora can be found at these repositories for binary Linux versions.
+Fedora can be found at these repositories for binary Linux versions.
 These repositories contain nightly builds as well. In the case your
 system is not listed here or you need to modify the sources, you have to build SUMO from sources.
 SUMO's precompiled binary is also available as a Flatpak and is hosted on Flathub. Any system that supports Flatpak should be able to run SUMO this way. Install Flatpak and add the Flathub repository as directed here.
@@ -271,8 +271,8 @@
 
 Send bug reports regarding SUMO packaged as Flatpak here.
 macOS#
-SUMO can be easily installed on macOS by using Homebrew. If you did not already install homebrew, you can do so by invoking te following command in a macOS Terminal:
-/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install.sh)"
+SUMO can be easily installed on macOS by using Homebrew. If you did not already install homebrew, you can do so by invoking te following command in a macOS Terminal:
+/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
 
 
 Please make sure your homebrew installation is up-to-date:
@@ -289,6 +289,10 @@
 brew install sumo
 
 
+
+Note
+It is possible to install older vesions of SUMO using Homebrew. Running brew search sumo will list all available versions (v1.0.1 or newer). To install a specific version (e.g. version 1.9.0), just run brew install sumo@1.9.0.
+
 If you need to compile SUMO with support for other libraries, such as GDAL, you need to provide further command line options as described here.
 To finalize your setup, please make sure to set the SUMO_HOME environment variable and have it point to the directory of your SUMO installation. Depending on your shell, you may set this variable either in .bashrc or .zshrc. To set this variable in .bashrc you can use the following commands. 
 touch ~/.bashrc; open ~/.bashrc
@@ -359,7 +363,7 @@
 
         
           
-            
This page was last edited on: 31 March 2023
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Installing/Linux_Build.html sumo-1.18.0/docs/userdoc/Installing/Linux_Build.html
--- sumo-1.17.0/docs/userdoc/Installing/Linux_Build.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Installing/Linux_Build.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -169,11 +169,12 @@
                     • release version or nightly tarball
                 
             Definition of SUMO_HOME
-            Install python packages
+            Installing Python packages for the tools
             Building the SUMO binaries with cmake
             Building with clang
             Installing the SUMO binaries
             Uninstalling
+            Building Python wheels for sumolib, traci and libsumo
             (Frequent) Rebuilds
             Troubleshooting
                 
@@ -189,7 +190,7 @@
     

 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -300,7 +301,7 @@
 local project history.
 release version or nightly tarball#
 Download
-sumo-src-1.17.0.tar.gz or http://sumo.dlr.de/daily/sumo-src-git.tar.gz
+sumo-src-1.18.0.tar.gz or https://sumo.dlr.de/daily/sumo-src-git.tar.gz
 tar xzf sumo-src-<version>.tar.gz
 cd sumo-<version>/
 pwd
@@ -326,15 +327,22 @@
 
 
 and console shows "/home/<user>/sumo-<version>"
-Install python packages#
-Compiling netedit requires a list of python packages to generate templates. Install it using pip:
-pip install google lxml rtree pandas matplotlib pulp pyproj ezdxf scipy fmpy ortools texttest pyautogui pyperclip
-
-
-Or if you're using python3
-pip3 install google lxml rtree pandas matplotlib pulp pyproj ezdxf scipy fmpy ortools texttest pyautogui pyperclip
-
-
+Installing Python packages for the tools#
+Calling the tools from netedit requires a list of Python packages to generate templates during compilation.
+Many of them might be available with the package manager of your distribution and most of the time we prefer
+to use those. For ubuntu this currently means, you should first do
+sudo apt-get install python3-pyproj python3-rtree python3-pandas python3-flake8 python3-autopep8 python3-scipy python3-pulp python3-ezdxf
+
+
+and then install the remaining parts using pip:
+pip install -r tools/requirements.txt
+
+
+The pip installation will ensure that all libraries are there, so it is safe to skip the first apt-get step.
+If you need information about the minimum required versions of the packages read them directly
+from the requirements.txt. Be aware that
+the minimum versions in the requirements file just reflect our current test server setup, so you might also get away with earlier versions.
+You might need to replace pip with pip3 if you are using python3 on Linux.
 Building the SUMO binaries with cmake#
 To build with cmake version 3 or higher is required.
 Create a build folder for cmake (in the sumo root folder)
@@ -430,6 +438,31 @@
 sudo xargs rm -r $SUMO_HOME
 
 
+Building Python wheels for sumolib, traci and libsumo#
+If you want to distribute sumolib, traci and/or libsumo as wheels
+you can build those wheels directly from the tools tree. Please be aware
+that nightly builds of those packages are also available on https://test.pypi.org
+pip install wheel build
+cd tools
+python build/version.py build/setup-sumolib.py ./setup.py
+python -m build --wheel
+python build/version.py build/setup-traci.py ./setup.py
+python -m build --wheel
+python build/version.py build/setup-libsumo.py ./setup.py
+python -m build --wheel
+
+
+You will need a recent version of pip (>=22) for this to work. If for some reason
+you cannot update your pip you can also use the (discouraged!) method of calling
+setup.py directly.
+cd tools
+python build/setup-sumolib.py bdist_wheel
+
+
+Please note that you always need to be in the tools directory for this to work
+and your wheels will be placed in tools/dist. Furthermore the traci and the sumolib wheel
+are platform and Python version independent while libsumo depends on the exact
+platform and Python you built it with.
 (Frequent) Rebuilds#
 If you did a repository clone you can simply update it by doing git pull
 from inside the SUMO_HOME folder. Then change to the build directory and run
@@ -447,7 +480,7 @@
 
 
 
Solution:
-http://lists.danga.com/pipermail/memcached/2005-September/001611.html
+https://lists.danga.com/pipermail/memcached/2005-September/001611.html
 ld cannot find an existing library (Fedora-23)#
 Problem:
 /usr/bin/ld: cannot find -lfreetype
@@ -461,7 +494,7 @@
 
 
 For details see
-stackoverflow
+stackoverflow
 discussion.
 Additional notes for Cygwin users#
 At the moment GUI building is still troublesome. It depends whether you
@@ -480,7 +513,7 @@
 
         

           
-            
This page was last edited on: 21 April 2023
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Installing/Linux_Build_Libraries.html sumo-1.18.0/docs/userdoc/Installing/Linux_Build_Libraries.html
--- sumo-1.17.0/docs/userdoc/Installing/Linux_Build_Libraries.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Installing/Linux_Build_Libraries.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -190,7 +190,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -242,7 +242,7 @@
 working GCC (version 3.3 and up should suffice) and probably some basic
 libraries Fox depends on.
 It has been tested successfully on several SuSE Linux installations and
-with a recent cygwin. Everything that needs
+with a recent cygwin. Everything that needs
 extra work on cygwin is described in the cygwin
 section.
 
@@ -262,14 +262,14 @@
 We use the GNU autotools for generating configure and Makefiles for
 Unix-like environments. Documentation can be found in the
 
-GNU autoconf pages,
-Manual for autoconf,
+GNU autoconf pages,
+Manual for autoconf,
 Manual for
   automake,
 Manual for
   libtool, and
 the
-  Autobook.
+  Autobook.
 
 The Libraries#
 
@@ -388,7 +388,7 @@
 
 
 You need to download fox-toolkit from it's website and build manually
-http://www.fox-toolkit.org/download.html
+https://www.fox-toolkit.org/download.html
 Cygwin#
 Cygwin comes with a quite old xerces-c (version 2.5). After installing
 it you need to make a symbolic link in /usr/lib such that the linker
@@ -404,7 +404,7 @@
 
         

           
-            
This page was last edited on: 28 March 2021
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Installing/MacOS_Build.html sumo-1.18.0/docs/userdoc/Installing/MacOS_Build.html
--- sumo-1.17.0/docs/userdoc/Installing/MacOS_Build.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Installing/MacOS_Build.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -196,7 +196,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -232,7 +232,7 @@
 You may use one of two ways to build and install SUMO on macOS: Homebrew (recommended) and MacPorts.
 The Homebrew Approach#
 Prerequisites#
-The installation requires Homebrew. If you did not already install homebrew, do so by invoking
+The installation requires Homebrew. If you did not already install homebrew, do so by invoking
 /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install.sh)"
 
 
@@ -422,7 +422,7 @@
 
         
           
-            
This page was last edited on: 10 June 2022
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Installing/Windows_Build.html sumo-1.18.0/docs/userdoc/Installing/Windows_Build.html
--- sumo-1.17.0/docs/userdoc/Installing/Windows_Build.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Installing/Windows_Build.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -204,7 +204,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -294,17 +294,17 @@
 If you decide to use the Python which comes with Visual Studio
 Test start a python script and add association
 Add Python to the path (also the Scripts dir), find it at C:\Program Files (x86)\Microsoft Visual Studio\Shared\Python37_64
-Install pyautogui, matplotlib, rtree, pyproj, lxml, pipwin following the instructions https://docs.microsoft.com/en-us/visualstudio/python/tutorial-working-with-python-in-visual-studio-step-05-installing-packages?view=vs-2019
+Install pyautogui, scipy, rtree, pyproj, lxml following the instructions https://docs.microsoft.com/en-us/visualstudio/python/tutorial-working-with-python-in-visual-studio-step-05-installing-packages?view=vs-2019
 
 
-If not, use pip install pyautogui matplotlib pyproj lxml pipwin, possibly with the --user option if you don't have admin rights
+If not, use pip install tools\requirements.txt, possibly with the --user option if you don't have admin rights
 
 
-Run pipwin install rtree (or download Rtree from here and install it manually)
 (after 30 days) Setup a Microsoft account (if you do not already have one) and register your Visual Studio
 
 Further notes#
-If you need a different python version or want to test with multiple Pythons you can either install them directly from Visual Studio or Download Python for Windows and install it. Most SUMO tools should work with Python 2 and 3. Please make sure that you install the recommended python modules as explained above and that the PATH environment variable contains the directory where the desired Python interpreter is.
+If you need a different python version or want to test with multiple Pythons you can either install them directly from Visual Studio or Download Python for Windows and install it. Most SUMO tools should work with Python 2 and 3. Please make sure that you install the recommended python modules as explained above and that the PATH environment variable contains the directory where the desired Python interpreter is.
+If you want to build SUMO in Debug mode, then you will need the Python Debug binaries. The Python interepreter that comes with Visual Studio doesn't install these libraries by default (at least in the case of Visual Studio Community 2022); you need to install the Data Science stack in addition to the Python and C++ development stacks mentionned above. More precisely, the component you need is called Python native development tools, make sure you check the correct box.
 If you want to clone / checkout a special SUMO version, you can of course do it from the command line (if you have installed the command line tools)
 using git clone --recursive https://github.com/eclipse/sumo or download and extract a source package, see Downloads.
 The command for the Libraries is: git clone --recursive https://github.com/DLR-TS/SUMOLibraries. If you do not place the libraries in the same folder as SUMO, you will need to set the SUMO_LIBRARIES environment variable to the directory.
@@ -337,8 +337,9 @@
 32bits/xerces-c-3.2.0/bin. You can add both to the path but always add the
 64 bit version first.
 Install python packages#
-Compiling netedit requires a list of python packages to generate templates. Install it using pip:
-pip install google lxml rtree pandas matplotlib pulp pyproj ezdxf scipy fmpy ortools texttest pyautogui pyperclip
+For using the SUMO Python tools from the command line or in netedit it is recommended to install a list of python packages.
+From your SUMO directory you can install them using pip:
+pip install -r tools\requirements.txt
 
 
 Manual CMake configuration#
@@ -423,7 +424,7 @@
 repair your file associations or undefine HAVE_VERSION_H in
 src/windows_config.h.
 If you did install Python correctly, double check that it passes
-command line
+command line
 arguments.
 For a quick fix, you can also execute the following commands manually:
 tools\build\version.py
@@ -495,7 +496,7 @@
 
         
           
-            
This page was last edited on: 03 April 2023
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Installing/Windows_Libraries.html sumo-1.18.0/docs/userdoc/Installing/Windows_Libraries.html
--- sumo-1.17.0/docs/userdoc/Installing/Windows_Libraries.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Installing/Windows_Libraries.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -192,7 +192,7 @@
     

 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 

@@ -237,9 +237,9 @@
 
 Apache does not provide binary distributions any longer, but you can
   try our own build of Xerces-C 3.2.0 with an additional patch fixing
-  unicode problems in a 32 bit
+  unicode problems in a 32 bit
   version
-  or its 64bit
+  or its 64bit
   version
   for the 64bit build.
 Create a environment variable XERCES pointing to your xerces-c
@@ -257,10 +257,10 @@
 Fox#
 
 If you do not need a GUI, you can skip this section.
-Usually you do not need to build Fox yourself you can download the
+
Usually you do not need to build Fox yourself you can download the
 readily compiled
 binaries.
-If you insist, please download fresh
+
If you insist, please download fresh
 sources and do not use
 the incomplete package.
 Up to (and including) SUMO 0.10.3 (precisely up to svn revision
@@ -279,7 +279,7 @@
 Studio debugger) version. If you want to build for the 64bit
 platform you need to add a new configuration to the foxdll project
 using the
-Configuration Manager.
+Configuration Manager.
 You might get approximately 240 warnings and one error, which can
 probably be ignored as long as you can find the resulting DLLs in
 the lib dir.
@@ -301,8 +301,8 @@
 Warning: This is a little advanced, we were successful with libpng
 1.5.2 and 1.6.20 together with zlib 1.2.5 and 1.2.8
 download zlib sources and libpng sources from
-[1] and
-[2]
+[1] and
+[2]
 unzip all zips
 there is no need to build zlib
 build pnglib by first adapting the path in
@@ -328,7 +328,7 @@
 
Warning: This is a little advanced, we were successful with jpeg 8d,
 and 9b the jpeg 8c which can be found at the fox-toolkit site was
 broken
-download libjpeg sources from [4] and unzip it
+download libjpeg sources from [4] and unzip it
 download win32.mak and place it in the jpeg dir
 open a visual studio command prompt, cd to the jpeg dir and execute
 
@@ -356,9 +356,9 @@
 PROJ and GDAL#
 If you do not need transformation of geocoordinates you can disable PROJ
 and GDAL in
-build/msvc10/Win32.props
+build/msvc10/Win32.props
 and / or
-build/msvc10/x64.props
+build/msvc10/x64.props
 (remove the UserMacros lines referencing the relevant *.lib files and
 remove the Preprocessor definitions HAVE_PROJ and/or HAVE_GDAL) and
 skip this section. Otherwise you have the choice between downloading the
@@ -436,7 +436,7 @@
 
         

           
-            
This page was last edited on: 03 April 2023
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/IntermodalRouting.html sumo-1.18.0/docs/userdoc/IntermodalRouting.html
--- sumo-1.17.0/docs/userdoc/IntermodalRouting.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/IntermodalRouting.html	2023-06-28 22:08:56.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -170,7 +170,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -235,7 +235,7 @@
 In order to be included by in the public transport routing, flows (also vehicles or trips) must be defined
 with a public transport schedule.
 An example for a bus line and a person that may uses this line are given below:
-<routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd">
+<routes xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://sumo.dlr.de/xsd/routes_file.xsd">
     <flow id="bus" from = "beg" to ="end" line="bus" begin="0" end="1000" period="300">
                 <stop busStop="busStopA" until="10"/>
                 <stop busStop="busStopB" until="110"/>
@@ -290,7 +290,7 @@
 
         
           
-            
This page was last edited on: 20 March 2023
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/jtrrouter.html sumo-1.18.0/docs/userdoc/jtrrouter.html
--- sumo-1.17.0/docs/userdoc/jtrrouter.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/jtrrouter.html	2023-06-28 22:08:56.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -193,7 +193,7 @@
     

 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 

@@ -258,7 +258,7 @@
 Options#
 You may use a XML schema definition file for setting up a jtrrouter
 configuration:
-jtrrouterConfiguration.xsd.
+jtrrouterConfiguration.xsd.
 Configuration#
 All applications of the SUMO-suite handle configuration options the
 same way. These options are discussed at Basics/Using the Command Line
@@ -670,7 +670,7 @@
 
         

           
-            
This page was last edited on: 05 January 2023
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Libraries_Licenses.html sumo-1.18.0/docs/userdoc/Libraries_Licenses.html
--- sumo-1.17.0/docs/userdoc/Libraries_Licenses.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Libraries_Licenses.html	2023-06-28 22:08:56.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -229,7 +229,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -292,7 +292,7 @@
   License,
   includes std_truetype which is in the public domain
 
-RTree - Improved tiling for the drawing area#
+RTree - Improved tiling for the drawing area#
 
 Version: unknown (2003)
 Modifications: syntactic sugar for gcc compilation; different
@@ -323,12 +323,12 @@
 
Microsoft Software
   License
 
-Xerces-C++ - XML Parser#
+Xerces-C++ - XML Parser#
 
-Apache Software License
+
Apache Software License
   version 2.0
 
-FOX toolkit - GUI Widget Toolkit#
+FOX toolkit - GUI Widget Toolkit#
 can be omitted, but sumo-gui,
 netedit and multithreading won't work
 
@@ -337,7 +337,7 @@
   relinking exemption
 zlib - self made license, free also for commercial use and
   binary distribution
-libpng - self made license, comparable to
+
libpng - self made license, comparable to
   zlib
 libjpeg - self made license, free also for commercial use and
   binary
@@ -352,26 +352,26 @@
 
MIT derived license
 
 Optional#
-GDAL - Geospatial Data Abstraction Library#
+GDAL - Geospatial Data Abstraction Library#
 
-X11/MIT
+
X11/MIT
   License
 
-gl2ps - Printing screenshots as ps or pdf files#
+gl2ps - Printing screenshots as ps or pdf files#
 
 Used version: 1.3.9
-License: GNU Library General Public
-  License or GL2PS
+
License: GNU Library General Public
+  License or GL2PS
   License
 
-Open Scene Graph - 3D Graphics Toolkit#
+Open Scene Graph - 3D Graphics Toolkit#
 
-OpenSceneGraph Public
+
OpenSceneGraph Public
   License
 
-FFmpeg - Multimedia Library#
+FFmpeg - Multimedia Library#
 
-GNU Lesser General Public
+
GNU Lesser General Public
   License
 
 Google Test - C++ Unit Test Framework#
@@ -387,12 +387,12 @@
 are distributed under GPL and are not part of the SUMO download.
 Data and Documentation#
 Unless otherwise noted all documentation (including the files in this directory and below) and data
-files are licensed under the Eclipse Public License v2 just as the rest of SUMO.
+files are licensed under the Eclipse Public License v2 just as the rest of SUMO.
 3D models#
 All models in the data/3D directory originate from
-http://opengameart.org/content/vehicles-assets-pt1 and are in the
+https://opengameart.org/content/vehicles-assets-pt1 and are in the
 public domain
- This work is licensed under a Creative Commons CC0 1.0 Universal license. To the extent possible under law, the person who associated CC0 with this work has waived all copyright and related or neighboring rights to this work.
+ This work is licensed under a Creative Commons CC0 1.0 Universal license. To the extent possible under law, the person who associated CC0 with this work has waived all copyright and related or neighboring rights to this work.
 
 OpenStreetMap data#
 All test inputs which build upon OpenStreetMap data (mainly the osm.xml
@@ -400,7 +400,7 @@
 License.
 Fonts#
 Currently the Google Roboto
-font is included which is available under an Apache
+font is included which is available under an Apache
 License.
                 
           
@@ -409,7 +409,7 @@
 
         
           
-            
This page was last edited on: 31 March 2023
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Libsumo.html sumo-1.18.0/docs/userdoc/Libsumo.html
--- sumo-1.17.0/docs/userdoc/Libsumo.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Libsumo.html	2023-06-28 22:08:56.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -201,7 +201,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -247,9 +247,9 @@
   classes for results which can be linked directly to the client code
 Function signatures similar to TraCI
 Pre-built language bindings for Java and Python (using
-  SWIG)
+  SWIG)
 Support for other programming languages via
-  SWIG
+  SWIG
 
 Limitations#
 The following things currently do not work (or work differently than with the TraCI Python client):
@@ -387,7 +387,7 @@
 
         
           
-            
This page was last edited on: 31 March 2023
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Libtraci.html sumo-1.18.0/docs/userdoc/Libtraci.html
--- sumo-1.17.0/docs/userdoc/Libtraci.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Libtraci.html	2023-06-28 22:08:56.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -198,7 +198,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -246,7 +246,7 @@
 C++ interface based on static functions and a few simple wrapper
   classes for results which can be linked directly to the client code
 Pre-built language bindings for Java and Python (using
-  SWIG)
+  SWIG)
 Future support for other programming languages via SWIG
 
 Unlike Libsumo, Libtraci allows
@@ -363,7 +363,7 @@
 
         
           
-            
This page was last edited on: 31 March 2023
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/marouter.html sumo-1.18.0/docs/userdoc/marouter.html
--- sumo-1.17.0/docs/userdoc/marouter.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/marouter.html	2023-06-28 22:08:56.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -163,6 +163,9 @@
             From 30.000 feet
             Usage Description
                 
+                    • Capacity-constraint (volume-delay) function
+                
+                
                     • Microscopic Outputs
                 
                 
@@ -199,7 +202,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -268,13 +271,19 @@
 
 SUE: stochastic user equilibrium
 
+marouter reads OD matrices and creates route files. These route files
+contain route distributions between traffic assignment zones. Each route
+in the distribution is a fully specified list of network edges.
+Capacity-constraint (volume-delay) function#
 marouter uses a hard-coded capacity-constraint function based on speed
 limit, lane number and edge priority to compute traveltimes and flows
 based on density. For details, see functions
 capacityConstraintFunction and getCapacity in <SUMO_HOME>/src/marouter/ROMAAssignments.cpp.
-marouter reads OD matrices and creates route files. These route files
-contain route distributions between traffic assignment zones. Each route
-in the distribution is a fully specified list of network edges.
+By setting option --capacities.default, the following constraint function is used:
+capacity = edge->getNumLanes() * 800;
+travelTime = edge->getLength() / edge->getSpeedLimit() * (1. + 1.*(flow / (capacity * 0.9)) * 3.);
+
+
 Microscopic Outputs#
 One of the main usages of marouter is to compute a
 User Assignment.
@@ -301,7 +310,7 @@
 
Options#
 You may use a XML schema definition file for setting up a marouter
 configuration:
-marouterConfiguration.xsd.
+marouterConfiguration.xsd.
 Configuration#
 
@@ -793,7 +802,7 @@
 
         
           
-            
This page was last edited on: 05 January 2023
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Models/Electric.html sumo-1.18.0/docs/userdoc/Models/Electric.html
--- sumo-1.17.0/docs/userdoc/Models/Electric.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Models/Electric.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -189,7 +189,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -283,8 +283,8 @@
 
-
-
+
+
@@ -757,7 +757,7 @@
 following publication.
Publications#

-Kurczveil, T., López, P.A., Schnieder, E., Implementation of an
+
Kurczveil, T., López, P.A., Schnieder, E., Implementation of an
 Energy Model and a Charging Infrastructure in SUMO. In: Behrisch,
 M., Krajzewicz, D., Weber, M. (eds.) Simulation of Urban Mobility.
 Lecture Notes in Computer Science, vol. 8594 , pp. 33--43. Springer,
@@ -794,7 +794,7 @@
 
         
           
-            
This page was last edited on: 31 March 2023
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Models/ElectricHybrid.html sumo-1.18.0/docs/userdoc/Models/ElectricHybrid.html
--- sumo-1.17.0/docs/userdoc/Models/ElectricHybrid.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Models/ElectricHybrid.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -213,7 +213,7 @@
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
diff -Nru sumo-1.17.0/docs/userdoc/Models/Emissions/HBEFA3-based.html sumo-1.18.0/docs/userdoc/Models/Emissions/HBEFA3-based.html
--- sumo-1.17.0/docs/userdoc/Models/Emissions/HBEFA3-based.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Models/Emissions/HBEFA3-based.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,7 +1,7 @@
 
@@ -98,7 +98,7 @@
                                 ChangeLog
-                                Contact
+                                Contact
                             
 
@@ -171,7 +171,7 @@
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
@@ -217,7 +217,7 @@
 Vehicle Emission Classes#
The vehicle classes below map directly to vehicle classes supplied by
-HBEFA. This is a major difference to the
+HBEFA. This is a major difference to the
 clustering done with HBEFA
 2.1. Note, that within HBEFA
 these classes are aggregates of more specific vehicle classes. To use
@@ -442,7 +442,7 @@
 
         

           
-            
This page was last edited on: 11 February 2021
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Models/Emissions/HBEFA4-based.html sumo-1.18.0/docs/userdoc/Models/Emissions/HBEFA4-based.html
--- sumo-1.17.0/docs/userdoc/Models/Emissions/HBEFA4-based.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Models/Emissions/HBEFA4-based.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -183,7 +183,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -230,7 +230,7 @@
 
 Vehicle Emission Classes#
 The vehicle classes below map directly to vehicle subsegments supplied by
-HBEFA, the SUMO names just remove special characters.
+HBEFA, the SUMO names just remove special characters.
 The original name and the numeric HBEFA id are also given in the table below
 To use the emission classes below prepend the class name with the HBEFA4
 prefix, e.g. emissionClass="HBEFA4/PC_petrol_Euro-4".
@@ -11194,7 +11194,7 @@
 
         
           
-            
This page was last edited on: 15 June 2022
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Models/Emissions/HBEFA-based.html sumo-1.18.0/docs/userdoc/Models/Emissions/HBEFA-based.html
--- sumo-1.17.0/docs/userdoc/Models/Emissions/HBEFA-based.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Models/Emissions/HBEFA-based.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -171,7 +171,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -203,11 +203,11 @@
                   
                   
 
-"The Handbook Emission Factors for Road Transport
+
"The Handbook Emission Factors for Road Transport
 (HBEFA) provides emission factors for all
 current vehicle categories (PC, LDV, HDV and motor cycles), each divided
 into different categories, for a wide variety of traffic situations."
-(from http://www.hbefa.net/, 30.01.2008). Since version 0.10.2, SUMO
+(from https://www.hbefa.net/, 30.01.2008). Since version 0.10.2, SUMO
 is able to simulate vehicular pollutant emissions based on this database
 application. Though HBEFA contains information about other pollutants,
 we decided to implement only the following, major ones:

@@ -219,19 +219,19 @@
 PM_x
 fuel consumption
 
-We have remodeled HBEFA data for the following
+
We have remodeled HBEFA data for the following
 reasons:
 
 The goal was to have an emission model be directly embedded in SUMO,
-    HBEFA is a database application for itself
+    HBEFA is a database application for itself
 To allow computation of vehicular emissions on a continuous range as
-    the original HBEFA data cover certain
+    the original HBEFA data cover certain
     speeds only
 To avoid having the need to deal with all of
-    HBEFA's emission classes
+    HBEFA's emission classes
 
 Vehicle Emission Classes#
-The original vehicle classes supplied by HBEFA
+
The original vehicle classes supplied by HBEFA
 have been clustered. In order to improve the quality, passengers and
 light delivery vehicles have been clustered independent to heavy duty
 vehicles. For the first set (passenger and light delivery vehicles), two
@@ -801,7 +801,7 @@
 
         

           
-            
This page was last edited on: 11 February 2021
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Models/Emissions/PHEMlight5.html sumo-1.18.0/docs/userdoc/Models/Emissions/PHEMlight5.html
--- sumo-1.17.0/docs/userdoc/Models/Emissions/PHEMlight5.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Models/Emissions/PHEMlight5.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -201,7 +201,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/Models/Emissions/PHEMlight.html sumo-1.18.0/docs/userdoc/Models/Emissions/PHEMlight.html
--- sumo-1.17.0/docs/userdoc/Models/Emissions/PHEMlight.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Models/Emissions/PHEMlight.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -198,7 +198,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -241,7 +241,7 @@
 embedded into SUMO, was developed. The PHEMlight model is the result of
 this work. An in-depth description can be found in
 COLOMBO's deliverable
-D4.2. The model
+D4.2. The model
 received a major update to version 2.0.0.0 in the beginning of 2016
 which also used new names for all vehicle classes, most notably all
 classes now have an english prefix distinguishing passenger cars (PC_),
@@ -451,7 +451,7 @@
 The special class zero may be used to specify a vehicle without emissions.
 Further Resources#
 
-COLOMBO: Deliverable 4.2; Extended Simulation Tool PHEM coupled to
+
COLOMBO: Deliverable 4.2; Extended Simulation Tool PHEM coupled to
   SUMO with User
   Guide; February,
   2014
@@ -468,7 +468,7 @@
 
         
           
-            
This page was last edited on: 03 April 2023
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Models/Emissions.html sumo-1.18.0/docs/userdoc/Models/Emissions.html
--- sumo-1.17.0/docs/userdoc/Models/Emissions.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Models/Emissions.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -171,7 +171,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -207,13 +207,13 @@
 SUMO includes the following emission models:
 
 HBEFA v2.1-based: A
-  continuous reformulation of the HBEFA v2.1
+  continuous reformulation of the HBEFA v2.1
   emissions data base (open source);
 HBEFA v3.1-based: A
-  continuous reformulation of the HBEFA v3.1
+  continuous reformulation of the HBEFA v3.1
   emissions data base (open source);
 HBEFA v4.2-based: A
-  continuous reformulation of the HBEFA v4.2
+  continuous reformulation of the HBEFA v4.2
   emissions data base (open source);
 PHEMlight, a derivation of
   the original
@@ -230,9 +230,9 @@
   Area Mechatronics in Mobile Propulsion (MMP), RWTH Aachen
   University.
 
-Literature on the Models and their implementation can be found at the
+
Literature on the Models and their implementation can be found at the
 DLR electronic library
-(http://elib.dlr.de/89398/).
+(https://elib.dlr.de/89398/).
 Using Models#
 All models implement different vehicle emission classes. These classes
 can be assigned to vehicles by using the vehicle type attribute
@@ -406,9 +406,9 @@
 
 

 
-
+
 This part of SUMO was developed, reworked, or extended within the project 
-"AMITRAN", co-funded by the European Commission within the Seventh Framework Programme.
+"AMITRAN", co-funded by the European Commission within the Seventh Framework Programme.
                 
           
           
@@ -416,7 +416,7 @@
 
         
           
-            
This page was last edited on: 17 March 2023
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Models/MMPEVEM.html sumo-1.18.0/docs/userdoc/Models/MMPEVEM.html
--- sumo-1.17.0/docs/userdoc/Models/MMPEVEM.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Models/MMPEVEM.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -180,7 +180,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/netconvert.html sumo-1.18.0/docs/userdoc/netconvert.html
--- sumo-1.17.0/docs/userdoc/netconvert.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/netconvert.html	2023-06-28 22:08:56.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -237,7 +237,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -761,6 +761,10 @@
 

+
+
+
+
@@ -1023,6 +1027,10 @@
 
+
+
+
+
@@ -1395,6 +1403,10 @@
 
+
+
+
+
@@ -1520,6 +1532,10 @@
 
+
+
+
+
@@ -1536,6 +1552,10 @@
 
+
+
+
+
@@ -1628,7 +1648,7 @@
 
 
-
+
@@ -1798,6 +1818,10 @@
 
+
+
+
+
 
 internalMomentOfInertia
 float 0.01 (kg·m²) Mom. of inertia of int. rot. elements J_int 0.01 (kg) Not a moment, but the (equivalent) mass of internal rotating elements
 
 
 radialDragCoefficient
 
 
 
     
 
 
 
 
                             
                             
                         
 
     
 
 
 
 Allow merging edges with differing lane widths if the difference is below FLOAT; default: 0
 
 --geometry.remove.max-junction-size <FLOAT> Prevent removal of junctions with a size above FLOAT as defined by custom edge endpoints; default: -1

 --geometry.max-segment-length <FLOAT>
 splits geometry to restrict segment length; default: 0
 
Determines the maximal distance for joining traffic lights (defaults to 20); default: 20
 
 --tls.join-exclude Interprets STR[] as list of tls ids to exclude from joining

 --tls.uncontrolled-within <BOOL>
 Do not control edges that lie fully within a joined traffic light. This may cause collisions but allows old traffic light plans to be used; default: false
 
Use maximum value of incoming and outgoing edge speed on junction instead of average; default: false
 
 --junctions.minimal-shape <BOOL> Build junctions with minimal shapes (igoring edge overlap); default: false

 --internal-junctions.vehicle-width <FLOAT>
 Assumed vehicle width for computing internal junction positions; default: 1.8
 
Add turn-around connections at all loaded stops.; default: false
 
 --railway.topology.repair.bidi-penalty <FLOAT> Penalty factor for adding new bidi edges to connect public transport stops; default: 1.2

 --railway.topology.all-bidi <BOOL>
 Make all rails usable in both direction; default: false
 
Extend loaded edge priority values based on estimated main direction; default: false
 
 --railway.signal.guess.by-stops <BOOL> Guess signals that guard public transport stops; default: false

 --railway.access-distance <FLOAT>
 The search radius for finding suitable road accesses for rail stops; default: 150
 

 --osm.extra-attributes List of additional attributes that shall be imported from OSM via osm.all-attributes (set 'all' to import all); default: bridge,tunnel,layer,postal_code List of additional attributes that shall be imported from OSM via osm.all-attributes (set 'all' to import all); default: all
 
 
 --osm.speedlimit-none <FLOAT> --opendrive.lane-shapes <BOOL>
 Use custom lane shapes to compensate discarded lane types; default: false
 
--opendrive.signal-groups <BOOL> Use the OpenDRIVE controller information for the generated signal program; default: false
 
 

 Report#
@@ -1999,7 +2023,7 @@
 
         
           
-            
This page was last edited on: 24 April 2023
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Netedit/attribute_help.html sumo-1.18.0/docs/userdoc/Netedit/attribute_help.html
--- sumo-1.17.0/docs/userdoc/Netedit/attribute_help.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Netedit/attribute_help.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             

                             
-                                Contact
+                                Contact
                             
                         
 
@@ -354,7 +354,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -1173,6 +1173,11 @@
 angle[0, 360]
 The angle of the road-side parking spaces relative to the lane angle, positive means clockwise default: 0.00
 
+
+lefthand
+boolean
+Enable or disable lefthand position default: 0
+
 
 
 space#
@@ -2338,6 +2343,16 @@
 unique string
 The name of the junction the trip ends at
 
+
+fromTaz
+unique string
+The name of the TAZ the trip starts at
+
+
+toTaz
+unique string
+The name of the TAZ the trip ends at
+
 
 
 vehicle#
@@ -2604,6 +2619,16 @@
 The name of the junction the flow ends at
 
 
+fromTaz
+unique string
+The name of the TAZ the flow starts at
+
+
+toTaz
+unique string
+The name of the TAZ the flow ends at
+
+
 departEdge
 unique string
 The index of the edge within route the flow starts at
@@ -2628,12 +2653,17 @@
 
 id
 unique string
-The id of VehicleType
+type ID
 
 
-VTypeDist.
+typeDist.
 string
-Vehicle Type Distribution
+Type distribution
+
+
+typeDistProb.
+probability[0, 1]
+Type distribution probability default: 1.0
 
 
 vClass
@@ -2643,7 +2673,7 @@
 
 color
 color
-This vehicle type's color
+This type's color
 
 
 length
@@ -3381,7 +3411,7 @@
 
 triggered
 discrete string
-Whether a person or container or bth may end the stop default: 0
+Whether a person or container or both may end the stop default: 0
 
 
 expected
@@ -3429,6 +3459,11 @@
 BusStop associated with this stop
 
 
+trainStop
+list of unique strings
+TrainStop associated with this stop
+
+
 containerStop
 list of unique strings
 ContainerStop associated with this stop
@@ -3851,6 +3886,11 @@
 Id of the destination busStop
 
 
+toTrainStop
+unique string
+Id of the destination trainStop
+
+
 fromJunction
 unique string
 The name of the junction the person trip starts at
@@ -3898,6 +3938,11 @@
 unique string
 ID of the destination bus stop
 
+
+toTrainStop
+unique string
+ID of the destination train stop
+
 
 
 walk#
@@ -3932,6 +3977,11 @@
 Id of the destination bus stop
 
 
+toTrainStop
+unique string
+Id of the destination train stop
+
+
 edges
 list of unique strings
 id of the edges to walk
@@ -4252,7 +4302,7 @@
 
         
           
-            
This page was last edited on: 20 April 2023
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Netedit/editModesCommon.html sumo-1.18.0/docs/userdoc/Netedit/editModesCommon.html
--- sumo-1.17.0/docs/userdoc/Netedit/editModesCommon.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Netedit/editModesCommon.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -226,7 +226,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/Netedit/editModesData.html sumo-1.18.0/docs/userdoc/Netedit/editModesData.html
--- sumo-1.17.0/docs/userdoc/Netedit/editModesData.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Netedit/editModesData.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -195,7 +195,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/Netedit/editModesDemand.html sumo-1.18.0/docs/userdoc/Netedit/editModesDemand.html
--- sumo-1.17.0/docs/userdoc/Netedit/editModesDemand.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Netedit/editModesDemand.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -186,7 +186,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/Netedit/editModes.html sumo-1.18.0/docs/userdoc/Netedit/editModes.html
--- sumo-1.17.0/docs/userdoc/Netedit/editModes.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Netedit/editModes.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -165,7 +165,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/Netedit/editModesNetwork.html sumo-1.18.0/docs/userdoc/Netedit/editModesNetwork.html
--- sumo-1.17.0/docs/userdoc/Netedit/editModesNetwork.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Netedit/editModesNetwork.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -210,7 +210,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/Netedit/elementsAdditional.html sumo-1.18.0/docs/userdoc/Netedit/elementsAdditional.html
--- sumo-1.17.0/docs/userdoc/Netedit/elementsAdditional.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Netedit/elementsAdditional.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -207,7 +207,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/Netedit/elementsDemand.html sumo-1.18.0/docs/userdoc/Netedit/elementsDemand.html
--- sumo-1.17.0/docs/userdoc/Netedit/elementsDemand.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Netedit/elementsDemand.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -198,7 +198,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/Netedit/elements.html sumo-1.18.0/docs/userdoc/Netedit/elements.html
--- sumo-1.17.0/docs/userdoc/Netedit/elements.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Netedit/elements.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -204,7 +204,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/Netedit/elementsNetwork.html sumo-1.18.0/docs/userdoc/Netedit/elementsNetwork.html
--- sumo-1.17.0/docs/userdoc/Netedit/elementsNetwork.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Netedit/elementsNetwork.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -180,7 +180,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/Netedit/elementsShape.html sumo-1.18.0/docs/userdoc/Netedit/elementsShape.html
--- sumo-1.17.0/docs/userdoc/Netedit/elementsShape.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Netedit/elementsShape.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -174,7 +174,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/Netedit/elementsTAZ.html sumo-1.18.0/docs/userdoc/Netedit/elementsTAZ.html
--- sumo-1.17.0/docs/userdoc/Netedit/elementsTAZ.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Netedit/elementsTAZ.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -165,7 +165,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/Netedit/index.html sumo-1.18.0/docs/userdoc/Netedit/index.html
--- sumo-1.17.0/docs/userdoc/Netedit/index.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Netedit/index.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -204,7 +204,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/Netedit/neteditPopupFunctions.html sumo-1.18.0/docs/userdoc/Netedit/neteditPopupFunctions.html
--- sumo-1.17.0/docs/userdoc/Netedit/neteditPopupFunctions.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Netedit/neteditPopupFunctions.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -228,7 +228,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/Netedit/neteditUsageExamples.html sumo-1.18.0/docs/userdoc/Netedit/neteditUsageExamples.html
--- sumo-1.17.0/docs/userdoc/Netedit/neteditUsageExamples.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Netedit/neteditUsageExamples.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -243,7 +243,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/Netedit/shortcuts.html sumo-1.18.0/docs/userdoc/Netedit/shortcuts.html
--- sumo-1.17.0/docs/userdoc/Netedit/shortcuts.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Netedit/shortcuts.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -171,7 +171,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -247,7 +247,7 @@
 
 C
 Connection Mode
-Person Plan mode
+Container mode
 Connection Data Mode
 
 
@@ -265,7 +265,7 @@
 
 G
 -
-Container mode
+-
 -
 
 
@@ -289,7 +289,7 @@
 
 L
 -
--
+ Person plan mode
 Lane Data Mode
 
 
@@ -405,7 +405,7 @@
 
 
 F9
-Edit viewport
+Visualization settings
 
 
 F10
@@ -452,7 +452,7 @@
 
 
 Ctrl + I
-Edit visualization
+Edit view port
 
 
 Ctrl + J
@@ -672,7 +672,7 @@
 
         
           
-            
This page was last edited on: 15 February 2023
+            
This page was last edited on: 12 May 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/netedit.html sumo-1.18.0/docs/userdoc/netedit.html
--- sumo-1.17.0/docs/userdoc/netedit.html	1970-01-01 00:00:00.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/netedit.html	2023-06-28 22:08:56.000000000 +0000
@@ -0,0 +1,2155 @@
+
+
+
+    
+        
+        
+        
+
+        
+        
+        
+        
+
+        
+        
+        
+        
+        netedit - SUMO Documentation
+        
+        
+        
+        
+        
+        
+        
+
+        
+        
+        
+         
+
+      
+
+    
+
+    
+
+        
+            
+                
+                
+                    
+                    
+                
+
+                
+                
+                        
+                        
+                            
+                                Documentation
+                            
+                            
+                                Tutorials
+                            
+                            
+                                FAQ
+                            
+                            
+                                Downloads
+                            
+                            
+                                Publications
+                            
+                            
+                                Developer
+                            
+                            
+                                ChangeLog
+                            
+                            
+                                Contact
+                            
+                        
+
+                    
+                        
+                            
+                                 Search
+                            
+                        
+                            
+                                 Edit on GitHub
+                            
+                      
+                          
+                            More 
+                          
+                          
+                            Report a Bug / Issue / Typo
+                            Help on editing articles
+                            Recent documentation changes
+                            Keyboard Shortcuts
+                            Download the Documentation
+                            Dark mode 
+                              
+                          
+                          
+                        
+                        
+                          
+                             Languages 
+                          
+                          
+                            
+                              Translations are generated automatically by Google Translate:
+                            
+                            Deutsch
+                            Español
+                            Français
+                            Magyar
+                            Türkçe
+                          
+                        
+                    
+                
+            
+        
+
+        
+          
+                
+                  
+                  
+
+    
+        
+    
+    
+        
+            Contents
+            From 30.000 feet
+            Usage Description
+                
+                    • Options
+                
+                
+                    → Configuration
+                
+                
+                    → Input
+                
+                
+                    → Output
+                
+                
+                    → Projection
+                
+                
+                    → Processing
+                
+                
+                    → Building Defaults
+                
+                
+                    → Tls Building
+                
+                
+                    → Ramp Guessing
+                
+                
+                    → Edge Removal
+                
+                
+                    → Unregulated Nodes
+                
+                
+                    → Junctions
+                
+                
+                    → Pedestrian
+                
+                
+                    → Bicycle
+                
+                
+                    → Railway
+                
+                
+                    → Formats
+                
+                
+                    → Netedit
+                
+                
+                    → Visualisation
+                
+                
+                    → Time
+                
+                
+                    → Report
+                
+                
+                    → Random Number
+                
+        
+    
+
+    
+        visit eclipse.dev/sumo
+    
+
+
+                
+                
+                   
+                  
+    
+    netedit
+
+                  netedit
+                  
+                  
+
+From 30.000 feet#
+netedit is the graphical editor for networks, additional infastructure,
+traffic objects and traffic data.
+
+Purpose: Create and modify simulation scenarios
+System: portable (Linux/Windows/Mac is tested); opens a window
+Input (optional): a network and any files belonging to a scenario
+Output: a netork and any files belonging to a scenario
+Programming Language: C++
+
+Usage Description#
+For an overview of features see Netedit Usage Documentation.
+Options#
+You may use a XML schema definition file for setting up a Netedit
+configuration: sumoConfiguration.xsd.
+Configuration#
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Option Description
-c <FILE>
 --configuration-file <FILE> Loads the named config on startup
-C <FILE>
 --save-configuration <FILE> Saves current configuration into FILE
--save-configuration.relative <BOOL> Enforce relative paths when saving the configuration; default: false
--save-template <FILE> Saves a configuration template (empty) into FILE
--save-schema <FILE> Saves the configuration schema into FILE
--save-commented <BOOL> Adds comments to saved template, configuration, or schema; default: false
+Input#
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Option Description
--sumocfg-file <FILE> Load sumo config
-a <FILE>
 --additional-files <FILE> Load additional and shapes descriptions from FILE(s)
-r <FILE>
 --route-files <FILE> Load demand elements descriptions from FILE(s)
-d <FILE>
 --data-files <FILE> Load data elements descriptions from FILE(s)
-m <FILE>
 --meandata-files <FILE> Load meanData descriptions from FILE(s)
-s <FILE>
 --sumo-net-file <FILE> Read SUMO-net from FILE
-n <FILE>
 --node-files <FILE> Read XML-node defs from FILE
-e <FILE>
 --edge-files <FILE> Read XML-edge defs from FILE
-x <FILE>
 --connection-files <FILE> Read XML-connection defs from FILE
-i <FILE>
 --tllogic-files <FILE> Read XML-traffic light defs from FILE
-t <FILE>
 --type-files <FILE> Read XML-type defs from FILE
--shapefile-prefix <FILE> Read shapefiles (ArcView, Tiger, ...) from files starting with 'FILE'
--dlr-navteq-prefix <FILE> Read converted Navteq GDF data (unsplitted Elmar-network) from path 'FILE'
--osm-files <FILE> Read OSM-network from path 'FILE(s)'
--opendrive-files <FILE> Read OpenDRIVE-network from FILE
--visum-file <FILE> Read VISUM-net from FILE
--vissim-file <FILE> Read VISSIM-net from FILE
--robocup-dir <FILE> Read RoboCup-net from DIR
--matsim-files <FILE> Read MATsim-net from FILE
--itsumo-files <FILE> Read ITSUMO-net from FILE
--heightmap.shapefiles <FILE> Read heightmap from ArcGIS shapefile
--heightmap.geotiff <FILE> Read heightmap from GeoTIFF
+Output#
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Option Description
--tls-file <STRING> File in which TLS Programs must be saved
--edgetypes-file <STRING> File in which edgeTypes must be saved
--write-license <BOOL> Include license info into every output file; default: false
--output-prefix <STRING> Prefix which is applied to all output files. The special string 'TIME' is replaced by the current time.
--precision <INT> Defines the number of digits after the comma for floating point output; default: 2
--precision.geo <INT> Defines the number of digits after the comma for lon,lat output; default: 6
-H <BOOL>
 --human-readable-time <BOOL> Write time values as hour:minute:second or day:hour:minute:second rather than seconds; default: false
-o <FILE>
 --output-file <FILE> The generated net will be written to FILE
-p <FILE>
 --plain-output-prefix <FILE> Prefix of files to write plain xml nodes, edges and connections to
--plain-output.lanes <BOOL> Write all lanes and their attributes even when they are not customized; default: false
--junctions.join-output <FILE> Writes information about joined junctions to FILE (can be loaded as additional node-file to reproduce joins
--prefix <STRING> Defines a prefix for edge and junction names
--amitran-output <FILE> The generated net will be written to FILE using Amitran format
--matsim-output <FILE> The generated net will be written to FILE using MATsim format
--opendrive-output <FILE> The generated net will be written to FILE using OpenDRIVE format
--dlr-navteq-output <FILE> The generated net will be written to dlr-navteq files with the given PREFIX
--dlr-navteq.precision <INT> The network coordinates are written with the specified level of output precision; default: 2
--output.street-names <BOOL> Street names will be included in the output (if available); default: false
--output.original-names <BOOL> Writes original names, if given, as parameter; default: false
--street-sign-output <FILE> Writes street signs as POIs to FILE
--ptstop-output <FILE> Writes public transport stops to FILE
--ptline-output <FILE> Writes public transport lines to FILE
--ptline-clean-up <BOOL> Clean-up pt stops that are not served by any line; default: false
--parking-output <FILE> Writes parking areas to FILE
--railway.topology.output <FILE> Analyze topology of the railway network
--polygon-output <FILE> Write shapes that are embedded in the network input and that are not supported by polyconvert (OpenDRIVE)
--opendrive-output.straight-threshold <FLOAT> Builds parameterized curves whenever the angular change  between straight segments exceeds FLOAT degrees; default: 1e-08
--opendrive-output.lefthand-left <BOOL> Write lanes in lefthand networks on the left side (positive indices); default: false
--opendrive-output.shape-match-dist <FLOAT> Match loaded shapes to the closest edge within FLOAT and export as road objects; default: -1
+Projection#
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Option Description
--simple-projection <BOOL> Uses a simple method for projection; default: false
--proj.scale <FLOAT> Scaling factor for input coordinates; default: 1
--proj.rotate <FLOAT> Rotation (clockwise degrees) for input coordinates; default: 0
--proj.utm <BOOL> Determine the UTM zone (for a universal transversal mercator projection based on the WGS84 ellipsoid); default: false
--proj.dhdn <BOOL> Determine the DHDN zone (for a transversal mercator projection based on the bessel ellipsoid, "Gauss-Krueger"); default: false
--proj <STRING> Uses STR as proj.4 definition for projection; default: !
--proj.inverse <BOOL> Inverses projection; default: false
--proj.dhdnutm <BOOL> Convert from Gauss-Krueger to UTM; default: false
--proj.plain-geo <BOOL> Write geo coordinates in plain-xml; default: false
+Processing#
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Option Description
--default.action-step-length <FLOAT> Length of the default interval length between action points for the car-following and lane-change models (in seconds). If not specified, the simulation step-length is used per default. Vehicle- or VType-specific settings override the default. Must be a multiple of the simulation step-length.; default: 0
--default.speeddev <FLOAT> Select default speed deviation. A negative value implies vClass specific defaults (0.1 for the default passenger class; default: -1
--speed-in-kmh <BOOL> vmax is parsed as given in km/h; default: false
--construction-date <STRING> Use YYYY-MM-DD date to determine the readiness of features under construction
--flatten <BOOL> Remove all z-data; default: false
--plain.extend-edge-shape <BOOL> If edge shapes do not end at the node positions, extend them; default: false
--numerical-ids <BOOL> Remaps alphanumerical IDs of nodes and edges to ensure that all IDs are integers; default: false
--numerical-ids.node-start <INT> Remaps IDs of nodes to integers starting at INT; default: 2147483647
--numerical-ids.edge-start <INT> Remaps IDs of edges to integers starting at INT; default: 2147483647
--reserved-ids <FILE> Ensures that generated ids do not included any of the typed IDs from FILE (sumo-gui selection file format)
--dismiss-vclasses <BOOL> Removes vehicle class restrictions from imported edges; default: false
--geometry.split <BOOL> Splits edges across geometry nodes; default: false
-R <BOOL>
 --geometry.remove <BOOL> Replace nodes which only define edge geometry by geometry points (joins edges); default: false
--geometry.remove.keep-edges.explicit Ensure that the given list of edges is not modified
--geometry.remove.keep-edges.input-file <FILE> Ensure that the edges in FILE are not modified (Each id on a single line. Selection files from sumo-gui are also supported)
--geometry.remove.keep-ptstops <BOOL> Ensure that edges with public transport stops are not modified; default: false
--geometry.remove.min-length <FLOAT> Allow merging edges with differing attributes when their length is below min-length; default: 0
--geometry.remove.width-tolerance <FLOAT> Allow merging edges with differing lane widths if the difference is below FLOAT; default: 0
--geometry.remove.max-junction-size <FLOAT> Prevent removal of junctions with a size above FLOAT as defined by custom edge endpoints; default: -1
--geometry.max-segment-length <FLOAT> splits geometry to restrict segment length; default: 0
--geometry.min-dist <FLOAT> reduces too similar geometry points; default: -1
--geometry.max-angle <FLOAT> Warn about edge geometries with an angle above DEGREES in successive segments; default: 99
--geometry.min-radius <FLOAT> Warn about edge geometries with a turning radius less than METERS at the start or end; default: 9
--geometry.min-radius.fix <BOOL> Straighten edge geometries to avoid turning radii less than geometry.min-radius; default: false
--geometry.min-radius.fix.railways <BOOL> Straighten edge geometries to avoid turning radii less than geometry.min-radius (only railways); default: true
--geometry.junction-mismatch-threshold <FLOAT> Warn if the junction shape is to far away from the original node position; default: 20
--geometry.check-overlap <FLOAT> Warn if edges overlap by more than the given threshold value; default: 0
--geometry.check-overlap.vertical-threshold <FLOAT> Ignore overlapping edges if they are separated vertically by the given threshold.; default: 4
--geometry.avoid-overlap <BOOL> Modify edge geometries to avoid overlap at junctions; default: true
--join-lanes <BOOL> join adjacent lanes that have the same permissions and which do not admit lane-changing (sidewalks and disallowed lanes); default: false
--ptline.match-dist <FLOAT> Matches stops outside the road network to the referencing pt line when below the given distance; default: 100
--ptstop-output.no-bidi <BOOL> Skips automatic generation of stops on the bidi-edge of a loaded stop; default: false
--geometry.max-grade <FLOAT> Warn about edge geometries with a grade in % above FLOAT.; default: 10
--geometry.max-grade.fix <BOOL> Smooth edge geometries with a grade above the warning threshold.; default: true
--offset.disable-normalization <BOOL> Turn off normalizing node positions
--offset.x <FLOAT> Adds FLOAT to net x-positions; default: 0
--offset.y <FLOAT> Adds FLOAT to net y-positions; default: 0
--offset.z <FLOAT> Adds FLOAT to net z-positions; default: 0
--flip-y-axis <BOOL> Flips the y-coordinate along zero; default: false
--roundabouts.guess <BOOL> Enable roundabout-guessing; default: true
--roundabouts.visibility-distance <FLOAT> Default visibility when approaching a roundabout; default: 9
--opposites.guess <BOOL> Enable guessing of opposite direction lanes usable for overtaking; default: false
--opposites.guess.fix-lengths <BOOL> Ensure that opposite edges have the same length; default: true
--fringe.guess <BOOL> Enable guessing of network fringe nodes; default: false
--fringe.guess.speed-threshold <FLOAT> Guess disconnected edges above the given speed as outer fringe; default: 13.8889
--lefthand <BOOL> Assumes left-hand traffic on the network; default: false
--edges.join <BOOL> Merges edges which connect the same nodes and are close to each other (recommended for VISSIM import); default: false
--speed.offset <FLOAT> Modifies all edge speeds by adding FLOAT; default: 0
--speed.factor <FLOAT> Modifies all edge speeds by multiplying by FLOAT; default: 1
--speed.minimum <FLOAT> Modifies all edge speeds to at least FLOAT; default: 0
--edges.join-tram-dist <FLOAT> Joins tram edges into road lanes with similar geometry (within FLOAT distance); default: -1
+Building Defaults#
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Option Description
-L <INT>
 --default.lanenumber <INT> The default number of lanes in an edge; default: 1
--default.lanewidth <FLOAT> The default width of lanes; default: -1
--default.spreadtype <STRING> The default method for computing lane shapes from edge shapes; default: right
-S <FLOAT>
 --default.speed <FLOAT> The default speed on an edge (in m/s); default: 13.89
--default.friction <FLOAT> The default friction on an edge; default: 1
-P <INT>
 --default.priority <INT> The default priority of an edge; default: -1
--default.type <STRING> The default edge type
--default.sidewalk-width <FLOAT> The default width of added sidewalks; default: 2
--default.bikelane-width <FLOAT> The default width of added bike lanes; default: 1
--default.crossing-width <FLOAT> The default width of a pedestrian crossing; default: 4
--default.crossing-speed <FLOAT> The default speed 'limit' on a pedestrian crossing (in m/s); default: 2.78
--default.walkingarea-speed <FLOAT> The default speed 'limit' on a pedestrian walkingarea (in m/s); default: 2.78
--default.allow <STRING> The default for allowed vehicle classes
--default.disallow <STRING> The default for disallowed vehicle classes
--default.junctions.keep-clear <BOOL> Whether junctions should be kept clear by default; default: true
--default.junctions.radius <FLOAT> The default turning radius of intersections; default: 4
--default.connection-length <FLOAT> The default length when overriding connection lengths; default: -1
--default.right-of-way <STRING> The default algorithm for computing right of way rules ('default', 'edgePriority'); default: default
+Tls Building#
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Option Description
--tls.discard-loaded <BOOL> Does not instatiate traffic lights loaded from other formats than plain-XML; default: false
--tls.discard-simple <BOOL> Does not instatiate traffic lights at geometry-like nodes loaded from other formats than plain-XML; default: false
--tls.set Interprets STR[] as list of junctions to be controlled by TLS
--tls.unset Interprets STR[] as list of junctions to be not controlled by TLS
--tls.guess <BOOL> Turns on TLS guessing; default: false
--tls.guess.threshold <FLOAT> Sets minimum value for the sum of all incoming lane speeds when guessing TLS; default: 69.4444
--tls.taz-nodes <BOOL> Sets district nodes as tls-controlled; default: false
--tls.guess.joining <BOOL> Includes node clusters into guess; default: false
--tls.join <BOOL> Tries to cluster tls-controlled nodes; default: false
--tls.join-dist <FLOAT> Determines the maximal distance for joining traffic lights (defaults to 20); default: 20
--tls.join-exclude Interprets STR[] as list of tls ids to exclude from joining
--tls.uncontrolled-within <BOOL> Do not control edges that lie fully within a joined traffic light. This may cause collisions but allows old traffic light plans to be used; default: false
--tls.ignore-internal-junction-jam <BOOL> Do not build mutually conflicting response matrix, potentially ignoring vehicles that are stuck at an internal junction when their phase has ended; default: false
--tls.guess-signals <BOOL> Interprets tls nodes surrounding an intersection as signal positions for a larger TLS. This is typical pattern for OSM-derived networks; default: false
--tls.guess-signals.dist <FLOAT> Distance for interpreting nodes as signal locations; default: 25
--tls.guess-signals.slack <INT> Number of uncontrolled entry edges to accept and still consider the central node as a traffic light; default: 0
--tls.cycle.time <INT> Use INT as cycle duration; default: 90
--tls.green.time <INT> Use INT as green phase duration; default: 31
-D <FLOAT>
 --tls.yellow.min-decel <FLOAT> Defines smallest vehicle deceleration; default: 3
--tls.yellow.patch-small <BOOL> Given yellow times are patched even if being too short; default: false
--tls.yellow.time <INT> Set INT as fixed time for yellow phase durations; default: -1
--tls.red.time <INT> Set INT as fixed time for red phase duration at traffic lights that do not have a conflicting flow; default: 5
--tls.allred.time <INT> Set INT as fixed time for intermediate red phase after every switch; default: 0
--tls.minor-left.max-speed <FLOAT> Use FLOAT as threshold for allowing left-turning vehicles to move in the same phase as oncoming straight-going vehicles; default: 19.44
--tls.left-green.time <INT> Use INT as green phase duration for left turns (s). Setting this value to 0 disables additional left-turning phases; default: 6
--tls.nema.vehExt <INT> Set INT as fixed time for intermediate vehext phase after every switch; default: 2
--tls.nema.yellow <INT> Set INT as fixed time for intermediate NEMA yelow phase after every switch; default: 3
--tls.nema.red <INT> Set INT as fixed time for intermediate NEMA red phase after every switch; default: 2
--tls.crossing-min.time <INT> Use INT as minimum green duration for pedestrian crossings (s).; default: 4
--tls.crossing-clearance.time <INT> Use INT as clearance time for pedestrian crossings (s).; default: 5
--tls.scramble.time <INT> Use INT as green phase duration for pedestrian scramble phase (s).; default: 5
--tls.half-offset TLSs in STR[] will be shifted by half-phase
--tls.quarter-offset TLSs in STR[] will be shifted by quarter-phase
--tls.default-type <STRING> TLSs with unspecified type will use STR as their algorithm; default: static
--tls.layout <STRING> Set phase layout four grouping opposite directions or grouping all movements for one incoming edge ['opposites', 'incoming']; default: opposites
--tls.no-mixed <BOOL> Avoid phases with green and red signals for different connections from the same lane; default: false
--tls.min-dur <INT> Default minimum phase duration for traffic lights with variable phase length; default: 5
--tls.max-dur <INT> Default maximum phase duration for traffic lights with variable phase length; default: 50
--tls.group-signals <BOOL> Assign the same tls link index to connections that share the same states; default: false
--tls.ungroup-signals <BOOL> Assign a distinct tls link index to every connection; default: false
--tls.rebuild <BOOL> rebuild all traffic light plans in the network; default: false
+Ramp Guessing#
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Option Description
--ramps.guess <BOOL> Enable ramp-guessing; default: false
--ramps.guess-acceleration-lanes <BOOL> Guess on-ramps and mark acceleration lanes if they exist but do not add new lanes; default: true
--ramps.max-ramp-speed <FLOAT> Treat edges with speed > FLOAT as no ramps; default: -1
--ramps.min-highway-speed <FLOAT> Treat edges with speed < FLOAT as no highways; default: 21.9444
--ramps.ramp-length <FLOAT> Use FLOAT as ramp-length; default: 100
--ramps.min-weave-length <FLOAT> Use FLOAT as minimum ramp-length; default: 50
--ramps.set Tries to handle the given edges as ramps
--ramps.unset Do not consider the given edges as ramps
--ramps.no-split <BOOL> Avoids edge splitting; default: false
+Edge Removal#
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Option Description
--keep-edges.min-speed <FLOAT> Only keep edges with speed in meters/second > FLOAT; default: -1
--remove-edges.explicit Remove edges in STR[]
--keep-edges.explicit Only keep edges in STR[] or those which are kept due to other keep-edges or remove-edges options
--keep-edges.input-file <FILE> Only keep edges in FILE (Each id on a single line. Selection files from sumo-gui are also supported) or those which are kept due to other keep-edges or remove-edges options
--remove-edges.input-file <FILE> Remove edges in FILE. (Each id on a single line. Selection files from sumo-gui are also supported)
--keep-edges.postload <BOOL> Remove edges after joining; default: false
--keep-edges.in-boundary Only keep edges which are located within the given boundary (given either as CARTESIAN corner coordinates  or as polygon )
--keep-edges.in-geo-boundary Only keep edges which are located within the given boundary (given either as GEODETIC corner coordinates  or as polygon )
--keep-edges.by-vclass Only keep edges which allow one of the vclasses in STR[]
--remove-edges.by-vclass Remove edges which allow only vclasses from STR[]
--keep-edges.by-type Only keep edges where type is in STR[]
--keep-edges.components <INT> Only keep the INT largest weakly connected components; default: 0
--remove-edges.by-type Remove edges where type is in STR[]
--remove-edges.isolated <BOOL> Removes isolated edges; default: false
+Unregulated Nodes#
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Option Description
--keep-nodes-unregulated <BOOL> All nodes will be unregulated; default: false
--keep-nodes-unregulated.explicit Do not regulate nodes in STR[]
--keep-nodes-unregulated.district-nodes <BOOL> Do not regulate district nodes; default: false
+Junctions#
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Option Description
--junctions.right-before-left.speed-threshold <FLOAT> Allow building right-before-left junctions when the incoming edge speeds are below FLOAT (m/s); default: 13.6111
--junctions.left-before-right <BOOL> Build left-before-right junctions instead of right-before-left junctions; default: false
--no-internal-links <BOOL> Omits internal links; default: false
--no-turnarounds <BOOL> Disables building turnarounds
--no-turnarounds.tls <BOOL> Disables building turnarounds at tls-controlled junctions; default: false
--no-turnarounds.geometry <BOOL> Disables building turnarounds at geometry-like junctions; default: true
--no-turnarounds.except-deadend <BOOL> Disables building turnarounds except at dead end junctions; default: false
--no-turnarounds.except-turnlane <BOOL> Disables building turnarounds except at at junctions with a dedicated turning lane; default: false
--no-turnarounds.fringe <BOOL> Disables building turnarounds at fringe junctions; default: false
--no-left-connections <BOOL> Disables building connections to left; default: false
--junctions.join <BOOL> Joins junctions that are close to each other (recommended for OSM import); default: false
--junctions.join-dist <FLOAT> Determines the maximal distance for joining junctions (defaults to 10); default: 10
--junctions.join-exclude Interprets STR[] as list of junctions to exclude from joining
--junctions.join-same <BOOL> Joins junctions that have the same coordinates even if not connected; default: false
--max-join-ids <INT> Abbreviate junction or TLS id if it joins more than INT junctions; default: 4
--junctions.corner-detail <INT> Generate INT intermediate points to smooth out intersection corners; default: 5
--junctions.internal-link-detail <INT> Generate INT intermediate points to smooth out lanes within the intersection; default: 5
--junctions.scurve-stretch <FLOAT> Generate longer intersections to allow for smooth s-curves when the number of lanes changes; default: 0
--junctions.join-turns <BOOL> Builds common edges for turning connections with common from- and to-edge. This causes discrepancies between geometrical length and assigned length due to averaging but enables lane-changing while turning; default: false
--junctions.limit-turn-speed <FLOAT> Limits speed on junctions to an average lateral acceleration of at most FLOAT m/s^2); default: 5.5
--junctions.limit-turn-speed.min-angle <FLOAT> Do not limit turn speed for angular changes below FLOAT (degrees). The value is subtracted from the geometric angle before computing the turning radius.; default: 15
--junctions.limit-turn-speed.min-angle.railway <FLOAT> Do not limit turn speed for angular changes below FLOAT (degrees) on railway edges. The value is subtracted from the geometric angle before computing the turning radius.; default: 35
--junctions.limit-turn-speed.warn.straight <FLOAT> Warn about turn speed limits that reduce the speed of straight connections by more than FLOAT; default: 5
--junctions.limit-turn-speed.warn.turn <FLOAT> Warn about turn speed limits that reduce the speed of turning connections (no u-turns) by more than FLOAT; default: 22
--junctions.small-radius <FLOAT> Default radius for junctions that do not require wide vehicle turns; default: 1.5
--junctions.higher-speed <BOOL> Use maximum value of incoming and outgoing edge speed on junction instead of average; default: false
--junctions.minimal-shape <BOOL> Build junctions with minimal shapes (igoring edge overlap); default: false
--internal-junctions.vehicle-width <FLOAT> Assumed vehicle width for computing internal junction positions; default: 1.8
--rectangular-lane-cut <BOOL> Forces rectangular cuts between lanes and intersections; default: false
--check-lane-foes.roundabout <BOOL> Allow driving onto a multi-lane road if there are foes on other lanes (at roundabouts); default: true
--check-lane-foes.all <BOOL> Allow driving onto a multi-lane road if there are foes on other lanes (everywhere); default: false
+Pedestrian#
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Option Description
--sidewalks.guess <BOOL> Guess pedestrian sidewalks based on edge speed; default: false
--sidewalks.guess.max-speed <FLOAT> Add sidewalks for edges with a speed equal or below the given limit; default: 13.89
--sidewalks.guess.min-speed <FLOAT> Add sidewalks for edges with a speed above the given limit; default: 5.8
--sidewalks.guess.from-permissions <BOOL> Add sidewalks for edges that allow pedestrians on any of their lanes regardless of speed; default: false
--sidewalks.guess.exclude Do not guess sidewalks for the given list of edges
--crossings.guess <BOOL> Guess pedestrian crossings based on the presence of sidewalks; default: false
--crossings.guess.speed-threshold <FLOAT> At uncontrolled nodes, do not build crossings across edges with a speed above the threshold; default: 13.89
--walkingareas <BOOL> Always build walking areas even if there are no crossings; default: false
--walkingareas.join-dist <FLOAT> Do not create a walkingarea between sidewalks that are connected by a pedestrian junction within FLOAT; default: 15
+Bicycle#
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Option Description
--bikelanes.guess <BOOL> Guess bike lanes based on edge speed; default: false
--bikelanes.guess.max-speed <FLOAT> Add bike lanes for edges with a speed equal or below the given limit; default: 22.22
--bikelanes.guess.min-speed <FLOAT> Add bike lanes for edges with a speed above the given limit; default: 5.8
--bikelanes.guess.from-permissions <BOOL> Add bike lanes for edges that allow bicycles on any of their lanes regardless of speed; default: false
--bikelanes.guess.exclude Do not guess bikelanes for the given list of edges
+Railway#
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Option Description
--railway.signals.discard <BOOL> Discard all railway signal information loaded from other formats than plain-xml; default: false
--railway.topology.repair <BOOL> Repair topology of the railway network; default: false
--railway.topology.repair.minimal <BOOL> Repair topology of the railway network just enough to let loaded public transport lines to work; default: false
--railway.topology.repair.connect-straight <BOOL> Allow bidirectional rail use wherever rails with opposite directions meet at a straight angle; default: false
--railway.topology.repair.stop-turn <BOOL> Add turn-around connections at all loaded stops.; default: false
--railway.topology.repair.bidi-penalty <FLOAT> Penalty factor for adding new bidi edges to connect public transport stops; default: 1.2
--railway.topology.all-bidi <BOOL> Make all rails usable in both direction; default: false
--railway.topology.all-bidi.input-file <FILE> Make all rails edge ids from FILE usable in both direction
--railway.topology.direction-priority <BOOL> Set edge priority values based on estimated main direction; default: false
--railway.topology.extend-priority <BOOL> Extend loaded edge priority values based on estimated main direction; default: false
--railway.signal.guess.by-stops <BOOL> Guess signals that guard public transport stops; default: false
--railway.access-distance <FLOAT> The search radius for finding suitable road accesses for rail stops; default: 150
--railway.max-accesses <INT> The maximum road accesses registered per rail stops; default: 5
--railway.access-factor <FLOAT> The walking length of the access is computed as air-line distance multiplied by FLOAT; default: 1.5
+Formats#
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Option Description
--discard-params Remove the list of keys from all params
--ignore-change-restrictions List vehicle classes that may ignore lane changing restrictions ('all' discards all restrictions); default: authority
--osm.skip-duplicates-check <BOOL> Skips the check for duplicate nodes and edges; default: false
--osm.elevation <BOOL> Imports elevation data; default: false
--osm.layer-elevation <FLOAT> Reconstruct (relative) elevation based on layer data. Each layer is raised by FLOAT m; default: 0
--osm.layer-elevation.max-grade <FLOAT> Maximum grade threshold in % at 50km/h when reconstrucing elevation based on layer data. The value is scaled according to road speed.; default: 10
--osm.oneway-spread-right <BOOL> Whether one-way roads should be spread to the side instead of centered; default: false
--osm.lane-access <BOOL> Import lane-specific access restrictions; default: false
--osm.bike-access <BOOL> Import bike lanes and fix directions and permissions on bike paths; default: false
--osm.sidewalks <BOOL> Import sidewalks; default: false
--osm.crossings <BOOL> Import crossings; default: false
--osm.turn-lanes <BOOL> Import turning arrows from OSM to help with connection building; default: false
--osm.stop-output.length <FLOAT> The default length of a public transport stop in FLOAT m; default: 25
--osm.stop-output.length.bus <FLOAT> The default length of a bus stop in FLOAT m; default: 15
--osm.stop-output.length.tram <FLOAT> The default length of a tram stop in FLOAT m; default: 25
--osm.stop-output.length.train <FLOAT> The default length of a train stop in FLOAT m; default: 200
--osm.all-attributes <BOOL> Whether additional attributes shall be imported; default: false
--osm.extra-attributes List of additional attributes that shall be imported from OSM via osm.all-attributes (set 'all' to import all); default: all
--osm.speedlimit-none <FLOAT> The speed limit to be set when there is no actual speed limit in reality; default: 39.4444
--matsim.keep-length <BOOL> The edge lengths given in the MATSIM-file will be kept; default: false
--matsim.lanes-from-capacity <BOOL> The lane number will be computed from the capacity; default: false
--shapefile.street-id <STRING> Read edge ids from column STR
--shapefile.from-id <STRING> Read from-node ids from column STR
--shapefile.to-id <STRING> Read to-node ids from column STR
--shapefile.type-id <STRING> Read type ids from column STR
--shapefile.laneNumber <STRING> Read lane number from column STR
--shapefile.speed <STRING> Read speed from column STR
--shapefile.length <STRING> Read custom edge length from column STR
--shapefile.width <STRING> Read total edge width from column STR
--shapefile.name <STRING> Read (non-unique) name from column STR
--shapefile.node-join-dist <FLOAT> Distance threshold for determining whether distinct shapes are connected (used when from-id and to-id are not available); default: 0
--shapefile.add-params Add the list of field names as edge params
--shapefile.use-defaults-on-failure <BOOL> Uses edge type defaults on problems; default: false
--shapefile.all-bidirectional <BOOL> Insert edges in both directions; default: false
--shapefile.guess-projection <BOOL> Guess the proper projection; default: false
--shapefile.traditional-axis-mapping <BOOL> Use traditional axis order (lon, lat); default: false
--dlr-navteq.tolerant-permissions <BOOL> Allow more vehicle classes by default; default: false
--dlr-navteq.keep-length <BOOL> The edge lengths given in the DLR Navteq-file will be kept; default: false
--vissim.join-distance <FLOAT> Structure join offset; default: 5
--vissim.default-speed <FLOAT> Use FLOAT as default speed; default: 50
--vissim.speed-norm <FLOAT> Factor for edge velocity; default: 1
--vissim.report-unset-speeds <BOOL> Writes lanes without an explicit speed set; default: false
--visum.language-file <FILE> Load language mappings from FILE
--visum.use-type-priority <BOOL> Uses priorities from types; default: false
--visum.use-type-laneno <BOOL> Uses lane numbers from types; default: false
--visum.use-type-speed <BOOL> Uses speeds from types; default: false
--visum.connector-speeds <FLOAT> Sets connector speed; default: 100
--visum.connectors-lane-number <INT> Sets connector lane number; default: 3
--visum.no-connectors <BOOL> Excludes connectors; default: true
--visum.recompute-lane-number <BOOL> Computes the number of lanes from the edges' capacities; default: false
--visum.verbose-warnings <BOOL> Prints all warnings, some of which are due to VISUM misbehaviour; default: false
--visum.lanes-from-capacity.norm <FLOAT> The factor for flow to no. lanes conversion; default: 1800
--opendrive.import-all-lanes <BOOL> Imports all lane types; default: false
--opendrive.ignore-widths <BOOL> Whether lane widths shall be ignored.; default: false
--opendrive.curve-resolution <FLOAT> The geometry resolution in m when importing curved geometries as line segments.; default: 2
--opendrive.advance-stopline <FLOAT> Allow stop lines to be built beyond the start of the junction if the geometries allow so; default: 0
--opendrive.min-width <FLOAT> The minimum lane width for determining start or end of variable-width lanes; default: 1.8
--opendrive.internal-shapes <BOOL> Import internal lane shapes; default: false
--opendrive.position-ids <BOOL> Sets edge-id based on road-id and offset in m (legacy); default: false
--opendrive.lane-shapes <BOOL> Use custom lane shapes to compensate discarded lane types; default: false
--opendrive.signal-groups <BOOL> Use the OpenDRIVE controller information for the generated signal program; default: false
+Netedit#
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Option Description
--new-network <BOOL> Start netedit with a new network; default: false
--attribute-help-output <FILE> Write attribute help to file
--node-prefix <STRING> Prefix for node naming; default: J
--edge-prefix <STRING> Prefix for edge naming; default: E
--edge-infix <STRING> Enable edge-infix ()
--busStop-prefix <STRING> Prefix for busStop naming; default: bs
--trainStop-prefix <STRING> Prefix for trainStop naming; default: ts
--containerStop-prefix <STRING> Prefix for containerStop naming; default: ct
--chargingStation-prefix <STRING> Prefix for chargingStation naming; default: cs
--parkingArea-prefix <STRING> Prefix for parkingArea naming; default: pa
--e1Detector-prefix <STRING> Prefix for e1Detector naming; default: e1
--e2Detector-prefix <STRING> Prefix for e2Detector naming; default: e2
--e3Detector-prefix <STRING> Prefix for e3Detector naming; default: e3
--e1InstantDetector-prefix <STRING> Prefix for e1InstantDetector naming; default: e1i
--rerouter-prefix <STRING> Prefix for rerouter naming; default: rr
--calibrator-prefix <STRING> Prefix for calibrator naming; default: ca
--routeProbe-prefix <STRING> Prefix for routeProbe naming; default: rp
--vss-prefix <STRING> Prefix for variable speed sign naming; default: vs
--tractionSubstation-prefix <STRING> prefix for traction substation naming; default: tr
--overheadWire-prefix <STRING> Prefix for overhead wire naming; default: ow
--polygon-prefix <STRING> Prefix for polygon naming; default: po
--poi-prefix <STRING> Prefix for poi naming; default: poi
--route-prefix <STRING> Prefix for route naming; default: r
--vType-prefix <STRING> Prefix for type naming; default: t
--vTypeDistribution-prefix <STRING> Prefix for type distribution naming; default: td
--vehicle-prefix <STRING> Prefix for vehicle naming; default: v
--trip-prefix <STRING> Prefix for trip naming; default: t
--flow-prefix <STRING> Prefix for flow naming; default: f
--person-prefix <STRING> Prefix for person naming; default: p
--personflow-prefix <STRING> Prefix for personFlow naming; default: pf
--container-prefix <STRING> Prefix for container naming; default: c
--containerflow-prefix <STRING> Prefix for containerFlow naming; default: cf
--meanDataEdge-prefix <STRING> Prefix for meanDataEdge naming; default: ed
--meanDataLane-prefix <STRING> Prefix for meanDataLane naming; default: ld
+Visualisation#
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Option Description
--disable-laneIcons <BOOL> Disable icons of special lanes; default: false
-T <BOOL>
 --disable-textures <BOOL> Disable textures; default: false
-g <FILE>
 --gui-settings-file <FILE> Load visualisation settings from FILE
--registry-viewport <BOOL> Load current viewport from registry; default: false
--window-size Create initial window with the given x,y size
--window-pos Create initial window at the given x,y position
--gui-testing <BOOL> Enable overlay for screen recognition; default: false
--gui-testing-debug <BOOL> Enable output messages during GUI-Testing; default: false
--gui-testing-debug-gl <BOOL> Enable output messages during GUI-Testing specific of gl functions; default: false
--gui-testing.setting-output <FILE> Save gui settings in the given settings-output file
+Time#
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Option Description
--begin <TIME> Defines the begin time in seconds; The simulation starts at this time; default: 0
--end <TIME> Defines the end time in seconds; The simulation ends at this time; default: -1
+Report#
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Option Description
-v <BOOL>
 --verbose <BOOL> Switches to verbose output; default: false
--print-options <BOOL> Prints option values before processing; default: false
-? <BOOL>
 --help <BOOL> Prints this screen or selected topics; default: false
-V <BOOL>
 --version <BOOL> Prints the current version; default: false
-X <STRING>
 --xml-validation <STRING> Set schema validation scheme of XML inputs ("never", "local", "auto" or "always"); default: local
--xml-validation.net <STRING> Set schema validation scheme of SUMO network inputs ("never", "local", "auto" or "always"); default: never
--xml-validation.routes <STRING> Set schema validation scheme of SUMO route inputs ("never", "local", "auto" or "always"); default: local
-W <BOOL>
 --no-warnings <BOOL> Disables output of warnings; default: false
--aggregate-warnings <INT> Aggregate warnings of the same type whenever more than INT occur; default: -1
-l <FILE>
 --log <FILE> Writes all messages to FILE (implies verbose)
--message-log <FILE> Writes all non-error messages to FILE (implies verbose)
--error-log <FILE> Writes all warnings and errors to FILE
--language <STRING> Language to use in messages; default: C
--ignore-errors <BOOL> Continue on broken input; default: false
--ignore-errors.connections <BOOL> Continue on invalid connections; default: false
--show-errors.connections-first-try <BOOL> Show errors in connections at parsing; default: false
--ignore-errors.edge-type <BOOL> Continue on unknown edge types; default: false
+Random Number#
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Option Description
--random <BOOL> Initialises the random number generator with the current system time; default: false
--seed <INT> Initialises the random number generator with the given value; default: 23423
+                
+          
+          
+        
+
+        
+          
+            
This page was last edited on: 28 June 2023
+          
+          
+            Copyright © 2001-2023 German Aerospace Center (DLR) and others.
+          Follow us on   
+          | Documentation built with MkDocs
+        
+
+      
+    
+        
+            
+                Search
+                
+            
+            
+                Enter your search terms:
+                
+                
+            
+        
+    
+
+      
+        
+
+        
+
+      
+    
+        
+            
+                Keyboard Shortcuts
+                
+            
+            
+              
+                
+                  
+                    
+                    
+                  
+                
+                
+                  
+                    
+                    
+                  
+                  
+                    
+                    
+                  
+                  
+                    
+                    
+                  
+                
+              Key Action
? Open this help dialog
s Search the Documentation
e Edit current page on GitHub
+            
+        
+    
+
+    
+
\ No newline at end of file
diff -Nru sumo-1.17.0/docs/userdoc/netgenerate.html sumo-1.18.0/docs/userdoc/netgenerate.html
--- sumo-1.17.0/docs/userdoc/netgenerate.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/netgenerate.html	2023-06-28 22:08:56.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -217,7 +217,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -266,7 +266,7 @@
 Options#
 You may use a XML schema definition file for setting up a netgenerate
 configuration:
-netgenerateConfiguration.xsd.
+netgenerateConfiguration.xsd.
 Configuration#
 All applications of the SUMO-suite handle configuration options the
 same way. These options are discussed at Basics/Using the Command Line
@@ -663,6 +663,10 @@
 Allow merging edges with differing lane widths if the difference is below FLOAT; default: 0
 
 
+--geometry.remove.max-junction-size <FLOAT>
+Prevent removal of junctions with a size above FLOAT as defined by custom edge endpoints; default: -1
+
+
 --geometry.max-segment-length <FLOAT>
 splits geometry to restrict segment length; default: 0
 
@@ -854,6 +858,10 @@
 Determines the maximal distance for joining traffic lights (defaults to 20); default: 20
 
 
+--tls.join-exclude
+Interprets STR[] as list of tls ids to exclude from joining
+
+
 --tls.uncontrolled-within <BOOL>
 Do not control edges that lie fully within a joined traffic light. This may cause collisions but allows old traffic light plans to be used; default: false
 
@@ -1139,6 +1147,10 @@
 Use maximum value of incoming and outgoing edge speed on junction instead of average; default: false
 
 
+--junctions.minimal-shape <BOOL>
+Build junctions with minimal shapes (igoring edge overlap); default: false
+
+
 --internal-junctions.vehicle-width <FLOAT>
 Assumed vehicle width for computing internal junction positions; default: 1.8
 
@@ -1323,7 +1335,7 @@
 
         

           
-            
This page was last edited on: 24 April 2023
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Networks/Abstract_Network_Generation.html sumo-1.18.0/docs/userdoc/Networks/Abstract_Network_Generation.html
--- sumo-1.17.0/docs/userdoc/Networks/Abstract_Network_Generation.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Networks/Abstract_Network_Generation.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -171,7 +171,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/Networks/Elevation.html sumo-1.18.0/docs/userdoc/Networks/Elevation.html
--- sumo-1.17.0/docs/userdoc/Networks/Elevation.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Networks/Elevation.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -175,7 +175,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/Networks/Export.html sumo-1.18.0/docs/userdoc/Networks/Export.html
--- sumo-1.17.0/docs/userdoc/Networks/Export.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Networks/Export.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -183,7 +183,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -237,11 +237,11 @@
 extraction version 6.0.
 Amitran#
 The Amitran network format consists of a single XML file conforming to
-the schema at http://sumo-sim.org/xsd/amitran/network.xsd. The option --amitran-output <FILE>
+the schema at https://sumo.dlr.de/xsd/amitran/network.xsd. The option --amitran-output <FILE>
 writes the data to a file with the following format
 <?xml version="1.0" encoding="utf-8"?>
 
-<network xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo-sim.org/xsd/amitran/network.xsd">
+<network xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/amitran/network.xsd">
    <node id="0" type="rightBeforeLeft"/>
    <node id="1" type="priority"/>
    ...
@@ -254,9 +254,9 @@
 class is a functional road class in the Navteq sense)
 
 
-
+
 This part of SUMO was developed, reworked, or extended within the project 
-"AMITRAN", co-funded by the European Commission within the Seventh Framework Programme.
+"AMITRAN", co-funded by the European Commission within the Seventh Framework Programme.

                 
           
           
@@ -264,7 +264,7 @@
 
         
           
-            
This page was last edited on: 31 March 2023
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Networks/Further_Options.html sumo-1.18.0/docs/userdoc/Networks/Further_Options.html
--- sumo-1.17.0/docs/userdoc/Networks/Further_Options.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Networks/Further_Options.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -172,7 +172,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/Networks/Further_Outputs.html sumo-1.18.0/docs/userdoc/Networks/Further_Outputs.html
--- sumo-1.17.0/docs/userdoc/Networks/Further_Outputs.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Networks/Further_Outputs.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -214,7 +214,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/Networks/Import/ArcView.html sumo-1.18.0/docs/userdoc/Networks/Import/ArcView.html
--- sumo-1.17.0/docs/userdoc/Networks/Import/ArcView.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Networks/Import/ArcView.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -182,7 +182,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -442,7 +442,7 @@
 
 'Frida' network (city of Osnabrück)#
 The network is available at the
-Frida-homepage and is licensed under the
+Frida-homepage and is licensed under the
 GPL.
 Our main interest is of course the street network. The following files
 describe this: strassen.dbf, strassen.shp, strassen.shx
@@ -458,7 +458,7 @@
 

 Different field naming
 The only problem with this is that we can not extract street names
-properly. Still, within FRIDA, the
+properly. Still, within FRIDA, the
 edges are numbered, and we may use the street id as name.
 The call has to be extended by: --arcview.street-id strShapeID
 
@@ -547,7 +547,7 @@
 the problem in inner-city areas, but yields in an unacceptable result
 for highways.
 
-This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 Unported License. The authors are listed in the history.
+This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 Unported License. The authors are listed in the history.
                 
           
           
@@ -555,7 +555,7 @@
 
         
           
-            
This page was last edited on: 31 March 2023
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Networks/Import/DlrNavteq.html sumo-1.18.0/docs/userdoc/Networks/Import/DlrNavteq.html
--- sumo-1.17.0/docs/userdoc/Networks/Import/DlrNavteq.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Networks/Import/DlrNavteq.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
diff -Nru sumo-1.17.0/docs/userdoc/Networks/Import/MATsim.html sumo-1.18.0/docs/userdoc/Networks/Import/MATsim.html
--- sumo-1.17.0/docs/userdoc/Networks/Import/MATsim.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Networks/Import/MATsim.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
diff -Nru sumo-1.17.0/docs/userdoc/Networks/Import/OpenDRIVE.html sumo-1.18.0/docs/userdoc/Networks/Import/OpenDRIVE.html
--- sumo-1.17.0/docs/userdoc/Networks/Import/OpenDRIVE.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Networks/Import/OpenDRIVE.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -178,6 +178,9 @@
                     • Handling of geometry
                 
                 
+                    • Handling of traffic light signaling
+                
+                
                     • Referencing original IDs
                 
             Road Objects
@@ -186,7 +189,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -218,7 +221,7 @@
                   
                   
 
-For reading OpenDRIVE networks, give
+
For reading OpenDRIVE networks, give
 netconvert the option --opendrive-files <FILE>[,<FILE>]* or --opendrive <FILE>[,<FILE>]* for short.
 netconvert --opendrive myOpenDriveNetwork.xodr -o mySUMOnetwork.net.xml
 
@@ -388,6 +391,10 @@
 sOffset-value.
 Handling of geometry#
 Geometry in OpenDRIVE takes the form of parametric curves (arcs, spirals and splines). These are all sampled with a configurable precision (--opendrive.curve-resolution <FLOAT>) to produce polylines in the .net.xml. Junction shapes are not encoded in OpenDRIVE. They are generated based on points where the shapes of normal roads and connecting roads meet. 
+Handling of traffic light signaling#
+OpenDRIVE considers traffic lights by the physical aspect of the signals, their position and the lanes they control. Optionally, signals can be grouped in a <controller> element.
+The car signals are imported into SUMO by default and organised into one traffic light per intersection. If the option --opendrive.signal-groups <FLOAT> is set to true, netconvert will try to build the same signal groups in SUMO
+as given by the OpenDRIVE <controller> items. This can generate invalid SUMO signal programs (minor "g" vs. major green "G", see signal state) or fail due to complex signal group settings. Currently, signals for cyclists and pedestrians are not imported.
 Referencing original IDs#
 When using the option --output.original-names, each lane will receive a <param origID="EDGE_ID LANE_INDEX"/> which can be used with
 the TraCI function moveToVTD.
@@ -418,7 +425,7 @@
 
         
           
-            
This page was last edited on: 31 March 2023
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Networks/Import/OpenStreetMapDownload.html sumo-1.18.0/docs/userdoc/Networks/Import/OpenStreetMapDownload.html
--- sumo-1.17.0/docs/userdoc/Networks/Import/OpenStreetMapDownload.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Networks/Import/OpenStreetMapDownload.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -195,7 +195,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -227,21 +227,21 @@
                   
                   
 
-From http://www.openstreetmap.org/:
+From https://www.openstreetmap.org/:
 
-"OpenStreetMap is a free editable
+
"OpenStreetMap is a free editable
 map of the whole world. It is made by people like you."

-"OpenStreetMap creates and provides
+
"OpenStreetMap creates and provides
 free geographic data such as street maps to anyone who wants them. The
 project was started because most maps you think of as free actually
 have legal or technical restrictions on their use, holding back people
 from using them in creative, productive, or unexpected ways."

 

 The amount of data contained within
-OpenStreetMap, and their quality, is
+OpenStreetMap, and their quality, is
 really amazing. Even though no demand data is available, the quality of
 the road networks makes it worth to regard
-OpenStreetMap as a data source for
+OpenStreetMap as a data source for
 traffic simulations, especially if one is interested in multi- or
 inter-modal simulations.
 This page describes how OpenStreetMap data can be obtained. OSM data
@@ -256,13 +256,13 @@
 modes can be generated automatically.
 Directly from the Browser#
 Data can be downloaded comfortably at
-http://www.openstreetmap.org/export by selecting a rectangular area.
+https://www.openstreetmap.org/export by selecting a rectangular area.
 However, this page limits the amount of data that can be downloaded.
 Depending on the data-density in the selected area this may limit the
 downloadable area to less than a square kilometer (although downloading
 a whole city may be possible).
-With the Java OpenStreetMap Editor (JOSM)#
-The Java OpenStreetMap Editor (JOSM) is
+
With the Java OpenStreetMap Editor (JOSM)#
+The Java OpenStreetMap Editor (JOSM) is
 a mature tool for handling OSM-data. It allows for comfortable
 downloading of rectangular areas using an interactive map. It even
 supports searching for an area by name (i.e. Berlin). It also supports
@@ -270,14 +270,14 @@
 
Downloading a Larger Rectangular Area Using the OpenStreetMap API#
 Larger amounts of OSM-data can be downloaded using a web browser or
 preferably with a program such as
-wget. For detailed information refer
-to the API overview
+wget. For detailed information refer
+to the API overview
 Downloading OSM-data via the API is a two step process: First you must
 determine the geo-coordinates for your area. Then you can download
 OSM-data using those coordinates.
 Obtain the geo-coordinates#
 You need the (longitude, latitude)-numbers for the south-west corner and
-for the north-east corner of your chosen area. You can get them at this
+for the north-east corner of your chosen area. You can get them at this
 page by pointing your mouse at
 the appropriate map location and observing the coordinates in the status
 bar. The inner city of Berlin lies within the following coordinates:
@@ -286,27 +286,27 @@
 
 
 Download the area#
-Construct an URI (web
+
Construct an URI (web
 adress) from
 the geo-coordinates and download the data from that URI. The URI takes
 the following form:
-http://api.openstreetmap.org/api/0.6/map?bbox=<SW-longitude,SW-latitude,NE-longitude,NE-latitude>
+https://api.openstreetmap.org/api/0.6/map?bbox=<SW-longitude,SW-latitude,NE-longitude,NE-latitude>
 
 
 for the above example this becomes
-http://api.openstreetmap.org/api/0.6/map?bbox=13.278,52.473,13.471,52.552
+https://api.openstreetmap.org/api/0.6/map?bbox=13.278,52.473,13.471,52.552
 
 
 you can download your data by entering the URI in a web-browers or by
-using another program such as wget.
-wget.exe "http://api.openstreetmap.org/api/0.6/map?bbox=13.278,52.473,13.471,52.552" -O berlin.osm.xml
+using another program such as wget.
+wget.exe "https://api.openstreetmap.org/api/0.6/map?bbox=13.278,52.473,13.471,52.552" -O berlin.osm.xml
 
 
 Important: the API version number 0.6 will eventually be outdated.
-Refer to the openstreetmap API
+Refer to the openstreetmap API
 page for the latest version.
 Downloading a City#
-Modelling a single city is a common simulation use case. OSM Overpass
+
Modelling a single city is a common simulation use case. OSM Overpass
 API provides a comfortable interface to
 obtain the road network and infrastructure within a city boundary (or
 other administrative region).
@@ -314,7 +314,7 @@
 Number) of the area you want to download. Then you can use that Id to
 download the area.
 Obtaining an area Id#
-Copy the following query into the input box on the the OSM Overpass API
+
Copy the following query into the input box on the the OSM Overpass API
 query page. Replace
 Berlin by the city name of your choice and click the accompanying
 button "Explore".
@@ -338,7 +338,7 @@
    <tag k="admin_level" v="4"/>
    <tag k="TMC:cid_58:tabcd_1:Class" v="Area"/>
    <tag k="name" v="Berlin"/>
-   <tag k="source" v="http://wiki.openstreetmap.org/wiki/Import/Catalogue/Kreisgrenzen_Deutschland_2005"/>
+   <tag k="source" v="https://wiki.openstreetmap.org/wiki/Import/Catalogue/Kreisgrenzen_Deutschland_2005"/>
    <tag k="TMC:cid_58:tabcd_1:LCLversion" v="9.00"/>
  </relation>
  <relation id="119876">
@@ -354,7 +354,7 @@
    <tag k="name" v="Berlin"/>
    <tag k="border_type" v="city"/>
    <tag k="created_by" v="polyshp2osm-multipoly"/>
-   <tag k="source" v="TIGER/Line® 2008 Place Shapefiles (http://www.census.gov/geo/www/tiger/)"/>
+   <tag k="source" v="TIGER/Line® 2008 Place Shapefiles (https://www.census.gov/geo/www/tiger/)"/>
    <tag k="tiger:reviewed" v="no"/>
    <tag k="is_in:country" v="USA"/>
    ...
@@ -369,7 +369,7 @@
 distinguish between Berlin,Germany and Berlin,USA/Georgia. If the
 output does not contain the region you were looking for, it might be
 helpful to add the type of region e.g. Berlin, city. If problems
-persist read on at the OSM Overpass API
+persist read on at the OSM Overpass API
 site.
 Downloading an area by Id#
 The Id obtained in the previous step for the city of Berlin was 62422.
@@ -377,7 +377,7 @@
 add the number 3,600,000,000 to obtain the Id of the area of berlin.
 3,600,000,000 + 62,422 = 3,600,062,422
 Using this number we construct another query for an input box on the
-OSM Overpass API query
+OSM Overpass API query
 page.
  <osm-script timeout="180" element-limit="20000000">
  <union>
@@ -402,7 +402,7 @@
 Downloading a very large area#
 Pre-packaged Areas#
 A large amount of pre-packaged areas are available at
-http://www.geofabrik.de/data/download.html. Many of these are quite
+https://www.geofabrik.de/data/download.html. Many of these are quite
 large and will probably require filtering before they can be reasonably
 processed. Importing the whole of Germany with [netconvert] takes
 about 60GB of RAM!
@@ -431,7 +431,7 @@
 
         
           
-            
This page was last edited on: 11 February 2021
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Networks/Import/OpenStreetMap.html sumo-1.18.0/docs/userdoc/Networks/Import/OpenStreetMap.html
--- sumo-1.17.0/docs/userdoc/Networks/Import/OpenStreetMap.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Networks/Import/OpenStreetMap.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -223,6 +223,9 @@
                 
                     • Shared Space for Trams and Road Vehicles
                 
+                
+                    • Further way/edge attributes
+                
             Editing OSM networks
                 
                     • JOSM
@@ -266,7 +269,7 @@
     

 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 

@@ -298,9 +301,9 @@
                   
                   
 
-"OpenStreetMap is a free editable map
+
"OpenStreetMap is a free editable map
 of the whole world. It is made by people like you." (from
-http://www.openstreetmap.org). This
+https://www.openstreetmap.org). This
 page describes the conversion of files containing data from OpenStreetMap to
 SUMO network files.

 There are several ways to download the data from OpenStreetMap to a
@@ -514,17 +517,17 @@
 
Incooperating z-coordinates in networks is still experimental so please
 report anything odd.
 SRTM#
-When using option --osm.elevation, z-data is imported from tags with key="ele"
+
When using option --osm.elevation, z-data is imported from tags with key="ele"
  in OSM nodes. Since this
 tag is not yet in wide use, tools exist to overlay OSM data with
 elevation data sources
-(http://wiki.openstreetmap.org/wiki/Srtm_to_Nodes). When using the
-osmosis-srtm pluging the option tagName=ele must be used since only the 'ele'
+(https://wiki.openstreetmap.org/wiki/Srtm_to_Nodes). When using the
+osmosis-srtm pluging the option tagName=ele must be used since only the 'ele'
 tag is evaluated and the
-plugin would use the 'height'
+plugin would use the 'height'
 tag by default.
 Layer Information#
-When using option --osm.layer-elevation, z-data is imported from tags with key="layer"
+
When using option --osm.layer-elevation, z-data is imported from tags with key="layer"
  in OSM ways. Since this
 data does not encode full elevation information, a heuristic is used to
 interpret the given information. Manual correction may be necessary.
@@ -637,9 +640,13 @@
 Shared Space for Trams and Road Vehicles#
 In the OSM database, shared space for tram and road vehicles is often modelled with distinct elements that occupy the same space. When imported directly, this would allow those modes of traffic to ignore each other due to running on different edges.
 To fix this, the option --edges.join-tram-dist FLOAT may be used. When this option is set (values between 1 and 2 are recommended), overlapping OSM elements will be converted to road lanes with shared permissions (indicated by a dark purple in sumo-gui).
+Further way/edge attributes#
+When setting option --output.street-names, the 'name' attribute of every edge will be set to the street name defined in the OSM data.
+When setting option --osm.all-attributes, all OSM tags of a way are exported as generic params of the edge.
+If only a specific selection of tags should be imported, this can be set with option --osm.extra-attributes.
 Editing OSM networks#
 JOSM#
-From George Dita, on 01.07.2009 JOSM
+
From George Dita, on 01.07.2009 JOSM
 can be used to edit OSM-data (i.e. for trimming a rectangular map and
 deleting unwanted features). After you delete the part that does not
 interest you, you have to alter the file using xmlstarlet which actually
@@ -654,7 +661,7 @@
 

 OSMOSIS#
 From Christian Klotz, on 01.07.2009, tip by Christoph Sommmer
-The java tool osmosis (http://wiki.openstreetmap.org/index.php/Osmosis)
+
The java tool osmosis (https://wiki.openstreetmap.org/index.php/Osmosis)
 can be used to filter out unwanted features from an OSM-file. The
 following command keeps motorways and motorway links while filtering out
 everything else:
@@ -842,7 +849,7 @@
 
    def getData(lsouthern-most latitude, western-most longitude, northern-most latitude, eastern-most longitude):
      query = 'way["waterway"="river"]["ship"="yes"](bbox:%s, %s, %s, %s)' %(southern-most latitude, western-most longitude, northern-most latitude, eastern-most longitude)
-     overpass_url = "http://overpass-api.de/api/interpreter"
+     overpass_url = "https://overpass-api.de/api/interpreter"
      overpass_query = """
      [out:json][timeout:25];
      (
@@ -883,7 +890,7 @@
 
         
           
-            
This page was last edited on: 31 March 2023
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Networks/Import/RoboCup.html sumo-1.18.0/docs/userdoc/Networks/Import/RoboCup.html
--- sumo-1.17.0/docs/userdoc/Networks/Import/RoboCup.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Networks/Import/RoboCup.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
diff -Nru sumo-1.17.0/docs/userdoc/Networks/Import/SUMO_Road_Networks.html sumo-1.18.0/docs/userdoc/Networks/Import/SUMO_Road_Networks.html
--- sumo-1.17.0/docs/userdoc/Networks/Import/SUMO_Road_Networks.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Networks/Import/SUMO_Road_Networks.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -171,7 +171,7 @@
     

 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 

diff -Nru sumo-1.17.0/docs/userdoc/Networks/Import/Vissim.html sumo-1.18.0/docs/userdoc/Networks/Import/Vissim.html
--- sumo-1.17.0/docs/userdoc/Networks/Import/Vissim.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Networks/Import/Vissim.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -173,7 +173,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -224,7 +224,7 @@
 maximum velocity to gain the velocity to use. The default value is 1.
 Furthermore, as we have to use geometrical heuristics for joining
 connections to nodes, a further factor steers the process of converting
-Vissim-networks: simply spoken, --vissim.offset <FLOAT> holds the information how near two
+Vissim-networks: simply spoken, --vissim.join-distance <FLOAT> holds the information how near two
 nodes must be (in meters) to be joined.
 During import, different actions must be done which may yield in some
 loss of data and may be watched in part by setting the verbose option.
@@ -291,7 +291,7 @@
 
         
           
-            
This page was last edited on: 11 February 2021
+            
This page was last edited on: 22 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Networks/Import/VISUM.html sumo-1.18.0/docs/userdoc/Networks/Import/VISUM.html
--- sumo-1.17.0/docs/userdoc/Networks/Import/VISUM.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Networks/Import/VISUM.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -177,7 +177,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/Networks/Import.html sumo-1.18.0/docs/userdoc/Networks/Import.html
--- sumo-1.17.0/docs/userdoc/Networks/Import.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Networks/Import.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
diff -Nru sumo-1.17.0/docs/userdoc/Networks/PlainXML.html sumo-1.18.0/docs/userdoc/Networks/PlainXML.html
--- sumo-1.17.0/docs/userdoc/Networks/PlainXML.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Networks/PlainXML.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -273,7 +273,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -357,15 +357,15 @@
 available as XML Schema Definitions:
 
 nodes files:
-  http://sumo.dlr.de/xsd/nodes_file.xsd
+  https://sumo.dlr.de/xsd/nodes_file.xsd
 edges files:
-  http://sumo.dlr.de/xsd/edges_file.xsd
+  https://sumo.dlr.de/xsd/edges_file.xsd
 types files:
-  http://sumo.dlr.de/xsd/types_file.xsd
+  https://sumo.dlr.de/xsd/types_file.xsd
 connections files:
-  http://sumo.dlr.de/xsd/connections_file.xsd
+  https://sumo.dlr.de/xsd/connections_file.xsd
 tllogic files:
-  http://sumo.dlr.de/xsd/tllogic_file.xsd
+  https://sumo.dlr.de/xsd/tllogic_file.xsd
 
 Node Descriptions#
 
@@ -395,7 +395,7 @@
 
 
 XML Schema
-nodes_file.xsd
+nodes_file.xsd
 
 
 
@@ -772,7 +772,7 @@
 
 
 XML Schema
-edges_file.xsd
+edges_file.xsd
 
 
 
@@ -1300,7 +1300,7 @@
 
 
 XML Schema
-types_file.xsd
+types_file.xsd
 
 
 
@@ -1401,7 +1401,7 @@
 
 
 XML Schema
-connections_file.xsd
+connections_file.xsd
 
 
 
@@ -1752,7 +1752,7 @@
 
 
 XML Schema
-tllogic_file.xsd
+tllogic_file.xsd
 
 
 
@@ -1937,7 +1937,7 @@
 
         
           
-            
This page was last edited on: 20 April 2023
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Networks/SUMO_Road_Networks.html sumo-1.18.0/docs/userdoc/Networks/SUMO_Road_Networks.html
--- sumo-1.17.0/docs/userdoc/Networks/SUMO_Road_Networks.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Networks/SUMO_Road_Networks.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -212,7 +212,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -272,7 +272,7 @@
 
 
 XML Schema
-net_file.xsd
+net_file.xsd
 
 
 
@@ -993,7 +993,7 @@
 
         
           
-            
This page was last edited on: 31 March 2023
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/od2trips.html sumo-1.18.0/docs/userdoc/od2trips.html
--- sumo-1.17.0/docs/userdoc/od2trips.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/od2trips.html	2023-06-28 22:08:56.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -194,7 +194,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -247,7 +247,7 @@
 Options#
 You may use a XML schema definition file for setting up a od2trips
 configuration:
-od2tripsConfiguration.xsd.
+od2tripsConfiguration.xsd.
 Configuration#
 All applications of the SUMO-suite handle configuration options the
 same way. These options are discussed at Basics/Using the Command Line
@@ -576,7 +576,7 @@
 
         
           
-            
This page was last edited on: 05 January 2023
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/OpenStreetMap_file.html sumo-1.18.0/docs/userdoc/OpenStreetMap_file.html
--- sumo-1.17.0/docs/userdoc/OpenStreetMap_file.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/OpenStreetMap_file.html	2023-06-28 22:08:56.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -166,7 +166,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -224,10 +224,10 @@
 
 
 XML Schema
-XSD of API v0.6
+XSD of API v0.6
 
 
-wiki.openstreetmap.org/wiki/.osm
+wiki.openstreetmap.org/wiki/.osm
 
 
 
@@ -275,12 +275,12 @@
   junction.
 
 Software for Viewing, Editing and Processing#
-The OpenStreetMap wiki lists a few tools to process OpenStreetMap
+
The OpenStreetMap wiki lists a few tools to process OpenStreetMap
 files. As a
-graphical editor, JOSM is very
+graphical editor, JOSM is very
 popular. You can modify roads and tags with it and also run some
 validation checks. The command line editor
-Osmosis allows
+Osmosis allows
 automated processing of OpenStreetMap data (see, for example,
 Networks/Import/OpenStreetMap#Editing OSM
 networks).
@@ -299,7 +299,7 @@
 
         
           
-            
This page was last edited on: 15 February 2021
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/OsmNetconvert.typ.xml.html sumo-1.18.0/docs/userdoc/OsmNetconvert.typ.xml.html
--- sumo-1.17.0/docs/userdoc/OsmNetconvert.typ.xml.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/OsmNetconvert.typ.xml.html	2023-06-28 22:08:56.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -198,10 +198,10 @@
 
 
 
-W. Bamberger
+W. Bamberger
 Own work (see also SUMO edge type file)
 This file is located in the SUMO repository. See the log there.
-This work is licensed under a Creative Commons CC0 1.0 Universal license. To the extent possible under law, the person who associated CC0 with this work has waived all copyright and related or neighboring rights to this work.
+This work is licensed under a Creative Commons CC0 1.0 Universal license. To the extent possible under law, the person who associated CC0 with this work has waived all copyright and related or neighboring rights to this work.
 
 
 
@@ -212,7 +212,7 @@
 
         
           
-            
This page was last edited on: 28 April 2021
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Osm-urban-de.typ.xml.html sumo-1.18.0/docs/userdoc/Osm-urban-de.typ.xml.html
--- sumo-1.17.0/docs/userdoc/Osm-urban-de.typ.xml.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Osm-urban-de.typ.xml.html	2023-06-28 22:08:56.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -198,10 +198,10 @@
 
 
 
-W. Bamberger
+W. Bamberger
 Own work (see also SUMO edge type file)
 This file is located in the SUMO repository. See the log there.
-This work is licensed under a Creative Commons CC0 1.0 Universal license. To the extent possible under law, the person who associated CC0 with this work has waived all copyright and related or neighboring rights to this work.
+This work is licensed under a Creative Commons CC0 1.0 Universal license. To the extent possible under law, the person who associated CC0 with this work has waived all copyright and related or neighboring rights to this work.
 
 
 
@@ -212,7 +212,7 @@
 
         
           
-            
This page was last edited on: 28 April 2021
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Other/File_Extensions.html sumo-1.18.0/docs/userdoc/Other/File_Extensions.html
--- sumo-1.17.0/docs/userdoc/Other/File_Extensions.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Other/File_Extensions.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -167,7 +167,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -214,61 +214,61 @@
 corresponding executable with "cfg" appended)
 *.sumocfg (formerly .sumo.cfg): Configuration file for
   sumo and sumo-gui
-  (xsd)
+  (xsd)
 *.netccfg (formerly .netc.cfg): Configuration file for
   netconvert
-  (xsd)
+  (xsd)
 *.netgcfg (formerly .netg.cfg): Configuration file for
   netgenerate
-  (xsd)
+  (xsd)
 *.duarcfg (formerly .rou.cfg): Configuration file for
   duarouter
-  (xsd)
+  (xsd)
 *.jtrrcfg (formerly .jtr.cfg): Configuration file for
   jtrrouter
-  (xsd)
+  (xsd)
 *.dfrocfg (formerly .df.cfg): Configuration file for
   dfrouter
-  (xsd)
+  (xsd)
 *.od2tcfg (formerly .od2t.cfg): Configuration file for
   od2trips
-  (xsd)
+  (xsd)
 *.acticfg (formerly .act.cfg): Configuration file for
   activitygen
-  (xsd)
+  (xsd)
 
 
 
 
 Data files
 *.net.xml: network file
-  (xsd,
+  (xsd,
   description)
 *.rou.xml: routes file
-  (xsd,
+  (xsd,
   description)
 *.rou.alt.xml: route alternatives file
-  (xsd,
+  (xsd,
   description)
 *.add.xml:
   sumo/sumo-gui - additional-file
-  (xsd, missing description)
+  (xsd, missing description)
 traffic lights only
-  (xsd, missing
+  (xsd, missing
   description)
 
 
 *.edg.xml: netconvert - edges file
-  (xsd,
+  (xsd,
   description)
 *.nod.xml: netconvert - nodes file
-  (xsd,
+  (xsd,
   description)
 *.con.xml: netconvert- connection
-  file (xsd,
+  file (xsd,
   description)
 *.typ.xml: netconvert- edge types
-  file (xsd,
+  file (xsd,
   description)
 *.trips.xml: trip definitions for
   duarouter,sumo
@@ -278,12 +278,12 @@
   (description)
 *.turns.xml: turn and sink definitions for
   jtrrouter
-  (xsd,
+  (xsd,
   description)
 *.taz.xml: traffic analysis zones (or districts) file
   mainly for
   od2trips,duarouter,sumo
-  (xsd)
+  (xsd)
   (description)
 
 
@@ -291,40 +291,40 @@
 
 Output files
 *.xml: inductive loop output
-  (xsd,
+  (xsd,
   description
 *.xml: areal lane detector output
-  (xsd,
+  (xsd,
   description)
 *.xml: areal lane detector output
-  (xsd,
+  (xsd,
   description)
 *.xml: emissions output
-  (xsd,
+  (xsd,
   description)
 *.xml: fcd output
-  (xsd,
+  (xsd,
   description)
 *.xml: full output
-  (xsd,
+  (xsd,
   description)
 *.xml: meandata output
-  (xsd,
+  (xsd,
   description)
 *.xml: netstate output
-  (xsd,
+  (xsd,
   description)
 *.xml: queue output
-  (xsd,
+  (xsd,
   description)
 *.xml: summary output
-  (xsd,
+  (xsd,
   description)
 *.xml: tripinfo output
-  (xsd,
+  (xsd,
   description)
 *.xml: vtypeprobe output
-  (xsd,
+  (xsd,
   description)
 
 
@@ -332,7 +332,7 @@
 
 Other files
 *.xml: edge diff
-  (xsd, missing
+  (xsd, missing
   description)
 
 
@@ -391,7 +391,7 @@
 
         
           
-            
This page was last edited on: 13 September 2022
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Other/Glossary.html sumo-1.18.0/docs/userdoc/Other/Glossary.html
--- sumo-1.17.0/docs/userdoc/Other/Glossary.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Other/Glossary.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -180,7 +180,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -460,8 +460,8 @@
 XML:
 "eXtensible Markup Language is a universal format
 for structured documents and data" as the w3c says. Further
-information may be found at http://www.w3c.org/XML/ or
-http://en.wikipedia.org/wiki/XML. Most of the data read and
+information may be found at https://www.w3c.org/XML/ or
+https://en.wikipedia.org/wiki/XML. Most of the data read and
 written by SUMO is stored as XML, see also the page on file
 types.
 
@@ -470,8 +470,8 @@
 XML Schema Definitions "... provide a means for
 defining the structure, content and semantics of XML documents" as
 the w3c says. Further information may be found at
-http://www.w3.org/XML/Schema or
-http://en.wikipedia.org/wiki/XML_Schema_%28W3C%29. A part of the
+https://www.w3.org/XML/Schema or
+https://en.wikipedia.org/wiki/XML_Schema_%28W3C%29. A part of the
 XML data formats used by SUMO is covered by xsd, see the page on
 file types.
 
@@ -482,7 +482,7 @@
 
         
           
-            
This page was last edited on: 20 April 2022
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Other/Links.html sumo-1.18.0/docs/userdoc/Other/Links.html
--- sumo-1.17.0/docs/userdoc/Other/Links.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Other/Links.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -191,7 +191,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -237,16 +237,16 @@
 Programming Tools#
 Documentation#
 
-Doxygen A class
+
Doxygen A class
   documentation utility.
-XMLMind XML Editor An editor
+
XMLMind XML Editor An editor
   supporting DocBook.
 MkDocs
   MkDocs, the tool used to build the SUMO-documentation.
 
 Software Engineering#
 
-SourceMonitor A
+
SourceMonitor A
   great source code metrics tool.
 
 Configuration Tools#
@@ -257,19 +257,19 @@
 Open Source Traffic Simulation Packages#
 Road Traffic in General#
 
-Matsim A mesoscopic simulation package.
-Trafix A road traffic simulation
+
Matsim A mesoscopic simulation package.
+Trafix A road traffic simulation
   based on cellular automata written in C++. [not revised].
-Visual Traffic
+
Visual Traffic
   Simulation
   A java application which allows to build own networks and simulate
   them. [not revised].
-MITRASIM-2000
+
MITRASIM-2000
   An (open source?) traffic simulation in Java. [not revised].
 BABSIM A simulation mainly concentrating on
   highways (BAB=BundesAutoBahnen, Federal Highways). Not yet given o
   the public.
-TraffSpot A microscopic simulation
+
TraffSpot A microscopic simulation
   with a nice 3D-view.
 
 Traffic Lights Optimisation#
@@ -282,7 +282,7 @@
 
 Applets#
 
-Microsimulation of Road Traffic
+
Microsimulation of Road Traffic
   A very neat simulation applet based on the IDM-model that includes
   lane changing by Martin Treiber.
 
@@ -293,7 +293,7 @@
 
         
           
-            
This page was last edited on: 11 February 2021
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Other/Projects.html sumo-1.18.0/docs/userdoc/Other/Projects.html
--- sumo-1.17.0/docs/userdoc/Other/Projects.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Other/Projects.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -182,7 +182,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -217,7 +217,7 @@
 At the DLR#
 Current Projects#
 
-MAVEN Managing Automated Vehicles
+
MAVEN Managing Automated Vehicles
   Enhances Network
 TransAID
   new hierarchical traffic management procedures to allow the smooth
@@ -228,11 +228,11 @@
   large-scale traffic for disaster and public event management
 I.MoVe
   developing additional car following models
-Urban Mobility Intermodal routing and
+
Urban Mobility Intermodal routing and
   modeling of transfer between vehicles in SUMO
-Mobility Inside Using SUMO's
+
Mobility Inside Using SUMO's
   intermodal routing engine
-HubChain (german) simulating
+
HubChain (german) simulating
   autonomous public transport in rural areas
 
 Past Projects#
@@ -241,27 +241,27 @@
   simulated the traffic of Berlin
 COLOMBO Cooperative Self-Organizing
   System for low Carbon Mobility at low Penetration Rates
-AMITRAN
-MODUM
-iTetris An Integrated Wireless and
+
AMITRAN
+MODUM
+iTetris An Integrated Wireless and
   Traffic Platform for Real-Time Road Traffic Management Solutions
 Delphi: country-wide traffic analysis and prognosis for Germany
 ORINOKO: improvements on mobility in the
   city of Nürnberg
 TrafficOnline: traffic flow estimation using cellular phones
-Soccer2006:
+
Soccer2006:
   Traffic prognosis during the FIFA-WorldCup 2006
 Weltjugendtag2005: Traffic prognosis during the world youth day 2005
 TrafficTower:
   A virtual traffic management centre
-INVENT: Evaluation of modern traffic
+
INVENT: Evaluation of modern traffic
   management approaches
-OIS: Verification of
+
OIS: Verification of
   using optical sensors for optimization of traffic lights
-CityMobil Automatic urban
+
CityMobil Automatic urban
   transportation. A simulation for a parking lot inspired by the Rome
   demonstrator is included with SUMO.
-DRIVE C2X Driving implementation
+
DRIVE C2X Driving implementation
   and evaluation of C2X communication technology
 MENDEL modeling electric
   buses and optimizing charging with respect to grid load
@@ -271,27 +271,27 @@
 
 MultiAgent Control of Traffic
   Signals
-VENTOS a VEhicular NeTwork Open
+
VENTOS a VEhicular NeTwork Open
   Simulator
 Webots a 3D physics robot simulator
   connected to SUMO
-eWorld - an application that
+
eWorld - an application that
   allows to convert and enrich roads networks; interaction is done via
   the TraCI-protocol
-Environmental Monitoring in/of Metropolitan Areas
+
Environmental Monitoring in/of Metropolitan Areas
   by Sven Lahde, Michael Doering, Wolf-Bastian Pöttner, Moritz Rosin,
   Gerrit Lammert and Lars Wolf from the University of Braunschweig,
   Germany
-AutoNomos - A Distributed and Self-Regulating Approach for Organizing a Large System of Mobile Objects. Axel Wegener, Horst Hellbrück
+
AutoNomos - A Distributed and Self-Regulating Approach for Organizing a Large System of Mobile Objects. Axel Wegener, Horst Hellbrück
   and Stefan Fischer from the University of Luebeck, Germany in
   cooperation with Sándor Fekete from Braunschweig Technical
   University, Germany
-TraNS - Traffic and Network Simulation environment for design, implementation
+
TraNS - Traffic and Network Simulation environment for design, implementation
   and realistic evaluation of VANET
   applications
   by Michal Piorkowski, Maxim Raya, Ada Lezama Lugo and Jean-Pierre
-  Hubaux from Laboratory for Computer Communications and Applications
-  (LCA), EPFL,
+  Hubaux from Laboratory for Computer Communications and Applications
+  (LCA), EPFL,
   Switzerland
   TraNS is the first open-source project providing a full-blown
   application-centric evaluation framework for VANETs. It has a unique
@@ -309,7 +309,7 @@
   (2)
 "Assessment of traffic regulation policies for the minimization of
   pollutants emissions"
-  by Mauro Bianchi at CEFRIEL, Italy.
+  by Mauro Bianchi at CEFRIEL, Italy.
   This project uses SUMO in combination with EMEP/CORINAIR methodology
   for evaluating the impact of different traffic regulation strategies
   on pollutants emissions. Traffic simulations are performed offline
@@ -318,7 +318,7 @@
   hypothesize an online regulation system with a network of sensors
   that is used to recognize the current traffic situations and deploy
   the optimal traffic regulation policies.
-Fidens – Trust between Cooperative Systems in Application to VANETs
+
Fidens – Trust between Cooperative Systems in Application to VANETs
   This project investigates trust in vehicular networks (VANETs).
   Besides the trust research, it features a simulation environment for
   large scale vehicular network applications. Our typical scenario
@@ -354,7 +354,7 @@
 
"Analyse und Simulation von Verkettbarkeitsmaßen in pseudonymer,
   mobiler
   Kommunikation" by Clemens Honomichl; Diploma thesis; 2008
-emil - Elektrobusse mit induktiver Ladetechnik (german only)
+emil - Elektrobusse mit induktiver Ladetechnik (german only)
 Metro Traffic Simulator
 
 Code repositories with SUMO related stuff#
@@ -387,7 +387,7 @@
 
         
           
-            
This page was last edited on: 16 February 2023
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/polyconvert.html sumo-1.18.0/docs/userdoc/polyconvert.html
--- sumo-1.17.0/docs/userdoc/polyconvert.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/polyconvert.html	2023-06-28 22:08:56.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -197,7 +197,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -264,7 +264,7 @@
 Options#
 You may use a XML schema definition file for setting up a polyconvert
 configuration:
-polyconvertConfiguration.xsd.
+polyconvertConfiguration.xsd.
 Configuration#
 All applications of the SUMO-suite handle configuration options the
 same way. These options are discussed at Basics/Using the Command Line
@@ -678,7 +678,7 @@
 
         

           
-            
This page was last edited on: 05 January 2023
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Publications.html sumo-1.18.0/docs/userdoc/Publications.html
--- sumo-1.17.0/docs/userdoc/Publications.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Publications.html	2023-06-28 22:08:56.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -168,7 +168,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -233,8 +233,8 @@
 
 
 SUMO Conference
-SUMO Conference Page
-1st SUMO User Conference Proceedings
+SUMO Conference Page
+1st SUMO User Conference Proceedings
 Berichte aus dem DLR-Institut für Verkehrssystemtechnik, Band 21
 2013
 
@@ -247,15 +247,15 @@
 
 
 SUMO Conference
-SUMO Conference Page
-SUMO2015 - Intermodal Simulation for Intermodal Transport
+SUMO Conference Page
+SUMO2015 - Intermodal Simulation for Intermodal Transport
 Berichte aus dem DLR-Institut für Verkehrssystemtechnik, Band 28
 2015
 
 
 SUMO Conference
-SUMO Conference Page
-SUMO2016 - Traffic, Mobility, and Logistics
+SUMO Conference Page
+SUMO2016 - Traffic, Mobility, and Logistics
 Berichte aus dem DLR-Institut für Verkehrssystemtechnik, Band 30
 2016
 
@@ -318,7 +318,7 @@
 
 SUMO Software Description
 Behrisch, Michael and Laura Bieker, Jakob Erdmann, Daniel Krajzewicz
-SUMO - Simulation of Urban MObility: An Overview, publications page
+SUMO - Simulation of Urban MObility: An Overview, publications page
 SIMUL 2011, The Third International Conference on Advances in System Simulation, pp. 63-68
 2011
 
@@ -346,7 +346,7 @@
 
 SUMO Software Description
 Krajzewicz, Daniel and Jakob Erdmann, Michael Behrisch, and Laura Bieker
-Recent Development and Applications of SUMO - Simulation of Urban MObility, Journal Page
+Recent Development and Applications of SUMO - Simulation of Urban MObility, Journal Page
 International Journal On Advances in Systems and Measurements, 5 (3&4), pp. 128-138
 2012
 
@@ -355,7 +355,7 @@
 Publications using SUMO#
 Most of the following entries and many more can also be found in this
 bibtex-file.
-We advice to use JabRef for editing
+We advice to use JabRef for editing
 this list of publications.
 
@@ -371,7 +371,7 @@
 
-
+
@@ -399,14 +399,14 @@
 
-
+
-
+
@@ -455,14 +455,14 @@
 
-
+
-
+
@@ -476,14 +476,14 @@
 
-
+
-
+
@@ -504,7 +504,7 @@
 
-
+
@@ -525,7 +525,7 @@
 
-
+
@@ -567,7 +567,7 @@
 
-
+
@@ -588,21 +588,21 @@
 
-
+
-
+
-
+
@@ -615,7 +615,7 @@
 
         
           
-            
This page was last edited on: 31 March 2023
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Screenshots/index.html sumo-1.18.0/docs/userdoc/Screenshots/index.html
--- sumo-1.17.0/docs/userdoc/Screenshots/index.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Screenshots/index.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -179,7 +179,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -226,14 +226,14 @@
 
 Screenshots from external applications#
 From 'TraNS'#
-TraNS
+
TraNS
 website
 Main TraNS v1.2 screen
 From 'eWorld'#
-eWorld website
+eWorld website
  eWorld Main Screen
 From 'SUMO Traffic Modeler'#
-SUMO Traffic Modeler
+
SUMO Traffic Modeler
 website
 Plain Bologna import
 Screenshots from Versions 0.7/0.8#
@@ -247,7 +247,7 @@
 
         
           
-            
This page was last edited on: 12 February 2021
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Screenshots/Shapes.html sumo-1.18.0/docs/userdoc/Screenshots/Shapes.html
--- sumo-1.17.0/docs/userdoc/Screenshots/Shapes.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Screenshots/Shapes.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -174,7 +174,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/Simpla.html sumo-1.18.0/docs/userdoc/Simpla.html
--- sumo-1.17.0/docs/userdoc/Simpla.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Simpla.html	2023-06-28 22:08:56.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -180,12 +180,15 @@
                 
                     • getPlatoonIDList() and getPlatoonInfo()
                 
+                
+                    • getPlatoonID()
+                
             Example
         
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -514,6 +517,14 @@
 
 
 

 
 Simulation Theory
 Chowdhury, D., L. Santen, A. Schadschneider Statistical Physics of Vehicular Traffic and Some Related Systems Statistical Physics of Vehicular Traffic and Some Related Systems
 Physics Reports 329, (4-6), pp. 199-329, Elsevier, ISSN 0370-1573
 2000
 

 Lane-Change Models
 Erdmann, Jakob Lane-Changing Model in SUMO Lane-Changing Model in SUMO
 Proceedings of the SUMO2014 Modeling Mobility with Open Data, pp. 77-88, Berlin, ISSN 1866-721X
 2014
 
 
 Intermodality
 Behrisch, Michael and Erdmann, Jakob and Krajzewicz, Daniel Adding intermodality to the microscopic simulation package SUMO Adding intermodality to the microscopic simulation package SUMO
 MESM 2010, Alexandria (Egypt)
 2010
 

 Traffic Lights
 Zubillaga D, Cruz G, Aguilar LD, Zapot‚catl J, Fern ndez N, Aguilar J, Rosenblueth DA, Gershenson C Measuring the Complexity of Self-Organizing Traffic Lights Measuring the Complexity of Self-Organizing Traffic Lights
 Entropy 2014, 16(5), 2384-2407
 2014
 
 
 Car2Car Communication
 Bauza, R. and J. Gozalvez and M. Sepulcre Operation and Performance of Vehicular Ad-hoc Routing Protocols in Realistic Environments Operation and Performance of Vehicular Ad-hoc Routing Protocols in Realistic Environments
 Proceedings of the 2nd IEEE International Symposium on Wireless Vehicular Communications (WiVeC), Calgary (Canada)
 2008
 

 Car2Car Communication
 Kristianto Karnadi, Feliz and Zhi Hai Mo and Kun-chan Lan Rapid Generation of Realistic Mobility Models for VANET Rapid Generation of Realistic Mobility Models for VANET
 ACM MOBICOMM
 2005
 
 
 Car2Car Communication
 Gozalvez, J. and M. Sepulcre Channel Efficiency of Adaptive Transmission Techniques for Wireless Vehicular Communications Channel Efficiency of Adaptive Transmission Techniques for Wireless Vehicular Communications
 Proceedings of the 15th World Congress on Intelligent Transport Systems, New York (USA)
 2008
 

 Car2Car Communication
 Piorkowski, Michal and Maxim Raya, Ada Lezama Lugo, Panos Papadimitratos, Matthias Grossglauser and Jean-Pierre Hubaux TraNS: Realistic Joint Traffic and Network Simulator for VANETs TraNS: Realistic Joint Traffic and Network Simulator for VANETs
 The 13th ACM Annual International Conference on Mobile Computing and Networking MobiCom'07, Montreal (Canada)
 2007
 

 Car2Car Communication
 Wegener, Axel and Michal Piorkowski, Maxim Raya, Horst Hellbrck, Stefan Fischer, and Jean-Pierre Hubaux TraCI: An Interface for Coupling Road Traffic and Network Simulators TraCI: An Interface for Coupling Road Traffic and Network Simulators
 The 11th Communications and Networking Simulation Symposium CNS'08, Ottawa (Canada)
 2008
 

 ITS - other topics
 Kerekes, John P. and Michael D. Presnar, Kenneth D. Fourspring, Zoran Ninkov, David R. Pogorzala, Alan D. Raisanen, Andrew C. Rice, Juan R. Vasquez, Jeffrey P. Patel, Robert T. MacIntyre, and Scott D. Brown Sensor modeling and demonstration of a multi-object spectrometer for performance-driven sensing Sensor modeling and demonstration of a multi-object spectrometer for performance-driven sensing
 Proc. SPIE 7334, 73340J, 
 2009
 

 ITS - other topics
 Xie, X.-F. and Y. Feng, K. Larry Head Unified route choice framework: Specification and application to urban traffic control Unified route choice framework: Specification and application to urban traffic control
 Transportation Research Record: Journal of the Transportation Research Board, 2466: 105-113
 2014
 
 
 Traffic Lights
 Xie, X.-F. et al. Schedule-driven intersection control Schedule-driven intersection control
 Transportation Research Part C: Emerging Technologies, 24: 168-189
 2012
 
 
 ITS - other topics
 Xie, X.-F. et al. Schedule-driven coordination for real-time traffic network control Schedule-driven coordination for real-time traffic network control
 International Conference on Automated Planning and Scheduling (ICAPS), pp. 323-331, Sao Paulo (Brazil)
 2012
 
+getPlatoonID()#
+This utility function allows to check if a given vehicle is part of a platoon in simpla. If the vehicle given by its ID is controlled by 
+simpla, the function returns the numerical platoon ID (-1 otherwise). The platoon ID can be used as an input to getPlatoonInfo to 
+get information about the platoon structure.
+vehID = "myExampleVehicle"
+platoonID = simpla.getPlatoonID(vehID)
+
+
 Example#
 An example can be downloaded from the nightly test suite
 This can be executed by calling python runner.py
@@ -524,7 +535,7 @@
 
         
           
-            
This page was last edited on: 31 March 2023
+            
This page was last edited on: 05 May 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Simulation/Basic_Definition.html sumo-1.18.0/docs/userdoc/Simulation/Basic_Definition.html
--- sumo-1.17.0/docs/userdoc/Simulation/Basic_Definition.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Simulation/Basic_Definition.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -181,7 +181,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -347,7 +347,7 @@
 
 Especially for larger time-steps (e.g. 1sec.) ballistic update yields
 more realistic dynamics for car-following models based on continuous
-dynamics. See also Martin Treiber, Venkatesan Kanagaraj, Comparing
+dynamics. See also Martin Treiber, Venkatesan Kanagaraj, Comparing
 Numerical Integration Schemes for Time-Continuous Car-Following
 Models.
 Ballistic update causes positions to be updated with the average speed
@@ -372,7 +372,7 @@
 
         

           
-            
This page was last edited on: 31 March 2023
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Simulation/Bicycles.html sumo-1.18.0/docs/userdoc/Simulation/Bicycles.html
--- sumo-1.17.0/docs/userdoc/Simulation/Bicycles.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Simulation/Bicycles.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -216,7 +216,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/Simulation/Bluetooth.html sumo-1.18.0/docs/userdoc/Simulation/Bluetooth.html
--- sumo-1.17.0/docs/userdoc/Simulation/Bluetooth.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Simulation/Bluetooth.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -171,7 +171,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -215,7 +215,7 @@
 event. The relevant parameters for configuring the sender and receiver
 devices are described at
 sumo#communication. Details on the
-detection process can be found in the following publication: Behrisch,
+detection process can be found in the following publication: Behrisch,
 Michael and Gurczik, Gaby (2014) Modelling Bluetooth Inquiry for SUMO.
 In: SUMO2014 Modeling Mobility with Open Data. SUMO2014, 15.-16.
 Mai 2014, Berlin
@@ -437,7 +437,7 @@
 
         
           
-            
This page was last edited on: 31 March 2023
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Simulation/Calibrator.html sumo-1.18.0/docs/userdoc/Simulation/Calibrator.html
--- sumo-1.17.0/docs/userdoc/Simulation/Calibrator.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Simulation/Calibrator.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -187,7 +187,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -338,7 +338,7 @@
 values conserve computation time but may also lead to a tighter
 clustering of inserted vehicles.
 The algorithm for deciding when exactly to insert (and remove) vehicles
-is described in Erdmann, Jakob (2012) Online-Kalibrierung einer
+is described in Erdmann, Jakob (2012) Online-Kalibrierung einer
 Mikroskopischen Verkehrssimulation. ViMOS 2012, 29.11.2012, Dresden,
 Deutschland.
 Routes of generated Vehicles#
@@ -473,7 +473,7 @@
 
         
           
-            
This page was last edited on: 31 March 2023
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Simulation/Distances.html sumo-1.18.0/docs/userdoc/Simulation/Distances.html
--- sumo-1.17.0/docs/userdoc/Simulation/Distances.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Simulation/Distances.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -179,7 +179,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/Simulation/Emergency.html sumo-1.18.0/docs/userdoc/Simulation/Emergency.html
--- sumo-1.17.0/docs/userdoc/Simulation/Emergency.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Simulation/Emergency.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -178,7 +178,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/Simulation/Friction.html sumo-1.18.0/docs/userdoc/Simulation/Friction.html
--- sumo-1.17.0/docs/userdoc/Simulation/Friction.html	1970-01-01 00:00:00.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Simulation/Friction.html	2023-06-28 22:08:57.000000000 +0000
@@ -0,0 +1,356 @@
+
+
+
+    
+        
+        
+        
+
+        
+        
+        
+        
+
+        
+        
+        
+        
+        Friction - SUMO Documentation
+        
+        
+        
+        
+        
+        
+        
+
+        
+        
+        
+         
+
+      
+
+    
+
+    
+
+        
+            
+                
+                
+                    
+                    
+                
+
+                
+                
+                        
+                        
+                            
+                                Documentation
+                            
+                            
+                                Tutorials
+                            
+                            
+                                FAQ
+                            
+                            
+                                Downloads
+                            
+                            
+                                Publications
+                            
+                            
+                                Developer
+                            
+                            
+                                ChangeLog
+                            
+                            
+                                Contact
+                            
+                        
+
+                    
+                        
+                            
+                                 Search
+                            
+                        
+                            
+                                 Edit on GitHub
+                            
+                      
+                          
+                            More 
+                          
+                          
+                            Report a Bug / Issue / Typo
+                            Help on editing articles
+                            Recent documentation changes
+                            Keyboard Shortcuts
+                            Download the Documentation
+                            Dark mode 
+                              
+                          
+                          
+                        
+                        
+                          
+                             Languages 
+                          
+                          
+                            
+                              Translations are generated automatically by Google Translate:
+                            
+                            Deutsch
+                            Español
+                            Français
+                            Magyar
+                            Türkçe
+                          
+                        
+                    
+                
+            
+        
+
+        
+          
+                
+                  
+                  
+
+    
+        
+    
+    
+        
+            Contents
+            Introduction
+            Equipping vehicles
+            Network modification
+            Vehicle Behavior
+            Parameters
+            TraCI
+                
+                    • Friction Modification
+                
+                
+                    • Parameter Retrieval
+                
+        
+    
+
+    
+        visit eclipse.dev/sumo
+    
+
+
+                
+                
+                   
+                  
+    
+    Friction
+
+                  Friction
+                  
+                  
+
+Introduction#
+Thanks to Thomas Weber et al SUMO supports simulation of friction on streets since version 1.14.0
+via network annotation and the friction device. This forces vehicles to reduce their
+maximum speed when they are on a slippery road.
+Equipping vehicles#
+To attach a friction device to a vehicle, the standard device-equipment
+procedures can
+be applied using friction as device name.
+For instance, a single vehicle can be equipped as in the following minimal example
+    <vehicle id="v0" route="route0" depart="0">
+        <param key="has.friction.device" value="true"/>
+    </vehicle>
+
+
+Network modification#
+The friction device will work with the lanes friction attribute, which defaults to 1 and can be modfied
+either directly in the network or dynamically using traci/libsumo.
+Vehicle Behavior#
+A vehicle with a friction device will determine a perceived friction by adding random noise to friction
+coefficient of the lane and then calculate a new maximum speed for the lane by applying the following factor:
+factor = -0.3491 * fric * fric + 0.8922 * fric + 0.4493
+
+
+Parameters#
+The following parameters affect the operation of the friction device.
+
+device.friction.stdDev: standard deviation when adding gaussian noise (default 1)
+device.friction.offset: constant offset to apply to all friction values (default 0)
+
+All device parameters may be set via sumo option, vType parameter or vehicle parameter
+TraCI#
+Friction Modification#
+Lanes support the setFriction and getFriction functions.
+Parameter Retrieval#
+Vehicles allow to retrieve frictionCoefficient (the perceived friction with noise),
+rawFriction (the friction value of the current lane), stdDev, and offset using
+the parameter API e.g. vehicle.getParameter(id, "device.friction.offset").
+                
+          
+          
+        
+
+        
+          
+            
This page was last edited on: 20 June 2023
+          
+          
+            Copyright © 2001-2023 German Aerospace Center (DLR) and others.
+          Follow us on   
+          | Documentation built with MkDocs
+        
+
+      
+    
+        
+            
+                Search
+                
+            
+            
+                Enter your search terms:
+                
+                
+            
+        
+    
+
+      
+        
+
+        
+
+      
+    
+        
+            
+                Keyboard Shortcuts
+                
+            
+            
+              
+                
+                  
+                    
+                    
+                  
+                
+                
+                  
+                    
+                    
+                  
+                  
+                    
+                    
+                  
+                  
+                    
+                    
+                  
+                
+              Key Action
? Open this help dialog
s Search the Documentation
e Edit current page on GitHub
+            
+        
+    
+
+    
+
\ No newline at end of file
diff -Nru sumo-1.17.0/docs/userdoc/Simulation/GenericParameters.html sumo-1.18.0/docs/userdoc/Simulation/GenericParameters.html
--- sumo-1.17.0/docs/userdoc/Simulation/GenericParameters.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Simulation/GenericParameters.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -189,6 +189,7 @@
 Lane
 Person
 Vehicle
+Stop
 VehicleType
 PoI
 Polygon
@@ -229,7 +230,7 @@
 
         
           
-            
This page was last edited on: 31 March 2023
+            
This page was last edited on: 05 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Simulation/GLOSA.html sumo-1.18.0/docs/userdoc/Simulation/GLOSA.html
--- sumo-1.17.0/docs/userdoc/Simulation/GLOSA.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Simulation/GLOSA.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -180,7 +180,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/Simulation/Intersections.html sumo-1.18.0/docs/userdoc/Simulation/Intersections.html
--- sumo-1.17.0/docs/userdoc/Simulation/Intersections.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Simulation/Intersections.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -201,7 +201,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -235,7 +235,7 @@
 
 The vehicle dynamics at intersection are governed by the intersection
 model described in
-[Road Intersection Model in SUMO, Krajzewicz et al]. Of course, the model in
+[Road Intersection Model in SUMO, Krajzewicz et al]. Of course, the model in
 the latest revision may deviate somewhat due to the ongoing evolution of
 the model. This page gives an overview over the configuration options
 governing the intersection model.
@@ -410,7 +410,7 @@
 
         
           
-            
This page was last edited on: 17 June 2022
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Simulation/Meso.html sumo-1.18.0/docs/userdoc/Simulation/Meso.html
--- sumo-1.17.0/docs/userdoc/Simulation/Meso.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Simulation/Meso.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -200,6 +200,9 @@
                     • Configuration by edge type
                 
                 
+                    • Multimodal simulation
+                
+                
                     • Outputs
                 
                 
@@ -210,7 +213,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -272,7 +275,7 @@
 MESO the option --mesosim <BOOL> must be set. Additional options are
 described at sumo#mesoscopic
 Model Description#
-The simulation model is based on the work of Eissfeldt, Vehicle-based modelling of traffic. The original
+
The simulation model is based on the work of Eissfeldt, Vehicle-based modelling of traffic. The original
 model was focused on motorway traffic. The current implementation
 contains significant extensions to support the simulation of
 heterogeneous urban traffic as well.
@@ -421,6 +424,9 @@
 
 
 All attributes are optional and default to the value of the option with the corresponding option name. (i.e. tauff ~ meso-tauff, tlsPenalty ~ meso-tls-penalty, ...).
+Multimodal simulation#
+By default, meso is meant to be used for road vehicles (i.e. cars and trucks). To make use of bicycles and edges that do not permit paasenger cars, option --meso-lane-queue must be set.
+This will turn every lane into a distinct queue instead of treating parallel lanes as a single queue.
 Outputs#
 Many of the output options of SUMO are supported but the resulting files
 differ somewhat:
@@ -469,7 +475,7 @@
 
         
           
-            
This page was last edited on: 31 March 2023
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Simulation/Motorways.html sumo-1.18.0/docs/userdoc/Simulation/Motorways.html
--- sumo-1.17.0/docs/userdoc/Simulation/Motorways.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Simulation/Motorways.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -188,7 +188,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/Simulation/NEMA.html sumo-1.18.0/docs/userdoc/Simulation/NEMA.html
--- sumo-1.17.0/docs/userdoc/Simulation/NEMA.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Simulation/NEMA.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -178,7 +178,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/Simulation/OppositeDirectionDriving.html sumo-1.18.0/docs/userdoc/Simulation/OppositeDirectionDriving.html
--- sumo-1.17.0/docs/userdoc/Simulation/OppositeDirectionDriving.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Simulation/OppositeDirectionDriving.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -177,7 +177,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/Simulation/Output/AmitranOutput.html sumo-1.18.0/docs/userdoc/Simulation/Output/AmitranOutput.html
--- sumo-1.17.0/docs/userdoc/Simulation/Output/AmitranOutput.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Simulation/Output/AmitranOutput.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -166,7 +166,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -200,14 +200,14 @@
 
 The Amitran trajectories output contains information about type, current
 speed and acceleration of each vehicle according to the schema at
-http://sumo.dlr.de/xsd/amitran/trajectories.xsd
+https://sumo.dlr.de/xsd/amitran/trajectories.xsd
 Instantiating within the Simulation#
 The simulation is forced to generate this output using the option --amitran-output <FILE>. <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.
 Generated Output#
 The generated XML file looks like this:
-<trajectories xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/amitran/trajectories.xsd" timeStepSize="1000">
+<trajectories xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://sumo.dlr.de/xsd/amitran/trajectories.xsd" timeStepSize="1000">
     <actorConfig id="0" vehicleClass="Passenger" fuel="Gasoline" emissionClass="Euro0" ref="DEFAULT_VEHTYPE"/>
     <vehicle id="0" actorConfig="0" startTime="100000" ref="always_left.0"/>
     <motionState vehicle="0" speed="0" time="100000" acceleration="0"/>
@@ -226,12 +226,12 @@
 written. The same is true for vehicles and their motionStates.
 All numbers and ids are integers, where all the times are in
 milliseconds. For details and further information on the types please
-see the schema http://sumo.dlr.de/xsd/amitran/trajectories.xsd.
+see the schema https://sumo.dlr.de/xsd/amitran/trajectories.xsd.
 
 
-
+
 This part of SUMO was developed, reworked, or extended within the project 
-"AMITRAN", co-funded by the European Commission within the Seventh Framework Programme.
+"AMITRAN", co-funded by the European Commission within the Seventh Framework Programme.

                 

           
           
@@ -239,7 +239,7 @@
 
         
           
-            
This page was last edited on: 31 March 2023
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Simulation/Output/Amitran_Traffic_Measures.html sumo-1.18.0/docs/userdoc/Simulation/Output/Amitran_Traffic_Measures.html
--- sumo-1.17.0/docs/userdoc/Simulation/Output/Amitran_Traffic_Measures.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Simulation/Output/Amitran_Traffic_Measures.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -171,7 +171,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -260,7 +260,7 @@
 
 
 Generated Output#
-<linkData xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://sumo.dlr.de/xsd/amitran/linkdata.xsd">
+<linkData xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://sumo.dlr.de/xsd/amitran/linkdata.xsd">
    <timeSlice startTime="0" duration="60000"/>
    <timeSlice startTime="60000" duration="60000">
        <link id="32" amount="2" averageSpeed="888"/>
@@ -339,9 +339,9 @@
 
 
 
-
+
 This part of SUMO was developed, reworked, or extended within the project 
-"AMITRAN", co-funded by the European Commission within the Seventh Framework Programme.
+"AMITRAN", co-funded by the European Commission within the Seventh Framework Programme.

                 

           
           
@@ -349,7 +349,7 @@
 
         
           
-            
This page was last edited on: 31 March 2023
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Simulation/Output/Binary.html sumo-1.18.0/docs/userdoc/Simulation/Output/Binary.html
--- sumo-1.17.0/docs/userdoc/Simulation/Output/Binary.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Simulation/Output/Binary.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -176,7 +176,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/Simulation/Output/Collisions.html sumo-1.18.0/docs/userdoc/Simulation/Output/Collisions.html
--- sumo-1.17.0/docs/userdoc/Simulation/Output/Collisions.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Simulation/Output/Collisions.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -167,7 +167,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/Simulation/Output/EmissionOutput.html sumo-1.18.0/docs/userdoc/Simulation/Output/EmissionOutput.html
--- sumo-1.17.0/docs/userdoc/Simulation/Output/EmissionOutput.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Simulation/Output/EmissionOutput.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -173,7 +173,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/Simulation/Output/FCDOutput.html sumo-1.18.0/docs/userdoc/Simulation/Output/FCDOutput.html
--- sumo-1.17.0/docs/userdoc/Simulation/Output/FCDOutput.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Simulation/Output/FCDOutput.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -198,7 +198,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -417,8 +417,8 @@
 
 NOTES#
 In combination with the given geometry of the vehicles (shapes) you can
-build some nice animations, e.g NASA
-WorldWind or Google
+build some nice animations, e.g NASA
+WorldWind or Google
 Earth.
 Visualization example#
 Accelerations versus distances#
@@ -444,7 +444,7 @@
 
         
           
-            
This page was last edited on: 31 March 2023
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Simulation/Output/FullOutput.html sumo-1.18.0/docs/userdoc/Simulation/Output/FullOutput.html
--- sumo-1.17.0/docs/userdoc/Simulation/Output/FullOutput.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Simulation/Output/FullOutput.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -167,7 +167,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -342,12 +342,12 @@
 
 
 fuel@vehicle
-ml/s
+mg/s
 The fuel consumed by the vehicle in the actual simulation step
 
 
 fuel@lane
-ml/s
+mg/s
 The fuel consumed by the vehicles on the specific lane
 
 
@@ -455,7 +455,7 @@
 
         
           
-            
This page was last edited on: 31 March 2023
+            
This page was last edited on: 24 May 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Simulation/Output/index.html sumo-1.18.0/docs/userdoc/Simulation/Output/index.html
--- sumo-1.17.0/docs/userdoc/Simulation/Output/index.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Simulation/Output/index.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -207,7 +207,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -281,7 +281,7 @@
   informations for all edges, lanes and vehicles (good for
   visualisation purposes)
 vtk output: generates
-  Files in the well known VTK (Visualization
+  Files in the well known VTK (Visualization
   Toolkit) format, to show the positions the speed value for every
   vehicle
 fcd output: Floating Car
@@ -344,7 +344,7 @@
   or separate the approaching edges and to include or exclude the
   junction interior. (area-based detection on edges)
 
-Alternatively, the values for edges or lanes can be manually aggregated to obtain the flow at at a junction.
+Alternatively, the values for edges or lanes can be aggregated to obtain the flow at at a junction by using edgeData attribute edges and aggregate="true".
 vehicle-based information#
 
 trip information:
@@ -549,7 +549,7 @@
 
         
           
-            
This page was last edited on: 09 November 2022
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Simulation/Output/Induction_Loops_Detectors_(E1).html sumo-1.18.0/docs/userdoc/Simulation/Output/Induction_Loops_Detectors_(E1).html
--- sumo-1.17.0/docs/userdoc/Simulation/Output/Induction_Loops_Detectors_(E1).html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Simulation/Output/Induction_Loops_Detectors_(E1).html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -168,7 +168,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/Simulation/Output/Instantaneous_Induction_Loops_Detectors.html sumo-1.18.0/docs/userdoc/Simulation/Output/Instantaneous_Induction_Loops_Detectors.html
--- sumo-1.17.0/docs/userdoc/Simulation/Output/Instantaneous_Induction_Loops_Detectors.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Simulation/Output/Instantaneous_Induction_Loops_Detectors.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -168,7 +168,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/Simulation/Output/Lanearea_Detectors_(E2).html sumo-1.18.0/docs/userdoc/Simulation/Output/Lanearea_Detectors_(E2).html
--- sumo-1.17.0/docs/userdoc/Simulation/Output/Lanearea_Detectors_(E2).html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Simulation/Output/Lanearea_Detectors_(E2).html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -178,7 +178,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/Simulation/Output/Lanechange.html sumo-1.18.0/docs/userdoc/Simulation/Output/Lanechange.html
--- sumo-1.17.0/docs/userdoc/Simulation/Output/Lanechange.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Simulation/Output/Lanechange.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -176,7 +176,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/Simulation/Output/Lane-_or_Edge-based_Emissions_Measures.html sumo-1.18.0/docs/userdoc/Simulation/Output/Lane-_or_Edge-based_Emissions_Measures.html
--- sumo-1.17.0/docs/userdoc/Simulation/Output/Lane-_or_Edge-based_Emissions_Measures.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Simulation/Output/Lane-_or_Edge-based_Emissions_Measures.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -193,7 +193,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/Simulation/Output/Lane-_or_Edge-based_Noise_Measures.html sumo-1.18.0/docs/userdoc/Simulation/Output/Lane-_or_Edge-based_Noise_Measures.html
--- sumo-1.17.0/docs/userdoc/Simulation/Output/Lane-_or_Edge-based_Noise_Measures.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Simulation/Output/Lane-_or_Edge-based_Noise_Measures.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -186,7 +186,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -220,8 +220,8 @@
 
 The edge/lane based noise output based on Harmonoise writes information
 about the noise produced on edges/lanes. The model was generated within
-the EC-project Imagine. Its
-description can be found in the deliverable 18 of this project (D18 The
+the EC-project Imagine. Its
+description can be found in the deliverable 18 of this project (D18 The
 Harmonoise Engineering
 model).
 
@@ -375,7 +375,7 @@
 
         
           
-            
This page was last edited on: 12 May 2022
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Simulation/Output/Lane-_or_Edge-based_Traffic_Measures.html sumo-1.18.0/docs/userdoc/Simulation/Output/Lane-_or_Edge-based_Traffic_Measures.html
--- sumo-1.17.0/docs/userdoc/Simulation/Output/Lane-_or_Edge-based_Traffic_Measures.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Simulation/Output/Lane-_or_Edge-based_Traffic_Measures.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -185,7 +185,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -607,7 +607,7 @@
 Visualization / Plotting#
 
 sumo-gui can load edgeData files and color network edges/lanes according to any of it's attributes
-sumo-gui can color edges/lanes by any of the attributse being collected while the simulation is running
+sumo-gui can color edges/lanes by any of the attributes being collected while the simulation is running
 netedit can be used to load/view/edit edgeData files
 The mpl_dump_onNet.py
   script can display values of this output as a colored net (and
@@ -631,7 +631,7 @@
 
         
           
-            
This page was last edited on: 07 December 2022
+            
This page was last edited on: 20 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Simulation/Output/Multi-Entry-Exit_Detectors_(E3).html sumo-1.18.0/docs/userdoc/Simulation/Output/Multi-Entry-Exit_Detectors_(E3).html
--- sumo-1.17.0/docs/userdoc/Simulation/Output/Multi-Entry-Exit_Detectors_(E3).html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Simulation/Output/Multi-Entry-Exit_Detectors_(E3).html	2023-06-28 22:08:57.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -171,7 +171,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -284,6 +284,11 @@
 If set to true, no error will be reported if vehicles leave the detector without first entering it. This can be useful when tracking vehicles for a particular combination of entry and exit lane at an intersection and other vehicles may also use the exit lane. default: false.
 
 
+expectArrival
+bool
+Whether no warning should be issued when a vehicle arrives within the detector area. default: false.
+
+
 vTypes
 string
 space separated list of vehicle type ids to consider, "" means all; default "".
@@ -458,7 +463,7 @@
 
         
           
-            
This page was last edited on: 11 November 2022
+            
This page was last edited on: 22 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Simulation/Output/PersonSummary.html sumo-1.18.0/docs/userdoc/Simulation/Output/PersonSummary.html
--- sumo-1.17.0/docs/userdoc/Simulation/Output/PersonSummary.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Simulation/Output/PersonSummary.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -166,7 +166,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/Simulation/Output/QueueOutput.html sumo-1.18.0/docs/userdoc/Simulation/Output/QueueOutput.html
--- sumo-1.17.0/docs/userdoc/Simulation/Output/QueueOutput.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Simulation/Output/QueueOutput.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -171,7 +171,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/Simulation/Output/RawDump.html sumo-1.18.0/docs/userdoc/Simulation/Output/RawDump.html
--- sumo-1.17.0/docs/userdoc/Simulation/Output/RawDump.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Simulation/Output/RawDump.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -168,7 +168,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/Simulation/Output/RouteProbe.html sumo-1.18.0/docs/userdoc/Simulation/Output/RouteProbe.html
--- sumo-1.17.0/docs/userdoc/Simulation/Output/RouteProbe.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Simulation/Output/RouteProbe.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -167,7 +167,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -203,7 +203,7 @@
 all vehicles that passed an edge in a given interval. Their real-world
 equivalent would be a police stop with questionnaire or a look into the
 database of navigation providers such as
-TomTom.
+TomTom.
 Instantiating within the Simulation#
 RouteProbe Detectors have to be defined within an additional-file which has to be
 loaded by the simulation.
@@ -271,7 +271,7 @@
 
         
           
-            
This page was last edited on: 03 June 2022
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Simulation/Output/SSM_Device.html sumo-1.18.0/docs/userdoc/Simulation/Output/SSM_Device.html
--- sumo-1.17.0/docs/userdoc/Simulation/Output/SSM_Device.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Simulation/Output/SSM_Device.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -176,6 +176,9 @@
                     • DRAC
                 
                 
+                    • MDRAC
+                
+                
                     • PET
                 
                 
@@ -197,7 +200,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -253,9 +256,10 @@
     ...
     <vehicle id="v0" route="route0" depart="0">
         <param key="has.ssm.device" value="true"/>
-        <param key="device.ssm.measures" value="TTC DRAC PET"/>
-        <param key="device.ssm.thresholds" value="3.0 3.0 2.0"/> 
+        <param key="device.ssm.measures" value="TTC DRAC PET MDRAC"/>
+        <param key="device.ssm.thresholds" value="3.0 3.0 2.0 3.4"/> 
         <param key="device.ssm.range" value="50.0" />
+        <param key="device.ssm.mdrac.prt" value="1.0" />
         <param key="device.ssm.extratime" value="5.0" />
         <param key="device.ssm.file" value="ssm_v0.xml" />
         <param key="device.ssm.trajectories" value="false" />
@@ -263,6 +267,7 @@
         <param key="device.ssm.write-positions" value="false" />
         <param key="device.ssm.write-lane-positions" value="false" />
         <param key="device.ssm.filter-edges.input-file" value="input_list.txt" />
+        <param key="device.ssm.exclude-conflict-types" value="" />
     </vehicle>
     ....
 </routes>
@@ -289,7 +294,7 @@
 
 thresholds
 list of floats
-TTC < 3.0[s]
DRAC > 3.0[m/s^2]
PET < 2.0[s]
BR > 0.0[m/s^2]
SGAP < 0.2[m]
TGAP < 0.5[s]
+TTC < 3.0[s]
DRAC > 3.0[m/s^2]
MDRAC > 3.4[m/s^2]
PET < 2.0[s]
BR > 0.0[m/s^2]
SGAP < 0.2[m]
TGAP < 0.5[s]
 This space or comma-separated list of SSM-thresholds determines, which encounters are classified as conflicts (if their measurements exceed a threshold) and thus written to the output file as a <conflict>-element. This list is required to have the same length as the list of measures if given.

Note: Currently the global measures are recorded as a single timeline for the whole simulation span and thresholds have only effect insofar a leader is looked for in the distance corresponding to the SGAP and, respectively, TGAP values.
 
 
@@ -340,6 +345,12 @@
 -
 If defined, only conflicts occured at the provided edges and junctions are measured. See Restricting SSM Device to Edges and Junctions
 
+
+exclude-conflict-types
+list of strings
+-
+This space or comma-separated list of SSM device conflict type codes determines which conflicts will appear in the output file. Any conflict which has been classified during at least one time step as one of the mentioned types is excluded from the output. Special values "foe" (types {3,7,11,13,15}) and "ego" (types {2,6,10,12,14}) add predefined sets to the list.
+
 
 
 Encounter types#
@@ -569,6 +580,7 @@
 
TTC (time to collision)
 DRAC (deceleration rate to avoid a crash)
 PET (post encroachment time)
+MDRAC (modified DRAC) 
 
 Further, the following additional safety-relevant output can be generated, which will not be linked to a specific encounter:
 
@@ -609,6 +621,16 @@
 Note
 This has still to be implemented, currently only one variant is used.
 
+MDRAC#
+A modified indicator of the DRAC called MDRAC considering a perception-reaction-time (PRT) is defined as 
+MDRAC = 0.5*speed_difference/(TTC - PRT).
+
+
+The PRT is configured with param key device.ssm.mdrac.prt or via option --device.ssm.mdrac.prt and defaults to a value of 1 second.
+
+Note
+This metric is not fully implemented for all conflict types yet! (only type 0 - 8 are partly tested so far)
+
 PET#
 For merging and crossing situations, the PET (post encroachment time) is defined as the difference of the leading vehicle's conflict area exit time tA and the following vehicle's conflict area entry time tB:
 PET = tB - tA.
@@ -648,11 +670,11 @@
          <foeVelocity values="13.02,0.00 12.57,0.00 12.12,0.00 ..."/>
          <conflictPoint values="99.23,49.46 99.23,49.46 99.23,49.46 ..."/>
          <TTCSpan values="1.78 1.74 1.70 1.67 1.63 1.60 1.56 ..."/>
-         <minTTC time="7.40" position="99.23,49.46" type="10" value="1.48"/>
+         <minTTC time="7.40" position="99.23,49.46" type="10" value="1.48" speed="13.50"/>
          <DRACSpan values="3.66 3.61 3.56 3.50 3.44 3.37 3.30 ..."/>
          <maxDRAC time="6.50" position="99.23,49.46" type="10" 
-value="3.66"/>
-         <PET time="9.42" position="99.23,49.46" type="17" value="0.72"/>
+value="3.66" speed="12.95"/>
+         <PET time="9.42" position="99.23,49.46" type="17" value="0.72" speed="5.12"/>
      </conflict>
      <conflict begin="21.50" end="27.20" ego="ego1" foe="foe2">
          ...
@@ -805,6 +827,13 @@
 --device.ssm.measures "TTC"
 
 
+
+speed
+float >= 0
+The speed of the reporting vehicle at the occurence of minTTC.
+--device.ssm.measures "TTC"
+
+
 maxDRAC
 time
 float
@@ -833,6 +862,13 @@
 --device.ssm.measures "DRAC"
 
 
+
+speed
+float >= 0
+The speed of the reporting vehicle at the occurence of maxDRAC.
+--device.ssm.measures "DRAC"
+
+
 PET
 time
 float
@@ -860,6 +896,13 @@
 The measured PET-value.
 --device.ssm.measures "PET"
 
+
+
+speed
+float >= 0
+The speed of the reporting vehicle at the occurence of PET.
+--device.ssm.measures "PET"
+
 
 
 The <globalMeasures> element has the following structure:
@@ -1018,7 +1061,7 @@
 
         
           
-            
This page was last edited on: 10 November 2022
+            
This page was last edited on: 08 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Simulation/Output/StatisticOutput.html sumo-1.18.0/docs/userdoc/Simulation/Output/StatisticOutput.html
--- sumo-1.17.0/docs/userdoc/Simulation/Output/StatisticOutput.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Simulation/Output/StatisticOutput.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         

 
@@ -163,6 +163,9 @@
             Instantiating within the Simulation
             Generated Output
                 
+                    • performance
+                
+                
                     • vehicles
                 
                 
@@ -175,6 +178,9 @@
                     • persons
                 
                 
+                    • personTeleports
+                
+                
                     • vehicleTripStatistics
                 
                 
@@ -194,7 +200,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -235,10 +241,12 @@
 Generated Output#
 The generated XML file looks like this:
 <statistics>
+    <performance ''ATTRIBUTES''.../>
     <vehicles ''ATTRIBUTES''.../>
     <teleports ''ATTRIBUTES''.../>
     <safety ''ATTRIBUTES''.../>
     <persons ''ATTRIBUTES''.../>
+    <personTeleports ''ATTRIBUTES''.../>
     <vehicleTripStatistics ''ATTRIBUTES''.../>
     <pedestrianStatistics ''ATTRIBUTES''.../>
     <rideStatistics ''ATTRIBUTES''.../>
@@ -247,6 +255,68 @@
 
 
 The following output attributes are generated:
+performance#
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Attribute Name Value Type Description
clockBegin time Unix time (or hh:mm:ss if --human-readable-time is set) when the simulation started
clockEnd time Unix time (or hh:mm:ss if --human-readable-time is set) when simulation ended
clockDuration time Time spent executing the simulation (clockEnd - clockBegin)
traciDuration s Time spent using TraCI
realTimeFactor # Factor describing the (simulated / real) time relation
vehicleUpdatesPerSecond # Vehicles present in the simulation per second
personUpdatesPerSecond # Persons present in the simulation per second
begin int (time) Begin time of the simulation
end int (time) End time of the simulation
duration int (time) Duration of the simulation (begin - end)
 vehicles#
 
@@ -292,7 +362,7 @@
 
-
+
@@ -360,6 +430,33 @@
 
 
 total
 # The total number of teleportations that occured The total number of teleportations that occurred
 
 
 jam
 
 
+personTeleports#
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Attribute Name Value Type Description
total # Total number of person teleports that occurred
abortWait # Number of teleports due to excessive waiting for a ride
wrongDest # Number of teleports due to riding to the wrong destination
 vehicleTripStatistics#
 
@@ -558,7 +655,7 @@
 When comparing simulations with a fixed end-time, those simulations may differ in the number of departed and arrived vehicles. In this case, care must be taken to include the "missing" vehicles in a comparison, since many outputs only include arrived vehicles by default.
 To include statistics for these vehicles, the options --tripinfo-output.write-unfinished --duration-log.statistics must be set.
 The general idea is to add up the travel time (duration) and the time that was spent waiting for departure (departDelay) for all vehicles that were defined in the input.
-To simplify comparison between simulations that have the same number of vehiclles, the attributes 'totalTravelTime' and 'totalDepartDelay' are provided.
+To simplify comparison between simulations that have the same number of vehicles, the attributes 'totalTravelTime' and 'totalDepartDelay' are provided.
An alternative way to compute the sum of travel time and delays is to multiply the averages:
totalTravelTimeAndDelay = 
      vehicles.inserted * (vehicleTripStatistics.duration + vehicleTripStatistics.departDelay)
@@ -571,7 +668,7 @@
 
         
           
-            
This page was last edited on: 27 February 2023
+            
This page was last edited on: 12 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Simulation/Output/StopOutput.html sumo-1.18.0/docs/userdoc/Simulation/Output/StopOutput.html
--- sumo-1.17.0/docs/userdoc/Simulation/Output/StopOutput.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Simulation/Output/StopOutput.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -173,7 +173,7 @@
     

-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     

diff -Nru sumo-1.17.0/docs/userdoc/Simulation/Output/Summary.html sumo-1.18.0/docs/userdoc/Simulation/Output/Summary.html
--- sumo-1.17.0/docs/userdoc/Simulation/Output/Summary.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Simulation/Output/Summary.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -170,7 +170,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/Simulation/Output/Traffic_Lights.html sumo-1.18.0/docs/userdoc/Simulation/Output/Traffic_Lights.html
--- sumo-1.17.0/docs/userdoc/Simulation/Output/Traffic_Lights.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Simulation/Output/Traffic_Lights.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -199,7 +199,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/Simulation/Output/TripInfo.html sumo-1.18.0/docs/userdoc/Simulation/Output/TripInfo.html
--- sumo-1.17.0/docs/userdoc/Simulation/Output/TripInfo.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Simulation/Output/TripInfo.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -180,7 +180,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -417,9 +417,14 @@
 
 
-
+
+
+
+
+
+
 
 
 
 
     
 
 
 fuel_abs ml mg
 The complete amount of fuel the vehicle used during the trip
 
electricity_abs Wh The complete amount of electricity the vehicle used during the trip
 
 

 Output for vehicles that have not arrived at simulation end#
@@ -550,7 +555,7 @@
 
         
           
-            
This page was last edited on: 09 November 2022
+            
This page was last edited on: 24 May 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Simulation/Output/VehRoutes.html sumo-1.18.0/docs/userdoc/Simulation/Output/VehRoutes.html
--- sumo-1.17.0/docs/userdoc/Simulation/Output/VehRoutes.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Simulation/Output/VehRoutes.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             

                             
-                                Contact
+                                Contact
                             
                         
 
@@ -172,7 +172,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/Simulation/Output/VTKOutput.html sumo-1.18.0/docs/userdoc/Simulation/Output/VTKOutput.html
--- sumo-1.17.0/docs/userdoc/Simulation/Output/VTKOutput.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Simulation/Output/VTKOutput.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -166,7 +166,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -201,7 +201,7 @@
 This output option offers you the possibility to visualise/analyse your
 simulation data using the famous VTK file format. There are several
 Tools and Frameworks to get started with VTK e.g.
-ParaView.
+ParaView.
 The generated output file is very basic, so each vehicle is presented by
 only one point. In the VTK file the vehicles were stored in
 3-dimensional coordinate system, until now the Z-coordinate is always
@@ -227,7 +227,7 @@
 
         

           
-            
This page was last edited on: 11 February 2021
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Simulation/Output/VTypeProbe.html sumo-1.18.0/docs/userdoc/Simulation/Output/VTypeProbe.html
--- sumo-1.17.0/docs/userdoc/Simulation/Output/VTypeProbe.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Simulation/Output/VTypeProbe.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -166,7 +166,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/Simulation/ParkingArea.html sumo-1.18.0/docs/userdoc/Simulation/ParkingArea.html
--- sumo-1.17.0/docs/userdoc/Simulation/ParkingArea.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Simulation/ParkingArea.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -173,7 +173,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -328,6 +328,13 @@
 0
 The angle of the road-side parking spaces relative to the lane angle, positive means clockwise
 
+
+lefthand
+bool
+
+false
+Whether roadside parking spaces should be drawn on the left side of the lane
+
 
 
 Custom parking spaces#
@@ -446,7 +453,7 @@
 
         
           
-            
This page was last edited on: 31 March 2023
+            
This page was last edited on: 25 May 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Simulation/Pedestrians.html sumo-1.18.0/docs/userdoc/Simulation/Pedestrians.html
--- sumo-1.17.0/docs/userdoc/Simulation/Pedestrians.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Simulation/Pedestrians.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -248,7 +248,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/Simulation/Public_Transport.html sumo-1.18.0/docs/userdoc/Simulation/Public_Transport.html
--- sumo-1.17.0/docs/userdoc/Simulation/Public_Transport.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Simulation/Public_Transport.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -204,7 +204,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -383,7 +383,7 @@
 Letting Vehicles stop at a bus stop#
 Vehicles must be informed that they must stop at a bus stop. The
 following example shows how this can be done (taken from <SUMO_HOME>/examples/sumo/busses):
-<additional xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/additional_file.xsd">
+<additional xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://sumo.dlr.de/xsd/additional_file.xsd">
     <busStop id="busstop1" lane="2/1to1/1_0" startPos="20" endPos="40" lines="100 101 102"/>
     <busStop id="busstop2" lane="1/2to0/2_0" startPos="20" endPos="40" lines="100 101"/>
     <busStop id="busstop3" lane="0/1to0/0_0" startPos="20" endPos="40" lines="100 101 102"/>
@@ -554,7 +554,7 @@
 
         
           
-            
This page was last edited on: 18 November 2022
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Simulation/Rail_signals.html sumo-1.18.0/docs/userdoc/Simulation/Rail_signals.html
--- sumo-1.17.0/docs/userdoc/Simulation/Rail_signals.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Simulation/Rail_signals.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -168,7 +168,7 @@
     

 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 

diff -Nru sumo-1.17.0/docs/userdoc/Simulation/Railways.html sumo-1.18.0/docs/userdoc/Simulation/Railways.html
--- sumo-1.17.0/docs/userdoc/Simulation/Railways.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Simulation/Railways.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -201,7 +201,6 @@
                 
                     • Kilometrage (Mileage, Chainage)
                 
-            Routing on Bidirectional Tracks
             Modelling Trains
             Train Schedules
             Train Interaction
@@ -249,7 +248,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -359,13 +358,23 @@
   here
 
 Routing in bidirectional networks#
-When computing train routes in a network with parallel tracks which are usable in both directions, it may be
-desirable that trains preferentially use one of the tracks (i.e. to always keep on
-the right side) and thereby preventing conflicts between oncoming trains.
+When train tracks can be used in both directions, there is considerable freedom for trains when search a path through the network. To reduce the number of conflicts (when two vehicles want to use the same track in opposite directions), the preferred direction for each track can be defined and factored into the routing decision.
 To express this preference, the edges in the preferred direction and on the
 preferred side may be assigned a higher priority value. This value will be taken
-into account when setting option --weights.priority-factor which applies to
+into account when setting option --weights.priority-factor FLOAT which applies to
 sumo and duarouter.
+At the default option value of 0. Edge priority is ignored when routing. When setting a positive value, the edges with the lowest priority receive a penalty factor to their estimated travel time of 1 + FLOAT (where FLOAT is the option argument) whereas the edges with the highest priority receive no penalty. Edges with medium priority will receive a penalty of 1 + x * FLOAT where 
+  x = (edgePriority - minPriority) / (maxPriority - minPriority)
+
+
+The priority values can either be assigned by the user or computed heuristically by netconvert by setting the option --railway.topology.direction-priority. This requires that some of the tracks in the network are uni-directional (to unambiguously define the main direction). The assigned priority values are:
+
+4: unidirectional track
+3: main direction of bidirectional track
+2: undetermined main direction (straight continuation from different directions of unidirectional track)
+1: undetermined main direction (no continuation from unidirectional track)
+0: reverse of main direction of bidirectional track
+
 Importing bidirectional tracks from OSM#
 When importing networks from
 OSM, rails tagged with railway:preferred_direction:both are
@@ -440,21 +449,6 @@
 
Note
 Negative distance values are not currently supported (pending introduction of another attribute)
 
-Routing on Bidirectional Tracks#
-When train tracks can be used in both directions, there is considerable freedom for trains when search a path through the network. To reduce the number of conflicts (when two vehicles want to use the same track in opposite directions), the preferred direction for each track can be defined and factored into the routing decision.
-When routes are computed in the simulation, this is done by setting the option --device.rerouting.priority-factor FLOAT. This causes the priority values of edges to be factored into the routing decision with higher values being preferred. 
-At the default value of 0. Edge priority is ignored when routing. When setting a positive value, the edges with the lowest priority receive a penalty factor to their estimated travel time of 1 + FLOAT whereas the edges with the highest priority receive no penalty. Edges with medium priority will receive a penalty of 1 + x * FLOAT where 
-  x = (edgePriority - minPriority) / (maxPriority - minPriority)
-
-
-The priority values can either be assigned by the user or computed heuristically by netconvert by setting the option --railway.topology.direction-priority. This requires that some of the tracks in the network are uni-directional (to unambiguously define the main direction). The assigned priority values are:
-
-4: unidirectional track
-3: main direction of bidirectional track
-2: undetermined main direction (straight continuation from different directions of unidirectional track)
-1: undetermined main direction (no continuation from unidirectional track)
-0: reverse of main direction of bidirectional track
-
 Modelling Trains#
 There is a dedicated carFollowMode for trains which can be activated by
 setting carFollowModel="Rail" trainType="<TYPE>" in the <vType> definition. Allowed values for trainType are
@@ -547,7 +541,7 @@
 
 Functionality a) corresponds to the "classic" safety behavior of rail signals (PZB). When option --railsignal-moving-block is set or individual signals are configured with parameter moving-block (see below), feature a) is disabled and trains will use their configured carFollowModel (i.e. 'Rail') for distance keeping. This is similar to the LZB safety system when used with extremely short virtual blocks.
 To switch a single signal into moving-block-mode, the following additional file may be loaded:
-<additional xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://sumo.dlr.de/xsd/additional_file.xsd">
+<additional xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://sumo.dlr.de/xsd/additional_file.xsd">
     <tlLogic id="gneJ8" programID="0">
         <param key="moving-block" value="true"/>
     </tlLogic>
@@ -688,7 +682,7 @@
 
         
           
-            
This page was last edited on: 31 March 2023
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Simulation/Randomness.html sumo-1.18.0/docs/userdoc/Simulation/Randomness.html
--- sumo-1.17.0/docs/userdoc/Simulation/Randomness.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Simulation/Randomness.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -161,6 +161,9 @@
         
             Contents
             Random number generation (RNG)
+                
+                    • Running repeatedly with different Seeds
+                
             Route Distributions
             Vehicle Type Distributions
             Speed distribution
@@ -200,7 +203,7 @@
     

 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 

@@ -236,7 +239,7 @@
 simulation scenario. There are multiple ways of adding stochasticity to
 a simulation. They are described below.
 Random number generation (RNG)#
-Sumo implements the Mersenne
+
Sumo implements the Mersenne
 Twister algorithm for
 generating random numbers. This random number generator (RNG) is
 initialized with a seed value which defaults to the (arbitrary) value
@@ -256,6 +259,8 @@
 
 
The decoupling is done to ensure that loading vehicles does not affect
 simulation behavior of earlier vehicles. All RNGs use the same seed.
+Running repeatedly with different Seeds#
+The tool runSeeds.py may be used to efficiently repeat simulations with multiple seeds. See the FAQ for a guide on how this is done.
 Route Distributions#
 Vehicles can be added to the simulation with a fixed route (<vehicle>) or with an origin-destination pair (<trip>).
 A third alternative is to specify a set of routes (<routeDistribution>) and let the vehicle draw a random route from such a distribution. For details, see route distributions.
@@ -356,7 +361,7 @@
 
         
           
-            
This page was last edited on: 26 August 2022
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Simulation/Rerouter.html sumo-1.18.0/docs/userdoc/Simulation/Rerouter.html
--- sumo-1.17.0/docs/userdoc/Simulation/Rerouter.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Simulation/Rerouter.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -223,7 +223,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/Simulation/RoadCapacity.html sumo-1.18.0/docs/userdoc/Simulation/RoadCapacity.html
--- sumo-1.17.0/docs/userdoc/Simulation/RoadCapacity.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Simulation/RoadCapacity.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -168,7 +168,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/Simulation/Routing.html sumo-1.18.0/docs/userdoc/Simulation/Routing.html
--- sumo-1.17.0/docs/userdoc/Simulation/Routing.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Simulation/Routing.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -211,7 +211,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/Simulation/Safety.html sumo-1.18.0/docs/userdoc/Simulation/Safety.html
--- sumo-1.17.0/docs/userdoc/Simulation/Safety.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Simulation/Safety.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -162,6 +162,9 @@
             Contents
             Collisions
                 
+                    • Intermodal Collisions
+                
+                
                     • Deliberately causing collisions
                 
                 
@@ -195,7 +198,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -256,6 +259,9 @@
 time before the collision action takes place. This allows for pile-ups
 and traffic disturbance. To enable stopping, the option --collision.stoptime <TIME> must be set
 with the stopping time in seconds.
+Intermodal Collisions#
+The collision action only gets triggered on vehicle-vehicle collision but not on vehicle-pedestrian collisions. Instead, intermodal collisiosn raise warning by default.
+The behavior can be changed by setting the options --intermodal-collision.action and --intermodal-collision.stoptime which work like the vehicle-on-vehicle collision options described above.
 
 Note
 The pedestrian model striping detects collisions between pedestrians. This only serves to detect issues with the model.
@@ -455,7 +461,7 @@
 
         
           
-            
This page was last edited on: 14 February 2023
+            
This page was last edited on: 25 April 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Simulation/SaveAndLoad.html sumo-1.18.0/docs/userdoc/Simulation/SaveAndLoad.html
--- sumo-1.17.0/docs/userdoc/Simulation/SaveAndLoad.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Simulation/SaveAndLoad.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -188,7 +188,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/Simulation/Shapes.html sumo-1.18.0/docs/userdoc/Simulation/Shapes.html
--- sumo-1.17.0/docs/userdoc/Simulation/Shapes.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Simulation/Shapes.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -173,7 +173,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/Simulation/SublaneModel.html sumo-1.18.0/docs/userdoc/Simulation/SublaneModel.html
--- sumo-1.17.0/docs/userdoc/Simulation/SublaneModel.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Simulation/SublaneModel.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -188,7 +188,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -244,7 +244,7 @@
 
 This model is activated using the option --lateral-resolution <FLOAT>. The model is described in
 Simulation framework for testing ADAS in Chinese traffic situations
-in proceedings of
+in proceedings of
 SUMO2016
 Lateral Resolution and Vehicle Position#
 When the sublane model is activated, the lateral vehicle position (measured as offset from the centerline of the lane) can take on any value between [-laneWidth/2, laneWidth/2] regardless of the lateral resolution value.
@@ -409,7 +409,7 @@
 
         
           
-            
This page was last edited on: 01 April 2022
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Simulation/Taxi.html sumo-1.18.0/docs/userdoc/Simulation/Taxi.html
--- sumo-1.17.0/docs/userdoc/Simulation/Taxi.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Simulation/Taxi.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -178,6 +178,9 @@
                 
                     • Idle Behavior
                 
+                
+                    → Defining taxi stands
+                
                 
                     • Customer Stops
                 
@@ -199,7 +202,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -325,11 +328,39 @@
 
 "stop" (default): stop at the current location (off-road) after delivering the last customer of the current service request.
 "randomCircling": continue driving to random edges until the next request is received. (caution: taxi might get stuck in a cul-de-sac if the network has those)
+"taxistand": drive to a taxi stand and wait there for the next customer / dispatch. Defining the set of taxi stands and the strategy of chosing among them is described below
 
 
 Note
 When using "randomCircling", the default value for parameter "device.taxi.end" is 8 hours after vehicle departure.
 
+Defining taxi stands#
+When using idle-algorithm taxistand, the following inputs must be provided:
+
+each taxi stand must be defined as a parkingAreas
+the list of parkingAreas that may be used for a particular taxi or taxi fleet must be defined as a <rerouter>-element according to the description for parking search simulation.
+the taxi must define the parameter device.taxi.stands-rerouter either as a child element of the <vehicle> or its <vType> and decelare the rerouter id. 
+
+The strategy for chosing among the alternative taxi stands follows the description for parking search simulation (i.e. with respect to prior knowledge of remaining capacity).
+Example declerations for the rerouter and the taxi vType that references it:
+<rerouter id="rr0" edges="B0C0 E2D2" vTypes="taxi">
+        <interval begin="0" end="1:0:0:0">
+            <parkingAreaReroute id="pa_0"/>
+            <parkingAreaReroute id="pa_1"/>
+        </interval>
+</rerouter>
+
+
+
+Note
+To avoid warnings, the edges attribute of the rerouter should match the edges which contain taxi stands.
+
+<vType id="taxi" vClass="taxi">
+        <param key="has.taxi.device" value="true"/>
+        <param key="device.taxi.stands-rerouter" value="rr0"/>
+</vType>
+
+
 Customer Stops#
 Taxis will stop to pick-up and drop-off customers. The 'actType' attribute of a stop indicates the purpose ('pickup' / 'dropOff') as well as the ids of the customers and their reservation id. Stop attributes can be configured using generic parameters <vType> or <vehicle> definition of the taxi:
     <vType id="taxi" vClass="taxi">
@@ -442,7 +473,7 @@
 
         
           
-            
This page was last edited on: 31 March 2023
+            
This page was last edited on: 30 May 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Simulation/Traffic_Lights.html sumo-1.18.0/docs/userdoc/Simulation/Traffic_Lights.html
--- sumo-1.17.0/docs/userdoc/Simulation/Traffic_Lights.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Simulation/Traffic_Lights.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -317,7 +317,7 @@
     

 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -453,9 +453,8 @@
 If the network was created by osmWebWizard.py the traffic lights are 'actuated' by default
 
 To convert an existing .net.xml file so that all traffic lights are actuated,
-perform the following steps:
-netconvert -s orig.net.xml --plain-output-prefix plain
-netconvert -e plain.edg.xml -n plain.nod.xml -x plain.con.xml -o updated.net.xml --ignore-errors.edge-type --tls.default-type actuated
+perform the following call: 
+netconvert -s orig.net.xml --o new.net.xml --tls.rebuild --tls.default-type actuated
 
 
 Adapting fixed timings (green split) to known traffic#
@@ -662,7 +661,7 @@
 TLS Link indices can be access using either
 
 sumolib using
-  tls.getConnections()
+  tls.getConnections()
 or TraCI using
   traci.trafficlight.getControlledLinks()
 
@@ -1478,7 +1477,7 @@
 
         
           
-            
This page was last edited on: 31 March 2023
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Simulation/Turnarounds.html sumo-1.18.0/docs/userdoc/Simulation/Turnarounds.html
--- sumo-1.17.0/docs/userdoc/Simulation/Turnarounds.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Simulation/Turnarounds.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -176,7 +176,7 @@
     

 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/Simulation/Vaporizer.html sumo-1.18.0/docs/userdoc/Simulation/Vaporizer.html
--- sumo-1.17.0/docs/userdoc/Simulation/Vaporizer.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Simulation/Vaporizer.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -165,7 +165,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/Simulation/Variable_Speed_Signs.html sumo-1.18.0/docs/userdoc/Simulation/Variable_Speed_Signs.html
--- sumo-1.17.0/docs/userdoc/Simulation/Variable_Speed_Signs.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Simulation/Variable_Speed_Signs.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -166,7 +166,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/Simulation/VehicleInsertion.html sumo-1.18.0/docs/userdoc/Simulation/VehicleInsertion.html
--- sumo-1.17.0/docs/userdoc/Simulation/VehicleInsertion.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Simulation/VehicleInsertion.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -182,7 +182,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/Simulation/VehiclePermissions.html sumo-1.18.0/docs/userdoc/Simulation/VehiclePermissions.html
--- sumo-1.17.0/docs/userdoc/Simulation/VehiclePermissions.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Simulation/VehiclePermissions.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -168,7 +168,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/Simulation/VehicleSpeed.html sumo-1.18.0/docs/userdoc/Simulation/VehicleSpeed.html
--- sumo-1.17.0/docs/userdoc/Simulation/VehicleSpeed.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Simulation/VehicleSpeed.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -183,7 +183,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/Simulation/Waterways.html sumo-1.18.0/docs/userdoc/Simulation/Waterways.html
--- sumo-1.17.0/docs/userdoc/Simulation/Waterways.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Simulation/Waterways.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -170,7 +170,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/Simulation/Why_Vehicles_are_teleporting.html sumo-1.18.0/docs/userdoc/Simulation/Why_Vehicles_are_teleporting.html
--- sumo-1.17.0/docs/userdoc/Simulation/Why_Vehicles_are_teleporting.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Simulation/Why_Vehicles_are_teleporting.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -172,7 +172,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/sitemap.xml sumo-1.18.0/docs/userdoc/sitemap.xml
--- sumo-1.17.0/docs/userdoc/sitemap.xml	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/sitemap.xml	2023-06-28 22:08:56.000000000 +0000
@@ -1,31 +1,31 @@
 
 
      https://sumo.dlr.de/docs/index.html
-     2023-04-24
+     2023-06-28
      daily
     
      https://sumo.dlr.de/docs/Tutorials/index.html
-     2023-04-24
+     2023-06-28
      daily
     
      https://sumo.dlr.de/docs/FAQ.html
-     2023-04-24
+     2023-06-28
      daily
     
      https://sumo.dlr.de/docs/Downloads.html
-     2023-04-24
+     2023-06-28
      daily
     
      https://sumo.dlr.de/docs/Publications.html
-     2023-04-24
+     2023-06-28
      daily
     
      https://sumo.dlr.de/docs/Developer/index.html
-     2023-04-24
+     2023-06-28
      daily
     
      https://sumo.dlr.de/docs/ChangeLog.html
-     2023-04-24
+     2023-06-28
      daily
     
 
\ No newline at end of file
Binary files /tmp/tmp7yk4jeko/wfG00_uEeX/sumo-1.17.0/docs/userdoc/sitemap.xml.gz and /tmp/tmp7yk4jeko/Palhb2urmR/sumo-1.18.0/docs/userdoc/sitemap.xml.gz differ
diff -Nru sumo-1.17.0/docs/userdoc/Specification/Containers.html sumo-1.18.0/docs/userdoc/Specification/Containers.html
--- sumo-1.17.0/docs/userdoc/Specification/Containers.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Specification/Containers.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -204,7 +204,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/Specification/Duarouter.html sumo-1.18.0/docs/userdoc/Specification/Duarouter.html
--- sumo-1.17.0/docs/userdoc/Specification/Duarouter.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Specification/Duarouter.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -190,7 +190,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/Specification/index.html sumo-1.18.0/docs/userdoc/Specification/index.html
--- sumo-1.17.0/docs/userdoc/Specification/index.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Specification/index.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -205,7 +205,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/Specification/Logistics.html sumo-1.18.0/docs/userdoc/Specification/Logistics.html
--- sumo-1.17.0/docs/userdoc/Specification/Logistics.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Specification/Logistics.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -165,7 +165,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/Specification/Persons.html sumo-1.18.0/docs/userdoc/Specification/Persons.html
--- sumo-1.17.0/docs/userdoc/Specification/Persons.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Specification/Persons.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -217,7 +217,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/Students_And_Support.html sumo-1.18.0/docs/userdoc/Students_And_Support.html
--- sumo-1.17.0/docs/userdoc/Students_And_Support.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Students_And_Support.html	2023-06-28 22:08:56.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -220,7 +220,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/SUMO_at_a_Glance.html sumo-1.18.0/docs/userdoc/SUMO_at_a_Glance.html
--- sumo-1.17.0/docs/userdoc/SUMO_at_a_Glance.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/SUMO_at_a_Glance.html	2023-06-28 22:08:56.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -171,7 +171,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -474,7 +474,7 @@
 

 
 Christoph Sommer
-TraCI merge with Veins, Subscription Interface, Misc.
+TraCI merge with Veins, Subscription Interface, Misc.
 
 
 David Eckhoff
@@ -502,7 +502,7 @@
 
 
 Walter Bamberger
-Development of activitygen as a base for the evaluation of trust scenarios in VANETs. The work is part of the project Fidens: Trust between Cooperative Systems featuring trusted probabilistic knowledge processing in vehicular networks.
+Development of activitygen as a base for the evaluation of trust scenarios in VANETs. The work is part of the project Fidens: Trust between Cooperative Systems featuring trusted probabilistic knowledge processing in vehicular networks.
 
 
 Matthew Fullerton
@@ -518,7 +518,7 @@
 
 
 Enrico Gueli
-TraCI4J
+TraCI4J
 
 
 
@@ -543,7 +543,7 @@
 
         
           
-            
This page was last edited on: 28 April 2021
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/SUMO_edge_type_file.html sumo-1.18.0/docs/userdoc/SUMO_edge_type_file.html
--- sumo-1.17.0/docs/userdoc/SUMO_edge_type_file.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/SUMO_edge_type_file.html	2023-06-28 22:08:56.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -173,7 +173,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -567,7 +567,7 @@
 
 
 Only few data is available about the railway types. The most important
-document might be the Eisenbahn-Bau- und Betriebsordnung
+document might be the Eisenbahn-Bau- und Betriebsordnung
 (EBO),
 but even that did not help me much. So the given values are mostly
 personal opinion, except if a reference is given. More references are
@@ -587,7 +587,7 @@
 
         
           
-            
This page was last edited on: 28 April 2021
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/sumo-gui.html sumo-1.18.0/docs/userdoc/sumo-gui.html
--- sumo-1.17.0/docs/userdoc/sumo-gui.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/sumo-gui.html	2023-06-28 22:08:56.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -350,7 +350,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -1647,7 +1647,7 @@
 When passing multiple files to the sumo-option --gui-settings-file, one
 viewing window is opened for each file at the start of the simulation.
 3D Visualization#
-When sumo-gui was compiled with OpenSceneGraph 
+
When sumo-gui was compiled with OpenSceneGraph 
 (OSG) support an additional
 ()-button is
 present to open a new 3D view. A pre-compiled Windows version for testing is available
@@ -1879,7 +1879,7 @@
 
         
           
-            
This page was last edited on: 09 March 2023
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/sumo.html sumo-1.18.0/docs/userdoc/sumo.html
--- sumo-1.17.0/docs/userdoc/sumo.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/sumo.html	2023-06-28 22:08:56.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -250,7 +250,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -320,7 +320,7 @@
 Options#
 You may use a XML schema definition file for setting up a SUMO
 configuration:
-sumoConfiguration.xsd.
+sumoConfiguration.xsd.
 Configuration#
 
@@ -815,10 +815,18 @@
 
+
+
+
+
+
+
+
+
@@ -1406,6 +1414,50 @@
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1473,7 +1525,7 @@
 
-
+
@@ -1492,6 +1544,10 @@
 
+
+
+
+
@@ -1507,6 +1563,10 @@
 
+
+
+
+
 How to deal with collisions: [none,warn,teleport,remove]; default: teleport
 
 --intermodal-collision.action <STRING> How to deal with collisions between vehicle and pedestrian: [none,warn,teleport,remove]; default: warn

 --collision.stoptime <TIME>
 Let vehicle stop for TIME before performing collision.action (except for action 'none'); default: 0
 
 --intermodal-collision.stoptime <TIME> Let vehicle stop for TIME before performing intermodal-collision.action (except for action 'none'); default: 0

 --collision.check-junctions <BOOL>
 Enables collisions checks on junctions; default: false
 
 
 --device.stationfinder.probability <FLOAT> The probability for a vehicle to have a 'stationfinder' device; default: -1
--device.stationfinder.explicit Assign a 'stationfinder' device to named vehicles
--device.stationfinder.deterministic <BOOL> The 'stationfinder' devices are set deterministic using a fraction of 1000; default: false
--device.stationfinder.rescueTime <TIME> Time to wait for a rescue vehicle on the road side when the battery is empty; default: 1800
--device.stationfinder.reserveFactor <FLOAT> Additional battery buffer for unexpected traffic situation when estimating the battery need; default: 1.1
--device.stationfinder.emptyThreshold <FLOAT> Battery percentage to go into rescue mode; default: 5
--device.stationfinder.radius <TIME> Search radius in travel time seconds; default: 180
--device.stationfinder.repeat <TIME> When to trigger a new search if no station has been found; default: 60
--device.stationfinder.maxChargePower <FLOAT> The maximum charging speed of the vehicle battery; default: 1000
--device.stationfinder.chargeType <STRING> Type of energy transfer; default: charging
--device.stationfinder.waitForCharge <TIME> After this waiting time vehicle searches for a new station when the initial one is blocked; default: 600

 --device.battery.probability <FLOAT>
 The probability for a vehicle to have a 'battery' device; default: -1
 
 
 --device.ssm.measures <STRING> Specifies which measures will be logged (as a space or comma-separated sequence of IDs in ('TTC', 'DRAC', 'PET')) Specifies which measures will be logged (as a space or comma-separated sequence of IDs in ('TTC', 'DRAC', 'PET', 'PPET','MDRAC'))
 
 
 --device.ssm.thresholds <STRING> Specifies the time in seconds to be logged after a conflict is over. Required >0 if PET is to be calculated for crossing conflicts.; default: 5
 
 --device.ssm.mdrac.prt <FLOAT> Specifies the perception reaction time for MDRAC computation.; default: 1

 --device.ssm.file <STRING>
 Give a global default filename for the SSM output
 
--device.ssm.write-lane-positions <BOOL>
 Whether to write lanes and their positions for each timestep; default: false
 
--device.ssm.exclude-conflict-types <STRING> Which conflicts will be excluded from the log according to the conflict type they have been classified (combination of values in 'ego', 'foe' , '', any numerical valid conflict type code). An empty value will log all and 'ego'/'foe' refer to a certain conflict type subset.
 
 
 Toc Device#
@@ -2212,7 +2272,7 @@
 
         
           
-            
This page was last edited on: 24 April 2023
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/SumoWorkshop2010.html sumo-1.18.0/docs/userdoc/SumoWorkshop2010.html
--- sumo-1.17.0/docs/userdoc/SumoWorkshop2010.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/SumoWorkshop2010.html	2023-06-28 22:08:56.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -181,7 +181,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -298,7 +298,7 @@
 workshop's result, we decided to set up a nice static entry page which
 allows to navigate further down with fewer clicks and which presents
 possibilities to navigate through SUMO documentation more easily.
-Now, the new entry page is available at http://sumo.sf.net. The
+
Now, the new entry page is available at https://sumo.sf.net. The
 navigation bar at the top points you to all the available support tools
 as trac, blog, etc. The links in the central area mainly point you to
 the according, old wiki sections.
@@ -312,7 +312,7 @@
 
         
           
-            
This page was last edited on: 14 April 2021
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Theory/Traffic_Simulations.html sumo-1.18.0/docs/userdoc/Theory/Traffic_Simulations.html
--- sumo-1.17.0/docs/userdoc/Theory/Traffic_Simulations.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Theory/Traffic_Simulations.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -166,7 +166,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/ToC_Device.html sumo-1.18.0/docs/userdoc/ToC_Device.html
--- sumo-1.17.0/docs/userdoc/ToC_Device.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/ToC_Device.html	2023-06-28 22:08:56.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -172,7 +172,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/Tools/Assign.html sumo-1.18.0/docs/userdoc/Tools/Assign.html
--- sumo-1.17.0/docs/userdoc/Tools/Assign.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Tools/Assign.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -168,6 +168,9 @@
                     → Loading vehicle types from an additional file
                 
                 
+                    • duaIterateMix.py
+                
+                
                     • duaIterate_analysis.py
                 
                 
@@ -186,7 +189,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -255,6 +258,8 @@
 Caution
 Options, prefixed with duarouter-- must be the last in the list of all options
 
+duaIterateMix.py#
+This tool is designed to solve the multiclass traffic assignment problem for mixed traffic flow. Most of the options in this tool are similar to those in duaIterate.py, with a few exceptions. To solve the multiclass traffic assignment problem, you need to provide two demand files. Use the option -t to specify the demand for UE-seeking vehicles, and use the option -r to specify the demand for SO-seeking vehicles. To obtain the multiclass traffic assignment solution, you should set the following options: --mix, --marginal-cost, and --marginal-cost.exp.
 duaIterate_analysis.py#
 To check the evolution of different simulation parameters during the dua
 estimation an additional script is provided which analyses teleport counts
@@ -321,7 +326,7 @@
 
         

           
-            
This page was last edited on: 01 February 2022
+            
This page was last edited on: 12 May 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Tools/Build.html sumo-1.18.0/docs/userdoc/Tools/Build.html
--- sumo-1.17.0/docs/userdoc/Tools/Build.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Tools/Build.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -182,7 +182,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -227,7 +227,7 @@
 Checks .java, .cpp, .h and .py files for the correct license header and
 applies autopep8 and
 flake8 for PEP 8 compatibility. Also
-applies astyle to all .java, .cpp, and
+applies astyle to all .java, .cpp, and
 .h files. The position of the source tree(s) to check is given as
 optional arguments or determined relative to the position of the script.
 This call is part of our nightly tests. The script is able to fix some
@@ -266,7 +266,7 @@
 
         
           
-            
This page was last edited on: 16 November 2022
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Tools/Detector.html sumo-1.18.0/docs/userdoc/Tools/Detector.html
--- sumo-1.17.0/docs/userdoc/Tools/Detector.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Tools/Detector.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -185,7 +185,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/Tools/devel.html sumo-1.18.0/docs/userdoc/Tools/devel.html
--- sumo-1.17.0/docs/userdoc/Tools/devel.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Tools/devel.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -167,7 +167,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/Tools/District.html sumo-1.18.0/docs/userdoc/Tools/District.html
--- sumo-1.17.0/docs/userdoc/Tools/District.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Tools/District.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -173,7 +173,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/Tools/Drt.html sumo-1.18.0/docs/userdoc/Tools/Drt.html
--- sumo-1.17.0/docs/userdoc/Tools/Drt.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Tools/Drt.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -169,7 +169,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/Tools/Emissions.html sumo-1.18.0/docs/userdoc/Tools/Emissions.html
--- sumo-1.17.0/docs/userdoc/Tools/Emissions.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Tools/Emissions.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -199,7 +199,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/Tools/Import/GTFS.html sumo-1.18.0/docs/userdoc/Tools/Import/GTFS.html
--- sumo-1.17.0/docs/userdoc/Tools/Import/GTFS.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Tools/Import/GTFS.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -168,7 +168,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -203,7 +203,8 @@
 Introduction#
 The General Transit Feed Specification defines a common format
 for public transportation schedules and associated geographic information. The tools described here 
-facilitate the import of schedules (and also routes to a limited degree) into SUMO.
+facilitate the import of schedules (and also routes to a limited degree) into SUMO. They require the installation
+of the pandas library. For best performance it is recommended to use at least pandas 2.0.
 See also the GTFS tutorial.
 gtfs2pt.py#
 This tool is the main script to import public transport from GTFS. Depending on 
@@ -253,7 +254,7 @@
 
         
           
-            
This page was last edited on: 30 April 2021
+            
This page was last edited on: 07 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Tools/Import/MATSim.html sumo-1.18.0/docs/userdoc/Tools/Import/MATSim.html
--- sumo-1.17.0/docs/userdoc/Tools/Import/MATSim.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Tools/Import/MATSim.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -166,7 +166,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/Tools/Import/OpenDRIVE.html sumo-1.18.0/docs/userdoc/Tools/Import/OpenDRIVE.html
--- sumo-1.17.0/docs/userdoc/Tools/Import/OpenDRIVE.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Tools/Import/OpenDRIVE.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -165,7 +165,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/Tools/Import/OSM.html sumo-1.18.0/docs/userdoc/Tools/Import/OSM.html
--- sumo-1.17.0/docs/userdoc/Tools/Import/OSM.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Tools/Import/OSM.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -168,7 +168,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/Tools/Import/VISSIM.html sumo-1.18.0/docs/userdoc/Tools/Import/VISSIM.html
--- sumo-1.17.0/docs/userdoc/Tools/Import/VISSIM.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Tools/Import/VISSIM.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -214,7 +214,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -408,7 +408,7 @@
 
 Allgemeine Informationen zur Definition von Routen und Zuflüssen finden
 sich unter
-http://sumo.dlr.de/docs/Definition_of_Vehicles,_Vehicle_Types,_and_Routes.html
+https://sumo.dlr.de/docs/Definition_of_Vehicles,_Vehicle_Types,_and_Routes.html
 (zuletzt geprüft am 28.07.2015).
 Umsetzung#
 Bei der Konversion durch das Tool
@@ -603,7 +603,7 @@
 
 
 
Nähere Beschreibungen zur Definition von Lichtsignalanlagen befinden
-sich unter http://sumo.dlr.de/docs/Simulation/Traffic_Lights.html (zuletzt
+sich unter https://sumo.dlr.de/docs/Simulation/Traffic_Lights.html (zuletzt
 geprüft am 28.07.2015).

 Umsetzung#
 Im Gegensatz zu den anderen Tools müssen hierbei zusätzlich alle .sig Files ausgelesen werden, die für jede Lichtsignalanlage automatisch
@@ -699,7 +699,7 @@
 
         
           
-            
This page was last edited on: 31 March 2023
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Tools/Import/VISUM.html sumo-1.18.0/docs/userdoc/Tools/Import/VISUM.html
--- sumo-1.17.0/docs/userdoc/Tools/Import/VISUM.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Tools/Import/VISUM.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -165,7 +165,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/Tools/index.html sumo-1.18.0/docs/userdoc/Tools/index.html
--- sumo-1.17.0/docs/userdoc/Tools/index.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Tools/index.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -162,12 +162,15 @@
             Contents
             Introduction
             How to use python tools
+                
+                    • Using tools from netedit
+                
             Tools by category
         
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -203,21 +206,24 @@
 Tools can be found in the SUMO-distribution under <SUMO_HOME>/tools. Most of
 them are tiny - they were written for a certain purpose and worked well
 under certain input, but may be not verified for other cases.
-All tools should work with Python 3.7 or later on Windows, Linux and MacOS.
-We try to keep them compatible with Python 3.5 and 2.7 as well.
+All tools should work with Python 3.7 or later on Windows, Linux and macOS.
+We try to keep them compatible with Python 3.5 and 2.7 as well. Some of them
+depend on external libraries, which can be installed using
+pip install -r tools/requirements.txt. For details on installation
+and required versions see also the Linux installation instructions.
 How to use python tools#
-Python tools must be called from the command
-line
+
Python tools are usually called from the command
+line.
 In the documentation linked below, the tools are described with a command like
 python tools/xml/xml2csv.py input.xml
 
 
 This works only, if the current working directory is <SUMO_HOME>.
-For the Windows OS, to run the tool from any directory, you can use use
+For the Windows OS, to run the tool from any directory, you can use
 python %SUMO_HOME%\tools\xml\xml2csv.py input.xml
 
 
-The equivalent command For Linux is
+The equivalent command for Linux is
 $SUMO_HOME/tools/xml/xml2csv.py input.xml
 
 
@@ -226,6 +232,8 @@
 
 
 For scripts in other subdirectories of tools you have to replace xml in this example by the name of the subdirectory
+Using tools from netedit#
+Since version 1.17.0, netedit supports calling many tools via configuration dialog by using the 'Tools' menu. For a demonstration, see the SUMO 2023 Confererence tutorial.
 Tools by category#
 The tools are divided into the following topics:
 
@@ -295,7 +303,7 @@
 
         
           
-            
This page was last edited on: 29 September 2021
+            
This page was last edited on: 08 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Tools/LiSuM.html sumo-1.18.0/docs/userdoc/Tools/LiSuM.html
--- sumo-1.17.0/docs/userdoc/Tools/LiSuM.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Tools/LiSuM.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -196,7 +196,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -244,7 +244,7 @@
 LiSuM) and VISSIM, a proprietary microscopic 3D traffic simulator.
 LiSuM was built on Java technology and thus can be run on any operating
 system supporting Java. LiSuM is licensed (just like SUMO) under the
-EPLv2.
+EPLv2.
 
 SUMO communicates with the LISA+ virtual controller through LiSuM
 Two versions of LiSuM are provided: A graphical version called
@@ -432,7 +432,7 @@
 
         

           
-            
This page was last edited on: 31 March 2023
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Tools/Misc.html sumo-1.18.0/docs/userdoc/Tools/Misc.html
--- sumo-1.17.0/docs/userdoc/Tools/Misc.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Tools/Misc.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -192,7 +192,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -410,7 +410,7 @@
 Example Output#
 The used busStops must be defined in an additional file and passed with option -s when running the tool.
 The resulting bus definition may look like this:
-<routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd">
+<routes xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://sumo.dlr.de/xsd/routes_file.xsd">
     <vType id="bus" vClass="bus"/>
     <route id="bus_123:0"" edges="110450334#1 110450334#2 338412122 391493949 391493947 391493950#0 391493950#1 391493952#0 391493952#1 391493952#2 391493954#0 391493954#1 391493954#2 391493954#3" >
         <stop busStop="stopA" duration="20" until="35.0"/> 
@@ -578,7 +578,7 @@
 
         
           
-            
This page was last edited on: 31 March 2023
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Tools/Net.html sumo-1.18.0/docs/userdoc/Tools/Net.html
--- sumo-1.17.0/docs/userdoc/Tools/Net.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Tools/Net.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -182,7 +182,7 @@
     

 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 

diff -Nru sumo-1.17.0/docs/userdoc/Tools/Output.html sumo-1.18.0/docs/userdoc/Tools/Output.html
--- sumo-1.17.0/docs/userdoc/Tools/Output.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Tools/Output.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -194,7 +194,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/Tools/Railways.html sumo-1.18.0/docs/userdoc/Tools/Railways.html
--- sumo-1.17.0/docs/userdoc/Tools/Railways.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Tools/Railways.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -193,7 +193,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -341,9 +341,13 @@
 
 --xml-output FILE (-o): write statistics to FILE in xml format
 --statistic-type (-t): select among statistics to be computed
-'d' : depart delay
-'a' : arrival delay
+'d' : stop depart delay
+'a' : stop arrival delay
 's' : stop duration difference
+'de' : stop depart delay comppared to 'ended' in input
+'as' : stop arrivalt delay comppared to recorded 'started' in input
+'t'  : traveltime according to schedule versus traveltime in simulation (between stops)
+'T'  : traveltime according to recording versus traveltime in simulation (between stops)
 
 
 
@@ -364,7 +368,7 @@
 
         
           
-            
This page was last edited on: 17 February 2023
+            
This page was last edited on: 01 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Tools/Routes.html sumo-1.18.0/docs/userdoc/Tools/Routes.html
--- sumo-1.17.0/docs/userdoc/Tools/Routes.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Tools/Routes.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -204,7 +204,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -607,7 +607,31 @@
 python tools/route/checkStopOrder.py -r <route-file>
 
 
-When setting option --stop-table STOP_ID a time table for all vehicles that service the given <busStop>-id is written to standard output.
+When setting option --stop-table STOP_ID a time table for all vehicles that service the given <busStop>-id is written to standard output.
+The option accepts a list of stops and also the * wildcard to generate a combined table for multiple busStops (i.e belonging to the same station).
+The resulting stop table may look as in the below example, where the columns correspond to the attributes of the stop execpt for the following two columns:
+- veh: the id of the vehicle to which this stop belongs
+- flags:
+  - p: parking
+  - F: first stop of the vehicle
+  - L: last stop of the vehicle
+  - w: waypoint
+  - o: vehicle is overtaken (some other vehicle arrives later at the same stop and departs earlier)
+  - O: vehicle ovetakes (some other vehicle arrives earlier and departs later)
+# busStop: stop_A,stop_B
+arrival  until      veh      tripId started   ended     flags   busStop
+12:20:30  12:24:12  H2303_6  4199   12:23:22    12:26:23            stop_B
+12:21:42  12:21:42  H2303_8  11010  12:25:15    12:25:15    F       stop_A
+12:50:36  12:53:48  H2303_7  11023  12:50:26    12:52:57            stop_B
+13:20:36  13:23:42  H2303_9  11073                                stop_B
+13:35:00  13:38:42  H2303_8  11025                                stop_B
+13:36:24  13:36:24  H2303_3  11012                                stop_A
+14:04:36  14:07:24  Z2602_2  1435                                   stop_B
+14:21:12  14:24:12  H2303_1  11027                              stop_B
+14:35:18  14:37:18  H3458_2  28915                              stop_B
+14:51:36  14:54:12  Z1351_9  2075                                   stop_B
+
+
 splitRandom.py#
 This tool splits a route file in two different route files
 python tools/route/splitRandom.py -r <route-file> -a <first output file> -b <second output file> -n <number of trips in second file>
@@ -632,7 +656,7 @@
 
         
           
-            
This page was last edited on: 11 April 2023
+            
This page was last edited on: 15 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Tools/Shapes.html sumo-1.18.0/docs/userdoc/Tools/Shapes.html
--- sumo-1.17.0/docs/userdoc/Tools/Shapes.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Tools/Shapes.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -170,7 +170,7 @@
     

 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/Tools/Sumolib.html sumo-1.18.0/docs/userdoc/Tools/Sumolib.html
--- sumo-1.17.0/docs/userdoc/Tools/Sumolib.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Tools/Sumolib.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -195,7 +195,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -229,7 +229,7 @@
 
 sumolib is a set of python modules for working with sumo networks,
 simulation output and other simulation artifacts. For a detailed list of
-available functions see the pydoc generated
+available functions see the pydoc generated
 documentation. You can
 browse the code here.
 importing sumolib in a script#
@@ -286,7 +286,7 @@
 Note
 This is just a processing example. To compute average travel speeds in a network, process edgeData, tripinfos or summary-output instead.
 
-compute the median speed using the Statistics module#
+compute the median speed using the Statistics module#
 edgeStats = sumolib.miscutils.Statistics("edge speeds")
 for edge in sumolib.xml.parse('myNet.edg.xml', ['edge']):
     edgeStats.add(float(edge.speed))
@@ -382,7 +382,7 @@
 
         
           
-            
This page was last edited on: 31 March 2023
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Tools/tls.html sumo-1.18.0/docs/userdoc/Tools/tls.html
--- sumo-1.17.0/docs/userdoc/Tools/tls.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Tools/tls.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -162,6 +162,9 @@
             Contents
             tlsCoordinator.py
             tlsCycleAdaptation.py
+                
+                    • Remarks
+                
             tls_csv2SUMO.py
                 
                     • Example
@@ -181,7 +184,7 @@
     

 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -233,9 +236,9 @@
 The route input must contain <vehicle>s with <route>-child-elements. Flows and trips are not supported.
 
 tlsCycleAdaptation.py#
-This script modifies the duration of green phases according to Websters
+
This script modifies the cycle lenth and the duration of green phases according to Websters
 formula to best accommodate a given traffic demand. Example call:
-python tools/tlsCycleAdaptation.py -n net.net.xml -r routes.rou.xml -o newTLS.add.xml
+python tools/tlsCycleAdaptation.py -n net.net.xml -r routes.rou.xml -o newTLS.add.xml -b begin_time
 
 
 This would generate the file newTLS.add.xml which can be loaded into
@@ -245,8 +248,34 @@
 
 

 Caution
-The route input must contain <vehicle>s with <route>-child-elements. Flows and trips are not supported.
+The route input must contain <vehicle>s with <route>-child-elements. Flows and trips are not supported. Vehicles with departure time = 'triggered' are not considered.
+
+
+Note
+The begin time is not mandatory. However, the begin time will be the earliest departure time in the given route file, if it is not given. The flows within 1 hour from the begin time on are considered. If the whole period in the given route file is less than 1 hour, the flows will be proportionally scaled up to 1-hour flows. If the period is longer than 1 hour and no begin time is given, the 1-hour 
 
+peak-flows will be used. 
+Remarks#
+The calcuation in this script are based on static hourly traffic flows. Therefore, the flow pattern (e.g. vehicles arriving only in the first 10 minutes) within a hourly flow cannot be reflected in the Webster's equation. Accordingly, the suggested signal timing plans may not correspond to the traffic situation in the microscopic simulation. Several parameters in the options may need to be adjusted according to the given use case. Some remarks for helping to get proper results are listed below.
+
+Hourly flow: 
+    Currently, this script only considers flows for one hour corresponding to the basic Webster's equation. So, the begin time needs to be given for getting the correct flows from the route file. Otherwise, the begin time = 0 is used as default, and the end time is then 3600 s. If the given period is longer than 1 hour, it is recommended to firstly find out the peak-hour begin time and use it in the script. If the given period is less than 1 hour, this script will still treat the respective flow as hourly flow. It is planned to scale/extract hourly flow from a given route file.
+
+
+Allocation of the movements at intersections: 
+    In the basic Webster's equation, critical flows are calculated according to the given signal groups. So, generally speaking, flows with the same direction and in the same green time phase are summed up. The capacity is then calculated according to the number of lanes, which the respective flows are allowed to use. Accordingly, the critical flow group for each signal phase can be identified. This script does the same thing. If through and right-turn movements share the same green time phase at an intersection and they can only respectively use one lane in the microscopic simulation, i.e. there is no shared lane for both through and right-turn movements, the respective capacity will be over-estimated for through-movement. To avoid such situation, the rightmost lane needs to be set as shared lane for both right-turn and through movements. 
+
+
+Lane capacity: 
+    In this script, the capacity is controlled by the option saturation-headway. As default, saturation-headway is set to 2 s. So, the default capacity is 1800 veh/lane/hour, which is for a longer road section normally. If the distance between any two intersections is quite short, e.g. 500 m in a city area, it is expected that the capacity is lower than the default capacity. It is needed to consider increasing the saturation-headway for adjusting the lane capacity.
+
+
+Currently, the considered road users (veh.type) include car, truck, trailer, bus, coach, moped, motorcycle, bicycle. PCE (Passenger Car Equivalents) is used as flow unit. 
+
+
+Synchronizaton of traffic signals: 
+    This script only deals with the signal timing optimization at one intersection at a time, and does not synchronize the traffic signals across all intersections. So, poor results could happen if there is any conflict between signal plans. The script tlsCoordinator.py can be used to coordinate traffic signals.
+
 tls_csv2SUMO.py#
 This tool requires the program definition and the SUMO-network it shall
 be converted to:
@@ -317,7 +346,7 @@
 
 Example#
 The example shows what is tested in
-[1].
+[1].
 It is not a real-world program plan, only a demonstration for using the
 script.
 We have a simple four-arms intersections which is controlled by traffic
@@ -561,7 +590,7 @@
 
         

           
-            
This page was last edited on: 18 October 2022
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Tools/TraceExporter.html sumo-1.18.0/docs/userdoc/Tools/TraceExporter.html
--- sumo-1.17.0/docs/userdoc/Tools/TraceExporter.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Tools/TraceExporter.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -214,7 +214,7 @@
     

 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -271,7 +271,7 @@
   *.tcl)
 PHEM: .dri-files, .str-files, .fzp-files, .flt-files
 GPSDAT csv traces (id,date,x,y,status,speedKMH)
-GPX
+GPX
 KML
 Kepler-JSON
 IPG Traces (experimental)
@@ -291,7 +291,7 @@
 traceExporter.py --fcd-input myFCDoutput.xml --omnet-output myOMNETfile.xml
 
 
-In the case given above, a file for OMNET
+
In the case given above, a file for OMNET
 will be built.
 In the following, the command line options are described.
 Input Options#
@@ -627,7 +627,7 @@
 
         
           
-            
This page was last edited on: 12 April 2021
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Tools/traci.html sumo-1.18.0/docs/userdoc/Tools/traci.html
--- sumo-1.17.0/docs/userdoc/Tools/traci.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Tools/traci.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -180,7 +180,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/Tools/Trip.html sumo-1.18.0/docs/userdoc/Tools/Trip.html
--- sumo-1.17.0/docs/userdoc/Tools/Trip.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Tools/Trip.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -216,7 +216,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -409,6 +409,9 @@
 walking, public transport or car --trip-attributes "modes=\"public car\""
 
 
+Using the option --personrides  will generated persons with <ride line="LINE"> definitions.
+using option --from-stops busStop will make persons start with an initial <stop duration="0"> at a random busStop
+using option --to-stops busStop will make persons end their journey at a random busStop
 
 
 Caution
@@ -479,7 +482,7 @@
 
         
           
-            
This page was last edited on: 31 March 2023
+            
This page was last edited on: 09 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Tools/Turns.html sumo-1.18.0/docs/userdoc/Tools/Turns.html
--- sumo-1.17.0/docs/userdoc/Tools/Turns.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Tools/Turns.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -171,6 +171,9 @@
                     • turn counts
                 
                 
+                    • turn ratios
+                
+                
                     • Obtaining initial routes
                 
                 
@@ -179,6 +182,12 @@
                 

                     • Origin-Destination restrictions
                 
+                
+                    → Edge Based
+                
+                
+                    → TAZ (district) Based
+                
                 
                     • Depart / Arrival restrictions
                 
@@ -197,12 +206,30 @@
                 
                     • Sampling
                 
+                
+                    → Default Sampling
+                
+                
+                    → Weighted Sampling
+                
                 
                     • Optimization
                 
                 
                     • Further Calibration
                 
+                
+                    • Quality Control
+                
+                
+                    → Problem areas
+                
+                
+                    → Textual quality metrics
+                
+                
+                    → Spatial quality data
+                
             generateTurnRatios.py
             generateTurnDefs.py
             turnCount2EdgeCount.py
@@ -215,7 +242,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -294,11 +321,38 @@
 </data>
 
 
+Example call:
 python tools/routeSampler.py -r <input-route-file> --turn-files <turn-files> -o <output-file>
 
 
 The attributes for reading the counts from the turn-data file can be set with option --turn-attribute (default 'count')
 In case an existing scenario should be modified (i.e. in combination with different kinds of counting data) it is also possible to convert an existing file with vehicles into a turn-count file.
+
+Note
+When working with turning counts at a roundabout, the incoming and outgoing edges are not directly connected (since vehicles must pass a number of edges within the roundabout first). In this case, the option --turn-max-gap must be used and should be set to the number of edges within the largest roundabout.
+
+turn ratios#
+Traffic data related to turning traffic can also be provided as ratios in the following format:
+<data>
+  <interval id="generated" begin="0.0" end="99.0">
+    <edgeRelation from="-58.121.42" to="64" probability="0.3"/>
+    <edgeRelation from="-58.121.42" to="-31" probability="0.7"/>    
+    <edgeRelation from="-31.80.00" to="31" probability="0.1"/>
+    <edgeRelation from="-31.80.00" to="37" probability="0.1"/>
+    <edgeRelation from="-31.80.00" to="-23" probability="0.8"/>    
+  </interval>
+</data>
+
+
+Example call:
+python tools/routeSampler.py -r <input-route-file> --turn-ratio-files <turn-ratio-files> -o <output-file>
+
+
+The attributes for reading the ratios from the turn-data file can be set with option --turn-ratio-attribute (default probability)
+
+Caution
+Turning ratios must be combined with some other counting data to define the absolute level of traffic. This can be any of the other counting data formats or by setting option --total-count.
+
 Obtaining initial routes#
 Routes generated by randomTrips.py (--route-output) can be a good input source. The following randomTrips.py options may be helpful:
 
@@ -325,9 +379,29 @@
 To define count restrictions on non-consecutive edges the option --turn-max-gap  can be used. Example:
 When setting option --turn-max-gap 2, the edgeRelation <edgeRelation from="A" to="D" .../> would apply to routes containing "A B", "A X D" or "A X Y D" but not "A X Y Z D".
 Origin-Destination restrictions#
+The following section describes counts that refer to the origin and destination of a route rather than to some intermediate route edges.
+Using such counts with routeSampler.py permits to combine thenm with other forms of counts or ratios. (Unlike od2trips which only imports OD-counts and nothing else).
+If origin destination counts are loaded, it is assumed that they give complete coverage of the scenario. This means, if no count is given for a particular Origin-Destination-pair, it is assumed that the count is 0 and no traffic is generated between the respective edges or TAZ.  To change this, the option --extra-od may be set. In this case, traffic between any relations can be generated as long as it does not exceed the loaded counts.
+Edge Based#
 When loading an edgeRelation file with the option --od-files, origin-destination counts will be added.
-This can be used to combine (edge-based) OD-relations with other counting data.  
+This can be used to combine (edge-based) OD-relations with other counting data. 
+<edgeRelation from="A" to="D" count="42"/>
+
+
+The above counting data example will match routes which start on edge A and end on edge D.   
 The tool route2OD.py supports option --edge-relations to transform any kind of route file into a suitable file of edge-based origin-destination edgeRelations.
+TAZ (district) Based#
+When loading an TAZ-file with option --taz-files, it is possible to define counts between Traffic Assignment Zones (TAZ, also called districts).
+The counting data itself must be given in the following from and loaded with option --od-files:
+<data>
+    <interval id="generated" begin="0.0" end="99.0">
+        <tazRelation from="1_2" to="2_0" count="5"/>
+    </interval>
+</data>    
+
+
+The TAZ ids which are referenced by the tazRelation attributes from and to must be defined within the loaded --taz-files.
+The above counting data example will match routes which start on any edge of TAZ 1_2 and end on any edge of taz 2_0.    
 Depart / Arrival restrictions#
 Additional attributes can be read from edgeData files to set the total number of departures or arrivals for each edge. This can be used to create traffic where there would be no traffic otherwise but also to restrict the sampled routes by action as additional constraints together with other counting data (i.e. turn-counts). The following options are available:
 
@@ -396,13 +470,21 @@
 
 
 Sampling#
-By default, sampling will be performed iteratively by 
-1) selecting a random counting location that has not yet reached it's count (and which still has viable routes)
-2) selecting a random route that passes this counting location
-until all counting locations have reached their measured count or there are no viable routes (routes which have all their passed counting locations below the input count)
-By setting the option --weighted. The sampling algorithm is changed. For each route a probability value is loaded from the input. The probability can either be specified explicitly using route attribute 'probability' or implicitly if a route with the same sequence of edges appears multiple times in the the route input. Sampling will be performed iteratively by
-1) selecting a random viable route sampled by probability
+In this stage, routes are selected randomly within the limits imposed by the input counts.
+Only routes that pass a minimum number of counting locations (option --min-count, default 1) are eligible for sampling.
+Default Sampling#
+By default, sampling will be performed iteratively by:
+
+selecting a random counting location that has not yet reached it's count (and which still has viable routes)
+selecting a random route that passes this counting location
+
 until all counting locations have reached their measured count or there are no viable routes (routes which have all their passed counting locations below the input count)
+Weighted Sampling#
+By setting the option --weighted. The sampling algorithm is changed. For each route a probability value is loaded from the input. The probability can either be specified explicitly using route attribute 'probability' or implicitly if a route with the same sequence of edges appears multiple times in the the route input. Sampling will be performed iteratively by:
+
+selecting a random viable route sampled by probability 
+
+until all counting locations have reached their measured count or there are no viable routes (routes which have all their passed counting locations below the input count)    
 Optimization#
 By default, routes will be sampled from the input route set until no further routes can be added without exceeding one of the counts. This may still leave some counts below their target values.
 The problem of selecting a multi-set of route so that all count values are matched can be formulated as an Integer linear programming problem (ILP).
@@ -420,6 +502,40 @@
 Further Calibration#
 It is possible to load the resulting output into routeSampler.py for another round of optimization. By setting the option --optimize-input the sampling step is skipped and the optimizer is run directly on the input route set.
 By removing specific routes or adding new ones, the user can thus tailor the generating traffic in an iterative manner.
+Quality Control#
+There is a range of reasons that could lead to a deviation between the routeSampler results and the user expectation. This section lists common reasons and documents which outputs can be used to judge the quality of the results.
+Problem areas#
+
+Selecting a set of routes to match a given set of counts is generally an underdetermined problem which means there is of not a unique solution. If there are insufficient constraints on the solution space (not enough counts), the chosen solution may appear implausible
+Input routes are not representative of the real routes
+     - not covering the counting locations 
+     - containing unlikely routes
+Temporal patterns are not captured by the given internval data (i.e. by only having counts for the whole day)
+Traffic counts are not stationary within an interval (i.e. a single vehicle passing a long a list of widely spaced counting locations and each interval registers a different location). In this case the route that covers all counting locations will not be sampled. (Longer intervals must be chosen in this case).
+Inconsistency in the counting data
+Many short routes (can be prevented by setting option --min-count)
+
+Textual quality metrics#
+
+underflow locations: Statistics on all counting locations with less traffic than defined in the input
+overflow locations: Statistics on all counting locations with more traffic than defined in the input (only happens due to rounding of fractional counts after optimization)
+GEH statistics: Statistics on locations that reach a defined GEH threshold (configurable with option --geh-ok, default 5)
+total number and percentage of matched counts (note that this is distinct from the number of vehicles since each vehicle may be counted multiple times) 
+
+Spatial quality data#
+By setting option --mismatch-output FILE an [edgeData] file will be created that holds the mismatch between input and output count (deficit) as well as the input count (measuredCount) for each time interval:
+Example:
+<data>
+    <interval id="deficit" begin="0.0" end="99.0">
+        <edgeRelation from="-58.121.42" to="64" measuredCount="1" deficit="0"/>
+        <edgeRelation from="-58.121.42" to="-31" measuredCount="3" deficit="0"/>
+        <edgeRelation from="45" to="-68" measuredCount="3" deficit="1"/>
+        ...
+    </interval>
+</data>  
+
+
+Such a data file can be visualized in sumo-gui and also plotted with plot_net_dump.py.    
 generateTurnRatios.py#
 This script is used to calculate the turn ratios from a
 an edge to its downstream edge with a given route file. The output file
@@ -467,7 +583,8 @@
 
jtcrouter.py#
 The JunctionTurnCountRouter generates vehicle routes from turn-count data.
 It does so by converting the turn counts into into flows and turn-ratio files that are suitable as jtrrouter input.
-Then it calls jtrrouter in the background. The turn
+Then it calls jtrrouter in the background.
+Example call:
 python tools/jtcrouter.py -n <net-file> -t <turn-file> -o <output-file>
 
 
@@ -498,7 +615,7 @@
 
         
           
-            
This page was last edited on: 31 March 2023
+            
This page was last edited on: 07 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Tools/Visualization.html sumo-1.18.0/docs/userdoc/Tools/Visualization.html
--- sumo-1.17.0/docs/userdoc/Tools/Visualization.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Tools/Visualization.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -314,7 +314,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -353,13 +353,13 @@
 paper. Additional tools read plain .csv-files and were added to the
 suite as they offer a similar interface.
 All these tools are just wrappers around the wonderful
-matplotlib library. If you are familiar with
+matplotlib library. If you are familiar with
 Python, you must have a look.
 The tools share a set of common options to
 fine-tune the appearance of the generated figures. These options' names
-where chosen similar to the matplotlib calls.
+where chosen similar to the matplotlib calls.
 The tools are implemented in Python and need
-matplotlib to be installed. The tools can be
+matplotlib to be installed. The tools can be
 found in <SUMO_HOME>/tools/visualization.
 Current Tools#
 Below, you will find the descriptions of tools that should work with the
@@ -367,7 +367,7 @@
 generate. To run them, you'll need:
 
 to install Python
-to install matplotlib
+to install matplotlib
 to set <SUMO_HOME>
 
 All scripts are executed from the command line and you have to give the
@@ -456,7 +456,7 @@
 

 Time to collision over simulation time#
 The plot is created from the output file of a SUMO simulation for which a global SSM device has been added. For this example, starting from the Bologna "acosta" scenario, the SUMO configuration file had been modified in order to compute time to collision:
-<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
+<configuration xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://sumo.dlr.de/xsd/sumoConfiguration.xsd">
 
     <device.ssm.deterministic value="true"/>
     <device.ssm.file value="ssm.xml"/>
@@ -1460,7 +1460,7 @@
 
         
           
-            
This page was last edited on: 31 March 2023
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Tools/Xml.html sumo-1.18.0/docs/userdoc/Tools/Xml.html
--- sumo-1.17.0/docs/userdoc/Tools/Xml.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Tools/Xml.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         

 
@@ -170,7 +170,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -205,7 +205,7 @@
 xml2csv.py#
 This converts any of the sumo xml files into a flat csv (character
 separated values) representation. CSV-Files are easy to parse and can be
-opened in LibreOffice or Microsoft Excel.
+opened in LibreOffice or Microsoft Excel.
 Usage:
 python tools/xml/xml2csv.py input.xml
 
@@ -216,7 +216,7 @@
 using --xsd <FILE> to aid the parsing and get headings also for attributes which may
 be not in the current file. If you give the additional --validation option the input
 file will be validated against the schema. This requires
-lxml to be installed.
+lxml to be installed.
 If you do not use the --xsd option
 the script will determine the attributes to parse from the first line (or block) it parses.
 If your file does not contain all wanted attributes in the first occuring element they will not get
@@ -266,9 +266,9 @@
 
The options have the same meaning as above.
 
 
-
+
 This part of SUMO was developed, reworked, or extended within the project 
-"AMITRAN", co-funded by the European Commission within the Seventh Framework Programme.
+"AMITRAN", co-funded by the European Commission within the Seventh Framework Programme.
 
 changeAttribute.py#
 This sets/removes the specified attribute on all tags (elements) in the input file and writes the result to a new file
@@ -293,7 +293,7 @@
 
         
           
-            
This page was last edited on: 17 February 2023
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Topics/Environmental_Issues.html sumo-1.18.0/docs/userdoc/Topics/Environmental_Issues.html
--- sumo-1.17.0/docs/userdoc/Topics/Environmental_Issues.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Topics/Environmental_Issues.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -184,7 +184,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -262,7 +262,7 @@
 SUMO includes the following emission models:
 
 HBEFA v2.1-based: A
-  continuous reformulation of the HBEFA [1]
+  continuous reformulation of the HBEFA [1]
   v2.1 emissions data base;
 PHEMlight, a derivation of
   the original
@@ -321,7 +321,7 @@
 fifteen reviewed models as well as the derivation of the HBEFA
 v2.1-based model are given in
 the deliverable "D3.1 – Traffic Modelling: Environmental Factors"[3]
-of the iTETRIS[4] project. The
+of the iTETRIS[4] project. The
 development of PHEMlight is
 described in the deliverable "Deliverable 4.1 - Extended Simulation
 Tool PHEM coupled to SUMO with User Guide (Draft)"[5] of the
@@ -331,7 +331,7 @@
 for the edges of a road network. But what if one would use the emitted
 pollutants instead? Would their emission be reduced? The first
 investigations on this topic were performed using a real-world network
-within the iTETRIS[7] project and were
+within the iTETRIS[7] project and were
 reported in its deliverable D3.1[3]. Further steps using real-world
 scenarios are given in [7], [8] and [9]. To gain deeper
 knowledge about the dynamics of the processes, later investigations
@@ -343,7 +343,7 @@
 quality. Traffic management, usually operated by local authorities, has
 the duty to perform corrective actions that reduce road traffic's
 impact, if needed.
-MARLIS[13]
+MARLIS[13]
 is a database that lists such actions performed by traffic management
 authorities. A proof-of-concept for simulating such actions using SUMO
 is presented in [14]. Tomàs Josep Vergés used this approach to
@@ -372,7 +372,7 @@
 
 
 
-HBEFA - Handbook emission factors for road
+
HBEFA - Handbook emission factors for road
     transport (German). INFRAS. Last visited on
     8th of January 2014.
 
@@ -388,7 +388,7 @@
     Modelling: Environmental Factors. iTETRIS consortium, 2009
 
 
-iTETRIS - An Integrated Wireless and Traffic Platform for
+
iTETRIS - An Integrated Wireless and Traffic Platform for
     Real-Time Road Traffic Management
     Solutions. iTETRIS web site. iTETRIS
     consortium. Last visited on 8th of January 2014.
@@ -434,7 +434,7 @@
     152/1. 2008.
 
 
-MARLIS - Datenbank mit Maßnahmen zur Reinhaltung der Luft in
+
MARLIS - Datenbank mit Maßnahmen zur Reinhaltung der Luft in
     Bezug auf Immissionen an Straßen, Version
     3.1
     (German). BASt database index. Last visited on 8th of January 2014.
@@ -462,7 +462,7 @@
 
         
           
-            
This page was last edited on: 21 April 2021
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Topics/V2X.html sumo-1.18.0/docs/userdoc/Topics/V2X.html
--- sumo-1.17.0/docs/userdoc/Topics/V2X.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Topics/V2X.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -177,7 +177,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -243,12 +243,12 @@
 
 
 Veins#
-See the Veins Homepage for a short overview,
+
See the Veins Homepage for a short overview,
 download links, beginner's tutorial, full publication list, and
 documentation.
 iCS#
 iCS is the "iTETRIS Control System", a middleware developed in the
-iTETRIS project to join SUMO, ns-3, and
+iTETRIS project to join SUMO, ns-3, and
 V2X application simulators. It is currently used and extended within the
 TransAID project.
 Eclipse MOSAIC#
@@ -271,7 +271,7 @@
 
         
           
-            
This page was last edited on: 11 February 2021
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/TraCI/Add_Vehicle.html sumo-1.18.0/docs/userdoc/TraCI/Add_Vehicle.html
--- sumo-1.17.0/docs/userdoc/TraCI/Add_Vehicle.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/TraCI/Add_Vehicle.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -171,7 +171,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/TraCI/BusStop.html sumo-1.18.0/docs/userdoc/TraCI/BusStop.html
--- sumo-1.17.0/docs/userdoc/TraCI/BusStop.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/TraCI/BusStop.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
diff -Nru sumo-1.17.0/docs/userdoc/TraCI/Calibrator.html sumo-1.18.0/docs/userdoc/TraCI/Calibrator.html
--- sumo-1.17.0/docs/userdoc/TraCI/Calibrator.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/TraCI/Calibrator.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
diff -Nru sumo-1.17.0/docs/userdoc/TraCI/Change_Calibrator_State.html sumo-1.18.0/docs/userdoc/TraCI/Change_Calibrator_State.html
--- sumo-1.17.0/docs/userdoc/TraCI/Change_Calibrator_State.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/TraCI/Change_Calibrator_State.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -169,7 +169,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/TraCI/Change_Edge_State.html sumo-1.18.0/docs/userdoc/TraCI/Change_Edge_State.html
--- sumo-1.17.0/docs/userdoc/TraCI/Change_Edge_State.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/TraCI/Change_Edge_State.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -171,7 +171,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/TraCI/Change_GUI_State.html sumo-1.18.0/docs/userdoc/TraCI/Change_GUI_State.html
--- sumo-1.17.0/docs/userdoc/TraCI/Change_GUI_State.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/TraCI/Change_GUI_State.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -183,7 +183,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/TraCI/Change_Inductionloop_State.html sumo-1.18.0/docs/userdoc/TraCI/Change_Inductionloop_State.html
--- sumo-1.17.0/docs/userdoc/TraCI/Change_Inductionloop_State.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/TraCI/Change_Inductionloop_State.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -169,7 +169,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/TraCI/Change_Lane_Area_Detector_State.html sumo-1.18.0/docs/userdoc/TraCI/Change_Lane_Area_Detector_State.html
--- sumo-1.17.0/docs/userdoc/TraCI/Change_Lane_Area_Detector_State.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/TraCI/Change_Lane_Area_Detector_State.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -165,7 +165,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/TraCI/Change_Lane_State.html sumo-1.18.0/docs/userdoc/TraCI/Change_Lane_State.html
--- sumo-1.17.0/docs/userdoc/TraCI/Change_Lane_State.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/TraCI/Change_Lane_State.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -165,7 +165,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/TraCI/Change_Person_State.html sumo-1.18.0/docs/userdoc/TraCI/Change_Person_State.html
--- sumo-1.17.0/docs/userdoc/TraCI/Change_Person_State.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/TraCI/Change_Person_State.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -187,7 +187,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/TraCI/Change_PoI_State.html sumo-1.18.0/docs/userdoc/TraCI/Change_PoI_State.html
--- sumo-1.17.0/docs/userdoc/TraCI/Change_PoI_State.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/TraCI/Change_PoI_State.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -183,7 +183,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -307,7 +307,7 @@
 highlight (0x6c)
 highlight specification, see below
 Adds a highlight to the PoI
-remove
+highlight
 
 
 
@@ -469,7 +469,7 @@
 
         
           
-            
This page was last edited on: 08 June 2022
+            
This page was last edited on: 30 May 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/TraCI/Change_Polygon_State.html sumo-1.18.0/docs/userdoc/TraCI/Change_Polygon_State.html
--- sumo-1.17.0/docs/userdoc/TraCI/Change_Polygon_State.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/TraCI/Change_Polygon_State.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -186,7 +186,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/TraCI/Change_Route_State.html sumo-1.18.0/docs/userdoc/TraCI/Change_Route_State.html
--- sumo-1.17.0/docs/userdoc/TraCI/Change_Route_State.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/TraCI/Change_Route_State.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -165,7 +165,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/TraCI/Change_Simulation_State.html sumo-1.18.0/docs/userdoc/TraCI/Change_Simulation_State.html
--- sumo-1.17.0/docs/userdoc/TraCI/Change_Simulation_State.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/TraCI/Change_Simulation_State.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -165,7 +165,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/TraCI/Change_Traffic_Lights_State.html sumo-1.18.0/docs/userdoc/TraCI/Change_Traffic_Lights_State.html
--- sumo-1.17.0/docs/userdoc/TraCI/Change_Traffic_Lights_State.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/TraCI/Change_Traffic_Lights_State.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -184,7 +184,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/TraCI/Change_Vehicle_State.html sumo-1.18.0/docs/userdoc/TraCI/Change_Vehicle_State.html
--- sumo-1.17.0/docs/userdoc/TraCI/Change_Vehicle_State.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/TraCI/Change_Vehicle_State.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -253,7 +253,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -459,8 +459,8 @@
 
 
 setStopParameter (0x55)
-compound (nextStopIndex, param, value) (see below)
-modifies attribute of stop at the given index. Changing location ('edge', 'busStop', etc.) behave like replaceRoute. See below for additional details
+compound (nextStopIndex, param, value, customParam) (see below)
+modifies attribute of stop at the given index. Changing location ('edge', 'busStop', etc.) behave like replaceRoute. If customParam is set to 1, modifes a user defined param instead.See below for additional details
 setStopParameter
 
 
@@ -620,6 +620,18 @@
 setLateralAlignment
 
 
+boarding duration (0x2f)
+double
+Sets the boarding duration for passengers entering/leaving this vehicle.
+setBoardingDuration
+
+
+impatience (0x26)
+string
+sets the current dynamic impatience of this vehicle. This value gets reset when the vehicle starts driving.
+setImpatience
+
+
 parameter (0x7e)
 string, string
 Sets the string value for the given string parameter
@@ -687,7 +699,7 @@
 Lane Index
 value type double
 Duration in seconds
-value type byte (optional)
+value type int (optional)
 stop flags: (see below)
 value type double (optional)
 start position
@@ -961,30 +973,50 @@
 
+
+
+
-
-
+
-
+
+
+
-
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
 
 byte integer byte
 string int string byte
 double integer byte byte byte
 double integer byte int byte
 double byte
 double byte
 int byte byte
 
 
 
 vehID value type compound item number (8 or 9) value type string Edge ID value type double end position value type byte Lane Index value type double Duration in seconds value type int stop flags (see stop) value type double start position value type double Until in seconds value type int
 nextStopIndex edgeID pos=1.0 laneIndex=0 duration=-1073741824.0 flags=0 startPos=-1073741824.0 until=-1073741824.0 teleport=0 value type byte (optional) teleport
 
 
 
@@ -1006,30 +1038,50 @@
 
+
+
+
-
-
+
-
+
+
+
-
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
 
 byte integer byte
 string int string byte
 double integer byte byte byte
 double integer byte int byte
 double byte
 double byte
 int byte byte
 
 
 
 vehID value type compound item number (8 or 9) value type string Edge ID value type double end position value type byte Lane Index value type double Duration in seconds value type int stop flags (see stop) value type double start position value type double Until in seconds value type int
 nextStopIndex edgeID pos=1.0 laneIndex=0 duration=-1073741824.0 flags=0 startPos=-1073741824.0 until=-1073741824.0 teleport=0 value type byte (optional) teleport
 
 
 
@@ -1048,18 +1100,22 @@
 
-
+
+
+
-
+
+
+
 
 string byte integer
 int
 string
 string byte
 
 
 
 vehID value type compound  item number (always 4)
 nextStopIndex
 param
 value customParam 
 
 
 
@@ -1068,6 +1124,7 @@
 nextStopIndex must be a non-negative number smaller than the number of remaining stops
 param may be any value permitted as xml-attribute for stops (except index)
 if param changes the location ('edge', 'busStop', ...), the function behaves like replaceStop
+if customParam is set to 1, param may be an arbitrary string and the function will set a custom parameter instead of an attribute
 
 resume (0x19)#
 
@@ -1725,7 +1782,7 @@
 
         
           
-            
This page was last edited on: 13 March 2023
+            
This page was last edited on: 21 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/TraCI/Change_VehicleType_State.html sumo-1.18.0/docs/userdoc/TraCI/Change_VehicleType_State.html
--- sumo-1.17.0/docs/userdoc/TraCI/Change_VehicleType_State.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/TraCI/Change_VehicleType_State.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -171,7 +171,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -351,6 +351,18 @@
 
+
+
+
+
+
+
+
+
+
+
+
+
@@ -408,7 +420,7 @@
 
         
           
-            
This page was last edited on: 18 February 2022
+            
This page was last edited on: 20 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/TraCI/ChargingStation.html sumo-1.18.0/docs/userdoc/TraCI/ChargingStation.html
--- sumo-1.17.0/docs/userdoc/TraCI/ChargingStation.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/TraCI/ChargingStation.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
diff -Nru sumo-1.17.0/docs/userdoc/TraCI/Control-related_commands.html sumo-1.18.0/docs/userdoc/TraCI/Control-related_commands.html
--- sumo-1.17.0/docs/userdoc/TraCI/Control-related_commands.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/TraCI/Control-related_commands.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -176,7 +176,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/TraCI/C++TraCIAPI.html sumo-1.18.0/docs/userdoc/TraCI/C++TraCIAPI.html
--- sumo-1.17.0/docs/userdoc/TraCI/C++TraCIAPI.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/TraCI/C++TraCIAPI.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -189,7 +189,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -227,12 +227,12 @@
 
 C++ TraCIAPI client library#
 The C++ TraCIAPI is client library that is part of the SUMO-source tree.
-The library can be downloaded as part of the source
+The library can be downloaded as part of the source
 distribution. Example code
 that uses the library is at
 <SUMO_HOME>/src/traci_testclient/TraCITestClient.cpp. Doxygen-generated
 documentation can be found
-here
+here
 Building the Library#
 To build the library without building SUMO, the following dependencies
 from the SUMO-source directory must be present:
@@ -312,7 +312,7 @@
 
         
           
-            
This page was last edited on: 03 April 2023
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/TraCI/Edge_Value_Retrieval.html sumo-1.18.0/docs/userdoc/TraCI/Edge_Value_Retrieval.html
--- sumo-1.17.0/docs/userdoc/TraCI/Edge_Value_Retrieval.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/TraCI/Edge_Value_Retrieval.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -171,7 +171,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -265,37 +265,37 @@
 
-
+
-
+
-
+
-
+
-
+
-
+
@@ -358,6 +358,12 @@
 
+
+
+
+
+
+setLateralAlignment
 
 boarding duration (0x2f) double Sets the boarding duration for passengers entering/leaving this vehicle. setBoardingDuration
impatience (0x26) string Sets the current base impatience of this vehicle. setImpatience

 copy (0x88)
 string
 Creates a new vehicle type with the given ID as a duplicate of the original type.

 CO2 emissions (id 0x60)
 double Sum of CO2 emissions on this edge in mg during this time step. Sum of CO2 emissions on this edge in mg/s during this time step.
 getCO2Emission
 
 
 CO emissions (id 0x61)
 double Sum of CO emissions on this edge in mg during this time step. Sum of CO emissions on this edge in mg/s during this time step.
 getCOEmission
 
 
 HC emissions (id 0x62)
 double Sum of HC emissions on this edge in mg during this time step. Sum of HC emissions on this edge in mg/s during this time step.
 getHCEmission
 
 
 PMx emissions (id 0x63)
 double Sum of PMx emissions on this edge in mg during this time step. Sum of PMx emissions on this edge in mg/s during this time step.
 getPMxEmission
 
 
 NOx emissions (id 0x64)
 double Sum of NOx emissions on this edge in mg during this time step. Sum of NOx emissions on this edge in mg/s during this time step.
 getNOxEmission
 
 
 fuel consumption (id 0x65)
 double Sum of fuel consumption on this edge in ml during this time step. Sum of fuel consumption on this edge in mg/s during this time step.
 getFuelConsumption
 
 Returns the total number of halting vehicles for the last time step on the given edge. A speed of less than 0.1 m/s is considered a halt.
 getLastStepHaltingNumber
 
angle (0x43) double Returns the heading of the straight line segment formed by the edge at the given position. getAngle
 
 
 Response 0xba: Edge Variable#
@@ -417,7 +423,7 @@
 
         
           
-            
This page was last edited on: 11 February 2021
+            
This page was last edited on: 17 May 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/TraCI/GenericParameters.html sumo-1.18.0/docs/userdoc/TraCI/GenericParameters.html
--- sumo-1.17.0/docs/userdoc/TraCI/GenericParameters.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/TraCI/GenericParameters.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -174,7 +174,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/TraCI/GUI_Value_Retrieval.html sumo-1.18.0/docs/userdoc/TraCI/GUI_Value_Retrieval.html
--- sumo-1.17.0/docs/userdoc/TraCI/GUI_Value_Retrieval.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/TraCI/GUI_Value_Retrieval.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -166,7 +166,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/TraCI/Induction_Loop_Value_Retrieval.html sumo-1.18.0/docs/userdoc/TraCI/Induction_Loop_Value_Retrieval.html
--- sumo-1.17.0/docs/userdoc/TraCI/Induction_Loop_Value_Retrieval.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/TraCI/Induction_Loop_Value_Retrieval.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -170,7 +170,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/TraCI/Interfacing_TraCI_from_Python.html sumo-1.18.0/docs/userdoc/TraCI/Interfacing_TraCI_from_Python.html
--- sumo-1.17.0/docs/userdoc/TraCI/Interfacing_TraCI_from_Python.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/TraCI/Interfacing_TraCI_from_Python.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -204,7 +204,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -237,21 +237,23 @@
                   
 
 The TraCI commands are split into the
-13 domains gui, lane, poi, simulation, trafficlight, vehicletype, edge,
-inductionloop, junction, multientryexit, polygon, route, person and
+domains busstop, calibrator, chargingstation, edge, gui, inductionloop, junction, lane,
+lanearea, meandata, multientryexit, overheadwire, parkingarea, person, poi, polygon,
+rerouter, route, routeprobe, simulation, trafficlight, variablespeedsign, vehicle, and vehicletype,
 vehicle, which correspond to individual modules. For a detailed list of
 available functions see the pydoc generated documentation. The source code
 can be found at
-[1]
+[1].
+Please note that if performance is an issue and you don't a need GUI, it is almost always better
+to use libsumo instead of traci, which has the same API.
 importing traci in a script#
-To use the library, the <SUMO_HOME>/tools directory must be on the python load
-path. This is typically done with a stanza like this:
-import os, sys
+To use the library, you can install it using pip install traci or add the <SUMO_HOME>/tools directory
+to your Python load path. This is typically done with a stanza like this:
+import os
+import sys
 if 'SUMO_HOME' in os.environ:
-    tools = os.path.join(os.environ['SUMO_HOME'], 'tools')
-    sys.path.append(tools)
-else:
-    sys.exit("please declare environment variable 'SUMO_HOME'")
+    sys.path.append(os.path.join(os.environ['SUMO_HOME'], 'tools'))
+import traci
 
 
 This assumes that the environment variable
@@ -261,6 +263,11 @@
 
sys.path.append(os.path.join('c:', os.sep, 'whatever', 'path', 'to', 'sumo', 'tools'))
 

 
+If you decide to switch to libsumo at a later stage or want to be flexible here,
+you can replace the import line later by:
+import libsumo as traci
+
+
 First Steps#
 In general it is very easy to interface with SUMO from Python (the
 following example is a modification of
@@ -316,6 +323,11 @@
 
 
The values retrieved are always the ones from the last time step, it is
 not possible to retrieve older values.
+
+Note
+Before version 1.18.0 traci.simulationStep() returned all subscription results, now it returns None.
+If you need the old behavior, use traci.simulationStepLegacy().
+
 Context Subscriptions#
 Context subscriptions work like subscriptions in that they retrieve a
 list of variables automatically for every simulation stop. However, the
@@ -345,6 +357,12 @@
 
 
The values retrieved are always the ones from the last time step, it is
 not possible to retrieve older values.
+
+Note
+Before version 1.18.0 traci.junction.getAllContextSubscriptionResults would not contain
+the ids of the junctions which did not have objects in their context.
+Now it returns their id mapped to an empty dictionary (similar to libsumo). This holds for the other domains as well.
+
 Context Subscription Filters#
 For vehicle-to-vehicle context subscriptions (i.e., context
 subscriptions, whose reference object is a vehicle and whose requested
@@ -381,7 +399,7 @@
 
VType: Only return vehicles of the specified vTypes
 VClass: Only return vehicles of the specified vClasses
 
-See the pydoc
+
See the pydoc
 documentation
 for detailed specifications.
 
@@ -498,7 +516,8 @@
 Tools/Sumolib
 Pitfalls and Solutions#
 
-Note that strings, if exchanged, have to be ASCII-encoded.
+Note that strings, if exchanged, had to be plain ASCII before 1.18.0.
+  Currently UTF-8 should be possible for all the strings.
 If you start sumo from within your python script using
   subprocess.Popen, be sure to call wait() on the resulting process
   object before quitting your script. You might loose output
@@ -514,7 +533,8 @@
 
 
 Make sure that the TRACIPATH corresponds to the sumo version that you wish to use. 
-If it does not, then the order of directories in LOADPATH (sys.path) must be changed or the SUMO installation must be removed from any directories that come before the wanted directory.
+If it does not, then the order of directories in LOADPATH (sys.path) must be changed
+or the SUMO installation must be removed from any directories that come before the wanted directory.
 Debugging a TraCI session on Linux#
 Sometimes SUMO may crash while running a simulation with TraCI. The
 below steps make it simple to run sumo with traci in a debugger:
@@ -625,7 +645,7 @@
 
         
           
-            
This page was last edited on: 31 March 2023
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/TraCI/Junction_Value_Retrieval.html sumo-1.18.0/docs/userdoc/TraCI/Junction_Value_Retrieval.html
--- sumo-1.17.0/docs/userdoc/TraCI/Junction_Value_Retrieval.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/TraCI/Junction_Value_Retrieval.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -168,7 +168,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/TraCI/Lane_Area_Detector_Value_Retrieval.html sumo-1.18.0/docs/userdoc/TraCI/Lane_Area_Detector_Value_Retrieval.html
--- sumo-1.17.0/docs/userdoc/TraCI/Lane_Area_Detector_Value_Retrieval.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/TraCI/Lane_Area_Detector_Value_Retrieval.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -167,7 +167,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/TraCI/Lane_Value_Retrieval.html sumo-1.18.0/docs/userdoc/TraCI/Lane_Value_Retrieval.html
--- sumo-1.17.0/docs/userdoc/TraCI/Lane_Value_Retrieval.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/TraCI/Lane_Value_Retrieval.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -174,7 +174,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -312,37 +312,37 @@
 
 CO2 emissions (id 0x60)
 double
-Sum of CO2 emissions on this lane in mg during this time step.
+Sum of CO2 emissions on this lane in mg/s during this time step.
 getCO2Emission
 
 
 CO emissions (id 0x61)
 double
-Sum of CO emissions on this lane in mg during this time step.
+Sum of CO emissions on this lane in mg/s during this time step.
 getCOEmission
 
 
 HC emissions (id 0x62)
 double
-Sum of HC emissions on this lane in mg during this time step.
+Sum of HC emissions on this lane in mg/s during this time step.
 getHCEmission
 
 
 PMx emissions (id 0x63)
 double
-Sum of PMx emissions on this lane in mg during this time step.
+Sum of PMx emissions on this lane in mg/s during this time step.
 getPMxEmission
 
 
 NOx emissions (id 0x64)
 double
-Sum of NOx emissions on this lane in mg during this time step.
+Sum of NOx emissions on this lane in mg/s during this time step.
 getNOxEmission
 
 
 fuel consumption (id 0x65)
 double
-Sum of fuel consumption on this lane in ml during this time step.
+Sum of fuel consumption on this lane in mg/s during this time step.
 getFuelConsumption
 
 
@@ -405,6 +405,12 @@
 Returns the total number of halting vehicles for the last time step on the given lane. A speed of less than 0.1 m/s is considered a halt.
 getLastStepHaltingNumber
 
+
+angle (0x43)
+double
+Returns the heading of the straight line segment formed by the lane at the given position.
+getAngle
+
 
 
 Response 0xb3: Lane Variable#
@@ -515,7 +521,7 @@
 
         
           
-            
This page was last edited on: 10 March 2023
+            
This page was last edited on: 17 May 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/TraCI/Multi-Entry-Exit_Detectors_Value_Retrieval.html sumo-1.18.0/docs/userdoc/TraCI/Multi-Entry-Exit_Detectors_Value_Retrieval.html
--- sumo-1.17.0/docs/userdoc/TraCI/Multi-Entry-Exit_Detectors_Value_Retrieval.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/TraCI/Multi-Entry-Exit_Detectors_Value_Retrieval.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -167,7 +167,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/TraCI/Object_Context_Subscription.html sumo-1.18.0/docs/userdoc/TraCI/Object_Context_Subscription.html
--- sumo-1.17.0/docs/userdoc/TraCI/Object_Context_Subscription.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/TraCI/Object_Context_Subscription.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -173,7 +173,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -556,9 +556,9 @@
 
 In the python
   library,
-  all domains support the methods subscribeContext and
+  all domains support the methods subscribeContext and
   unsubscribeContext
-For the python client several methods for adding context filters
+
For the python client several methods for adding context filters
   for vehicle-to-vehicle context
   subscriptions
   are included.
@@ -579,7 +579,7 @@
 
         
           
-            
This page was last edited on: 02 December 2021
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/TraCI/Object_Variable_Subscription.html sumo-1.18.0/docs/userdoc/TraCI/Object_Variable_Subscription.html
--- sumo-1.17.0/docs/userdoc/TraCI/Object_Variable_Subscription.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/TraCI/Object_Variable_Subscription.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -169,7 +169,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/TraCI/OverheadWire.html sumo-1.18.0/docs/userdoc/TraCI/OverheadWire.html
--- sumo-1.17.0/docs/userdoc/TraCI/OverheadWire.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/TraCI/OverheadWire.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
diff -Nru sumo-1.17.0/docs/userdoc/TraCI/ParkingArea.html sumo-1.18.0/docs/userdoc/TraCI/ParkingArea.html
--- sumo-1.17.0/docs/userdoc/TraCI/ParkingArea.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/TraCI/ParkingArea.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
diff -Nru sumo-1.17.0/docs/userdoc/TraCI/Person_Value_Retrieval.html sumo-1.18.0/docs/userdoc/TraCI/Person_Value_Retrieval.html
--- sumo-1.17.0/docs/userdoc/TraCI/Person_Value_Retrieval.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/TraCI/Person_Value_Retrieval.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -168,7 +168,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/TraCI/POI_Value_Retrieval.html sumo-1.18.0/docs/userdoc/TraCI/POI_Value_Retrieval.html
--- sumo-1.17.0/docs/userdoc/TraCI/POI_Value_Retrieval.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/TraCI/POI_Value_Retrieval.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -168,7 +168,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/TraCI/Polygon_Value_Retrieval.html sumo-1.18.0/docs/userdoc/TraCI/Polygon_Value_Retrieval.html
--- sumo-1.17.0/docs/userdoc/TraCI/Polygon_Value_Retrieval.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/TraCI/Polygon_Value_Retrieval.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -168,7 +168,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/TraCI/Protocol.html sumo-1.18.0/docs/userdoc/TraCI/Protocol.html
--- sumo-1.17.0/docs/userdoc/TraCI/Protocol.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/TraCI/Protocol.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -188,7 +188,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/TraCI/Rerouter.html sumo-1.18.0/docs/userdoc/TraCI/Rerouter.html
--- sumo-1.17.0/docs/userdoc/TraCI/Rerouter.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/TraCI/Rerouter.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -168,7 +168,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/TraCI/RouteProbe.html sumo-1.18.0/docs/userdoc/TraCI/RouteProbe.html
--- sumo-1.17.0/docs/userdoc/TraCI/RouteProbe.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/TraCI/RouteProbe.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -168,7 +168,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/TraCI/Route_Value_Retrieval.html sumo-1.18.0/docs/userdoc/TraCI/Route_Value_Retrieval.html
--- sumo-1.17.0/docs/userdoc/TraCI/Route_Value_Retrieval.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/TraCI/Route_Value_Retrieval.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -168,7 +168,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/TraCI/Simulation_Value_Retrieval.html sumo-1.18.0/docs/userdoc/TraCI/Simulation_Value_Retrieval.html
--- sumo-1.17.0/docs/userdoc/TraCI/Simulation_Value_Retrieval.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/TraCI/Simulation_Value_Retrieval.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -189,7 +189,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -256,187 +256,187 @@
 current simulation time (0x66)
 double
 Returns the current simulation time (in s)
-getTime
+getTime
 
 
 current simulation time (0x70) (deprecated)
 int
 Returns the current simulation time (in ms)
-getCurrentTime
+getCurrentTime
 
 
 number of loaded vehicles (id 0x71)
 int
 The number of vehicles which were loaded in this time step.
-getLoadedNumber
+getLoadedNumber
 
 
 ids of loaded vehicles (id 0x72)
 stringList
 A list of ids of vehicles which were loaded in this time step.
-getLoadedIDList
+getLoadedIDList
 
 
 number of departed vehicles (id 0x73)
 int
 The number of vehicles which departed (were inserted into the road network) in this time step.
-getDepartedNumber
+getDepartedNumber
 
 
 ids of departed vehicles (id 0x74)
 stringList
 A list of ids of vehicles which departed (were inserted into the road network) in this time step.
-getDepartedIDList
+getDepartedIDList
 
 
 number of vehicles that start to teleport

 (id 0x75)
 int
 The number of vehicles which started to teleport in this time step.
-getStartingTeleportNumber
+getStartingTeleportNumber
 
 
 ids of vehicles that start to teleport (id 0x76)
 stringList
 A list of ids of vehicles which started to teleport in this time step.
-getStartingTeleportIDList
+getStartingTeleportIDList
 
 
 number of vehicles that end being teleported

 (id 0x77)
 int
 The number of vehicles which ended to be teleported in this time step.
-getEndingTeleportNumber
+getEndingTeleportNumber
 
 
 ids of vehicles that end being teleported

 (id 0x78)
 stringList
 A list of ids of vehicles which ended to be teleported in this time step.
-getEndingTeleportIDList
+getEndingTeleportIDList
 
 
 number of arrived vehicles (id 0x79)
 int
 The number of vehicles which arrived (have reached their destination and are removed from the road network) in this time step.
-getArrivedNumber
+getArrivedNumber
 
 
 ids of arrived vehicles (id 0x7a)
 stringList
 A list of ids of vehicles which arrived (have reached their destination and are removed from the road network) in this time step.
-getArrivedIDList
+getArrivedIDList
 
 
 network bounding box (id 0x7c)
 2D polygon
 The lower left and the upper right corner of the bounding box of the simulation network.
-getNetBoundary
+getNetBoundary
 
 
 minimum number of vehicles that are still expected to leave the net (id 0x7d)
 int
 The number of vehicles which are in the net plus the ones still waiting to start. This number may be smaller than the actual number of vehicles still to come because of delayed route file parsing.
-getMinExpectedNumber
+getMinExpectedNumber
 
 
 number of vehicles that begin a stop (id 0x68)
 int
 The number of vehicles that halted on a scheduled stop in this time step.
-getStopStartingVehiclesNumber
+getStopStartingVehiclesNumber
 
 
 ids of vehicles that begin a stop (id 0x69)
 stringList
 A list of ids of vehicles that halted on a scheduled stop in this time step.
-getStopStartingVehiclesIDList
+getStopStartingVehiclesIDList
 
 
 number of vehicles that end a stop (id 0x6a)
 int
 The number of vehicles that begin to continue their journey, leaving a scheduled stop in this time step.
-getStopEndingVehiclesNumber
+getStopEndingVehiclesNumber
 
 
 ids of vehicles that end a stop (id 0x6b)
 stringList
 A list of ids of vehicles that begin to continue their journey, leaving a scheduled stop in this time step.
-getStopEndingVehiclesIDList
+getStopEndingVehiclesIDList
 
 
 number of vehicles involved in a collision (id 0x80)
 int
 The number of vehicles that were involved in a collision in this time step.
-getCollidingVehiclesNumber
+getCollidingVehiclesNumber
 
 
 ids of vehicles involved in a collision (id 0x81)
 stringList
 A list of ids of vehicles that were involved in a collision in this time step.
-getCollidingVehiclesIDList
+getCollidingVehiclesIDList
 
 
 number of vehicles that begin to be parked

 (id 0x6c)
 int
 The number of vehicles that enter a parking position in this time step.
-getParkingStartingVehiclesNumber
+getParkingStartingVehiclesNumber
 
 
 ids of vehicles that begin to be parked

 (id 0x6d)
 stringList
 A list of ids of vehicles that enter a parking position in this time step.
-getParkingStartingVehiclesIDList
+getParkingStartingVehiclesIDList
 
 
 number of vehicles that end to be parked

 (id 0x6e)
 int
 The number of vehicles that begin to continue their journey, leaving a scheduled parking in this time step.
-getParkingEndingVehiclesNumber
+getParkingEndingVehiclesNumber
 
 
 ids of vehicles that end being parked (id 0x6f)
 stringList
 A list of ids of vehicles that begin to continue their journey, leaving a scheduled parking in this time step.
-getParkingEndingVehiclesIDList
+getParkingEndingVehiclesIDList
 
 
 bus stop waiting (id 0x67)
 int
 Get the total number of waiting persons at the named bus stop.
-getBusStopWaiting
+getBusStopWaiting
 
 
 bus stop waiting ids (id 0xef)
 stringList
 Get the ids of waiting persons at the named bus stop.
-getBusStopWaitingIDList
+getBusStopWaitingIDList
 
 
 delta T (id 0x7b)
 double
 Returns the length of one simulation step in seconds.
-getDeltaT
+getDeltaT
 
 
 parameter (0x7e)
 string
 Returns the value for the given string parameter.
-getParameter
+getParameter
 
 
 scale (id 0x8e)
 double
 Returns the traffic scaling factor.
-getScale
+getScale
 
 
 option (0x3f)
 string
 Returns the value of one of the global SUMO options.
-getOption
+getOption
 
 
 
@@ -837,7 +837,7 @@
 
         
           
-            
This page was last edited on: 16 February 2023
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/TraCI/SUMO_ID_Commands_Structure.html sumo-1.18.0/docs/userdoc/TraCI/SUMO_ID_Commands_Structure.html
--- sumo-1.17.0/docs/userdoc/TraCI/SUMO_ID_Commands_Structure.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/TraCI/SUMO_ID_Commands_Structure.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -183,7 +183,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/TraCI/TraaS.html sumo-1.18.0/docs/userdoc/TraCI/TraaS.html
--- sumo-1.17.0/docs/userdoc/TraCI/TraaS.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/TraCI/TraaS.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -191,7 +191,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/TraCI/Traffic_Lights_Value_Retrieval.html sumo-1.18.0/docs/userdoc/TraCI/Traffic_Lights_Value_Retrieval.html
--- sumo-1.17.0/docs/userdoc/TraCI/Traffic_Lights_Value_Retrieval.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/TraCI/Traffic_Lights_Value_Retrieval.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -173,7 +173,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/TraCI/VariableSpeedSign.html sumo-1.18.0/docs/userdoc/TraCI/VariableSpeedSign.html
--- sumo-1.17.0/docs/userdoc/TraCI/VariableSpeedSign.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/TraCI/VariableSpeedSign.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -165,7 +165,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/TraCI/Vehicle_Signalling.html sumo-1.18.0/docs/userdoc/TraCI/Vehicle_Signalling.html
--- sumo-1.17.0/docs/userdoc/TraCI/Vehicle_Signalling.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/TraCI/Vehicle_Signalling.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -168,7 +168,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/TraCI/VehicleType_Value_Retrieval.html sumo-1.18.0/docs/userdoc/TraCI/VehicleType_Value_Retrieval.html
--- sumo-1.17.0/docs/userdoc/TraCI/VehicleType_Value_Retrieval.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/TraCI/VehicleType_Value_Retrieval.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -166,7 +166,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -364,6 +364,18 @@
 Returns the traffic scaling factor for vehicles of this type
 getScale
 
+
+boarding duration (0x2f)
+double
+Returns the boarding duration for passengers entering/leaving this vehicle.
+setBoardingDuration
+
+
+impatience (0x26)
+string
+Returns the current base impatience of this vehicle.
+setImpatience
+
 
 
 Overview Retrievable Vehicle Type Variables
@@ -394,7 +406,7 @@
 
         
           
-            
This page was last edited on: 18 February 2022
+            
This page was last edited on: 20 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/TraCI/Vehicle_Value_Retrieval.html sumo-1.18.0/docs/userdoc/TraCI/Vehicle_Value_Retrieval.html
--- sumo-1.17.0/docs/userdoc/TraCI/Vehicle_Value_Retrieval.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/TraCI/Vehicle_Value_Retrieval.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -190,6 +190,12 @@
                 
                     • stopSpeed (0x1d)
                 
+                
+                    • junction foes (0x37)
+                
+                
+                    • stopParameter (0x55)
+                
             Device and LaneChangeModel Parameter Retrieval 0x7e
                 
                     • Supported Device Parameters
@@ -207,7 +213,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -464,7 +470,7 @@
 
 
 stop state (id 0xb5)
-ubyte
+int
 value = 1 * stopped + 2 * parking + 4 * triggered + 8 * containerTriggered + 16 * atBusStop + 32 * atContainerStop + 64 * atChargingStation + 128 * atParkingArea
 getStopState

 isAtBusStop

@@ -660,6 +666,18 @@
 
getMaxSpeedLat
 
 
+boarding duration (0x2f)
+double
+Returns the boarding duration of the vehicle in s
+getBoarding
+
+
+current impatience (0x26)
+double
+Returns the current [dynamic impatience](../Definition_of_Vehicles%2C_Vehicle_Types%2C_and_Routes.md#impatience) of this vehicle.
+getImpatience
+  
+
 lateral gap (0xbb)
 double
 Returns the desired lateral gap of this vehicle at 50km/h in m.
@@ -926,6 +944,18 @@
 Return the safe speed for stopping at gap computed by the carFollowModel of vehicle
 getStopSpeed
 
+  
+  junction foes (0x37)
+  complex
+  Returns the list of foes within a certain distance of the ego vehicle.
+  getJunctionFoes
+
+
+  stop parameters (0x55)
+  string
+  Returns the attribute by the given name for the stop of the given index (0 is the next stop, -1 is the previous stop etc) for the specified vehicle. If customParam is set to True (1), the user defined custom parameter will returned instead.
+  
getStopParameter
+
 
 
 
@@ -1163,6 +1193,46 @@
 
 The returned value is the safe speed in m/s for stopping after gap when braking
 from the given speed.
+junction foes (0x37)#
+
+
+
+
+
+
+
+
+
+
+
+
+
+byte double
value type double lookahead distance in m
+The returned value is the safe speed in m/s for stopping after gap when braking
+from the given speed.
+stopParameter (0x55)#
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+byte int int string byte
value type compound 3 stopIndex param customParam
+The stopIndex must be in range [-numberOfPassedStops, numberORemaingStops - 1]
+The customParam is interpreted as a boolean and deterines whether an attribute values or a user defined parama is returned.
 Device and LaneChangeModel Parameter Retrieval 0x7e#
 Vehicles supports retrieval of device parameters using the generic
 parameter retrieval
@@ -1244,7 +1314,7 @@
 
         

           
-            
This page was last edited on: 08 March 2023
+            
This page was last edited on: 21 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/TraCI.html sumo-1.18.0/docs/userdoc/TraCI.html
--- sumo-1.17.0/docs/userdoc/TraCI.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/TraCI.html	2023-06-28 22:08:56.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -213,7 +213,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -470,7 +470,7 @@
 C++: The C++ TraCIAPI is a client
   library that is part of the sumo-source tree. (API
   coverage is good but this client is no longer updated. Please use libtraci instead.)
-C++: The Veins project provides a
+
C++: The Veins project provides a
   middle-ware for coupling sumo with
   OMNET++. As part of the infrastructure it
   provides a C++ client library for the TraCI API (API completeness is
@@ -481,7 +481,7 @@
 
.NET: libtracics is an experimental SWIG generated binding to the original libtraci.
   It has full API coverage but is untested and needs to be generated by the user from the source.
 Matlab
-  TraCI4Matlab.
+  TraCI4Matlab.
   The client is included as part of each SUMO release in
   <SUMO_HOME>/tools/contributed/traci4matlab
   Not all TraCI commands have been implemented. It is recommended to 
@@ -600,7 +600,7 @@
 
         
           
-            
This page was last edited on: 30 March 2023
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Tutorials/Autobahn.html sumo-1.18.0/docs/userdoc/Tutorials/Autobahn.html
--- sumo-1.17.0/docs/userdoc/Tutorials/Autobahn.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Tutorials/Autobahn.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -167,7 +167,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/Tutorials/Calibration/Berlin.html sumo-1.18.0/docs/userdoc/Tutorials/Calibration/Berlin.html
--- sumo-1.17.0/docs/userdoc/Tutorials/Calibration/Berlin.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Tutorials/Calibration/Berlin.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -176,7 +176,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -291,7 +291,7 @@
 References#
 
 [1]
-  http://www.dlr.de/fs/en/desktopdefault.aspx/tabid-1237/5441_read-11863/
+  https://www.dlr.de/fs/en/desktopdefault.aspx/tabid-1237/5441_read-11863/
   last visited 07 February 2012
 [2] Bundesanstalt für Straßenverkehrswesen (2002): Technische
   Lieferbedingungen für Streckenstationen. Bundesministerium für
@@ -316,7 +316,7 @@
 
         
           
-            
This page was last edited on: 28 February 2023
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Tutorials/Calibration/San_Pablo_Dam.html sumo-1.18.0/docs/userdoc/Tutorials/Calibration/San_Pablo_Dam.html
--- sumo-1.17.0/docs/userdoc/Tutorials/Calibration/San_Pablo_Dam.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Tutorials/Calibration/San_Pablo_Dam.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -174,7 +174,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -223,12 +223,12 @@
 to match a set of data gained from the real world. The data set we use
 was collected on the San Pablo Dam Road "from 6:45 a.m. to 9:00 a.m. on
 Tuesday, November 18 and again on Thursday, November 20, 1997"
-([Smilowitz1999]). Please look here
+([Smilowitz1999]). Please look here
 (OpenStreetMap)
-or here
+or here
 (GoogleMaps)
 for the location. The data set's pages are
-here. It was also used
+here. It was also used
 for benchmarking car-following models, see [Brockfeld2003a]. The data
 set consists of times at which vehicles pass count points and is assumed
 to be quite clean.
@@ -361,11 +361,11 @@
 [Smilowitz1999] K. Smilowitz, C. Daganzo, M.J. Cassidy and R.L.
 Bertini. 1999. Some observations of highway traffic in long queues.
 Transportation Research Records, 1678, pp. 225-233; available at
-[1]
+[1]
 [Brockfeld2003a] E. Brockfeld, R. Kühne, A. Skabardonis, P. Wagner.
 2003 Towards a benchmarking of Microscopic Traffic Flow Models.
 Transportation Research Records, 1852 (TRB2003-001164), pp. 124-129;
-available at [2]
+available at [2]
                 
           
           
@@ -373,7 +373,7 @@
 
         
           
-            
This page was last edited on: 28 February 2023
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Tutorials/CityMobil.html sumo-1.18.0/docs/userdoc/Tutorials/CityMobil.html
--- sumo-1.17.0/docs/userdoc/Tutorials/CityMobil.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Tutorials/CityMobil.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -172,7 +172,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -254,7 +254,7 @@
 <!-- generated on 2020-09-01 11:03:05.263997 by createNetTaxi.py v1_6_0+1864-1ecf301a37
   options: 
 -->
-<nodes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/nodes_file.xsd">
+<nodes xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://sumo.dlr.de/xsd/nodes_file.xsd">
 
 
 This gives complete information on how and when this file has been generated as well
@@ -446,7 +446,7 @@
 
         

           
-            
This page was last edited on: 31 March 2023
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Tutorials/CityMobil_old.html sumo-1.18.0/docs/userdoc/Tutorials/CityMobil_old.html
--- sumo-1.17.0/docs/userdoc/Tutorials/CityMobil_old.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Tutorials/CityMobil_old.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
diff -Nru sumo-1.17.0/docs/userdoc/Tutorials/Driving_in_Circles.html sumo-1.18.0/docs/userdoc/Tutorials/Driving_in_Circles.html
--- sumo-1.17.0/docs/userdoc/Tutorials/Driving_in_Circles.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Tutorials/Driving_in_Circles.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -185,7 +185,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/Tutorials/FundamentalDiagram.html sumo-1.18.0/docs/userdoc/Tutorials/FundamentalDiagram.html
--- sumo-1.17.0/docs/userdoc/Tutorials/FundamentalDiagram.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Tutorials/FundamentalDiagram.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -179,7 +179,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/Tutorials/GTFS.html sumo-1.18.0/docs/userdoc/Tutorials/GTFS.html
--- sumo-1.17.0/docs/userdoc/Tutorials/GTFS.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Tutorials/GTFS.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -175,7 +175,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/Tutorials/Hello_SUMO.html sumo-1.18.0/docs/userdoc/Tutorials/Hello_SUMO.html
--- sumo-1.17.0/docs/userdoc/Tutorials/Hello_SUMO.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Tutorials/Hello_SUMO.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -170,7 +170,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/Tutorials/Hello_World.html sumo-1.18.0/docs/userdoc/Tutorials/Hello_World.html
--- sumo-1.17.0/docs/userdoc/Tutorials/Hello_World.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Tutorials/Hello_World.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -176,7 +176,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/Tutorials/HighwayDetector.html sumo-1.18.0/docs/userdoc/Tutorials/HighwayDetector.html
--- sumo-1.17.0/docs/userdoc/Tutorials/HighwayDetector.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Tutorials/HighwayDetector.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -186,7 +186,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -276,7 +276,7 @@
 default. The default output file name is set as none. Detector type
 (source, sink, between) can also be given if it is available. An example
 of the output file is shown below.
-<additional xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/additional_file.xsd">
+<additional xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://sumo.dlr.de/xsd/additional_file.xsd">
 <e1Detector id=""det0"" lane="262667814#2.7_0" pos="80.2550814486" period="60" file="NUL" friendlyPos="True"/>
 <e1Detector id=""det1"" lane="262667814#2.7_1" pos="90.2522181762" period="60" file="NUL" friendlyPos="True"/>
 <e1Detector id=""det2"" lane="262667814#2.7_2" pos="91.6879752087" period="60" file="NUL" friendlyPos="True"/>
@@ -299,7 +299,7 @@
 
 In addition to the above mentioned detector definition, the following
 definition can also be applied.
-<detectors xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/detectors_file.xsd">
+<detectors xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://sumo.dlr.de/xsd/detectors_file.xsd">
 <detectorDefinition id="MQ11Fs1" lane="ErnstRuska2O_0" pos="5.00" type="source"/>
 <detectorDefinition id="MQ12Fs1" lane="ErnstRuska2W_0" pos="-5.00" type="between"/>
 <detectorDefinition id="MQ13Fs1N" lane="EinsteinN_0" pos="5.00" type="sink"/>
@@ -340,7 +340,7 @@
 
 Moreover, it is also possible to set up a configuration file with use of
 a XML schema definition
-(dfrouterConfiguration.xsd).
+(dfrouterConfiguration.xsd).
 Comparison of the detected and the estimated flows#
 According to the aforementioned methods, routes can be
 estimated/generated with given detector data, and then used in the
@@ -388,7 +388,7 @@
 
         

           
-            
This page was last edited on: 31 March 2023
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Tutorials/Import_from_OpenStreetMap.html sumo-1.18.0/docs/userdoc/Tutorials/Import_from_OpenStreetMap.html
--- sumo-1.17.0/docs/userdoc/Tutorials/Import_from_OpenStreetMap.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Tutorials/Import_from_OpenStreetMap.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -167,7 +167,7 @@
     

 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 

@@ -233,7 +233,7 @@
 enhanced. The following steps are recommended for the same:
 
 Complete the map directly in OpenStreetMap. Follow the guidelines on
-    the OpenStreetMap wiki in the area
+    the OpenStreetMap wiki in the area
     Map Making. They give valuable hints what software to use and how
     to encode all attributes of the map. You should ensure that the map
     contains all data related to traffic simulation. (At this stage,
@@ -413,7 +413,7 @@
 
         
           
-            
This page was last edited on: 28 February 2023
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Tutorials/index.html sumo-1.18.0/docs/userdoc/Tutorials/index.html
--- sumo-1.17.0/docs/userdoc/Tutorials/index.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Tutorials/index.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -196,7 +196,7 @@
     

 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 

@@ -248,14 +248,15 @@
 The SUMO User Conference is an anual event organized by the German Aerospace Center (DLR) in Berlin. Since 2015, each conference begins with a SUMO tutorial session. Below you can find the tutorial material (slide deck and input files). Since 2019, the tutorials have also been recorded on video.
 Files#
 
-SUMO 2015: network editing with xml patch, persons, 
-SUMO 2016: network editing, meso, containers, New Features 2016 (Slides)
-SUMO 2017: network editing, randomTrips, calibrators (xml only), public transport (obsolete)
-SUMO 2018: fixing intermodal junctions, calibrators in netedit, junction model parameters, editing shapes
-SUMO 2019: network editing, visualizing traffic data, public transport from OSM, parking, netgenerate
-SUMO 2020: turn lanes, routeSampler.py, defining counting data in netedit, taxi/DRT
-SUMO 2021: traffic light layout, indirect left turn, TAZ, OD-traffic, GTFS
-SUMO 2022: network editing, flows, opposite driving, pedestrian crossings, parking search
+SUMO 2015: network editing with xml patch, persons, 
+SUMO 2016: network editing, meso, containers, New Features 2016 (Slides)
+SUMO 2017: network editing, randomTrips, calibrators (xml only), public transport (obsolete)
+SUMO 2018: fixing intermodal junctions, calibrators in netedit, junction model parameters, editing shapes
+SUMO 2019: network editing, visualizing traffic data, public transport from OSM, parking, netgenerate
+SUMO 2020: turn lanes, routeSampler.py, defining counting data in netedit, taxi/DRT
+SUMO 2021: traffic light layout, indirect left turn, TAZ, OD-traffic, GTFS
+SUMO 2022: network editing, flows, opposite driving, pedestrian crossings, parking search
+SUMO 2023: graphical diff, personFlow, plotting tools, analyzing repeated runs
 
 Videos#
 Watch the 2019 Tutorial
@@ -264,7 +265,9 @@
 

 Watch the 2021 Tutorial
 

-Watch the 2022 Tutorial
+Watch the 2022 Tutorial
+

+Watch the 2023 Tutorial
 Advanced Tutorials#
 
 Hello SUMO - The simplest net and a single car set up "by hand"
@@ -287,7 +290,7 @@
 Udemy tutorial in Portuguese courtesy of Ednardo Ferreira.
 ITSC 2015#
 
-Download the Tutorial Files at http://sumo.dlr.de/daily/ITSC2015_tutorial.zip
+Download the Tutorial Files at https://sumo.dlr.de/daily/ITSC2015_tutorial.zip
 
 Im- and Export#
 
@@ -334,7 +337,7 @@
 
         
           
-            
This page was last edited on: 28 February 2023
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Tutorials/Manhattan.html sumo-1.18.0/docs/userdoc/Tutorials/Manhattan.html
--- sumo-1.17.0/docs/userdoc/Tutorials/Manhattan.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Tutorials/Manhattan.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -179,7 +179,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/Tutorials/Open_and_Simulate.html sumo-1.18.0/docs/userdoc/Tutorials/Open_and_Simulate.html
--- sumo-1.17.0/docs/userdoc/Tutorials/Open_and_Simulate.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Tutorials/Open_and_Simulate.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -169,7 +169,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/Tutorials/OSMActivityGen/eichstaett.net.xml.html sumo-1.18.0/docs/userdoc/Tutorials/OSMActivityGen/eichstaett.net.xml.html
--- sumo-1.17.0/docs/userdoc/Tutorials/OSMActivityGen/eichstaett.net.xml.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Tutorials/OSMActivityGen/eichstaett.net.xml.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -199,12 +199,12 @@
 
 
 Author
-W. Bamberger
+W. Bamberger
 
 
 Source
 Tutorials/OSMActivityGen/eichstaett.osm by W. Bamberger.

-Map data © OpenStreetMap contributors, CC-BY-SA
+Map data © OpenStreetMap contributors, CC-BY-SA
 
 
 History
@@ -213,7 +213,7 @@
 
 License
 
-This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 Unported License. The authors are listed in the history.
+This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 Unported License. The authors are listed in the history.
 
 
 
@@ -225,7 +225,7 @@
 
         
           
-            
This page was last edited on: 22 September 2022
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Tutorials/OSMActivityGen/eichstaett.osm.html sumo-1.18.0/docs/userdoc/Tutorials/OSMActivityGen/eichstaett.osm.html
--- sumo-1.17.0/docs/userdoc/Tutorials/OSMActivityGen/eichstaett.osm.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Tutorials/OSMActivityGen/eichstaett.osm.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -198,7 +198,7 @@
 
 
 Author
-W. Bamberger
+W. Bamberger
 
 
 Date
@@ -207,7 +207,7 @@
 
 Source
 
-Map data © OpenStreetMap contributors, CC-BY-SA
+Map data © OpenStreetMap contributors, CC-BY-SA
 
 
 History
@@ -216,7 +216,7 @@
 
 License
 
-This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 Unported License. The authors are listed in the history.
+This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 Unported License. The authors are listed in the history.
 
 
 
@@ -228,7 +228,7 @@
 
         
           
-            
This page was last edited on: 28 February 2023
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Tutorials/OSMWebWizard.html sumo-1.18.0/docs/userdoc/Tutorials/OSMWebWizard.html
--- sumo-1.17.0/docs/userdoc/Tutorials/OSMWebWizard.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Tutorials/OSMWebWizard.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -172,7 +172,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -215,7 +215,7 @@
 Requirements#
 
 SUMO installation
-Python (>= 2.7) installation
+Python (>= 2.7) installation
 
 Getting started#
 The OSM Web Wizard is essentially a collection of python scripts located
@@ -337,7 +337,7 @@
 
         

           
-            
This page was last edited on: 28 February 2023
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Tutorials/Output_Parsing.html sumo-1.18.0/docs/userdoc/Tutorials/Output_Parsing.html
--- sumo-1.17.0/docs/userdoc/Tutorials/Output_Parsing.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Tutorials/Output_Parsing.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -170,7 +170,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -222,7 +222,7 @@
 (circular.nod.xml):
 <?xml version="1.0" encoding="UTF-8"?>
 
-<nodes version="0.13" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.sf.net/xsd/nodes_file.xsd">
+<nodes version="0.13" xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://sumo.sf.net/xsd/nodes_file.xsd">
     <node id="bottom-left" x="0" y="0"/>
     <node id="bottom-right" x="1250" y="0"/>
     <node id="top-right" x="1250" y="1250"/>
@@ -235,7 +235,7 @@
 type in a separate file (circular.typ.xml):
 <?xml version="1.0" encoding="UTF-8"?>
 
-<types xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.sf.net/xsd/types_file.xsd">
+<types xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://sumo.sf.net/xsd/types_file.xsd">
     <type id="edgeType" numLanes="2" speed="36.1"/>
 </types>
 
@@ -243,7 +243,7 @@
 Finally we define the edges connecting the nodes (circular.edg.xml):
 <?xml version="1.0" encoding="UTF-8"?>
 
-<edges version="0.13" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.sf.net/xsd/edges_file.xsd">
+<edges version="0.13" xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://sumo.sf.net/xsd/edges_file.xsd">
     <edge from="bottom-left" id="bottom" to="bottom-right" type="edgeType"/>
     <edge from="bottom-right" id="right" to="top-right" type="edgeType"/>
     <edge from="top-right" id="top" to="top-left" type="edgeType"/>
@@ -261,8 +261,8 @@
 netconvert configuration file is as follows (circular.netccfg):
 <?xml version="1.0" encoding="UTF-8"?>
 
-<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-    xsi:noNamespaceSchemaLocation="http://sumo.sf.net/xsd/netconvertConfiguration.xsd">
+<configuration xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance" 
+    xsi:noNamespaceSchemaLocation="https://sumo.sf.net/xsd/netconvertConfiguration.xsd">
 
    <input>
        <node-files value="circular.nod.xml"/>
@@ -295,8 +295,8 @@
 Next, we define routes and traffic flows. Open a new file called circular.rou.xml and insert the following vehicle type definitions for cars and trucks:
 <?xml version="1.0" encoding="UTF-8"?>
 
-<routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-  xsi:noNamespaceSchemaLocation="http://sumo.sf.net/xsd/routes_file.xsd">
+<routes xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance" 
+  xsi:noNamespaceSchemaLocation="https://sumo.sf.net/xsd/routes_file.xsd">
     <vType accel="1.5" decel="4.5" id="car" length="5" maxSpeed="36.1"/>
     <vType accel="0.4" decel="4.5" id="truck" length="12" maxSpeed="22.2"/>
 </routes>
@@ -329,7 +329,7 @@
 Thus, we create a file called circular.add.xml which defines a rerouter on the edges bottom and top each, such that vehicles continue on routes routeRight and routeLeft, respectively.
 <?xml version="1.0" encoding="UTF-8"?>
 
-<additional xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.sf.net/xsd/additional_file.xsd">
+<additional xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://sumo.sf.net/xsd/additional_file.xsd">
     <rerouter id="rerouterBottom" edges="bottom">
         <interval begin="0" end="100000">
             <routeProbReroute id="routeRight" />
@@ -347,7 +347,7 @@
 With all input files (network, routes, rerouters) completed, we can create a SUMO configuration file circular.sumocfg:
 <?xml version="1.0" encoding="UTF-8"?>
 
-<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.sf.net/xsd/sumoConfiguration.xsd">
+<configuration xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://sumo.sf.net/xsd/sumoConfiguration.xsd">
     <input>
         <net-file value="circular.net.xml"/>
         <additional-files value="circular.rou.xml,circular.add.xml"/>
@@ -375,7 +375,7 @@
 
         
           
-            
This page was last edited on: 28 February 2023
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Tutorials/Plotting_Cookbook.html sumo-1.18.0/docs/userdoc/Tutorials/Plotting_Cookbook.html
--- sumo-1.17.0/docs/userdoc/Tutorials/Plotting_Cookbook.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Tutorials/Plotting_Cookbook.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -165,7 +165,7 @@
     

 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 

diff -Nru sumo-1.17.0/docs/userdoc/Tutorials/port.html sumo-1.18.0/docs/userdoc/Tutorials/port.html
--- sumo-1.17.0/docs/userdoc/Tutorials/port.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Tutorials/port.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -212,7 +212,7 @@
     

 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 

diff -Nru sumo-1.17.0/docs/userdoc/Tutorials/PT_from_OpenStreetMap.html sumo-1.18.0/docs/userdoc/Tutorials/PT_from_OpenStreetMap.html
--- sumo-1.17.0/docs/userdoc/Tutorials/PT_from_OpenStreetMap.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Tutorials/PT_from_OpenStreetMap.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -167,7 +167,7 @@
     

 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 

diff -Nru sumo-1.17.0/docs/userdoc/Tutorials/PublicTransport.html sumo-1.18.0/docs/userdoc/Tutorials/PublicTransport.html
--- sumo-1.17.0/docs/userdoc/Tutorials/PublicTransport.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Tutorials/PublicTransport.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -187,7 +187,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -342,7 +342,7 @@
 with a sumocfg. Within this, you set the net, route and additional files. 

 Afterwards, you can start your simulation by clicking on it or starting it over on the
 command line.
-<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
+<configuration xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://sumo.dlr.de/xsd/sumoConfiguration.xsd">
 
     <input>
         <net-file value="net.net.xml"/>
@@ -366,7 +366,7 @@
 
         
           
-            
This page was last edited on: 31 March 2023
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Tutorials/quick_start.html sumo-1.18.0/docs/userdoc/Tutorials/quick_start.html
--- sumo-1.17.0/docs/userdoc/Tutorials/quick_start.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Tutorials/quick_start.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -186,7 +186,7 @@
     

 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 

@@ -773,8 +773,8 @@
 Listing 1.7. Configuration file for the traffic simulation of the
 example network (quickstart.sumocfg)
 <?xml version="1.0" encoding="iso-8859-1"?>
-<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
+<configuration xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"
+  xsi:noNamespaceSchemaLocation="https://sumo.dlr.de/xsd/sumoConfiguration.xsd">
     <input>
         <net-file value="quickstart.net.xml"/>
         <route-files value="quickstart.rou.xml"/>
@@ -824,7 +824,7 @@
 
         
           
-            
This page was last edited on: 31 March 2023
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Tutorials/Quick_Start_old_style.html sumo-1.18.0/docs/userdoc/Tutorials/Quick_Start_old_style.html
--- sumo-1.17.0/docs/userdoc/Tutorials/Quick_Start_old_style.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Tutorials/Quick_Start_old_style.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -200,7 +200,7 @@
     

 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -380,8 +380,8 @@
 Listing 1.1 Format of the node file of the example network
 (quickstart.nod.xml)
 <?xml version="1.0" encoding="UTF-8"?>
-<nodes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:noNamespaceSchemaLocation="http://sumo.sf.net/xsd/nodes_file.xsd">
+<nodes xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"
+  xsi:noNamespaceSchemaLocation="https://sumo.sf.net/xsd/nodes_file.xsd">
     <node id="91" x="-1000.0" y="1000.0" />
     <node id="92" x="-1000.0" y="0.0" />
     <node id="93" x="3000.0" y="0.0" />
@@ -446,8 +446,8 @@
 
 Listing 1.3 Link file of the example network (quickstart.edg.xml)
 <?xml version="1.0" encoding="UTF-8"?>
-<edges xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:noNamespaceSchemaLocation="http://sumo.sf.net/xsd/edges_file.xsd">
+<edges xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"
+  xsi:noNamespaceSchemaLocation="https://sumo.sf.net/xsd/edges_file.xsd">
     <edge id="D1" from="911" to="91" type="a"/>
     <edge id="D2" from="91" to="911" type="b"/>
     <edge id="D3" from="912" to="92" type="a"/>
@@ -509,8 +509,8 @@
 Listing 1.4 Specification of traffic movements
 (quickstart.con.xml)
 <?xml version="1.0" encoding="UTF-8"?>
-<connections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:noNamespaceSchemaLocation="http://sumo.sf.net/xsd/connections_file.xsd">
+<connections xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"
+  xsi:noNamespaceSchemaLocation="https://sumo.sf.net/xsd/connections_file.xsd">
     <connection from="L2" to="L12" fromLane="0" toLane="0"/>
     <connection from="L2" to="L12" fromLane="0" toLane="1"/>
     <connection from="L2" to="L12" fromLane="1" toLane="2"/>
@@ -756,8 +756,8 @@
 Listing 1.7 Configuration file for the traffic simulation of the
 example network (quickstart.sumo.cfg)
 <?xml version="1.0" encoding="iso-8859-1"?>
-<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:noNamespaceSchemaLocation="http://sumo.sf.net/xsd/sumoConfiguration.xsd">
+<configuration xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"
+  xsi:noNamespaceSchemaLocation="https://sumo.sf.net/xsd/sumoConfiguration.xsd">
     <input>
         <net-file value="quickstart.net.xml"/>
         <route-files value="quickstart.rou.xml"/>
@@ -803,7 +803,7 @@
 
         
           
-            
This page was last edited on: 31 March 2023
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Tutorials/ScenarioGuide.html sumo-1.18.0/docs/userdoc/Tutorials/ScenarioGuide.html
--- sumo-1.17.0/docs/userdoc/Tutorials/ScenarioGuide.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Tutorials/ScenarioGuide.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -190,7 +190,7 @@
     

 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 

@@ -246,7 +246,7 @@
 Networks/Import.
 If you do not yet have any network data#
 Use publicly available network data from
-OpenStreetMap as described here:
+OpenStreetMap as described here:
 Networks/Import/OpenStreetMapDownload.
 Then import the network as described here:
 Networks/Import/OpenStreetMap.
@@ -366,7 +366,7 @@
 
         
           
-            
This page was last edited on: 31 March 2023
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Tutorials/SUMOlympics.html sumo-1.18.0/docs/userdoc/Tutorials/SUMOlympics.html
--- sumo-1.17.0/docs/userdoc/Tutorials/SUMOlympics.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Tutorials/SUMOlympics.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -176,7 +176,7 @@
     

 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 

@@ -232,7 +232,7 @@
 different lanes side-by-side. Thus, we have to add lanes for each mode.
 To do so, right-click on the edge and hover over "add restricted lane"
 in the context menu. This will show you three choices for the creation
-of special purpose lanes: Sidewalk, Bikelane, and Buslane. Add one lane
+of special purpose lanes: Sidewalk, bike lane, and Bus lane. Add one lane
 for each type.
 
 To create a tram, we add a new lane by clicking on "Duplicate lane" in
@@ -360,7 +360,7 @@
 
         

           
-            
This page was last edited on: 31 March 2023
+            
This page was last edited on: 15 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Tutorials/TaxiService.html sumo-1.18.0/docs/userdoc/Tutorials/TaxiService.html
--- sumo-1.17.0/docs/userdoc/Tutorials/TaxiService.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Tutorials/TaxiService.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -195,7 +195,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/Tutorials/Trace_File_Generation.html sumo-1.18.0/docs/userdoc/Tutorials/Trace_File_Generation.html
--- sumo-1.17.0/docs/userdoc/Tutorials/Trace_File_Generation.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Tutorials/Trace_File_Generation.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -179,7 +179,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/Tutorials/TraCI4Traffic_Lights.html sumo-1.18.0/docs/userdoc/Tutorials/TraCI4Traffic_Lights.html
--- sumo-1.17.0/docs/userdoc/Tutorials/TraCI4Traffic_Lights.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Tutorials/TraCI4Traffic_Lights.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -174,7 +174,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -254,7 +254,7 @@
 makes use of the TraCI python API bundled with SUMO. A description of
 the API can be found at
 TraCI/Interfacing_TraCI_from_Python.
-For a detailed list of available functions see the pydoc generated
+For a detailed list of available functions see the pydoc generated
 documentation.
 Simulation#
 The main program is implemented in the script runner.py. There, we
@@ -309,7 +309,7 @@
 
         

           
-            
This page was last edited on: 28 February 2023
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Tutorials/TraCIPedCrossing.html sumo-1.18.0/docs/userdoc/Tutorials/TraCIPedCrossing.html
--- sumo-1.17.0/docs/userdoc/Tutorials/TraCIPedCrossing.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Tutorials/TraCIPedCrossing.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -174,7 +174,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -237,12 +237,12 @@
 The control logic resides in the python script runner.py. It builds
 the network (via netconvert) generates the
 pedestrian routes (via
-[1],
+[1],
 and interacts with the simulation to controls the traffic light. It
 makes use of the TraCI python API bundled with SUMO. A description of
 the API can be found at
 TraCI/Interfacing_TraCI_from_Python.
-For a detailed list of available functions see the pydoc generated
+For a detailed list of available functions see the pydoc generated
 documentation.
 Traffic light control#
 The traffic light follows a fixed cycle of phases of as defined below.
@@ -291,7 +291,7 @@
 
         

           
-            
This page was last edited on: 31 March 2023
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Vehicle_Type_Parameter_Defaults.html sumo-1.18.0/docs/userdoc/Vehicle_Type_Parameter_Defaults.html
--- sumo-1.17.0/docs/userdoc/Vehicle_Type_Parameter_Defaults.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Vehicle_Type_Parameter_Defaults.html	2023-06-28 22:08:56.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -620,7 +620,7 @@
 
 
 (1): https://www.baua.de/DE/Angebote/Publikationen/AWE/AWE108.pdf?__blob=publicationFile
-(2): https://web.archive.org/web/20100531025842/http://www.motorrad-leuschner-d.de/motorraeder.html
+(2): https://web.archive.org/web/20100531025842/https://www.motorrad-leuschner-d.de/motorraeder.html
 (3): https://web.archive.org/web/20110313224137/www.bvg.de/index.php/de/binaries/asset/download/470184/file/1-1
 (4): https://de.wikipedia.org/wiki/S-Bahn_Berlin
 (5): https://de.wikipedia.org/wiki/Schieneng%C3%BCterverkehr
@@ -628,7 +628,7 @@
 (7): https://de.wikipedia.org/wiki/GTxN/M/S
 (8): https://de.wikipedia.org/wiki/Flachwagen
 (9): https://de.wikipedia.org/wiki/Reisebus
-(10): http://www.neoplan-bus.com/cms/media/de/content/downloads/skyliner/NEOPLAN_SKYLINER.pdf
+(10): https://www.neoplan-bus.com/cms/media/de/content/downloads/skyliner/NEOPLAN_SKYLINER.pdf
 (11): https://de.wikipedia.org/wiki/DBAG-Baureihe_425
 (12): https://de.wikipedia.org/wiki/ICE_3
 (14): https://www.truck.man.eu/man/media/de/content_medien/doc/business_website_truck_master_1/einsatzgebiete/de_2/man-lkw-tg-fernverkehr-volumen.pdf
@@ -637,25 +637,24 @@
 (17): Fußgeher- und Fahrradverkehr: Planungsprinzipien; Hermann Knoflacher; Böhlau Verlag Wien, 1995
 (18): RiLSA 2010
 (19): https://www.colliseum.eu/wiki/images/b/bf/Geschwindigkeiten%2C_Verz%C3%B6gerungen_und_Beschleunigungen_nicht_motorisierter%2C_ungesch%C3%BCtzter_Verkehrsteilnehmer_am_Beispiel_Fahrrad_und_Inlineskates.pdf
-(20): http://tuprints.ulb.tu-darmstadt.de/905/1/Schroeder_Frank_FZD_Diss.pdf
-(21): http://www.unfallrekonstruktion.de/pdf/nickel.pdf
-(22): http://www.trb.org/publications/nchrp/nchrp_rpt_505.pdf (p48)
-(23): http://jml2012.indexcopernicus.com/fulltxt.php?ICID=1022800 (dead link) (pdf p.229-230)
+(20): https://tuprints.ulb.tu-darmstadt.de/905/1/Schroeder_Frank_FZD_Diss.pdf
+(21): https://www.unfallrekonstruktion.de/pdf/nickel.pdf
+(22): https://www.trb.org/publications/nchrp/nchrp_rpt_505.pdf (p48)
+(23): https://jml2012.indexcopernicus.com/fulltxt.php?ICID=1022800 (dead link) (pdf p.229-230)
 (24): https://de.wikipedia.org/wiki/Kleinkraftrad
 (25): https://de.wikipedia.org/wiki/Vespa_LX
-(26): http://www.colliseum.net/wiki/Bremsversuche_mit_dem_Kleinkraftrad_S_50_/_S_51
-(27): https://web.archive.org/web/20120622045505/http://www.unfallaufnahme.info/uebersichten-listen-und-tabellen/geschwindigkeiten-und-bremswege/index.html
+(26): https://www.colliseum.net/wiki/Bremsversuche_mit_dem_Kleinkraftrad_S_50_/_S_51
+(27): https://web.archive.org/web/20120622045505/https://www.unfallaufnahme.info/uebersichten-listen-und-tabellen/geschwindigkeiten-und-bremswege/index.html
 (28): https://www.bmw-motorrad.de/
-(29): https://web.archive.org/web/20140227232934/http://www.volkswagen.de/de/models/golf_7/trimlevel_overview.s9_trimlevel_detail.suffix.html/der-golf-cup~2Fcup.html
+(29): https://web.archive.org/web/20140227232934/https://www.volkswagen.de/de/models/golf_7/trimlevel_overview.s9_trimlevel_detail.suffix.html/der-golf-cup~2Fcup.html
 (30): https://web.archive.org/web/20160320031009/https://www.buchbinder.de/de/fahrzeuge.html
-(31): http://www.colliseum.net/wiki/Lkw-Anfahrbeschleunigungswerte_f%C3%BCr_die_Praxis
+(31): https://www.colliseum.net/wiki/Lkw-Anfahrbeschleunigungswerte_f%C3%BCr_die_Praxis
 (32): https://de.wikipedia.org/wiki/Zul%C3%A4ssige_H%C3%B6chstgeschwindigkeit_im_Stra%C3%9Fenverkehr_(Deutschland)
-(33): http://www.ice-fansite.com/index.php?option=com_content&view=article&id=195:ice1-techdat&catid=50:icet&Itemid=69 (dead link)
+(33): https://www.ice-fansite.com/index.php?option=com_content&view=article&id=195:ice1-techdat&catid=50:icet&Itemid=69 (dead link)
 (34): https://en.wikipedia.org/wiki/Orders_of_magnitude_(acceleration)
 (35): https://www.researchgate.net/publication/311633504_Improving_Road_Safety_of_Tank_Truck_in_Indonesia_by_Speed_Limiter_Installation
-(36): http://ka.stadtwiki.net/H%C3%B6chstgeschwindigkeit_(Bahn)
+(36): https://ka.stadtwiki.net/H%C3%B6chstgeschwindigkeit_(Bahn)
 (37): https://www.rettungsdienst.brk.de/leichte-sprache/abteilung/beschaffung/rettungswagen-rtw/rtw-by-2010.html
-(38): https://www.berlin.de/binaries/asset/image_assets/5859948/source/1565347986/624x468/
 (39): https://electric-scooter.guide/comparisons/electric-scooter-performance-tests/
 (40): https://www.chip.de/artikel/E-Scooter-Test-Die-besten-Elektro-Scooter-mit-Strassenzulassung_165587317.html
 (*): estimated
@@ -668,7 +667,7 @@
 
         
           
-            
This page was last edited on: 28 November 2022
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Versioning.html sumo-1.18.0/docs/userdoc/Versioning.html
--- sumo-1.17.0/docs/userdoc/Versioning.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Versioning.html	2023-06-28 22:08:56.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -190,7 +190,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/XMLValidation.html sumo-1.18.0/docs/userdoc/XMLValidation.html
--- sumo-1.17.0/docs/userdoc/XMLValidation.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/XMLValidation.html	2023-06-28 22:08:56.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -169,7 +169,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -233,7 +233,7 @@
 and attributes which should have been placed within another element.
 Another prerequisite for validation is a schema declaration within the
 root element of the input file such as
-<routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd">
+<routes xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://sumo.dlr.de/xsd/routes_file.xsd">
 
 
 When setting the validation options to always the schemata for networks, additional files and routes
@@ -255,8 +255,8 @@
 receive the appropriate schema declaration. When writing an input file
 from scratch the schema declaration must be added manually to the root
 element as follows:
-    <ROOT_ELEMENT xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/SCHEMA_FILE">
+    <ROOT_ELEMENT xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="https://sumo.dlr.de/xsd/SCHEMA_FILE">
 
 
 where ROOT_ELEMENT and SCHEMA_FILE should be set according to the
@@ -322,7 +322,7 @@
 set,
 these files will be used when validating inputs.
 Otherwise, the files are loaded from
-http://sumo.dlr.de/xsd/SCHEMA_FILE which may slow down the
+https://sumo.dlr.de/xsd/SCHEMA_FILE which may slow down the
 application (or fail if there is no internet connection).
 SUMO File Types#
 A complete listing of file extensions used by SUMO
@@ -332,7 +332,7 @@
 
To disable schema validation any of the following actions is sufficient

 
 set the option --xml-validation never
-Remove the xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/....xsd"
+
Remove the xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://sumo.dlr.de/xsd/....xsd"
 attribute from the top of the XML input file.
 
                 

@@ -342,7 +342,7 @@
 
         
           
-            
This page was last edited on: 31 March 2023
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Z/Changes_from_Version_0.10.0_to_Version_0.10.1.html sumo-1.18.0/docs/userdoc/Z/Changes_from_Version_0.10.0_to_Version_0.10.1.html
--- sumo-1.17.0/docs/userdoc/Z/Changes_from_Version_0.10.0_to_Version_0.10.1.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Z/Changes_from_Version_0.10.0_to_Version_0.10.1.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
diff -Nru sumo-1.17.0/docs/userdoc/Z/Changes_from_Version_0.10.1_to_Version_0.10.2.html sumo-1.18.0/docs/userdoc/Z/Changes_from_Version_0.10.1_to_Version_0.10.2.html
--- sumo-1.17.0/docs/userdoc/Z/Changes_from_Version_0.10.1_to_Version_0.10.2.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Z/Changes_from_Version_0.10.1_to_Version_0.10.2.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
diff -Nru sumo-1.17.0/docs/userdoc/Z/Changes_from_Version_0.10.2_to_Version_0.10.3.html sumo-1.18.0/docs/userdoc/Z/Changes_from_Version_0.10.2_to_Version_0.10.3.html
--- sumo-1.17.0/docs/userdoc/Z/Changes_from_Version_0.10.2_to_Version_0.10.3.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Z/Changes_from_Version_0.10.2_to_Version_0.10.3.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
diff -Nru sumo-1.17.0/docs/userdoc/Z/Changes_from_Version_0.10.3_to_Version_0.11.0.html sumo-1.18.0/docs/userdoc/Z/Changes_from_Version_0.10.3_to_Version_0.11.0.html
--- sumo-1.17.0/docs/userdoc/Z/Changes_from_Version_0.10.3_to_Version_0.11.0.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Z/Changes_from_Version_0.10.3_to_Version_0.11.0.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -230,8 +230,8 @@
 corrected behavior of using intervals in edgelane traffic,
   edgelane hbefa,
   and edgelane harmonoise
-  (solved bug 2504162: multiple begins / ends should be defined in separate dumps
-  and bug 2504144: dump intervals are mandatory)
+  (solved bug 2504162: multiple begins / ends should be defined in separate dumps
+  and bug 2504144: dump intervals are mandatory)
 edgelane hbefa
   now additionally writes per-vehicle values
 
@@ -244,7 +244,7 @@
 sumo-gui
 Added the possibility to load view settings and
   decals from
-  a configuration file (implemented request 2168007: add possibility to load view settings file with start of gui).
+  a configuration file (implemented request 2168007: add possibility to load view settings file with start of gui).
   Added the possibility to generate snapshots on startup, defined
   in a configuration file.
 Removed the "additional weight" dialog - was not known to be
@@ -324,7 +324,7 @@
 
         
           
-            
This page was last edited on: 12 February 2021
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Z/Changes_from_Version_0.11.0_to_Version_0.11.1.html sumo-1.18.0/docs/userdoc/Z/Changes_from_Version_0.11.0_to_Version_0.11.1.html
--- sumo-1.17.0/docs/userdoc/Z/Changes_from_Version_0.11.0_to_Version_0.11.1.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Z/Changes_from_Version_0.11.0_to_Version_0.11.1.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -203,7 +203,7 @@
 
 
 sumo-gui
-implemented request 1641989: No view reset on reload.
+implemented request 1641989: No view reset on reload.
 the number of colors used for range visualization is now variable
 debugged problems with not shown junction names
 
@@ -271,7 +271,7 @@
 
         
           
-            
This page was last edited on: 11 February 2021
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Z/Changes_from_Version_0.11.1_to_Version_0.12.0.html sumo-1.18.0/docs/userdoc/Z/Changes_from_Version_0.11.1_to_Version_0.12.0.html
--- sumo-1.17.0/docs/userdoc/Z/Changes_from_Version_0.11.1_to_Version_0.12.0.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Z/Changes_from_Version_0.11.1_to_Version_0.12.0.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -182,7 +182,7 @@
 Release date: 27.05.2010
 
 Simulation
-solved regarding red light late blocks vehicles
+solved regarding red light late blocks vehicles
 corrected the documentation on using an abstract vehicle class;
   the attribute which defines it is named vclass not class.
 introducing flows as replacement for vehicles with repno and
@@ -251,7 +251,7 @@
 
         
           
-            
This page was last edited on: 11 February 2021
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Z/Changes_from_Version_0.12.0_to_Version_0.12.1.html sumo-1.18.0/docs/userdoc/Z/Changes_from_Version_0.12.0_to_Version_0.12.1.html
--- sumo-1.17.0/docs/userdoc/Z/Changes_from_Version_0.12.0_to_Version_0.12.1.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Z/Changes_from_Version_0.12.0_to_Version_0.12.1.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
diff -Nru sumo-1.17.0/docs/userdoc/Z/Changes_from_Version_0.12.1_to_Version_0.12.2.html sumo-1.18.0/docs/userdoc/Z/Changes_from_Version_0.12.1_to_Version_0.12.2.html
--- sumo-1.17.0/docs/userdoc/Z/Changes_from_Version_0.12.1_to_Version_0.12.2.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Z/Changes_from_Version_0.12.1_to_Version_0.12.2.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
diff -Nru sumo-1.17.0/docs/userdoc/Z/Changes_from_Version_0.12.2_to_Version_0.12.3.html sumo-1.18.0/docs/userdoc/Z/Changes_from_Version_0.12.2_to_Version_0.12.3.html
--- sumo-1.17.0/docs/userdoc/Z/Changes_from_Version_0.12.2_to_Version_0.12.3.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Z/Changes_from_Version_0.12.2_to_Version_0.12.3.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -209,7 +209,7 @@
 
 sumo-gui
 corrected vehicle's angle (was
-  ticket#430)
+  ticket#430)
 Clipboard works under Linux
 
 
@@ -221,7 +221,7 @@
 
         
           
-            
This page was last edited on: 11 February 2021
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Z/Changes_from_Version_0.12.3_to_Version_0.13.0.html sumo-1.18.0/docs/userdoc/Z/Changes_from_Version_0.12.3_to_Version_0.13.0.html
--- sumo-1.17.0/docs/userdoc/Z/Changes_from_Version_0.12.3_to_Version_0.13.0.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Z/Changes_from_Version_0.12.3_to_Version_0.13.0.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -168,7 +168,7 @@
     

 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -305,8 +305,8 @@
 removed the possibility to set and retrieve traffic lights by
   phase/brake/yellow-tuples (both, state 0x21 and program 0x25)
 completely removed old API
-solved tickets ticket#273 (consolidate speed and acceleration manipulation methods) and
-  ticket#330 (Speed adaptation after receiving SLOWDOWN command not working.)
+solved tickets ticket#273 (consolidate speed and acceleration manipulation methods) and
+  ticket#330 (Speed adaptation after receiving SLOWDOWN command not working.)
 introduced a way to decide whether safe velocity, maximum
   deceleration and maximum acceleration shall be considered when
   changing a vehicle's speed, see:
@@ -334,7 +334,7 @@
 
         
           
-            
This page was last edited on: 11 February 2021
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Z/Changes_from_Version_0.13.0_to_Version_0.13.1.html sumo-1.18.0/docs/userdoc/Z/Changes_from_Version_0.13.0_to_Version_0.13.1.html
--- sumo-1.17.0/docs/userdoc/Z/Changes_from_Version_0.13.0_to_Version_0.13.1.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Z/Changes_from_Version_0.13.0_to_Version_0.13.1.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -167,7 +167,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/Z/Changes_from_Version_0.13.1_to_Version_0.14.0.html sumo-1.18.0/docs/userdoc/Z/Changes_from_Version_0.13.1_to_Version_0.14.0.html
--- sumo-1.17.0/docs/userdoc/Z/Changes_from_Version_0.13.1_to_Version_0.14.0.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Z/Changes_from_Version_0.13.1_to_Version_0.14.0.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -167,7 +167,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/Z/Changes_from_Version_0.14.0_to_Version_0.15.0.html sumo-1.18.0/docs/userdoc/Z/Changes_from_Version_0.14.0_to_Version_0.15.0.html
--- sumo-1.17.0/docs/userdoc/Z/Changes_from_Version_0.14.0_to_Version_0.15.0.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Z/Changes_from_Version_0.14.0_to_Version_0.15.0.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -167,7 +167,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -213,7 +213,7 @@
   in front of the position. This effects the retrieval of a
   vehicle's position via TraCI, and also the measures collected by
   detectors - now, the collected vehicle lengths do not contain
-  the minimum distance anymore. see blog entry
+  the minimum distance anymore. see blog entry
 consolidating right-of-way rules (again). Networks must be
   rebuild
 fixed crash when using TraCI to set new TLS-programs with less
@@ -299,7 +299,7 @@
 
         
           
-            
This page was last edited on: 11 February 2021
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Z/Changes_from_Version_0.15.0_to_Version_0.16.0.html sumo-1.18.0/docs/userdoc/Z/Changes_from_Version_0.15.0_to_Version_0.16.0.html
--- sumo-1.17.0/docs/userdoc/Z/Changes_from_Version_0.15.0_to_Version_0.16.0.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Z/Changes_from_Version_0.15.0_to_Version_0.16.0.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -167,7 +167,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -208,7 +208,7 @@
 
 Simulation
 Fixed the bug which prevented vehicles to be inserted in the
-  middle of a street using departPos="free" (ticket732,
+  middle of a street using departPos="free" (ticket732,
   thanks to Björn Hendriks for reporting it)
 Fixed several bugs that were causing collisions
 Fixed bug in the default car-following model wich lead to
@@ -270,13 +270,13 @@
 
Options --offset.x and --offset.y are no longer ignored
 Renamed to netgenerate due to naming
   conflicts in Debian, was
-  ticket717,
-  and Debian-ticket 673931
+  ticket717,
+  and Debian-ticket 673931
 
 
 TraCI
 fixed geo conversion
-  ticket804
+  ticket804
 
 
 TOOLS
@@ -448,7 +448,7 @@
 
         
           
-            
This page was last edited on: 11 February 2021
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Z/Changes_from_Version_0.16.0_to_Version_0.17.0.html sumo-1.18.0/docs/userdoc/Z/Changes_from_Version_0.16.0_to_Version_0.17.0.html
--- sumo-1.17.0/docs/userdoc/Z/Changes_from_Version_0.16.0_to_Version_0.17.0.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Z/Changes_from_Version_0.16.0_to_Version_0.17.0.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -166,7 +166,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/Z/Changes_from_Version_0.17.0_to_Version_0.17.1.html sumo-1.18.0/docs/userdoc/Z/Changes_from_Version_0.17.0_to_Version_0.17.1.html
--- sumo-1.17.0/docs/userdoc/Z/Changes_from_Version_0.17.0_to_Version_0.17.1.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Z/Changes_from_Version_0.17.0_to_Version_0.17.1.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -165,7 +165,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/Z/Changes_from_Version_0.17.1_to_Version_0.18.0.html sumo-1.18.0/docs/userdoc/Z/Changes_from_Version_0.17.1_to_Version_0.18.0.html
--- sumo-1.17.0/docs/userdoc/Z/Changes_from_Version_0.17.1_to_Version_0.18.0.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Z/Changes_from_Version_0.17.1_to_Version_0.18.0.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -167,7 +167,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/Z/Changes_from_Version_0.18.0_to_Version_0.19.0.html sumo-1.18.0/docs/userdoc/Z/Changes_from_Version_0.18.0_to_Version_0.19.0.html
--- sumo-1.17.0/docs/userdoc/Z/Changes_from_Version_0.18.0_to_Version_0.19.0.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Z/Changes_from_Version_0.18.0_to_Version_0.19.0.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -167,7 +167,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/Z/Changes_from_Version_0.19.0_to_Version_0.20.0.html sumo-1.18.0/docs/userdoc/Z/Changes_from_Version_0.19.0_to_Version_0.20.0.html
--- sumo-1.17.0/docs/userdoc/Z/Changes_from_Version_0.19.0_to_Version_0.20.0.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Z/Changes_from_Version_0.19.0_to_Version_0.20.0.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -167,7 +167,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/Z/Changes_from_Version_0.20.0_to_Version_0.21.0.html sumo-1.18.0/docs/userdoc/Z/Changes_from_Version_0.20.0_to_Version_0.21.0.html
--- sumo-1.17.0/docs/userdoc/Z/Changes_from_Version_0.20.0_to_Version_0.21.0.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Z/Changes_from_Version_0.20.0_to_Version_0.21.0.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -167,7 +167,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -469,7 +469,7 @@
 Referenze typemap files for
   importing edges and polygon data from OSM networks as well as
   from other formats can now be found at <SUMO_HOME>/data
-SUMO builds now with clang as well
+SUMO builds now with clang as well
 The shortcut -p for the option --print-options was removed because of possible
   name clashes
 
@@ -482,7 +482,7 @@
 
         
           
-            
This page was last edited on: 12 April 2021
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Z/Changes_from_Version_0.21.0_to_Version_0.22.0.html sumo-1.18.0/docs/userdoc/Z/Changes_from_Version_0.21.0_to_Version_0.22.0.html
--- sumo-1.17.0/docs/userdoc/Z/Changes_from_Version_0.21.0_to_Version_0.22.0.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Z/Changes_from_Version_0.21.0_to_Version_0.22.0.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -167,7 +167,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -350,8 +350,7 @@
       are now scrollable to allow work on smaller screens.
 The attributes which can be used to customize lane colors can
       now also be used to scale their width. This is done in the view
-      customization dialog unter 'Streets' -> 'Scale width'. See
-      [1].
+      customization dialog unter 'Streets' -> 'Scale width'.
 Vehicle coloring by time since lane change now indicates the
       direction of the change by its color
 Added new link state 'u' to encode red-yellow phase (shown as
@@ -467,7 +466,7 @@
 
         
           
-            
This page was last edited on: 11 February 2021
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Z/Changes_from_version_0.7.0_to_version_pre0.8.html sumo-1.18.0/docs/userdoc/Z/Changes_from_version_0.7.0_to_version_pre0.8.html
--- sumo-1.17.0/docs/userdoc/Z/Changes_from_version_0.7.0_to_version_pre0.8.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Z/Changes_from_version_0.7.0_to_version_pre0.8.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
diff -Nru sumo-1.17.0/docs/userdoc/Z/Changes_from_version_0.8.0.1_to_version_0.8.0.2.html sumo-1.18.0/docs/userdoc/Z/Changes_from_version_0.8.0.1_to_version_0.8.0.2.html
--- sumo-1.17.0/docs/userdoc/Z/Changes_from_version_0.8.0.1_to_version_0.8.0.2.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Z/Changes_from_version_0.8.0.1_to_version_0.8.0.2.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
diff -Nru sumo-1.17.0/docs/userdoc/Z/Changes_from_version_0.8.0.2_to_version_0.8.2.1.html sumo-1.18.0/docs/userdoc/Z/Changes_from_version_0.8.0.2_to_version_0.8.2.1.html
--- sumo-1.17.0/docs/userdoc/Z/Changes_from_version_0.8.0.2_to_version_0.8.2.1.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Z/Changes_from_version_0.8.0.2_to_version_0.8.2.1.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
diff -Nru sumo-1.17.0/docs/userdoc/Z/Changes_from_version_0.8.0_to_version_0.8.0.1.html sumo-1.18.0/docs/userdoc/Z/Changes_from_version_0.8.0_to_version_0.8.0.1.html
--- sumo-1.17.0/docs/userdoc/Z/Changes_from_version_0.8.0_to_version_0.8.0.1.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Z/Changes_from_version_0.8.0_to_version_0.8.0.1.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
diff -Nru sumo-1.17.0/docs/userdoc/Z/Changes_from_version_0.8.2.1_to_version_0.8.2.2.html sumo-1.18.0/docs/userdoc/Z/Changes_from_version_0.8.2.1_to_version_0.8.2.2.html
--- sumo-1.17.0/docs/userdoc/Z/Changes_from_version_0.8.2.1_to_version_0.8.2.2.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Z/Changes_from_version_0.8.2.1_to_version_0.8.2.2.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
diff -Nru sumo-1.17.0/docs/userdoc/Z/Changes_from_version_0.8.2.2_to_version_0.8.3.html sumo-1.18.0/docs/userdoc/Z/Changes_from_version_0.8.2.2_to_version_0.8.3.html
--- sumo-1.17.0/docs/userdoc/Z/Changes_from_version_0.8.2.2_to_version_0.8.3.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Z/Changes_from_version_0.8.2.2_to_version_0.8.3.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
diff -Nru sumo-1.17.0/docs/userdoc/Z/Changes_from_version_0.8.x_to_version_0.9.0.html sumo-1.18.0/docs/userdoc/Z/Changes_from_version_0.8.x_to_version_0.9.0.html
--- sumo-1.17.0/docs/userdoc/Z/Changes_from_version_0.8.x_to_version_0.9.0.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Z/Changes_from_version_0.8.x_to_version_0.9.0.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
diff -Nru sumo-1.17.0/docs/userdoc/Z/Changes_from_version_0.9.0_to_version_0.9.1.html sumo-1.18.0/docs/userdoc/Z/Changes_from_version_0.9.0_to_version_0.9.1.html
--- sumo-1.17.0/docs/userdoc/Z/Changes_from_version_0.9.0_to_version_0.9.1.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Z/Changes_from_version_0.9.0_to_version_0.9.1.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
diff -Nru sumo-1.17.0/docs/userdoc/Z/Changes_from_Version_0.9.10_to_Version_0.10.0.html sumo-1.18.0/docs/userdoc/Z/Changes_from_Version_0.9.10_to_Version_0.10.0.html
--- sumo-1.17.0/docs/userdoc/Z/Changes_from_Version_0.9.10_to_Version_0.10.0.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Z/Changes_from_Version_0.9.10_to_Version_0.10.0.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
diff -Nru sumo-1.17.0/docs/userdoc/Z/Changes_from_version_0.9.1_to_version_0.9.2.html sumo-1.18.0/docs/userdoc/Z/Changes_from_version_0.9.1_to_version_0.9.2.html
--- sumo-1.17.0/docs/userdoc/Z/Changes_from_version_0.9.1_to_version_0.9.2.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Z/Changes_from_version_0.9.1_to_version_0.9.2.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
diff -Nru sumo-1.17.0/docs/userdoc/Z/Changes_from_version_0.9.2_to_version_0.9.3.html sumo-1.18.0/docs/userdoc/Z/Changes_from_version_0.9.2_to_version_0.9.3.html
--- sumo-1.17.0/docs/userdoc/Z/Changes_from_version_0.9.2_to_version_0.9.3.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Z/Changes_from_version_0.9.2_to_version_0.9.3.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
diff -Nru sumo-1.17.0/docs/userdoc/Z/Changes_from_version_0.9.3_to_version_0.9.4.html sumo-1.18.0/docs/userdoc/Z/Changes_from_version_0.9.3_to_version_0.9.4.html
--- sumo-1.17.0/docs/userdoc/Z/Changes_from_version_0.9.3_to_version_0.9.4.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Z/Changes_from_version_0.9.3_to_version_0.9.4.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -197,7 +197,7 @@
 Together with this extension, the import of ArcView-files has been
 rechecked and now allows to import networks stored in other schemes than
 the one NavTeq uses. The new options are described here.
-Some further comments on importing ArcView-files are available here. By now, they include only some comments on importing an open-source network of Osnabrück. You can take a look at this here and also download it from here.
+Some further comments on importing ArcView-files are available here. By now, they include only some comments on importing an open-source network of Osnabrück. You can take a look at this here and also download it from here.
 3. The developer documentation has been split into several parts.
 It seems to be unmanageable to write a complete developer documentation.
 Due to this, we now offer some additional documentation on certain
@@ -272,7 +272,7 @@
 
         

           
-            
This page was last edited on: 12 February 2021
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Z/Changes_from_version_0.9.5_to_version_0.9.6.html sumo-1.18.0/docs/userdoc/Z/Changes_from_version_0.9.5_to_version_0.9.6.html
--- sumo-1.17.0/docs/userdoc/Z/Changes_from_version_0.9.5_to_version_0.9.6.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Z/Changes_from_version_0.9.5_to_version_0.9.6.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
diff -Nru sumo-1.17.0/docs/userdoc/Z/Changes_from_version_0.9.6_to_version_0.9.7.html sumo-1.18.0/docs/userdoc/Z/Changes_from_version_0.9.6_to_version_0.9.7.html
--- sumo-1.17.0/docs/userdoc/Z/Changes_from_version_0.9.6_to_version_0.9.7.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Z/Changes_from_version_0.9.6_to_version_0.9.7.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
diff -Nru sumo-1.17.0/docs/userdoc/Z/Changes_from_version_0.9.7_to_version_0.9.8.html sumo-1.18.0/docs/userdoc/Z/Changes_from_version_0.9.7_to_version_0.9.8.html
--- sumo-1.17.0/docs/userdoc/Z/Changes_from_version_0.9.7_to_version_0.9.8.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Z/Changes_from_version_0.9.7_to_version_0.9.8.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -206,7 +206,7 @@
 
 simulation
 debugged tls-coupled e2-output
-debugged bug 1886198 Segmentation
+
debugged bug 1886198 Segmentation
   Fault;
   see comment; thanks to Helcio Bezerra de Mello for the bug
   report
@@ -218,13 +218,13 @@
 while looking for next links to use, the vehicle is now aware of
   his best lanes
 simplified computation of best lanes
-debugged bug 1871859 vehicles do not wait on lane
+
debugged bug 1871859 vehicles do not wait on lane
   end;
   thanks to Jensen Chou for the bug report
-debugged bug 1871964 left-moving vehicles do not fill
+
debugged bug 1871964 left-moving vehicles do not fill
   junction
 patched error handling in emitters; tests added
-debugged bug 1873155 vehicles with depart lower than begin are
+
debugged bug 1873155 vehicles with depart lower than begin are
   emitted;
   tests added
 tests for rerouter added; partially debugged
@@ -251,14 +251,14 @@
 
 
 guisim
-debugged bug 1830296 guiemitter destroys event
+
debugged bug 1830296 guiemitter destroys event
   que
   by introducing a thread-aware event control version for guisim
   (GUIEventControl)
-implementing feature request 1645216 Indicator / blinker
+
implementing feature request 1645216 Indicator / blinker
   depending on junction
   distance
-debugged bug 1862073 view is not refreshed when (de)selecting
+
debugged bug 1862073 view is not refreshed when (de)selecting
   item
 added doxygen-documentation for utils/gui/div
 
@@ -267,7 +267,7 @@
 
 
 netconvert
-debugged bug 1886198 User reports unknown error while importing
+
debugged bug 1886198 User reports unknown error while importing
   shapefile;
   see comment; thanks to Maxim Raya for the bug report
 
@@ -298,14 +298,14 @@
 
debugged problems with repetition of vehicles that have a color
   within guisim (application terminated)
 patched XMLSubSys documentation (was
-  bug 1828803)
+  bug 1828803)
 fixed vehicle decelerations when being on a higher priorised road
   (bug
-  1830266)
+  1830266)
 fixed netconvert bugs occuring when connected nodes are too close
   together (bugs
-  1639460,
-  1639436)
+  1639460,
+  1639436)
 moved color out of MSVehicle (affects loading classes)
 router import classes now process input colors as strings
 consolidated XML-definitions
@@ -318,19 +318,19 @@
 junctions and how other vehicles get informed about vehicles
 approaching on incoming lanes. Quite heavy changes, in fact, I hope
 of benefit. You may read some further information on this in the
-following tracker items: bug 1840935: exchange of vehicles over
+following tracker items: bug 1840935: exchange of vehicles over
 lanes disallow fails with two
 vehs,
-bug 1840938: lane exchange mechanism ignores undefined lane
+bug 1840938: lane exchange mechanism ignores undefined lane
 order,
-bug 1840952: drop vehicle exchange in lane
+bug 1840952: drop vehicle exchange in lane
 changer,
-bug 1840944: replace approaching information in
+bug 1840944: replace approaching information in
 lanes
 
 
 Further work on inner-junction traffic (still not 100% complete)
-bug 1840950: take into account inner-junction
+
bug 1840950: take into account inner-junction
   state
 
 
@@ -345,7 +345,7 @@
 
         
           
-            
This page was last edited on: 11 February 2021
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Z/Changes_from_version_0.9.8_to_version_0.9.9.html sumo-1.18.0/docs/userdoc/Z/Changes_from_version_0.9.8_to_version_0.9.9.html
--- sumo-1.17.0/docs/userdoc/Z/Changes_from_version_0.9.8_to_version_0.9.9.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Z/Changes_from_version_0.9.8_to_version_0.9.9.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -182,17 +182,17 @@
 Release date: 05.08.2008
 
 All
-debugged bug 1976405 Saving invalid dump
+
debugged bug 1976405 Saving invalid dump
   configuration;
   Was a false encoding in Option_IntVector
 builds under 64bit Linux (solved bugs
-  bug 1927822,
-  bug 1928370,
-  bug 1930444,
-  bug 1931468,
-  bug 1932961,
-  bug 1933569,
-  bug 1934635;
+  bug 1927822,
+  bug 1928370,
+  bug 1930444,
+  bug 1931468,
+  bug 1932961,
+  bug 1933569,
+  bug 1934635;
   thanks to Ronald Nippold for being persistent in supplying the
   build logs
 encapsulated xerces-attributes; makes value retrieval so much
@@ -221,7 +221,7 @@
   (--exclude-empty-edges/--exclude-empty-lanes) allow to
   dump only information about edges/lanes which were occupied by
   vehicles.
-debugged bug 1964433 different simulation results for different starting times;
+
debugged bug 1964433 different simulation results for different starting times;
   The issue was a false computation of WAUT switching and TLS
   offset times when choosing a different simulation begin time
   than 0
@@ -229,11 +229,11 @@
   MSVehicle::isOnRoad
 removed MSEdge::isSource; was used only once and can be easily
   replaced by comparing the result of MSEdge::getPurpose()
-debugged bug 1932105 second stop on the same edge confuses vehicles
-debugged bug 1941846 repeatable crash with sumo r5378
-debugged bug 1912547 linux 64 bit compile error for sumo svn 5143
-debugged bug 1913655 command line sumo throws unknown exception
-debugged bug 1924989 sumo r5186 crashs by pure virtual function call
+debugged bug 1932105 second stop on the same edge confuses vehicles
+debugged bug 1941846 repeatable crash with sumo r5378
+debugged bug 1912547 linux 64 bit compile error for sumo svn 5143
+debugged bug 1913655 command line sumo throws unknown exception
+debugged bug 1924989 sumo r5186 crashs by pure virtual function call
 begun work on Specification
 all vehicles are emitted at position=0, with speed=0
 
@@ -261,24 +261,24 @@
 
Removed opening an additional command line window from the
   release version
 Title is now set properly
-debugged bug 2021454 Discarding View settings resets them;
+
debugged bug 2021454 Discarding View settings resets them;
   The editor now uses the settings that were used when it was
   opened as the one to apply when "cancel" is pressed
-debugged bug 2021464 view settings are not saved;
+
debugged bug 2021464 view settings are not saved;
   The button is now removed, all the interaction will be done via
   the top buttons
-debugged bug 2015792 Save List of selected Items;
+
debugged bug 2015792 Save List of selected Items;
   The proper extension (mostly ".txt") is now appended if no
   extension is given. Affects saving breakpoints, additional
   weights, tracked parameter, and selections.
-bug 1919509 guisim crashed
+
bug 1919509 guisim crashed
     is invalid, the issue was a buggy opengl driver
 
 
 
 
 netconvert
-debugged bug 1993928 --keep-edges.input-file does not remove empty nodes;
+
debugged bug 1993928 --keep-edges.input-file does not remove empty nodes;
   as soon as one edge-removal(keeping) option occures, nodes are
   rechecked whether they contain any further edge. If not, the
   node is removed.
@@ -294,7 +294,7 @@
 removed "name" attribute from NBEdge; was not written anyway
 work on SUMO-networks reimport
   (unfinished)
-documentation: debugged bug 1909685 option "omit-corrupt-edges" not recognized
+
documentation: debugged bug 1909685 option "omit-corrupt-edges" not recognized
   (use --dismiss-loading-errors instead of
   --omit-corrupt-edges)
 removed usage of NLLoadFilter
@@ -312,7 +312,7 @@
 
 
 duarouter
-debugged bug 1981921 duarouter truncates routes;
+
debugged bug 1981921 duarouter truncates routes;
   Now, --remove-loops only prunes the route if the vehicle
   would have to take a turnaround at the begin or end.
 reworked handling of broken routes; longer routes are not
@@ -369,7 +369,7 @@
 
         
           
-            
This page was last edited on: 01 March 2021
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Z/Changes_from_version_0.9.9_to_version_0.9.10.html sumo-1.18.0/docs/userdoc/Z/Changes_from_version_0.9.9_to_version_0.9.10.html
--- sumo-1.17.0/docs/userdoc/Z/Changes_from_version_0.9.9_to_version_0.9.10.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Z/Changes_from_version_0.9.9_to_version_0.9.10.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -182,7 +182,7 @@
 Release date: 16.09.2008
 
 Building
-debugged bug 2042630 --enable-traci disables traci?
+debugged bug 2042630 --enable-traci disables traci?
 
 
 
@@ -228,7 +228,7 @@
 
 duarouter
 patched behavior on missing files
-debugged bug 2042630 remove-loops breaks application
+debugged bug 2042630 remove-loops breaks application
 
 
 
@@ -239,7 +239,7 @@
 
         
           
-            
This page was last edited on: 11 February 2021
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Z/Changes_in_2015_releases.html sumo-1.18.0/docs/userdoc/Z/Changes_in_2015_releases.html
--- sumo-1.17.0/docs/userdoc/Z/Changes_in_2015_releases.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Z/Changes_in_2015_releases.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -194,7 +194,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -486,7 +486,7 @@
 
Right-turn-on-red
   is now supported via the new node type traffic_light_right_on_red. #1287
 Importing .inpx VISSIM networks is now supported.
-  Thanks to the AIT for their
+  Thanks to the AIT for their
   contribution.
 The positioning and presence of internal junctions
   can now be customized with the new connection attribute contPos. #2016
@@ -576,8 +576,8 @@
 
 Documentation
 Online documentation of
-  TraCI4J can now be found at
-  traci4j-javadoc
+  TraCI4J can now be found at
+  traci4j-javadoc
 The section on Additional netconvert outputs was completely rewritten.
 Added a new page on XML Validation
 Added documentation for the C++ TraCI API client
@@ -921,7 +921,7 @@
 
 Scenarios
 An updated version of the TAPASCologne scenario can be found
-  on the sourceforge download page.
+  on the sourceforge download page.
   This updates the network to the latest OSM data and
   netconvert version.
 An updated version of the Bologna scenarios can be found on
@@ -1207,7 +1207,7 @@
 
 
 netconvert
-read heightmaps from GeoTIFFs for instance SRTM data #1495
+read heightmaps from GeoTIFFs for instance SRTM data #1495
 when adding sidewalks via
   typemap or --sidewalks.guess, permissions on
   all other lanes are now automatically set to disallow
@@ -1328,7 +1328,7 @@
 
         
           
-            
This page was last edited on: 10 January 2023
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Z/Changes_in_2016_releases.html sumo-1.18.0/docs/userdoc/Z/Changes_in_2016_releases.html
--- sumo-1.17.0/docs/userdoc/Z/Changes_in_2016_releases.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Z/Changes_in_2016_releases.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,7 +1,7 @@
 
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -201,7 +201,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
@@ -835,7 +835,7 @@
 
 Documentation
 Test coverage analysis can now be found at
-  [1].
+  [1].
 Documented Wireless device detection
   model which has been available
   since version 0.18.0
@@ -1277,7 +1277,7 @@
 
         
           
-            
This page was last edited on: 10 January 2023
+            
This page was last edited on: 28 June 2023
           
           
             Copyright © 2001-2023 German Aerospace Center (DLR) and others.
diff -Nru sumo-1.17.0/docs/userdoc/Z/Changes_in_2017_releases.html sumo-1.18.0/docs/userdoc/Z/Changes_in_2017_releases.html
--- sumo-1.17.0/docs/userdoc/Z/Changes_in_2017_releases.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Z/Changes_in_2017_releases.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -204,7 +204,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/Z/Changes_in_2018_releases.html sumo-1.18.0/docs/userdoc/Z/Changes_in_2018_releases.html
--- sumo-1.17.0/docs/userdoc/Z/Changes_in_2018_releases.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Z/Changes_in_2018_releases.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -194,7 +194,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/Z/Changes_in_2019_releases.html sumo-1.18.0/docs/userdoc/Z/Changes_in_2019_releases.html
--- sumo-1.17.0/docs/userdoc/Z/Changes_in_2019_releases.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Z/Changes_in_2019_releases.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -204,7 +204,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/Z/Changes_in_2020_releases.html sumo-1.18.0/docs/userdoc/Z/Changes_in_2020_releases.html
--- sumo-1.17.0/docs/userdoc/Z/Changes_in_2020_releases.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Z/Changes_in_2020_releases.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -204,7 +204,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/userdoc/Z/Changes_in_2021_releases.html sumo-1.18.0/docs/userdoc/Z/Changes_in_2021_releases.html
--- sumo-1.17.0/docs/userdoc/Z/Changes_in_2021_releases.html	2023-04-24 22:08:42.000000000 +0000
+++ sumo-1.18.0/docs/userdoc/Z/Changes_in_2021_releases.html	2023-06-28 22:08:57.000000000 +0000
@@ -1,6 +1,6 @@
 
 
@@ -98,7 +98,7 @@
                                 ChangeLog
                             
                             
-                                Contact
+                                Contact
                             
                         
 
@@ -211,7 +211,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/docs/web/docs/activitygen.md sumo-1.18.0/docs/web/docs/activitygen.md
--- sumo-1.17.0/docs/web/docs/activitygen.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/activitygen.md	2023-06-28 20:02:17.000000000 +0000
@@ -32,7 +32,7 @@
 
 You may use a XML schema definition file for setting up a activitygen
 configuration:
-[activitygenConfiguration.xsd](http://sumo.dlr.de/xsd/activitygenConfiguration.xsd).
+[activitygenConfiguration.xsd](https://sumo.dlr.de/xsd/activitygenConfiguration.xsd).
 
 ### Configuration
 
diff -Nru sumo-1.17.0/docs/web/docs/Basics/Basic_Computer_Skills.md sumo-1.18.0/docs/web/docs/Basics/Basic_Computer_Skills.md
--- sumo-1.17.0/docs/web/docs/Basics/Basic_Computer_Skills.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Basics/Basic_Computer_Skills.md	2023-06-28 20:02:17.000000000 +0000
@@ -22,8 +22,8 @@
 
 Notepad is a very basic text editor. You can increase your comfort and
 productivity by switching to an editor with more features. Consider
-[Notepad++](http://notepad-plus-plus.org/) or
-[vim](http://www.vim.org/download.php#pc) and also see this [comparison of text editors](https://en.wikipedia.org/wiki/Comparison_of_text_editors)
+[Notepad++](https://notepad-plus-plus.org/) or
+[vim](https://www.vim.org/download.php#pc) and also see this [comparison of text editors](https://en.wikipedia.org/wiki/Comparison_of_text_editors)
 
 !!! note
     Files used by SUMO have by convention names ending with
diff -Nru sumo-1.17.0/docs/web/docs/ChangeLog.md sumo-1.18.0/docs/web/docs/ChangeLog.md
--- sumo-1.17.0/docs/web/docs/ChangeLog.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/ChangeLog.md	2023-06-28 20:02:17.000000000 +0000
@@ -2,6 +2,221 @@
 title: ChangeLog
 ---
 
+## Version 1.18.0 (29.06.2023)
+
+### Bugfixes
+
+- Simulation
+  - Setting param `vTpes` for actuated and delay_based tls detectors is working again. Issue #13448 (regression in 1.15.0)
+  - Fixed invalid emission and consumption outputs for the HBEFA4 emission classes (model was calibrated on km/h instead of m/s). Issue #13250
+  - Collisions on shared walkingareas without vehicular road intersection are now detected. Issue #13132
+  - A warning is now given if save-state.times are not reached due to a mismatch with step-length and begin time. Issue #13162
+  - Fixed crash when loading rail simulation state with step-length > 1. Issue #13161
+  - Fixed crash when loading state with vehicles that have triggered departure. Issue #13096
+  - Simulation outputs now include non-zero z-data even if the slope is 0. Issue #13171
+  - Fixed crash / invalid output if a person has a `` after accessing a busStop via an access element. Issue #13108
+  - Fixed invalid 'started' and 'arrivalDelay' after passing a short waypoint edge at high speed. Issue #13179
+  - Fixed crash after rerouting and losing a stop. Issue #13190
+  - Fixed invalid TTC computation when both vehicles are extrapolated to stop. Issue #13212
+  - A parkingReroute now works even if the parkingArea on the current edge is not included in the alternatives list. Issue #13288
+  - Fixed unnecessary emergency braking when cars urgently needs to swap lanes. Issue #13295  
+  - IDM no longer violates right of way due to imprecise stopping at minor link. Issue #13369
+  - Fixed error when loading personTrip between identical stops. Issue #13385
+  - Fixed invalid error message for disconnected personTrip between stops. Issue #13386
+  - Fixed collision on junction due to unsafe lane changing. Issue #13363  
+  - Fixed error when using option **--replay-rerouting**. Issue #13389
+  - Fixed invalid saved state when input contains route distribution within a vehicle. Issue #13449
+  - Fixed emergency braking / collision at roundabout. Issue #13292
+  - Fixed emergency braking on traffic light junction #13516
+  - The simulation now aborts when encountering an invalid stop definition (unless option **--ignore-errors** is set). Issue #12670
+  - bidirectional lane use:
+    - Fixed invalid collision warning when using bidi lane. Issue #13312
+    - Fixed unsafe right-of-way rules at junction with shared median lane. Issue #13316
+    - Fixed frontal collision on shared median lane. Issue #13313
+    - Fixed deadlock on bidi edge. Issue #13396
+    - Fixed blockage on intersection with oncoming leader. Issue #13397
+    - Fixed collision and emergency braking. Issue #11642
+
+- netedit
+  - Fixed crash when importing OSM data direclty. Issue #13297 (regression in 1.16.0)
+  - Fixed invalid undo operation after moving a set of network elements. Issue #13421 (regression in 1.16.0)
+  - Fixed segfault when closing netedit and no net is loaded #13131 (regression in 1.17.0)
+  - Fixed spacing for person mode path info subframe. Issue #13140 (regression in 1.17.0)
+  - Loading Data Elements via menu item is working again. Issue #13224 (regression in 1.17.0)
+  - Saving plain xml now works when selecting an existing plain-xml file to define the output prefix. Issue #13200 (regression in 1.16.0)
+  - netdiff-dialog now permits to change the output prefix. Issue #13130
+  - Fixed invalid default values in netgenerate dialog and tool dialogs. Issue #13152
+  - Boolean options can now be reset in tool dialogs. Issue #13156
+  - Function 'add reverse edge' applied on a selection, no longer adds duplicate reverse edges. Issue #13209
+  - Fixed inconsistent ordering of popup functions for additionals. Issue #13261
+  - Stops at a `trainStop` can now be defined. Issue #13258
+  - Loading a second .sumocfg now properly resets all options. Issue #13123
+  - Object ids that contain the characters `!`, `?` or `*` (which are permitted in sumo) can now be loaded (such ids are discouraged since they make it more difficult to list object ids on the command line). Issue #13351
+  - A person with a single stop stage is now visible after loading. Issue #13126
+  - Creation of busStops and trainStops with the same id is now prevented (since this would give an error when loading the simulation). Issue #13269
+  - Person rides between rail stops can now be defined. Issue #13273
+  - Fixed crash saving network with stop container plans #13390
+  - In the vType editor, the vClass attribute is now updated when switching current type. Issue #13317
+  - The "stacked" person indicator is now working for persons that start at a busStop. Issue #12380
+  - Z value is no longer applied twice in move mode. Issue #13411
+  - Fixed error when saving sumo/netedit configs at path containing spaces. Issue #13373
+  - Added missing updates of frames after undo/redo. Issue #13429
+  - Python tools now work when the SUMO_HOME path contains spaces. Issue #13458
+  - Using netedit to define custom detectors for actuated traffic lights is now working. Issue #13412
+  - Resetting the `next` attribute of branching traffic light programs is now working. issue #13409
+  - Trigger attributes can no longer be defined for waypoints (the simulation does not allow this). Issue #13499
+
+- sumo-gui
+  - The breakpoint-dialog now takes into account the begin time when rounding breakpoints to a reachable step. Issue #13163
+  - game mode now switches time display style for all time labels. Issue #13211
+  - Fixed crash when switching to a (mismatching) alternative net file. Issue #13215
+  - Clicking on a vehicle id which is not in the network no longer moves the view to Position::INVALID. Issue #13251
+  - Fixed invalid rendering of spread-bidi lanes for shared median lane network. Issue #13343
+  - Fixed bug where vehicle context menu function 'select foes' did not select all relevant junction foes. Issue #13358
+
+- netconvert
+  - Fixed inconsistent network file after setting **--default.spreadtype center**. Issue #13127
+  - OpenDRIVE export: fixed invalid crosswalk shape. Issue #10432  
+  - Fixed invalid connection permissions after joining junction. Issue #13217
+  - Fixed broken network after setting option **--tls.rebuild**. Issue #13240
+  - Fixed classification of turnaround connection on some divided highways. Issue #13238    
+  - Fixed invalid consistency error for circular public transport line. Issue #13255
+  - OSM: fixed incomplete pt-route. Issue #13249
+  - OSM: fixed problems with one-way bus and bicycle infrastructure. Issue #12592
+  - OSM: fixed crash when using option **--osm.turn-lanes**. Issue #13413
+  - User defined node radius is no longer ignored for geometry-like nodes. Issue #13064      
+  - Fixed incomplete ptline-output for circular route. Issue #13431
+  - Fixed minor links in rail taxi network. Issue #13456
+  - Fixed unsafe signal plan at joint tls. Issue #13502
+  - Fixed overly large junction shapes when edges meet at a sharp angle. Issue #13505
+  - bidi edges
+    - Option **--railway.topology.repair.minimal** now performs minimal repair with respect to public transport lines. Issue #13248
+    - Fixed bug where bidi edge could not be declared. Issue #13225    
+    - Fixed bug where option **--railway.topology.repair** created superfluous bidi edges. Issue #13247
+    - Fixed missing bidi attribute for shared median lane with disconnected outer lanes. Issue #13335
+    - Fixed invalid bidi attribute for internal edge. Issue #13344
+    - Fixed invalid right of way rules when shared median lane ends. Issue #13345
+    - Fixed unsafe right of way rules at internal junction with bidiLane. Issue #13400
+    - Fixed asymmetrical bidi attribute. Issue #13510  
+
+- duarouter
+  - Fixed railway routing failure if the stop is defined on a short buffer edge (also applies to sumo). Issue #13277
+  - Fixed invalid route cost for train reversal on long edge (also applies to sumo). Issue #13360
+  - Fixed intermodal routing failing for rail taxi (also applies to sumo). Issue #13424
+  - Fixed invalid ride in output when starting personTrip on rail edge. Issue #13506
+  - Initial taxi waiting time is now included in cost computation when a personTrip starts with a taxi ride. Issue #13513
+  - Fixed invalid route output when a personTrip provides alternative vehicle modes. Issue #13512
+
+- activitygen
+  - Fixed crash when there are no work positions within a city. Issue #13315
+  - Now handling `nan` values in population input. Issue #13323
+  - Fixed invalid work position statistics when stat file is lacking city gates. Issue #13381
+
+- TraCI
+  - Fixed crash when calling traci.load and running with sumo-gui. Issue #13150 (regression in 1.16.0)
+  - Calling `vehicle.insertStop` now preserves the original route edges beyond the inserted stop. Issue #13092
+  - Fixed libtraci crashes when working on closed connection. Issue #13285
+  - Fixed missing vehicle type in saved state and vehroute-output for vehicle added via TraCI. Issue #13384
+  - Added missing error reporting when setting invalid carFollowModel parameters via `traci.vehicle.setParameter`. Issue #13399
+
+- Tools
+  - Fixed mouse control in several game scenarios. Issue #13366 (regression in 1.17.0)
+  - Fixed error when calling some tools without argument. Issue #13388 (regression in 1.17.0)
+  - abstractRail.py: Failure to optimize one region is now recoverable. Issue #13193
+  - gridDistricts.py: Networks with non-normalized offsets now create correct taz shapes. Issue #13264
+  - Function `sumolib.net.getBoxXY` now returns correct results for large networks. Issue #13320
+  - In circlePolygon.py, abbreviation -c is used for config, instead for color
+  - When loading a tool configuration, unknown options now raise an error. Issue #13091  
+  - generateRailSignalConstraints.py: fixed invalid bidi constraint for trains with multiple diversionary tracks between stops. Issue #13519
+  
+
+### Enhancements
+
+- Simulation
+  - Added options **--intermodal-collision.action** and **--intermodal-collision.stoptime** to configure vehicle behavior after colliding with a pedestrian. Issue #13133
+  - In the sublane mode, vehicle elevation is now interpolated when lane changing between lanes that have different z-values. Issue #13170  
+  - Added `device.taxi.idle-algorithm` value `taxistand` which makes idle taxis return to a pre-configured set of locations. Issue #13334
+  - The SSM-device now supports the new surrogate safety measure "MDRAC" which is modified maximum deceleration rate to avoid crash with perception/reaction time. Issue #13350
+  - statistic-output now include the number of emergency braking events. Issue #10596
+  - Vehicles can now be configured to ignore specific vehicles during car-following by using [generic parameters](Simulation/GenericParameters.md) `carFollowMode.ignoreIDs` and `carFollowModel.ignoreTypes`. Issue #13362  
+  - Stops now support custom parameters #13365
+  - Multi-Entry-Exit (E3) detectors now support attribute `expectArrival` to suppress arrival warnings. Issue #13476
+  - Vehicles with `depart="split"` now automatically adapt their departPos to the rear of the [train from which they split](Simulation/Railways.md#portion_working). Issue #13480
+
+- sumo-gui
+  - Element `parkingArea` now supports placing stopping places to the left of the lane in right-hand networks by setting attribute `lefthand="true"`. Issue #13303
+  - Simulation end time is now written into the message window. Issue #13145
+  - Live edgeData can now be observed after the simulation ends. Issue #13144
+  - vTypes of typed detectors are now shown in the detector parameter dialog. Issue #13447
+
+- netedit
+  - Supermodes can now be activated using the modes menu. Issue #13138
+  - After generating a network without warnings, the new network will open directly without manually closing the output dialog. Issue #13149
+  - Implemented new dialog for setting netedit and sumo options. This dialog supports option help, file selection dialogs and permits dynamic filtering of listed options. Issue #12007
+  - Simplified selection of .sumocfg files when calling runSeeds.py tool. Issue #13118
+  - Simplified seelction of edge is when calling python tools. Issue #12852
+  - The traffic light join mode now has  'OK / 'cancel' buttons. Issue #13028
+  - Now netedit supports trip and flows over TAZs. Issue #13311
+  - Improved error messages when loading additional objects. Issue #13507
+
+- netconvert
+  - OpenDRIVE import: now supports road objects from connecting roads. Issue #13196
+  - OpenDRIVE export: now includes additional road object attributes. Issue #13205
+  - Added option **--geometry.remove.max-junction-size FLOAT** to prevent unsmooth road shape when converting large junctions to a geometry point. Issue #13199
+  - OSM import: typemap `osmNetconvertRailUsage.typ.xml` now imports service designation. Issue #13213
+  - Unused edge types are now excluded from .net.xml. Issue #13228
+  - Added option **--railway.signal.guess.by-stops** to add rail_signal nodes to a network that is lacking them. Issue #5143
+  - When using option **--tls.rebuild**, the tltype can be changed by setting option **--tls.default-type**. Issue #13267
+  - Added option **--junctions.minimal-shape** to enforce small junctions. Issue #13377
+  - Added option **--opendrive.signal-groups** to import controller information from OpenDRIVE. Issue #2365
+  - Added option **--tls.join-exclude** for more control over automatic tls joining. Issue #13466
+
+- TraCI
+  - Added function `simpla.getPlatoonID`. Issue #13029
+  - Added functions `lane.getAngle' and `edge.getAngle`. Issue #10901
+  - Added function `vehicle.getJunctionFoes`. Issue #12640
+  - Using UTF-8 consistently. Issue #7171  
+  - getAllContextSubscriptionResults has now entries also for objects without results. Issue #6446
+  - Vehicles with SSM device now permit retrieval of the minimum PPET using param `device.ssm.minPPET`. Issue 13293
+  - Function `traci.vehicle.setStopParameter` and `getStopParameter` now supports optional argument `customParam=True` to work with user defined stop parameters. Issue #13365
+  - vehicle and vehicletype domain now support the functions set/getBoardingDuration and set/getImpatience. When impatience is set on a vehicle it affects the dynamic impatience which gets reset on starting to drive. Calling vehicle.getImpatience now returns the dynamic impatience instead of the base value defined in the vType. Issue #10430, #13403
+  
+- tools
+  - randomTrips.py: added options **--from-stops** and **--to-stops** to define pedestrians, personTrips and person rides from and to stops (i.e. busStop). Issue #13375
+  - randomTrips.py: now issues a warning if option **--binomial** is too low for the given period. Issue #13404
+  - plotXMLAttributes.py and plot_trajectories.py now show the plot by default. Issue #13158
+  - plotXMLAttributes.py: Added option **--join-files** to treat data points from different files as if coming from the same file. Issue #13154
+  - plotXMLAttributes.py: Now supports attribute value `@DENSITY` to create density plots. Issue #13182
+  - runSeeds.py: shortened generated folder names. Issue #13167
+  - runSeeds.py: added option **--no-folders** to keep all written files in the same directory when running with multiple configuration files or applications (folder name becomes file name prefix). Issue #13157
+  - routeSampler: Added option **--taz-files** and support for loading origin destination matrices in `tazRelation` format. Issue #6890
+  - abstractRail.py: Now handles regions without stops. Issue #13221
+  - gtfs2pt.py: can now disable generation of pedestrian access via option **--skip-access**. Issue #12774
+  - gtfs2pt: stop names are now included in route-output. Issue #13274
+  - ptlines2flows.py: now support configuration files. Issue #13254  
+  - generateParkingAreas.py: now support option **--lefthand** to create lefthand parking areas. Issue #13305
+  - [scheduleStats.py](Tools/Railways.md#schedulestatspy): Now permits analysis of planned and actual travel time between pairs of stops. Issue #13354
+  - tileGet.py now supports option **--parallel-jobs** to speed up data retrieval. Issue #13327
+  - checkStopOrder.py: can now generate a combined stop table for multiple stop locations. Issue #13259
+  - checkStopOrder.py: marks waypoints in stop table output. Issue #13420
+  - checkStopOrder.py: added option **--filter-ids** to filter the input by vehicle id. Issue #13488  
+  - generateRailSignalConstraints.py: now supports [portion working](Simulation/Railways.md#portion_working) (vehicles with `depart="split"`). Issue #13478
+  - generateRailSignalConstraints.py: now finds additional bidi conflicts. Issue #12085
+  - improved game internationalization. Issue #13082
+
+### Miscellaneous
+
+- splitRouteFiles.py, netcheck.py, plot_csv_bars.py, plot_net_trafficLights.py and plot_csv_timeline now use the **-c** shortcut for loading a configuration. All options that previously used this continue to work with the respective long option name (e.g. --columns). Issue #8409 and #12874
+- plotXMLAttributes.py and plot_trajectories.py no longer create output file 'plot.png' by default. Issue #13166
+- netconvert: road objects imported from OpenDRIVE are now placed on a higher layer to make them visible above the road. Issue #13197
+- netconvert: option **--osm.all-attributes** now defaults to exporting all attributes because the explicit list of attributes (**--osm.extra-attributes**) now defaults to value **all**. Issue #13218
+- netconvert: increased default bike path width. Issue #13425
+- Netedit demand mode hotkeys changed: **C** now activates container mode and **L** activates person plan mode. Issue #13141
+- All strings sent and received by TraCI are now utf8 encoded and interpreted as utf8. Issue #7171
+- `traci.simulationStep` has no return value on Python any longer (similar to the other languages), use `traci.simulationStepLegacy` for the old behavior. Issue #13296
+- The default file extension for netedit configuration files was changed from `.neteditconfig` to `.netecfg` for consistency with other config extensions. Issue #13100
+
+
 ## Version 1.17.0 (25.04.2023)
 
 ### Bugfixes
@@ -63,7 +278,7 @@
   - Fixed crash when unjoining a joint traffic light. Issue #12610
   - Fixed "Invalid reference counter" error after recomputing with volatile options with data elements. Issue #13058
   - Netedit now gives a warning when changing user defined junction type 'rail_crossing' to priority. Issue #9273
-  - Fixed bug where person plan elements after a stop where not loaded correctly. Issue #13125
+  - Fixed bug where person plan elements after a stop were not loaded correctly. Issue #13125
 
 - sumo-gui
   - Fixed invalid carriageLength for tram. Issue #13011 (regression in 1.11.0)
@@ -143,9 +358,9 @@
   - Vehicle attribute `depart` now supports the new value `begin` referring to the start of the simulation. Issue #12270
 
 - netconvert
-  - Added options **--shapefile.width** and **--shapefile.length** to allow importing custom widths and lengths from [shape files](Networks/Import/ArcView.md). Issue #12575
-  - Exceptions for turning restrictions are now imported from OSM. Issue #12645
+  - Added options **--shapefile.width** and **--shapefile.length** to allow importing custom widths and lengths from [shape files](Networks/Import/ArcView.md). Issue #12575  
   - Option **--osm.extra-attributes** now also applies to all node attributes. Issue #12677
+  - OSM: Exceptions for turning restrictions are now imported. Issue #12645
   - OSM: Supporting bus lane restrictions using `psv`. Issue #6767
   - junction attribute 'radius' now overrides option **--junctions.small-radius**. Issue #12816
   - merging two projected plain-xml networks with different offsets is now working. Issue #12841
@@ -154,11 +369,11 @@
   - OpenDRIVE: lane access declarations are now imported. Issue #12804
 
 - netedit
-  - Added menu entry for directly calling netgenerate and and instantly editing the generated network. Issue #2393
+  - Added menu entry for directly calling netgenerate and instantly editing the generated network. Issue #2393
   - Added menu and dialogs for calling python tools without using the command line. Issue #4138
   - When calling netdiff from tools menu, the computed differences may be selectively imported for visualization (i.e. differently colored shapes for added, deleted and modified edges). Issue #2736
   - All objects with a name attribute can now be located by name using the locate-dialog. Issue #12686
-  - Inspect now allows inspecting individual objects that are part of a selection via ALT+LEFT_CLICK. Issue #12690
+  - Inspect mode now allows inspecting individual objects that are part of a selection via ALT+LEFT_CLICK. Issue #12690
   - In data mode, overlapped data elements list is now sorted by interval begin. Issue #11330
   - If a route is selected it will always be shown on top of other overlapping routes. Issue #12582
   - The vehicle type "DEFAULT_RAILTYPE" can now be used for defining trains. Issue #6752
@@ -207,7 +422,7 @@
   - Improved compatibility between sumolib phase definitions and libsumo phase definitions. Issue #12131
   - Added tool [abstractRail.py](Tools/Net.md#abstractrailpy) to generate an abstract/schematic rail network based on a geodetic rail network. Issue #12662
   - Added tool [stationDistricts.py](Tools/District.md#stationdistrictspy) for segmenting a public transport network based public transport stations. Issue #12662
-  - Added tool [attributeCompare.py](Tools/Output.md#attributecomparepy) to compare matching attribute across multiple files. Issue #13026
+  - Added tool [attributeCompare.py](Tools/Output.md#attributecomparepy) to compare matching attributes across multiple files. Issue #13026
   - attributeDiff.py: Can now optionally group attributes by one or more id-attributes before comparing. #12794
   - attributeDiff.py: optionally write entries that could not be compared (via new options **-m** and **-M**. Issue #12798
   - attributeStats.py: Now supports option **--human-readable-time** (**-H**) to make attributes with large time values more legible. Issue #12822
diff -Nru sumo-1.17.0/docs/web/docs/Contact.md sumo-1.18.0/docs/web/docs/Contact.md
--- sumo-1.17.0/docs/web/docs/Contact.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Contact.md	2023-06-28 20:02:17.000000000 +0000
@@ -2,4 +2,4 @@
 title: Contact
 ---
 
-Please refer to [eclipse.org/sumo/contact](https://eclipse.org/sumo/contact/)
\ No newline at end of file
+Please refer to [eclipse.dev/sumo/contact](https://eclipse.dev/sumo/contact/)
\ No newline at end of file
diff -Nru sumo-1.17.0/docs/web/docs/Contributed/index.md sumo-1.18.0/docs/web/docs/Contributed/index.md
--- sumo-1.17.0/docs/web/docs/Contributed/index.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Contributed/index.md	2023-06-28 20:02:17.000000000 +0000
@@ -48,13 +48,13 @@
 
 ## Demand Generators
 
-- [Citymob for Roadmaps](https://web.archive.org/web/20190910115452/http://www.grc.upv.es/Software/c4r.html)
+- [Citymob for Roadmaps](https://web.archive.org/web/20190910115452/https://www.grc.upv.es/Software/c4r.html)
 
     mobility pattern generator for vehicular networks (VANet focus)
 
 ## Scenario and Network Editors
 
-- [eWorld](https://web.archive.org/web/20161205050209/http://eworld.sourceforge.net/)
+- [eWorld](https://web.archive.org/web/20161205050209/https://eworld.sourceforge.net/)
 
     an application that allows to convert and enrich roads networks
 
@@ -73,21 +73,21 @@
 
     connects SUMO to ns-3
 
-- [TraNS](http://trans.epfl.ch/)
+- [TraNS](https://trans.epfl.ch/)
 
     connects SUMO to ns-2
 
-- [MOVE](https://web.archive.org/web/20111210235800/http://lens1.csie.ncku.edu.tw/wiki/doku.php?id=%E2%80%A7realistic_mobility_generator_for_vehicular_networks)
+- [MOVE](https://web.archive.org/web/20111210235800/https://lens1.csie.ncku.edu.tw/wiki/doku.php?id=%E2%80%A7realistic_mobility_generator_for_vehicular_networks)
 
     connects SUMO to ns-2
 
-- [VSimRTI](http://www.dcaiti.tu-berlin.de/research/simulation/)
+- [VSimRTI](https://www.dcaiti.tu-berlin.de/research/simulation/)
 
     C2X environment connecting SUMO to different network and application simulators (OMNeT++ and JiST/SWANS)
 
 ## Other
 
-- [TraCI4Matlab](http://de.mathworks.com/matlabcentral/fileexchange/44805-traci4matlab)
+- [TraCI4Matlab](https://de.mathworks.com/matlabcentral/fileexchange/44805-traci4matlab)
   
     A Matlab interface for connecting and extending information via [TraCI](../TraCI.md)
 
diff -Nru sumo-1.17.0/docs/web/docs/Contributed/SUMOPy/GUI/Getting_Started.md sumo-1.18.0/docs/web/docs/Contributed/SUMOPy/GUI/Getting_Started.md
--- sumo-1.17.0/docs/web/docs/Contributed/SUMOPy/GUI/Getting_Started.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Contributed/SUMOPy/GUI/Getting_Started.md	2023-06-28 20:02:17.000000000 +0000
@@ -226,7 +226,7 @@
 `Network>Edit with netedit`
 
 netedit| will be fired up with the network ready to be edited. The use
-of netedit| is documented here: . After
+of netedit| is documented here: . After
 editing, the network must be saved within netedit| be pressing -s
 or with File\>save|. Then netedit| can be closed and the modified
 network will be reimported into SUMOPy.
diff -Nru sumo-1.17.0/docs/web/docs/Contributed/SUMOPy/Installation/Linux.md sumo-1.18.0/docs/web/docs/Contributed/SUMOPy/Installation/Linux.md
--- sumo-1.17.0/docs/web/docs/Contributed/SUMOPy/Installation/Linux.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Contributed/SUMOPy/Installation/Linux.md	2023-06-28 20:02:17.000000000 +0000
@@ -25,7 +25,7 @@
 install `python-wxgtk2.8`:
 
 ```sh
-echo "deb http://archive.ubuntu.com/ubuntu wily main universe"| sudo tee /etc/apt/sources.list.d/wily-copies.list
+echo "deb https://archive.ubuntu.com/ubuntu wily main universe"| sudo tee /etc/apt/sources.list.d/wily-copies.list
 
 sudo apt install python-wxgtk2.8
 
diff -Nru sumo-1.17.0/docs/web/docs/Contributed/SUMOPy.md sumo-1.18.0/docs/web/docs/Contributed/SUMOPy.md
--- sumo-1.17.0/docs/web/docs/Contributed/SUMOPy.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Contributed/SUMOPy.md	2023-06-28 20:02:17.000000000 +0000
@@ -6,8 +6,8 @@
 SUMOPy. SUMOPy is intended to expand the user-base of the traffic
 micro-simulator SUMO by providing a user-friendly, yet flexible
 simulation suite. The original publication related to SUMOPy can be
-found at the [University of Bologna](https://web.archive.org/web/20181101145057/http://campus.unibo.it/200538/1/Research-A-Choudhry-657079-.pdf)
-and in the [proceedings of the SUMO2013](http://sumo.dlr.de/2013/SUMO2013_15-17May%202013_Berlin-Adlershof.pdf).
+found at the [University of Bologna](https://web.archive.org/web/20181101145057/https://campus.unibo.it/200538/1/Research-A-Choudhry-657079-.pdf)
+and in the [proceedings of the SUMO2013](https://sumo.dlr.de/2013/SUMO2013_15-17May%202013_Berlin-Adlershof.pdf).
 
 A further scope of SUMOPy is to manage the huge amount of data necessary
 to run complex multi-modal simulations. This includes different demand
diff -Nru sumo-1.17.0/docs/web/docs/Data/Networks.md sumo-1.18.0/docs/web/docs/Data/Networks.md
--- sumo-1.17.0/docs/web/docs/Data/Networks.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Data/Networks.md	2023-06-28 20:02:17.000000000 +0000
@@ -28,7 +28,7 @@
 
 # Frida-project
 
-- *URL*: 
+- *URL*: 
 - *Area*: city of Osnabrück
 - *Demand data*: not available
 - *Extraction*: **netconvert --shapefile strassen -o frida2.net.xml
diff -Nru sumo-1.17.0/docs/web/docs/Data/Scenarios/TAPASCologne.md sumo-1.18.0/docs/web/docs/Data/Scenarios/TAPASCologne.md
--- sumo-1.17.0/docs/web/docs/Data/Scenarios/TAPASCologne.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Data/Scenarios/TAPASCologne.md	2023-06-28 20:02:17.000000000 +0000
@@ -7,16 +7,16 @@
 ## Availability
 
 ![88x31.png](../../images/88x31.png "88x31.png") The data is available under the
-[Creative Commons](http://creativecommons.org/licenses/by-nc-sa/3.0/)
+[Creative Commons](https://creativecommons.org/licenses/by-nc-sa/3.0/)
 license. You **must tell where the data is from**, it is **not allowed
 to use it for commercial** purposes, as soon as you use it **we want to
 be informed** about it (use the
 [sumo-user](https://dev.eclipse.org/mailman/listinfo/sumo-user) mailing list).
 
 The data can be [downloaded from our scenario
-repository](http://sourceforge.net/projects/sumo/files/traffic_data/scenarios/TAPASCologne).
+repository](https://sourceforge.net/projects/sumo/files/traffic_data/scenarios/TAPASCologne).
 There also vehicle traces available from the [KolnTrace project at CITI
-Lab](http://kolntrace.project.citi-lab.fr/).
+Lab](https://kolntrace.project.citi-lab.fr/).
 
 ## About
 
@@ -29,10 +29,10 @@
 Germans and on information about the infrastructure of the area they
 live in. More information about the system can be found within this
 [publication on
-TAPAS](http://elib.dlr.de/45058/02/SRL_81_-_Beitrag_Varschen.pdf). The
+TAPAS](https://elib.dlr.de/45058/02/SRL_81_-_Beitrag_Varschen.pdf). The
 original data was using a closed-source road network and was mapped onto
 one stemming from the [OpenStreetMap
-project](http://www.openstreetmap.de/).
+project](https://www.openstreetmap.de/).
 
 As is, TAPASCologne is only hardly usable. Work must be put into
 improving the network quality, as well as into verification of the
@@ -163,7 +163,7 @@
 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\]](http://www.stadt-koeln.de/mediaasset/content/pdf15/stadtkoeln_zahlenspiegel_e_bfrei.pdf).
+[\[1\]](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
diff -Nru sumo-1.17.0/docs/web/docs/Data/Scenarios.md sumo-1.18.0/docs/web/docs/Data/Scenarios.md
--- sumo-1.17.0/docs/web/docs/Data/Scenarios.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Data/Scenarios.md	2023-06-28 20:02:17.000000000 +0000
@@ -16,8 +16,8 @@
 
 A small-scale scenario based on the city of Bologna. The large
 roundabout can be found at 44.494554,11.314393. These scenarios were
-developed as part of the [iTETRIS project](http://www.ict-itetris.eu). A
-[publication](http://elib.dlr.de/89354) on these scenarios was presented
+developed as part of the [iTETRIS project](https://www.ict-itetris.eu). A
+[publication](https://elib.dlr.de/89354) on these scenarios was presented
 at [SUMO
 Conference 2014](https://sumo.dlr.de/docs/Publications.html#SUMO_2014): L.
 Bieker, D. Krajzewicz, A. Morra, C. Michelacci and F. Cartolano,
@@ -25,7 +25,7 @@
 of Bologna", SUMO2014, p 19-26
 
 - [Bologna Scenario on GitHub](https://github.com/DLR-TS/sumo-scenarios/tree/main/bologna/)
-- (Old release) [Download .zip files from SourceForge](http://sourceforge.net/projects/sumo/files/traffic_data/scenarios/Bologna_small)
+- (Old release) [Download .zip files from SourceForge](https://sourceforge.net/projects/sumo/files/traffic_data/scenarios/Bologna_small)
 
 # Braunschweig
 
@@ -101,10 +101,10 @@
 infrastructure of the area they live in.
 
 More information about the system can be found within this [publication
-on TAPAS](http://elib.dlr.de/45058/02/SRL_81_-_Beitrag_Varschen.pdf).
+on TAPAS](https://elib.dlr.de/45058/02/SRL_81_-_Beitrag_Varschen.pdf).
 The original data was using a closed-source road network and was mapped
 onto one stemming from the [OpenStreetMap
-project](http://www.openstreetmap.de/).
+project](https://www.openstreetmap.de/).
 
 There is further information about
 [TAPASCologne](../Data/Scenarios/TAPASCologne.md).
@@ -122,9 +122,9 @@
 
 # Further real-world scenarios
 
-- [Bologna Ringway](http://academic.lucabedogni.it/the-bologna-ringway-dataset/).
+- [Bologna Ringway](https://academic.lucabedogni.it/the-bologna-ringway-dataset/).
     Scenario built within the [COLOMBO R&D
-    project](https://web.archive.org/web/20170716120720/http://www.colombo-fp7.eu/).
+    project](https://web.archive.org/web/20170716120720/https://www.colombo-fp7.eu/).
 
 !!! caution
     This scenario is known to have lots of collisions due to unsafe traffic lights and some invalid junction definitions. It is also quite jammed.
@@ -134,13 +134,13 @@
 Synthetic - or abstract - scenarios only resemble typical layouts of
 real-world junctions and arterials without mapping a very specific one.
 Some synthetic scenarios of the [COLOMBO R&D
-project](https://web.archive.org/web/20170716120720/http://www.colombo-fp7.eu/) are examples of the German guideline
+project](https://web.archive.org/web/20170716120720/https://www.colombo-fp7.eu/) are examples of the German guideline
 RiLSA. They are described in [D1.1 "Scenario Specifications and Required
 Modifications to Simulation
-Tools"](https://web.archive.org/web/20170808122505/http://elib.dlr.de/98046/1/COLOMBO_D1.1_ScenariosExtensions_v2.4.pdf)(chapter
+Tools"](https://web.archive.org/web/20170808122505/https://elib.dlr.de/98046/1/COLOMBO_D1.1_ScenariosExtensions_v2.4.pdf)(chapter
 4).
 
-- Download: [4 RiLSA \*.zip files](http://sourceforge.net/projects/sumo/files/traffic_data/scenarios/RiLSA)
+- Download: [4 RiLSA \*.zip files](https://sourceforge.net/projects/sumo/files/traffic_data/scenarios/RiLSA)
 
 # Wildau
 
diff -Nru sumo-1.17.0/docs/web/docs/Data/Traffic_Data.md sumo-1.18.0/docs/web/docs/Data/Traffic_Data.md
--- sumo-1.17.0/docs/web/docs/Data/Traffic_Data.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Data/Traffic_Data.md	2023-06-28 20:02:17.000000000 +0000
@@ -18,7 +18,7 @@
 #### per-vehicle speed and lengths
 
 The data is given as a tar file named
-[fsp_speed_and_lengths.tar](http://prdownloads.sourceforge.net/sumo/fsp_speed_and_lengths.tar?download)
+[fsp_speed_and_lengths.tar](https://prdownloads.sourceforge.net/sumo/fsp_speed_and_lengths.tar?download)
 (\~40MB). Within this tar-file you will find a folder which contains
 compressed (gzip) data files. Each data file represents a day for one
 direction (north/south). The following days are given:
@@ -52,11 +52,11 @@
 
 - ["An Example of Microscopic Car Models Validation using the open
   source Traffic Simulation
-  SUMO"](http://sumo.dlr.de/pdf/dkrajzew_ESS2002_LOG14_Validation.pdf);
+  SUMO"](https://sumo.dlr.de/pdf/dkrajzew_ESS2002_LOG14_Validation.pdf);
   Daniel Krajzewicz, Georg Hertkorn, Christian Rössel, Peter Wagner;
   In: Proceedings of Simulation in Industry, 14th European Simulation
   Symposium, 2002, SCS European Publishing House, 2002, pp. 318-322,
   Simulation in Industry, 14th European Simulation Symposium, Oct.
   2002, Dresden / Germany
   
-  Available as: [.pdf, \~320KB](http://sumo.dlr.de/pdf/dkrajzew_ESS2002_LOG14_Validation.pdf).
\ No newline at end of file
+  Available as: [.pdf, \~320KB](https://sumo.dlr.de/pdf/dkrajzew_ESS2002_LOG14_Validation.pdf).
\ No newline at end of file
diff -Nru sumo-1.17.0/docs/web/docs/Definition_of_Vehicles,_Vehicle_Types,_and_Routes.md sumo-1.18.0/docs/web/docs/Definition_of_Vehicles,_Vehicle_Types,_and_Routes.md
--- sumo-1.17.0/docs/web/docs/Definition_of_Vehicles,_Vehicle_Types,_and_Routes.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Definition_of_Vehicles,_Vehicle_Types,_and_Routes.md	2023-06-28 20:02:17.000000000 +0000
@@ -7,7 +7,7 @@
 | Type of content    | Vehicles, Vehicle Types, and Routes |
 | Open format?       | Yes                                 |
 | SUMO specific?     | Yes                                 |
-| XML Schema         | [routes_file.xsd](http://sumo.dlr.de/xsd/routes_file.xsd) |
+| XML Schema         | [routes_file.xsd](https://sumo.dlr.de/xsd/routes_file.xsd) |
 
 There are [various applications](index.md#data_sources_for_demand_generation)
 that can be used to define vehicular demand for SUMO from existing input data.
@@ -465,7 +465,7 @@
 | decel             | float                             | 4.5                                                                 | The deceleration ability of vehicles of this type (in m/s^2)                                                                                                                                                           |
 | apparentDecel     | float                             | `==decel`                                                           | The apparent deceleration of the vehicle as used by the standard model (in m/s^2). The follower uses this value as expected maximal deceleration of the leader.                                                        |
 | emergencyDecel    | float                             | 9.0                                                                 | The maximal physically possible deceleration for the vehicle (in m/s^2).                                                                                                                                               |
-startupDelay        | float >= 0        | 0                | The extra delay time before starting to drive after having had to stop      
+startupDelay        | float >= 0        | 0                | The extra delay time before starting to drive after having had to stop. This is not applied after a scheduled `` except for `carFollowModel="Rail"`      
 | sigma             | float                             | 0.5                                                                 | [Car-following model](#car-following_models) parameter, see below                                                                                          |
 | tau               | float                             | 1.0                                                                 | [Car-following model](#car-following_models) parameter, see below                                                                                          |
 | length            | float                             | 5.0                                                                 | The vehicle's **netto**-length (length) (in m)                                                                                                                                                                         |
@@ -653,7 +653,7 @@
 | bicycle        | 16                     |                                                                                                                                                                   |
 | evehicle       | 17                     | future mobility concepts such as electric vehicles which may get special access rights                                                                            |
 | tram           | 18                     |                                                                                                                                                                   |
-| rail_urban    | 19                     | heavier than 'tram' but distinct from 'rail'. Encompasses [Light Rail](http://en.wikipedia.org/wiki/Light_Rail) and [S-Bahn](http://en.wikipedia.org/wiki/S-Bahn) |
+| rail_urban    | 19                     | heavier than 'tram' but distinct from 'rail'. Encompasses [Light Rail](https://en.wikipedia.org/wiki/Light_Rail) and [S-Bahn](https://en.wikipedia.org/wiki/S-Bahn) |
 | rail           | 20                     | heavy rail                                                                                                                                                        |
 | rail_electric | 21                     | heavy rail vehicle that may only drive on electrified tracks                                                                                                      |
 | rail_fast     | 22                     | [High-speed-rail](https://en.wikipedia.org/wiki/High-speed_rail)                                                                                                  |
@@ -776,7 +776,7 @@
 | carFollowing-KraussAB       | KraussAB                                        | the default Krauss model with bounded acceleration (only relevant when using PHEM classes)   |
 | carFollowing-SmartSK        | SmartSK                                         | Variant of the default Krauss model

**Caution:** lacking documentation                |
 | carFollowing-Wiedemann      | Wiedemann                                       | Car following model by Wiedemann (2-Parameters)                                              |
-| carFollowing-W99            | W99                                             | Car following model by Wiedemann, [10-Parameter version](http://w99demo.com/)                |
+| carFollowing-W99            | W99                                             | Car following model by Wiedemann, [10-Parameter version](https://w99demo.com/)                |
 | carFollowing-Daniel1        | Daniel1                                         | Car following model by Daniel Krajzewicz

**Caution:** lacking documentation           |
 | carFollowing-ACC            | ACC                                             | [Car following model by Milanés V. and Shladover S.E.](Car-Following-Models/ACC.md)  |
 | carFollowing-CACC           | CACC                                            | [Car following model by Milanés V. and Shladover S.E.](Car-Following-Models/CACC.md) |
@@ -793,7 +793,7 @@
 | accel                        | [vClass-specific](Vehicle_Type_Parameter_Defaults.md) | >= 0     | The acceleration ability of vehicles of this type (in m/s^2)                                    | all models |
 | decel                        | [vClass-specific](Vehicle_Type_Parameter_Defaults.md) | >= 0     | The deceleration ability of vehicles of this type (in m/s^2)                                    | all models |
 | emergencyDecel               | [vClass-specific](Vehicle_Type_Parameter_Defaults.md) | >= decel | The maximum deceleration ability of vehicles of this type in case of emergency (in m/s^2)       | all models except "Daniel1" |
-| startupDelay                 | 0 | >=0  | The extra delay time before starting to drive after having had to stop      | all models except "Daniel1" |
+| startupDelay                 | 0 | >=0  | The extra delay time before starting to drive after having had to stop. This is not applied after a scheduled `` except for `carFollowModel="Rail"`      | all models except "Daniel1" |
 | sigma                        | 0.5                                                   | [0,1]    | The driver imperfection (0 denotes perfect driving)                                             | Krauss, SKOrig, PW2009 |
 | sigmaStep                    | step-length                                           | > 0      | The frequence for updating the acceleration associated with driver imperfection. If set to a constant value (i.e *1*), this decouples the driving imperfection from the simulation step-length                                             | Krauss, SKOrig, PW2009 |
 | tau                          | 1                                                     | >= 0     | The driver's desired (minimum) time headway. Exact interpretation varies by model. For the default model *Krauss* this is based on the net space between leader back and follower front). For limitations, see [Car-Following-Models\#tau](Car-Following-Models.md#tau)). | all models                                        |
@@ -855,7 +855,7 @@
 ### Default *Krauss* Model Description
 
 The default model is a modification of the model defined by Stefan Krauß
-in [Microscopic Modeling of Traffic Flow: Investigation of Collision Free Vehicle Dynamics](http://sumo.dlr.de/pdf/KraussDiss.pdf). The
+in [Microscopic Modeling of Traffic Flow: Investigation of Collision Free Vehicle Dynamics](https://sumo.dlr.de/pdf/KraussDiss.pdf). The
 implemented model follows the same idea as that of Krauß, namely: Let
 vehicles drive as fast as possibly while maintaining perfect safety
 (always being able to avoid a collision if the leader starts braking
@@ -872,6 +872,29 @@
   collisions when using *Ballistic*. See also
   [Simulation/Basic_Definition\#Defining_the_Integration_Method](Simulation/Basic_Definition.md#defining_the_integration_method).
 
+### Transient carFollowModel Parameters
+
+carFollowModel parameters that are expected to change during the simulation are modelled via [generic parameters](https://sumo.dlr.de/docs/Simulation/GenericParameters.md). The following parameters are supported (via xml input and `traci.vehicle.setParameter`):
+
+- carFollowModel.ignoreIDs : ignore foe vehicles with the given ids
+- carFollowModel.ignoreTypes : ignore foe vehicles that have any of the given types
+
+If multiple ignore parameters are set, they are combined with "or".
+Foes are ignored while they are being followed.
+Example:
+
+```xml
+
+   
+   
+
+```
+
+!!! note
+    These parameters take no effect in [meso] (Simulation/Meso.md)
+    
+See also [transient junctionModel parameters](#transient_parameters).
+
 ## Lane-Changing Models
 
 The lane-changing models currently implemented in SUMO are given in the
@@ -879,9 +902,9 @@
 
 | Attribute Value | Description                                                                                              |
 | --------------- | -------------------------------------------------------------------------------------------------------- |
-| LC2013          | The default car following model, developed by Jakob Erdmann based on DK2008 (see [SUMO’s Lane-Changing Model](http://elib.dlr.de/102254/)). This is the default model.    |
+| LC2013          | The default car following model, developed by Jakob Erdmann based on DK2008 (see [SUMO’s Lane-Changing Model](https://elib.dlr.de/102254/)). This is the default model.    |
 | SL2015          | Lane-changing model for [sublane-simulation](Simulation/SublaneModel.md) (used by default when setting option **--lateral-resolution** {{DT_FLOAT}}). This model can only be used with the sublane-extension.

**Caution:** This model may technically be used without activating sublane-simulation but this usage has not been fully tested and may not work as expected.  |
-| DK2008          | The original lane-changing model of sumo until version 0.18.0, developed by Daniel Krajzewicz (see [Traffic Simulation with SUMO – Simulation of Urban Mobility](http://link.springer.com/chapter/10.1007/978-1-4419-6142-6_7)). |
+| DK2008          | The original lane-changing model of sumo until version 0.18.0, developed by Daniel Krajzewicz (see [Traffic Simulation with SUMO – Simulation of Urban Mobility](https://link.springer.com/chapter/10.1007/978-1-4419-6142-6_7)). |
 
 
 Mostly, each model uses its own set of parameters. The following table
@@ -1144,6 +1167,8 @@
 | posLat             | float            |  | - | lateral offset while stopped |
 | onDemand           | bool             |  | false | whether stopping may be skipped if no person wants to embark or disembark there |
 | jump           | float(s) or HH:MM:SS |  | -1 | when set to a non-negative value, jump to the next *mandatory* route edge (next stop or arrival edge) and spend the given time for the *jump* |
+| split          | string |  | vehicle id | must be set to the id of a vehicle with `depart="split"`. [Splits the train](Simulation/Railways.md#splitting_a_train) upon reaching the stop. |
+| join           | string |  | vehicle id | must be set to the id of a vehicle that stops with `triggered="join"`. [Joins this train to another](Simulation/Railways.md#joining_two_trains) upn reaching the stop |
 
 - If "duration" *and* "until" are given, the vehicle will stop for at least "duration" seconds.
 - If "duration" is 0 the vehicle will decelerate to reach velocity 0 and then start to accelerate again.
@@ -1196,6 +1221,18 @@
 !!! caution
     The next stop must be on a different edge that that on which the jump started or the next stop will be skipped.
 
+## User defined Parameters
+
+Stops support [Generic Parameters](Simulation/GenericParameters.md). These may also be retrieved and modified via [TraCI](TraCI/Vehicle_Value_Retrieval.md)
+
+```xml
+
+  
+      
+  
+
+```
+
 # Colors
 
 A color is defined as *red,green,blue* or *red,green,blue,alpha* either
@@ -1262,7 +1299,7 @@
 setting the option **--device..probability** (e.g. `--device.fcd.probability 0.25`. This will equip
 about a quarter of the vehicles with an fcd device (each vehicle
 determines this randomly with 25% probability).) To make the assignment
-exact the additional option **--device..deterministic** can be set Another option is to pass the
+exact the additional option **--device..deterministic** can be set. Another option is to pass the
 list of vehicle ids that shall be equipped using the option **--device..explicit **.
 
 !!! note
diff -Nru sumo-1.17.0/docs/web/docs/Demand/Activity-based_Demand_Generation.md sumo-1.18.0/docs/web/docs/Demand/Activity-based_Demand_Generation.md
--- sumo-1.17.0/docs/web/docs/Demand/Activity-based_Demand_Generation.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Demand/Activity-based_Demand_Generation.md	2023-06-28 20:02:17.000000000 +0000
@@ -619,7 +619,7 @@
 
 ActivityGen was developed as a tool for the evaluation of trust
 scenarios in VANETs. The work was part of the project [Fidens: Trust
-between Cooperative Systems](https://web.archive.org/web/20120313075112/http://www.ldv.ei.tum.de/en/research/fidens/) featuring
+between Cooperative Systems](https://web.archive.org/web/20120313075112/https://www.ldv.ei.tum.de/en/research/fidens/) featuring
 trusted probabilistic knowledge processing in vehicular networks. For
 further documentation on the internals of the model, refer to the source
 code in [{{SUMO}}/src/activitygen]({{Source}}src/activitygen) or ask the [original
diff -Nru sumo-1.17.0/docs/web/docs/Demand/Automatic_Routing.md sumo-1.18.0/docs/web/docs/Demand/Automatic_Routing.md
--- sumo-1.17.0/docs/web/docs/Demand/Automatic_Routing.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Demand/Automatic_Routing.md	2023-06-28 20:02:17.000000000 +0000
@@ -115,6 +115,15 @@
 rerouting device is via [generic
 parameters](../Definition_of_Vehicles,_Vehicle_Types,_and_Routes.md#devices).
 
+The following parameters are supported as child elements of a ``, ``, `` or ``:
+
+- device.rerouting.period
+- device.rerouting.pre-period
+- device.rerouting.proability
+- device.rerouting.deterministic
+- has.rerouting.device
+
+
 # TraCI
 
 The device can be accessed using the TraCI function
diff -Nru sumo-1.17.0/docs/web/docs/Demand/Dynamic_User_Assignment.md sumo-1.18.0/docs/web/docs/Demand/Dynamic_User_Assignment.md
--- sumo-1.17.0/docs/web/docs/Demand/Dynamic_User_Assignment.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Demand/Dynamic_User_Assignment.md	2023-06-28 20:02:17.000000000 +0000
@@ -63,9 +63,18 @@
 if none of the present routes is the "cheapest") and may be chosen
 according to the route choice mechanisms described below.
 
+## Alternative Route Selection
+
 Between successive calls of duarouter, the *.rou.alt.xml* format is used
 to record not only the current *best* route but also previously computed
-alternative routes. These routes are collected within a route
+alternative routes. By default the fasted route is considered the *best* but this criterion may be changed with option **--eco-measure** to instead minimize a pollutant (i.e. *CO2*).
+
+This way, a new alternative route may be added in each iteration.
+The total number of alternatives is limited to 5 and the limit may be changed with option **--max-alternatives**.
+In each iteration, the route usage probability is calculated for each route (see below). 
+When the number of routes for a vehicle is larger than the defined amount, the route with smallest probability is removed.
+
+These best routes are collected within a route
 distribution and used when deciding the actual route to drive in the
 next simulation step. This isn't always the one with the currently
 lowest cost but is rather sampled from the distribution of alternative
@@ -79,9 +88,9 @@
 The input for each of the methods is a weight or cost function \(w\) on
 the edges of the net, coming from the simulation or default costs (in
 the first step or for edges which have not been traveled yet), and a set
-of routes  where each route  has an old cost  and an
-old probability  (from the last iteration) and needs a new cost
- and a new probability .
+of routes  where each route  has an old cost  and an
+old probability  (from the last iteration) and needs a new cost
+ and a new probability .
 
 ### Gawron (default)
 
@@ -93,10 +102,6 @@
 - the sum of edge travel times for a set of alternative routes
 - the previous probability of choosing a route
 
-#### Number of Routes in each traveller's route set
-
-The maximum number of routes can be defined by users, where 5 is the default value. In each iteration, the route usage probability is calculated for each route. When the number of routes is larger than the defined amount, routes with smallest probabilities are removed.
-
 #### Updates of Travel Time
 
 The update rule is explained with the following example. Driver d chooses Route r in Iteration i. The travel time Tau_d(r, i+1) is calculated according to the aggregated and averaged link travel times per defined interval (default: 900 s) in Iteration i. The travel time for Driver d's Route r in Iteration i+1 equals to Tau_d(r, i) as indicated in Formula (1). The travel times of the other routes in Driver d's route set are then updated with Formula (2) respectively, where Tau_d(s, i) is the travel time needed to travel on Route s in Iteration i and calculated with the same way used for calculating Tau_d(r, i) an T_d(s, i-1). The parameter beta is to prevent travellers from strongly "remembering" the latest trave time of each route in their route sets. The current default value for beta is 0.3.
@@ -116,12 +121,12 @@
 takes the route cost directly as the sum of the edge costs from the last
 simulation.
 
-
+
 
 The probabilities are calculated from an exponential function with
-parameter  scaled by the sum over all route values:
+parameter  scaled by the sum over all route values:
 
-
+
 
 !!! caution
     It is recommended to set option **--convergence-steps** (i.e. to the same number as **-last-step**) to ensure convergence. Otherwise Logit route choice may keep oscillating, especially with higher values of **--logittheta**.
@@ -182,6 +187,29 @@
 prevent duplicate definition of vehicle types in the generated output
 files.
 
+
+# Iterative Assignment (Approximating System Optimum)
+
+The system optimal condition can be achieved by replacing the path travel time with the path marginal travel time (MTT). There are two ways to calculate the path MTT: 1) global approximation, which represents the changes in the total system travel time caused by an additional vehicle that is added to the path at a certain time interval, and 2) local approximation, which represents the changes in the path travel time caused by an additional vehicle that is added to the route at a certain time interval. duaIterate.py supports an approach where the path MTT is approximated as a summation of the corresponding link MTTs. bBcause the global approximation of MTT is computationally expensive and is not practical for large-scale DTA, the tool implements the local approximation of MTT. 
+
+Given that SUMO provides the average travel time of each link, it is not possible to directly calculate the additional travel time that one vehicle inflicts on the link. An alternative approach to compute the link MTT is to calculate the average travel time in successive iterations (with a different number of vehicles assigned to each link in each iteration) and compute the difference in link average travel time. Using this method, the average inflicted additional travel time on the link can be calculated. Therefore, a surrogate model of MTT is used to achieve SO as follows:
+
+![grafik](https://github.com/eclipse/sumo/assets/6240630/f539a81c-8f5a-4bb5-afe4-bfd0c17866fe)
+
+where ![grafik](https://github.com/eclipse/sumo/assets/6240630/c8927274-d95f-4247-a973-7a2bed921b65)
+ is the surrogate MTT of link *a* at simulation step *i*;  ![grafik](https://github.com/eclipse/sumo/assets/6240630/1de5b8e7-66a3-4256-bf28-ddd484f2803e)
+ and  ![grafik](https://github.com/eclipse/sumo/assets/6240630/6eb312f7-ea13-4246-a30b-5517511397f7)
+ are, respectively, the travel time (cost) of link *a* at simulation steps *i-1* and *i-2* ; and ![grafik](https://github.com/eclipse/sumo/assets/6240630/b5e4ade9-6e19-40b1-9d14-c69063a853cd)
+ and ![grafik](https://github.com/eclipse/sumo/assets/6240630/4f0dd98f-4ad4-4d3a-b0f3-4f181be25feb) are, respectively, the traffic flow of link *a* at simulation steps *i-1* and *i-2*. 
+ 
+The Dynamic System Optimal traffic assignment can be activated by setting optons **--marginal-cost, --marginal-cost.exp**, in duaIterate.py. As the MTTs in the proposed algorithm are calculated based on a local approximation, it may lead to its overestimation. Therefore, it is recommended to use the second term of the MTT equation for calibration (option **--marginal-cost.exp**)
+For more information about dynamic system optimal modelling in SUMO please refer to https://doi.org/10.52825/scp.v3i.119. 
+
+# Iterative Assignment (Mixing DUE and SO)
+
+If traffic consists of a mix of human driven vehicles and computed controlled vehicles one migh assume that the former follow an "egoistic" routing approach (DUE) whereas the latter may be configured to route according to system optimum considerations. 
+The tool [duaIterateMix.py](../Tools/Assign.md#duaiteratemixpy) can be used to compute the Multiclass Simulation-based Traffic Assignment Problem for Mixed traffic flow. This problem involves a dynamic Traffic Assignment Problem with two vehicle classes: one class follows the System Optimum (SO) principle, while the other class follows the User Equilibrium (UE) principles. The objective is to achieve a multiclass traffic assignment where the travel time for UE-seeking vehicles and the marginal travel time for SO-seeking vehicles between the same origin-destination (OD) pair are equal and minimized. For detailed information on solving the multiclass traffic assignment problem using SUMO, please refer to the following link: https://doi.org/10.48550/arXiv.2301.11083 
+
 # oneShot-assignment
 
 An alternative to the iterative user assignment above is incremental
diff -Nru sumo-1.17.0/docs/web/docs/Demand/Importing_O/D_Matrices.md sumo-1.18.0/docs/web/docs/Demand/Importing_O/D_Matrices.md
--- sumo-1.17.0/docs/web/docs/Demand/Importing_O/D_Matrices.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Demand/Importing_O/D_Matrices.md	2023-06-28 20:02:17.000000000 +0000
@@ -143,7 +143,7 @@
 every a given vehicle type as follows:
 
 ```xml
-
+
     
       
       
@@ -273,7 +273,7 @@
 every vehicle type as follows:
 
 ```xml
-
+
    
        
            
diff -Nru sumo-1.17.0/docs/web/docs/Demand/Random_Routes.md sumo-1.18.0/docs/web/docs/Demand/Random_Routes.md
--- sumo-1.17.0/docs/web/docs/Demand/Random_Routes.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Demand/Random_Routes.md	2023-06-28 20:02:17.000000000 +0000
@@ -13,5 +13,5 @@
 # See Also
 
 - [randomTrips.py](../Tools/Trip.md#randomtripspy) script for random routes generation
-- "bug" [random routes only created for timestep 1](http://sourceforge.net/tracker/?func=detail&aid=1914360&group_id=45607&atid=443421)
-- "bug" [About Generating random Routes](http://sourceforge.net/tracker/?func=detail&aid=2746763&group_id=45607&atid=443421)
\ No newline at end of file
+- "bug" [random routes only created for timestep 1](https://sourceforge.net/tracker/?func=detail&aid=1914360&group_id=45607&atid=443421)
+- "bug" [About Generating random Routes](https://sourceforge.net/tracker/?func=detail&aid=2746763&group_id=45607&atid=443421)
\ No newline at end of file
diff -Nru sumo-1.17.0/docs/web/docs/Demand/Routing_by_Turn_Probabilities.md sumo-1.18.0/docs/web/docs/Demand/Routing_by_Turn_Probabilities.md
--- sumo-1.17.0/docs/web/docs/Demand/Routing_by_Turn_Probabilities.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Demand/Routing_by_Turn_Probabilities.md	2023-06-28 20:02:17.000000000 +0000
@@ -29,7 +29,7 @@
 | Type of content    | turn and sink definitions |
 | Open format?       | Yes                       |
 | SUMO specific?     | Yes                       |
-| XML Schema         | [edgerelations_file.xsd](http://sumo.dlr.de/xsd/edgerelations_file.xsd)           |
+| XML Schema         | [edgerelations_file.xsd](https://sumo.dlr.de/xsd/edgerelations_file.xsd)           |
 
 To describe the turn definitions, one has to write an XML file. Within
 this file, for each interval and each edge the list of percentages to
diff -Nru sumo-1.17.0/docs/web/docs/Developer/CodeStyle.md sumo-1.18.0/docs/web/docs/Developer/CodeStyle.md
--- sumo-1.17.0/docs/web/docs/Developer/CodeStyle.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Developer/CodeStyle.md	2023-06-28 20:02:17.000000000 +0000
@@ -9,7 +9,7 @@
 macOS and Linux](https://github.com/eclipse/sumo/actions), and [Visual
 Studio 2015 - 2022 on
 Windows](https://ci.appveyor.com/project/eclipsewebmaster/sumo). For the
-C++ code we use [AStyle](http://astyle.sourceforge.net/) to keep
+C++ code we use [AStyle](https://astyle.sourceforge.net/) to keep
 indentation and other whitespace usage consistent throughout the
 project. In order to make your code appear same as the original SUMO
 code use the following call to AStyle (or execute
@@ -100,7 +100,7 @@
 ## Throw-declarations
 
 - We are not using throw-declarations, see:
-   (thanks to Björn
+   (thanks to Björn
   Hendriks); we'll remove the existing ones subsequently.
 
 ## Object Handling
@@ -139,7 +139,7 @@
 # Python Code
 
 We try to adhere to the [PEP 8 Style
-Guide](http://www.python.org/dev/peps/pep-0008/) and use
+Guide](https://www.python.org/dev/peps/pep-0008/) and use
 [autopep8](https://github.com/hhatto/autopep8) and
 [flake8](https://github.com/PyCQA/flake8) to check this. If you have
 both modules installed, you can run [tools/build/checkStyle.py
@@ -193,7 +193,7 @@
 
 For further information about possible error sources and difficulties
 resulting in Python 3 compatibility see also
- and
+ and
 
 
 ## Template
diff -Nru sumo-1.17.0/docs/web/docs/Developer/CppFileTemplate.md sumo-1.18.0/docs/web/docs/Developer/CppFileTemplate.md
--- sumo-1.17.0/docs/web/docs/Developer/CppFileTemplate.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Developer/CppFileTemplate.md	2023-06-28 20:02:17.000000000 +0000
@@ -4,7 +4,7 @@
 
 ```cpp
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see 
+// Eclipse SUMO, Simulation of Urban MObility; see 
 // Copyright (C) - German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/docs/web/docs/Developer/Docker.md sumo-1.18.0/docs/web/docs/Developer/Docker.md
--- sumo-1.17.0/docs/web/docs/Developer/Docker.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Developer/Docker.md	2023-06-28 20:02:17.000000000 +0000
@@ -36,7 +36,7 @@
 [hybrid_sumo_jps](https://hub.docker.com/r/grgrlmml/hybrid_sumo_jps/)
 project aims on providing an easy to use docker image for running a
 hybrid simulation that couples SUMO with
-[JuPedSim](http://www.jupedsim.org). SUMO is a mighty simulator for all
+[JuPedSim](https://www.jupedsim.org). SUMO is a mighty simulator for all
 kinds of transport problems that focuses mainly on motorized traffic.
 While SUMO also provides a pedestrian model for simulating pedestrians
 on sidewalks, crossings or the like, it lacks of the capability to model
diff -Nru sumo-1.17.0/docs/web/docs/Developer/ExploringTheStructure.md sumo-1.18.0/docs/web/docs/Developer/ExploringTheStructure.md
--- sumo-1.17.0/docs/web/docs/Developer/ExploringTheStructure.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Developer/ExploringTheStructure.md	2023-06-28 20:02:17.000000000 +0000
@@ -4,9 +4,9 @@
 
 # Introduction
 
-Each night a documentation of the C++ source code is generated with the tool [Doxygen](http://www.doxygen.nl/).
+Each night a documentation of the C++ source code is generated with the tool [Doxygen](https://www.doxygen.nl/).
 The result is accessible via [inline code documentation
-  (doxygen)](http://sumo.dlr.de/daily/doxygen/).
+  (doxygen)](https://sumo.dlr.de/daily/doxygen/).
 
 # Looking for a class by name
 
diff -Nru sumo-1.17.0/docs/web/docs/Developer/HFileTemplate.md sumo-1.18.0/docs/web/docs/Developer/HFileTemplate.md
--- sumo-1.17.0/docs/web/docs/Developer/HFileTemplate.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Developer/HFileTemplate.md	2023-06-28 20:02:17.000000000 +0000
@@ -4,7 +4,7 @@
 
 ```cpp
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see 
+// Eclipse SUMO, Simulation of Urban MObility; see 
 // Copyright (C) - German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/docs/web/docs/Developer/HowToRelease.md sumo-1.18.0/docs/web/docs/Developer/HowToRelease.md
--- sumo-1.17.0/docs/web/docs/Developer/HowToRelease.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Developer/HowToRelease.md	2023-06-28 20:02:17.000000000 +0000
@@ -127,8 +127,8 @@
 - make a new folder in S:\Releases
 - make new sumo.dlr.de-release
   - copy the folder from S:\Releases to the releases dir `scp -r /media/S/Releases/x.y.z delphi@ts-sim-front-ba.intra.dlr.de:docs/releases`
-- update the eclipse.org/sumo website
-  - modify the version number (Version) [in config.yaml](https://github.com/eclipse/sumo.website/blob/source/config/_default/config.yaml) in the **Default Parameters** section at the beginning
+- update the eclipse.dev/sumo website
+  - modify the version number (Version) [in config.yaml](https://github.com/eclipse/sumo.website/blob/main/src/config/_default/config.yaml) in the **Default Parameters** section at the beginning
 - make new sourceforge-release
   - make a new release within the sumo package (named "version x.y.z")
   - add files to the release
diff -Nru sumo-1.17.0/docs/web/docs/Developer/index.md sumo-1.18.0/docs/web/docs/Developer/index.md
--- sumo-1.17.0/docs/web/docs/Developer/index.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Developer/index.md	2023-06-28 20:02:17.000000000 +0000
@@ -11,7 +11,7 @@
 - [Developer/GUI Testing](GUI_Testing.md) - information about how to set up "interactive" GUI Tests with PyAutoGUI
 - [Developer/Debugging](Debugging.md) - information about debugging SUMO
 - [Developer/Exploring the structure](ExploringTheStructure.md) - explore the structure of SUMO with the doxygen documentation
-- [Inline code documentation (doxygen)](http://sumo.dlr.de/daily/doxygen/)
+- [Inline code documentation (doxygen)](https://sumo.dlr.de/daily/doxygen/)
 - [Developer/Used Tools](Used_Tools.md) - tools used for developing SUMO
 - [Developer/Managing Publications](Managing_Publications.md) - how to work with the publications bibtex-file
 - [Developer/FMI](FMI.md) - information about the current state of the FMI 2.0 support in SUMO
diff -Nru sumo-1.17.0/docs/web/docs/Developer/Managing_Publications.md sumo-1.18.0/docs/web/docs/Developer/Managing_Publications.md
--- sumo-1.17.0/docs/web/docs/Developer/Managing_Publications.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Developer/Managing_Publications.md	2023-06-28 20:02:17.000000000 +0000
@@ -3,7 +3,7 @@
 ---
 
 Publications are stored in an extended
-[bibtex-file](http://sourceforge.net/apps/trac/sumo/browser/trunk/sumo/docs/sumo.bib)
+[bibtex-file](https://sourceforge.net/apps/trac/sumo/browser/trunk/sumo/docs/sumo.bib)
 generated using [JabRef](https://www.jabref.org/).
 
 # Organising
diff -Nru sumo-1.17.0/docs/web/docs/Developer/PythonFileTemplate.md sumo-1.18.0/docs/web/docs/Developer/PythonFileTemplate.md
--- sumo-1.17.0/docs/web/docs/Developer/PythonFileTemplate.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Developer/PythonFileTemplate.md	2023-06-28 20:02:17.000000000 +0000
@@ -5,7 +5,7 @@
 ```py
 #!/usr/bin/env python # Leave this one out for non executable python files
 # -*- coding: utf-8 -*- # optional encoding line, use if non-ASCII characters are in the code
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) - German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/docs/web/docs/Developer/Tests.md sumo-1.18.0/docs/web/docs/Developer/Tests.md
--- sumo-1.17.0/docs/web/docs/Developer/Tests.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Developer/Tests.md	2023-06-28 20:02:17.000000000 +0000
@@ -4,7 +4,7 @@
 
 # Introduction
 
-We use [TextTest](http://texttest.org/) to test whether the software
+We use [TextTest](https://texttest.org/) to test whether the software
 still behaves as expected. TextTest compares an application's file
 output, including the output to stdout and stderr with predefined
 outputs from files.
@@ -22,7 +22,7 @@
 
 # Setup
 
-We use [TextTest](http://texttest.org/) 4.x as our testing environment which
+We use [TextTest](https://texttest.org/) 4.x as our testing environment which
 is Python based and currently available for Python 3. To install
 it on Linux / MacOS, you can open a terminal and type:
 
@@ -37,7 +37,7 @@
 
 It might not pull in all the dependencies, so in some cases you need
 to follow the [TextTest installation
-instructions](http://texttest.sourceforge.net/index.php?page=documentation_trunk&n=install_texttest)
+instructions](https://texttest.sourceforge.net/index.php?page=documentation_trunk&n=install_texttest)
 and the additional info there.
 
 For MacOS the following command should install all dependencies:
@@ -72,7 +72,7 @@
 # Running the Tests
 
 Within the  `{{SUMO}}/tests` folder you can find batch files for Windows and shell files for Linux & macOS which start
-[TextTest](http://texttest.org/) with our test suites. `runAllTests.bat` (Windows) or `runTests.sh` (Linux, macOS)
+[TextTest](https://texttest.org/) with our test suites. `runAllTests.bat` (Windows) or `runTests.sh` (Linux, macOS)
 starts TextTest for testing all applications located in the folder,
 `runNetconvertTests.bat` (Windows) will only show tests for netconvert,
 `runDuarouterTests.bat`(Windows) only those for duarouter etc. For Linux and macOS you can do this via the
@@ -126,7 +126,7 @@
 - build a configuration file; its name is "config", the extension is
   the application's to test name, so in our case it's
   **config.polyconvert**. Please consult
-  [TextTest](http://texttest.org/) documentation about the content,
+  [TextTest](https://texttest.org/) documentation about the content,
   nonetheless, here are some notes
   - do not forget the import of the main config file (config_all)
   - name the binary correct
diff -Nru sumo-1.17.0/docs/web/docs/Developer/Used_Tools.md sumo-1.18.0/docs/web/docs/Developer/Used_Tools.md
--- sumo-1.17.0/docs/web/docs/Developer/Used_Tools.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Developer/Used_Tools.md	2023-06-28 20:02:17.000000000 +0000
@@ -2,7 +2,7 @@
 title: Used Tools
 ---
 
-- [TextTest](http://texttest.sourceforge.net/) An acceptance test framework.
-- [UMLet](http://www.umlet.com/) Free UML diagrams drawing tool.
-- [Doxygen](http://www.doxygen.nl/) A class documentation utility.
+- [TextTest](https://texttest.sourceforge.net/) An acceptance test framework.
+- [UMLet](https://www.umlet.com/) Free UML diagrams drawing tool.
+- [Doxygen](https://www.doxygen.nl/) A class documentation utility.
 - [gtest (googletest)](https://github.com/google/googletest) A unit-test framework.
\ No newline at end of file
diff -Nru sumo-1.17.0/docs/web/docs/Developer/XML_Validation.md sumo-1.18.0/docs/web/docs/Developer/XML_Validation.md
--- sumo-1.17.0/docs/web/docs/Developer/XML_Validation.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Developer/XML_Validation.md	2023-06-28 20:02:17.000000000 +0000
@@ -41,11 +41,11 @@
 files which are using Python. It seems as two are majorly used:
 
 - [lxml](https://lxml.de/validation.html)
-- [XSV](http://www.ltg.ed.ac.uk/~ht/xsv-status.html)
+- [XSV](https://www.ltg.ed.ac.uk/~ht/xsv-status.html)
 
 further candidates:
 
-- [xmlproc](http://www.garshol.priv.no/download/software/xmlproc/)
+- [xmlproc](https://www.garshol.priv.no/download/software/xmlproc/)
 - [minixsv](https://pypi.org/project/minixsv/)
 
 A short comparison:
diff -Nru sumo-1.17.0/docs/web/docs/dfrouter.md sumo-1.18.0/docs/web/docs/dfrouter.md
--- sumo-1.17.0/docs/web/docs/dfrouter.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/dfrouter.md	2023-06-28 20:02:17.000000000 +0000
@@ -32,7 +32,7 @@
 
 You may use a XML schema definition file for setting up a dfrouter
 configuration:
-[dfrouterConfiguration.xsd](http://sumo.dlr.de/xsd/dfrouterConfiguration.xsd).
+[dfrouterConfiguration.xsd](https://sumo.dlr.de/xsd/dfrouterConfiguration.xsd).
 
 ### Configuration
 
diff -Nru sumo-1.17.0/docs/web/docs/DiplomStudArb.md sumo-1.18.0/docs/web/docs/DiplomStudArb.md
--- sumo-1.17.0/docs/web/docs/DiplomStudArb.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/DiplomStudArb.md	2023-06-28 20:02:17.000000000 +0000
@@ -12,7 +12,7 @@
 Die meisten der folgenden Themen lassen sich sowohl im Rahmen einer
 Master- oder Diplomarbeit als auch in reduziertem Umfang in einer
 Studien- oder Bachelorarbeit behandeln. Alle stehen mehr oder weniger
-direkt im Zusammenhang mit [SUMO](http://sumo.dlr.de/).
+direkt im Zusammenhang mit [SUMO](https://sumo.dlr.de/).
 
 Alle Themen sind ausdrücklich nur als Vorschläge gedacht. Falls jemand
 nach Kennenlernen der Software und der Anwendungsgebiete eigene
diff -Nru sumo-1.17.0/docs/web/docs/Downloads.md sumo-1.18.0/docs/web/docs/Downloads.md
--- sumo-1.17.0/docs/web/docs/Downloads.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Downloads.md	2023-06-28 20:02:17.000000000 +0000
@@ -59,17 +59,16 @@
 At the moment there is no documentation included in the packages. The
 repositories include a nightly build as well (called ***sumo-git***).
 
-- [openSUSE Leap 15.2 repository](http://download.opensuse.org/repositories/science:/dlr/openSUSE_Leap_15.2/)
-- [openSUSE Leap 15.3 repository](http://download.opensuse.org/repositories/science:/dlr/15.3/)
-- [openSUSE Leap 15.4 repository](http://download.opensuse.org/repositories/science:/dlr/15.4/)
-- [openSUSE Tumbleweed repository](http://download.opensuse.org/repositories/science:/dlr/openSUSE_Tumbleweed/)
-- [Fedora 34 repository](http://download.opensuse.org/repositories/science:/dlr/Fedora_34/)
-- [Fedora 35 repository](http://download.opensuse.org/repositories/science:/dlr/Fedora_35/)
-- [Fedora 36 repository](http://download.opensuse.org/repositories/science:/dlr/Fedora_36/)
-- [Fedora 37 repository](http://download.opensuse.org/repositories/science:/dlr/Fedora_37/)
-- [Fedora Rawhide repository](http://download.opensuse.org/repositories/science:/dlr/Fedora_Rawhide/)
-- [CentOS 7 repository](http://download.opensuse.org/repositories/science:/dlr/CentOS_7/)
-- [CentOS 8 repository](http://download.opensuse.org/repositories/science:/dlr/CentOS_8/)
+- [openSUSE Leap 15.2 repository](https://download.opensuse.org/repositories/science:/dlr/openSUSE_Leap_15.2/)
+- [openSUSE Leap 15.3 repository](https://download.opensuse.org/repositories/science:/dlr/15.3/)
+- [openSUSE Leap 15.4 repository](https://download.opensuse.org/repositories/science:/dlr/15.4/)
+- [openSUSE Tumbleweed repository](https://download.opensuse.org/repositories/science:/dlr/openSUSE_Tumbleweed/)
+- [Fedora 36 repository](https://download.opensuse.org/repositories/science:/dlr/Fedora_36/)
+- [Fedora 37 repository](https://download.opensuse.org/repositories/science:/dlr/Fedora_37/)
+- [Fedora 38 repository](https://download.opensuse.org/repositories/science:/dlr/Fedora_38/)
+- [Fedora Rawhide repository](https://download.opensuse.org/repositories/science:/dlr/Fedora_Rawhide/)
+- [CentOS 7 repository](https://download.opensuse.org/repositories/science:/dlr/CentOS_7/)
+- [CentOS 8 repository](https://download.opensuse.org/repositories/science:/dlr/CentOS_8/)
 
 ### Examples
 
@@ -81,7 +80,7 @@
 ```
 and like this, for zypper on openSUSE Leap 15.3:
 ```
-zypper ar http://download.opensuse.org/repositories/science:/dlr/15.3/ science:dlr
+zypper ar https://download.opensuse.org/repositories/science:/dlr/15.3/ science:dlr
 zypper in sumo={{Version}}
 ```
 I you leave out the version number it will install the latest nightly build.
diff -Nru sumo-1.17.0/docs/web/docs/duarouter.md sumo-1.18.0/docs/web/docs/duarouter.md
--- sumo-1.17.0/docs/web/docs/duarouter.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/duarouter.md	2023-06-28 20:02:17.000000000 +0000
@@ -57,7 +57,7 @@
 
 You may use a XML schema definition file for setting up a duarouter
 configuration:
-[duarouterConfiguration.xsd](http://sumo.dlr.de/xsd/duarouterConfiguration.xsd).
+[duarouterConfiguration.xsd](https://sumo.dlr.de/xsd/duarouterConfiguration.xsd).
 
 ### Configuration
 
diff -Nru sumo-1.17.0/docs/web/docs/Editing_Articles.md sumo-1.18.0/docs/web/docs/Editing_Articles.md
--- sumo-1.17.0/docs/web/docs/Editing_Articles.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Editing_Articles.md	2023-06-28 20:02:17.000000000 +0000
@@ -177,24 +177,24 @@
 In order to insert Mathematical expressions (symbols or equations), you should write them in [LaTeX format](https://en.wikibooks.org/wiki/LaTeX/Mathematics). Math elements are being displayed as images, using a html `` element.
 Just replace `` with your math expression in the following html element:
 
-``
+``
 
 
 ## Example
 ```
-
+
 ```
 ***will display:***
 
-
+
 
 
 ```
-
+
 ```
 ***will display:***
 
-
+
 
 
 
diff -Nru sumo-1.17.0/docs/web/docs/FAQ.md sumo-1.18.0/docs/web/docs/FAQ.md
--- sumo-1.17.0/docs/web/docs/FAQ.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/FAQ.md	2023-06-28 20:02:17.000000000 +0000
@@ -53,7 +53,7 @@
 - Report bugs (crashes, surprising behavior) or invalid documentation
   at [sumo-user](https://accounts.eclipse.org/mailing-list/sumo-user)
   or at 
-- The main development team at the [DLR](http://sumo.dlr.de) is always
+- The main development team at the [DLR](https://sumo.dlr.de) is always
   looking for project partners. [Contact us](Contact.md) to
   discuss your proposals.
 - Make your SUMO simulation scenarios publicly available
@@ -64,7 +64,7 @@
 - Contribute to this wiki ([contact us](Contact.md), so we can
   give you editing rights)
 - Create a video tutorial and tell us about it
-- Join us at the annual [SUMO User Conference](https://eclipse.org/sumo/conference/)
+- Join us at the annual [SUMO User Conference](https://eclipse.dev/sumo/conference/)
 
 ### How do code contributions work?
 
@@ -247,7 +247,7 @@
 
   Unfortunately, we do not have the resources to do other peoples
   projects for free.
-  [Contact](http://www.dlr.de/ts/en/desktopdefault.aspx/tabid-1231/mailcontact-30303/)
+  [Contact](https://www.dlr.de/ts/en/desktopdefault.aspx/tabid-1231/mailcontact-30303/)
   us for paid consultancy.
   We try to help out with bugs and give pointers to the relevant
   documentation but this free support is limited to what we can do in
@@ -394,7 +394,7 @@
 ### Is there further documentation on Git and Subversion?
 
   There are the [Git book](https://git-scm.com/book/) and the
-  [Subversion book](http://svnbook.red-bean.com/) and the [GitHub help](https://help.github.com/) is also worth reading.
+  [Subversion book](https://svnbook.red-bean.com/) and the [GitHub help](https://help.github.com/) is also worth reading.
 
 ### How to get an older version of SUMO?
 
@@ -757,7 +757,7 @@
   For more complex cases (i.e. large temporal gaps or spatial errors)
   the problem is known as [Map Matching](https://en.wikipedia.org/wiki/Map_matching). Open source
   tools exist to facilitate this
-  ([MatchGPX2OSM](http://wiki.openstreetmap.org/wiki/Routing/Travel_Time_Analysis/MatchGPX2OSM)
+  ([MatchGPX2OSM](https://wiki.openstreetmap.org/wiki/Routing/Travel_Time_Analysis/MatchGPX2OSM)
   [graphhopper](https://github.com/graphhopper/map-matching)).
 
   To exactly reproduce high-resolution trajectories, it is possible to
@@ -1056,7 +1056,7 @@
 
 There are several ways to build videos from your SUMO simulation. You
 can use screen capturing tools like VLC Player
-[\[1\]](http://www.videolan.org/vlc). The disadvantage of this approach is
+[\[1\]](https://www.videolan.org/vlc). The disadvantage of this approach is
 the requirement of a (very) fast CPU to capture the video in real time,
 it depends on the chosen resolution and screen size of the simulation.
 
@@ -1081,8 +1081,8 @@
 ```
 
 Next you have to glue the images together. This job can be done
-graphically with virtualdub [\[2\]](http://www.virtualdub.org) or via
-commandline with ffmpeg [\[3\]](http://www.ffmpeg.org). An example command
+graphically with virtualdub [\[2\]](https://www.virtualdub.org) or via
+commandline with ffmpeg [\[3\]](https://www.ffmpeg.org). An example command
 for ffmpeg is shown below.
 
 ```
@@ -1104,9 +1104,9 @@
 
 ### Incompatibility with DisplayLink devices
 
-Drivers of [DisplayLink](http://www.DisplayLink.com) devices are
+Drivers of [DisplayLink](https://www.DisplayLink.com) devices are
 incompatibles with Fox Library. If sumo-gui or netedit presents graphics
-problem like [this](http://sumo.dlr.de/docs/images/DisplayLinkError.png)
+problem like [this](https://sumo.dlr.de/docs/images/DisplayLinkError.png)
 during the execution, DisplayLink drivers must be uninstalled.
 
 ### Distorted view with green lines all over the network
@@ -1220,11 +1220,18 @@
 
 ### How do I use *.tcl* files with NS2?
 
-  Questions regarding NS2 should be put to [the NS2 mailing list](http://www.isi.edu/nsnam/ns/ns-lists.html).
+  Questions regarding NS2 should be put to [the NS2 mailing list](https://www.isi.edu/nsnam/ns/ns-lists.html).
 
 ### How do I combine SUMO with a network simulator?
 
-  Check out [veins](http://veins.car2x.org/).
+  Check out [veins](https://veins.car2x.org/).
+  
+### Can SUMO simulate V2V / V2X messages?
+
+  Sumo does generally does not model messaging. The best way to do so is by managing the messages with connected code.
+  If you want to simulate the application layer and can work with the assumption that messages "just work", you can often handle the messages with your own (simple) TraCI code. If you need to simulate the physical process, using a network simulator is recommended (see above).
+  Sumo supports a [vehicle device](Simulation/Bluetooth.md) to log connectivity events but this is not designed to integrate with an application layer and aims only at logging.
+  
   
 ## Validity
 ### What are publications on SUMO's validity?
diff -Nru sumo-1.17.0/docs/web/docs/index.md sumo-1.18.0/docs/web/docs/index.md
--- sumo-1.17.0/docs/web/docs/index.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/index.md	2023-06-28 20:02:17.000000000 +0000
@@ -140,6 +140,7 @@
 - [Safety](Simulation/Safety.md)
 - [Mesoscopic model](Simulation/Meso.md)
 - [Lengths and Distances](Simulation/Distances.md)
+- [Friction](Simulation/Friction.md)
 
 ## Common Problems
 
diff -Nru sumo-1.17.0/docs/web/docs/Installing/index.md sumo-1.18.0/docs/web/docs/Installing/index.md
--- sumo-1.17.0/docs/web/docs/Installing/index.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Installing/index.md	2023-06-28 20:02:17.000000000 +0000
@@ -28,7 +28,7 @@
 etc.) have to be run from the command line. To facilitate this there is
 also a start-commandline.bat which sets up the whole environment for
 you. If you feel unsure about the command line, please read
-[Basics/Basic_Computer_Skills\#Running_Programs_from_the_Command_Line](../Basics/Basic_Computer_Skills.md#running_programs_from_the_command_line).
+[Running Programs from the Command Line](../Basics/Basic_Computer_Skills.md#running_programs_from_the_command_line).
 
 If you want a bleeding edge nightly build or need tests or source files,
 you can download them from the [Download](../Downloads.md) page.
@@ -59,7 +59,7 @@
 ```
 
 Precompiled binaries for different distributions like openSUSE and
-Fedora can be found at these [repositories for binary Linux versions](http://download.opensuse.org/repositories/home:/behrisch/).
+Fedora can be found at these [repositories for binary Linux versions](https://download.opensuse.org/repositories/home:/behrisch/).
 These repositories contain nightly builds as well. In the case your
 system is not listed here or you need to modify the sources, [you have to build SUMO from sources](Linux_Build.md).
 
@@ -79,9 +79,9 @@
 
 # macOS
 
-SUMO can be easily installed on macOS by using [Homebrew](http://brew.sh). If you did not already install homebrew, you can do so by invoking te following command in a macOS Terminal:
+SUMO can be easily installed on macOS by using [Homebrew](https://brew.sh). If you did not already install homebrew, you can do so by invoking te following command in a macOS Terminal:
 ```
-/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install.sh)"
+/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
 ```
 Please make sure your homebrew installation is up-to-date:
 ```
@@ -97,6 +97,9 @@
 brew tap dlr-ts/sumo
 brew install sumo
 ```
+!!! note
+    It is possible to install older vesions of SUMO using Homebrew. Running `brew search sumo` will list all available versions (v1.0.1 or newer). To install a specific version (e.g. version 1.9.0), just run `brew install sumo@1.9.0`.
+
 If you need to compile SUMO with support for other libraries, such as GDAL, you need to provide further command line options [as described here](https://github.com/DLR-TS/homebrew-sumo#usage).
 To finalize your setup, please make sure to set the **SUMO_HOME** environment variable and have it point to the directory of your SUMO installation. Depending on your shell, you may set this variable either in `.bashrc` or `.zshrc`. To set this variable in `.bashrc` you can use the following commands. 
 ```
diff -Nru sumo-1.17.0/docs/web/docs/Installing/Linux_Build_Libraries.md sumo-1.18.0/docs/web/docs/Installing/Linux_Build_Libraries.md
--- sumo-1.17.0/docs/web/docs/Installing/Linux_Build_Libraries.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Installing/Linux_Build_Libraries.md	2023-06-28 20:02:17.000000000 +0000
@@ -24,7 +24,7 @@
 libraries Fox depends on.
 
 It has been tested successfully on several SuSE Linux installations and
-with a recent [cygwin](http://www.cygwin.org). Everything that needs
+with a recent [cygwin](https://www.cygwin.org). Everything that needs
 extra work on cygwin is described in the [cygwin
 section](#cygwin).
 
@@ -45,14 +45,14 @@
 We use the GNU autotools for generating configure and Makefiles for
 Unix-like environments. Documentation can be found in the
 
-- [GNU autoconf pages](http://www.gnu.org/software/autoconf/),
-- [Manual for autoconf](http://www.gnu.org/software/autoconf/manual/),
+- [GNU autoconf pages](https://www.gnu.org/software/autoconf/),
+- [Manual for autoconf](https://www.gnu.org/software/autoconf/manual/),
 - [Manual for
   automake](https://www.gnu.org/software/automake/),
 - [Manual for
   libtool](https://www.gnu.org/software/libtool/manual/libtool.html), and
 - the
-  [Autobook](http://sources.redhat.com/autobook/autobook/autobook_toc.html).
+  [Autobook](https://sources.redhat.com/autobook/autobook/autobook_toc.html).
 
 #### The Libraries
 
@@ -191,7 +191,7 @@
 ```
 
 You need to download fox-toolkit from it's website and build manually
-http://www.fox-toolkit.org/download.html
+https://www.fox-toolkit.org/download.html
 
 #### Cygwin
 
diff -Nru sumo-1.17.0/docs/web/docs/Installing/Linux_Build.md sumo-1.18.0/docs/web/docs/Installing/Linux_Build.md
--- sumo-1.17.0/docs/web/docs/Installing/Linux_Build.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Installing/Linux_Build.md	2023-06-28 20:02:17.000000000 +0000
@@ -96,7 +96,7 @@
 ### release version or nightly tarball
 
 Download
-[sumo-src-{{Version}}.tar.gz](https://sumo.dlr.de/releases/{{Version}}/sumo-src-{{Version}}.tar.gz) or 
+[sumo-src-{{Version}}.tar.gz](https://sumo.dlr.de/releases/{{Version}}/sumo-src-{{Version}}.tar.gz) or 
 
 ```
 tar xzf sumo-src-.tar.gz
@@ -131,19 +131,30 @@
 
 and console shows "/home//sumo-"
 
-## Install python packages
+## Installing Python packages for the tools
 
-Compiling netedit requires a list of python packages to generate templates. Install it using pip:
+Calling the tools from netedit requires a list of Python packages to generate templates during compilation.
+Many of them might be available with the package manager of your distribution and most of the time we prefer
+to use those. For ubuntu this currently means, you should first do
 
 ```
-pip install google lxml rtree pandas matplotlib pulp pyproj ezdxf scipy fmpy ortools texttest pyautogui pyperclip
+sudo apt-get install python3-pyproj python3-rtree python3-pandas python3-flake8 python3-autopep8 python3-scipy python3-pulp python3-ezdxf
 ```
-Or if you're using python3
+
+and then install the remaining parts using pip:
 
 ```
-pip3 install google lxml rtree pandas matplotlib pulp pyproj ezdxf scipy fmpy ortools texttest pyautogui pyperclip
+pip install -r tools/requirements.txt
 ```
 
+The pip installation will ensure that all libraries are there, so it is safe to skip the first `apt-get` step.
+If you need information about the minimum required versions of the packages read them directly
+from the [requirements.txt](https://github.com/eclipse/sumo/blob/main/tools/requirements.txt). Be aware that
+the minimum versions in the requirements file just reflect our current test server setup, so you might also get away with earlier versions.
+
+You might need to replace `pip` with `pip3` if you are using python3 on Linux.
+
+
 ## Building the SUMO binaries with cmake
 
 To build with cmake version 3 or higher is required.
@@ -266,6 +277,33 @@
 sudo xargs rm -r $SUMO_HOME
 ```
 
+## Building Python wheels for sumolib, traci and libsumo
+
+If you want to distribute sumolib, traci and/or libsumo as wheels
+you can build those wheels directly from the tools tree. Please be aware
+that nightly builds of those packages are also available on https://test.pypi.org
+```
+pip install wheel build
+cd tools
+python build/version.py build/setup-sumolib.py ./setup.py
+python -m build --wheel
+python build/version.py build/setup-traci.py ./setup.py
+python -m build --wheel
+python build/version.py build/setup-libsumo.py ./setup.py
+python -m build --wheel
+```
+You will need a recent version of pip (>=22) for this to work. If for some reason
+you cannot update your pip you can also use the (discouraged!) method of calling
+setup.py directly.
+```
+cd tools
+python build/setup-sumolib.py bdist_wheel
+```
+Please note that you always need to be in the tools directory for this to work
+and your wheels will be placed in tools/dist. Furthermore the traci and the sumolib wheel
+are platform and Python version independent while libsumo depends on the exact
+platform and Python you built it with.
+
 ## (Frequent) Rebuilds
 
 If you did a repository clone you can simply update it by doing `git pull`
@@ -292,7 +330,7 @@
 ```
 
 Solution:
-
+
 
 ### ld cannot find an existing library (Fedora-23)
 
@@ -312,7 +350,7 @@
 ```
 
 For details see
-[stackoverflow](http://stackoverflow.com/questions/335928/ld-cannot-find-an-existing-library)
+[stackoverflow](https://stackoverflow.com/questions/335928/ld-cannot-find-an-existing-library)
 discussion.
 
 ### Additional notes for Cygwin users
diff -Nru sumo-1.17.0/docs/web/docs/Installing/MacOS_Build.md sumo-1.18.0/docs/web/docs/Installing/MacOS_Build.md
--- sumo-1.17.0/docs/web/docs/Installing/MacOS_Build.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Installing/MacOS_Build.md	2023-06-28 20:02:17.000000000 +0000
@@ -10,7 +10,7 @@
 
 ## Prerequisites
 
-The installation requires [Homebrew](http://brew.sh). If you did not already install homebrew, do so by invoking
+The installation requires [Homebrew](https://brew.sh). If you did not already install homebrew, do so by invoking
 ```
 /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install.sh)"
 ```
diff -Nru sumo-1.17.0/docs/web/docs/Installing/Windows_Build.md sumo-1.18.0/docs/web/docs/Installing/Windows_Build.md
--- sumo-1.17.0/docs/web/docs/Installing/Windows_Build.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Installing/Windows_Build.md	2023-06-28 20:02:17.000000000 +0000
@@ -52,15 +52,16 @@
 - If you decide to use the Python which comes with Visual Studio
   - Test start a python script and add association
   - Add Python to the path (also the Scripts dir), find it at `C:\Program Files (x86)\Microsoft Visual Studio\Shared\Python37_64`
-  - Install pyautogui, matplotlib, rtree, pyproj, lxml, pipwin following the instructions https://docs.microsoft.com/en-us/visualstudio/python/tutorial-working-with-python-in-visual-studio-step-05-installing-packages?view=vs-2019
-- If not, use `pip install pyautogui matplotlib pyproj lxml pipwin`, possibly with the `--user` option if you don't have admin rights
+  - Install pyautogui, scipy, rtree, pyproj, lxml following the instructions https://docs.microsoft.com/en-us/visualstudio/python/tutorial-working-with-python-in-visual-studio-step-05-installing-packages?view=vs-2019
+- If not, use `pip install tools\requirements.txt`, possibly with the `--user` option if you don't have admin rights
 
-- Run `pipwin install rtree` (or download Rtree [from here](https://www.lfd.uci.edu/~gohlke/pythonlibs/#rtree) and install it manually)
 - (after 30 days) Setup a Microsoft account (if you do not already have one) and register your Visual Studio
 
 ## Further notes
 
-If you need a different python version or want to test with multiple Pythons you can either install them directly from Visual Studio or [Download Python for Windows](http://www.python.org/download/) and install it. Most SUMO tools should work with Python 2 and 3. Please make sure that you install the recommended python modules as explained above and that the `PATH` environment variable contains the directory where the desired Python interpreter is.
+If you need a different python version or want to test with multiple Pythons you can either install them directly from Visual Studio or [Download Python for Windows](https://www.python.org/download/) and install it. Most SUMO tools should work with Python 2 and 3. Please make sure that you install the recommended python modules as explained above and that the `PATH` environment variable contains the directory where the desired Python interpreter is.
+
+If you want to build SUMO in Debug mode, then you will need the *Python Debug binaries*. The Python interepreter that comes with Visual Studio doesn't install these libraries by default (at least in the case of Visual Studio Community 2022); you need to install the *Data Science stack* in addition to the *Python and C++ development stacks* mentionned above. More precisely, the component you need is called *Python native development tools*, make sure you check the correct box.
 
 If you want to clone / checkout a special SUMO version, you can of course do it from the command line (if you have installed the command line tools)
 using `git clone --recursive https://github.com/eclipse/sumo` or download and extract a source package, see [Downloads](../Downloads.md).
@@ -102,10 +103,11 @@
 
 ## Install python packages
 
-Compiling netedit requires a list of python packages to generate templates. Install it using pip:
+For using the SUMO Python tools from the command line or in netedit it is recommended to install a list of python packages.
+From your SUMO directory you can install them using pip:
 
 ```
-pip install google lxml rtree pandas matplotlib pulp pyproj ezdxf scipy fmpy ortools texttest pyautogui pyperclip
+pip install -r tools\requirements.txt
 ```
 
 ## Manual CMake configuration
@@ -195,7 +197,7 @@
 
 If you did install Python correctly, double check that it passes
 [command line
-arguments](http://stackoverflow.com/questions/2640971/windows-is-not-passing-command-line-arguments-to-python-programs-executed-from-t).
+arguments](https://stackoverflow.com/questions/2640971/windows-is-not-passing-command-line-arguments-to-python-programs-executed-from-t).
 For a quick fix, you can also execute the following commands manually:
 
 ```
diff -Nru sumo-1.17.0/docs/web/docs/Installing/Windows_Libraries.md sumo-1.18.0/docs/web/docs/Installing/Windows_Libraries.md
--- sumo-1.17.0/docs/web/docs/Installing/Windows_Libraries.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Installing/Windows_Libraries.md	2023-06-28 20:02:17.000000000 +0000
@@ -17,9 +17,9 @@
 - Apache does not provide binary distributions any longer, but you can
   try our own build of Xerces-C 3.2.0 with an additional patch fixing
   unicode problems [in a 32 bit
-  version](http://sourceforge.net/projects/sumo/files/dependencies/xerces-c-3.2.0-win32vc12.zip)
+  version](https://sourceforge.net/projects/sumo/files/dependencies/xerces-c-3.2.0-win32vc12.zip)
   or its [64bit
-  version](http://sourceforge.net/projects/sumo/files/dependencies/xerces-c-3.2.0-win64vc12.zip)
+  version](https://sourceforge.net/projects/sumo/files/dependencies/xerces-c-3.2.0-win64vc12.zip)
   for the 64bit build.
 - Create a environment variable XERCES pointing to your xerces-c
   directory, e.g.
@@ -38,9 +38,9 @@
 - If you do not need a GUI, you can skip this section.
 - Usually you do not need to build Fox yourself you can [download the
 readily compiled
-binaries](http://sourceforge.net/projects/sumo/files/dependencies/).
+binaries](https://sourceforge.net/projects/sumo/files/dependencies/).
 - If you insist, please [download fresh
-sources](http://www.fox-toolkit.org/download.html) and do not use
+sources](https://www.fox-toolkit.org/download.html) and do not use
 the incomplete package.
 - Up to (and including) SUMO 0.10.3 (precisely up to svn revision
 7025) SUMO used Fox 1.4, now it uses Fox 1.6. The building
@@ -56,7 +56,7 @@
 Studio debugger) version. If you want to build for the 64bit
 platform you need to add a new configuration to the foxdll project
 using the
-[Configuration Manager](http://msdn.microsoft.com/en-us/library/t1hy4dhz(VS.80>).aspx).
+[Configuration Manager](https://msdn.microsoft.com/en-us/library/t1hy4dhz(VS.80>).aspx).
 - You might get approximately 240 warnings and one error, which can
 probably be ignored as long as you can find the resulting DLLs in
 the lib dir.
@@ -78,8 +78,8 @@
 - Warning: This is a little advanced, we were successful with libpng
 1.5.2 and 1.6.20 together with zlib 1.2.5 and 1.2.8
 - download zlib sources and libpng sources from
-[\[1\]](http://www.libpng.org/pub/png/libpng.html) and
-[\[2\]](http://www.zlib.net/)
+[\[1\]](https://www.libpng.org/pub/png/libpng.html) and
+[\[2\]](https://www.zlib.net/)
 - unzip all zips
 - there is no need to build zlib
 - build pnglib by first adapting the path in
@@ -103,7 +103,7 @@
 - Warning: This is a little advanced, we were successful with jpeg 8d,
 and 9b the jpeg 8c which can be found at the fox-toolkit site was
 broken
-- download libjpeg sources from [\[4\]](http://www.ijg.org/) and unzip it
+- download libjpeg sources from [\[4\]](https://www.ijg.org/) and unzip it
 - download win32.mak and place it in the jpeg dir
 - open a visual studio command prompt, cd to the jpeg dir and execute
 
@@ -129,9 +129,9 @@
 
 If you do not need transformation of geocoordinates you can disable PROJ
 and GDAL in
-[build/msvc10/Win32.props](http://apps.sourceforge.net/trac/sumo/browser/trunk/sumo/build/msvc10/Win32.props)
+[build/msvc10/Win32.props](https://apps.sourceforge.net/trac/sumo/browser/trunk/sumo/build/msvc10/Win32.props)
 and / or
-[build/msvc10/x64.props](http://apps.sourceforge.net/trac/sumo/browser/trunk/sumo/build/msvc10/x64.props)
+[build/msvc10/x64.props](https://apps.sourceforge.net/trac/sumo/browser/trunk/sumo/build/msvc10/x64.props)
 (remove the UserMacros lines referencing the relevant \*.lib files and
 remove the Preprocessor definitions HAVE_PROJ and/or HAVE_GDAL) and
 skip this section. Otherwise you have the choice between downloading the
diff -Nru sumo-1.17.0/docs/web/docs/IntermodalRouting.md sumo-1.18.0/docs/web/docs/IntermodalRouting.md
--- sumo-1.17.0/docs/web/docs/IntermodalRouting.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/IntermodalRouting.md	2023-06-28 20:02:17.000000000 +0000
@@ -48,7 +48,7 @@
 An example for a bus line and a person that may uses this line are given below:
 
 ```xml
-
+
     
                 
                 
diff -Nru sumo-1.17.0/docs/web/docs/jtrrouter.md sumo-1.18.0/docs/web/docs/jtrrouter.md
--- sumo-1.17.0/docs/web/docs/jtrrouter.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/jtrrouter.md	2023-06-28 20:02:17.000000000 +0000
@@ -37,7 +37,7 @@
 
 You may use a XML schema definition file for setting up a jtrrouter
 configuration:
-[jtrrouterConfiguration.xsd](http://sumo.dlr.de/xsd/jtrrouterConfiguration.xsd).
+[jtrrouterConfiguration.xsd](https://sumo.dlr.de/xsd/jtrrouterConfiguration.xsd).
 
 ### Configuration
 
diff -Nru sumo-1.17.0/docs/web/docs/Libraries_Licenses.md sumo-1.18.0/docs/web/docs/Libraries_Licenses.md
--- sumo-1.17.0/docs/web/docs/Libraries_Licenses.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Libraries_Licenses.md	2023-06-28 20:02:17.000000000 +0000
@@ -36,7 +36,7 @@
   License](https://github.com/memononen/fontstash/blob/master/LICENSE.txt),
   includes std_truetype which is in the public domain
 
-### [RTree](http://www.superliminal.com/sources/RTreeTemplate.zip) - Improved tiling for the drawing area
+### [RTree](https://www.superliminal.com/sources/RTreeTemplate.zip) - Improved tiling for the drawing area
 
 - Version: unknown (2003)
 - Modifications: syntactic sugar for gcc compilation; different
@@ -69,12 +69,12 @@
 - [Microsoft Software
   License](https://www.visualstudio.com/en-us/mt171551.aspx)
 
-### [Xerces-C++](http://xerces.apache.org/xerces-c/) - XML Parser
+### [Xerces-C++](https://xerces.apache.org/xerces-c/) - XML Parser
 
 - [Apache Software License
-  version 2.0](http://www.apache.org/licenses/LICENSE-2.0)
+  version 2.0](https://www.apache.org/licenses/LICENSE-2.0)
 
-### [FOX toolkit](http://fox-toolkit.org/) - GUI Widget Toolkit
+### [FOX toolkit](https://fox-toolkit.org/) - GUI Widget Toolkit
 
 can be omitted, but [sumo-gui](sumo-gui.md),
 [netedit](Netedit/index.md) and multithreading won't work
@@ -85,7 +85,7 @@
   - zlib - [self made license, free also for commercial use and
     binary distribution](https://www.zlib.net/zlib_license.html)
   - libpng - [self made license, comparable to
-    zlib](http://www.libpng.org/pub/png/src/libpng-LICENSE.txt)
+    zlib](https://www.libpng.org/pub/png/src/libpng-LICENSE.txt)
   - libjpeg - [self made license, free also for commercial use and
     binary
     distribution](https://github.com/winlibs/libjpeg/blob/master/README)
@@ -99,27 +99,27 @@
 
 ## Optional
 
-### [GDAL](http://www.gdal.org/) - Geospatial Data Abstraction Library
+### [GDAL](https://www.gdal.org/) - Geospatial Data Abstraction Library
 
 - [X11/MIT
-  License](http://svn.osgeo.org/gdal/trunk/gdal/LICENSE.TXT)
+  License](https://svn.osgeo.org/gdal/trunk/gdal/LICENSE.TXT)
 
-### [gl2ps](http://www.geuz.org/gl2ps/) - Printing screenshots as ps or pdf files
+### [gl2ps](https://www.geuz.org/gl2ps/) - Printing screenshots as ps or pdf files
 
 - Used version: 1.3.9
 - License: [GNU Library General Public
-  License](http://www.geuz.org/gl2ps/COPYING.LGPL) or [GL2PS
-  License](http://www.geuz.org/gl2ps/COPYING.GL2PS)
+  License](https://www.geuz.org/gl2ps/COPYING.LGPL) or [GL2PS
+  License](https://www.geuz.org/gl2ps/COPYING.GL2PS)
 
-### [Open Scene Graph](http://www.openscenegraph.org/) - 3D Graphics Toolkit
+### [Open Scene Graph](https://www.openscenegraph.org/) - 3D Graphics Toolkit
 
 - [OpenSceneGraph Public
-  License](http://www.openscenegraph.org/images/LICENSE.txt)
+  License](https://www.openscenegraph.org/images/LICENSE.txt)
 
-### [FFmpeg](http://ffmpeg.org/) - Multimedia Library
+### [FFmpeg](https://ffmpeg.org/) - Multimedia Library
 
 - [GNU Lesser General Public
-  License](http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html)
+  License](https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html)
 
 ### [Google Test](https://github.com/google/googletest) - C++ Unit Test Framework
 
@@ -137,15 +137,15 @@
 ## Data and Documentation
 
 Unless otherwise noted all documentation (including the files in this directory and below) and data
-files are licensed under the [Eclipse Public License v2](http://www.eclipse.org/legal/epl-v20.html) just as the rest of SUMO.
+files are licensed under the [Eclipse Public License v2](https://www.eclipse.org/legal/epl-v20.html) just as the rest of SUMO.
 
 ### 3D models
 
 All models in the data/3D directory originate from
- and are in the
+ and are in the
 public domain
 
- This work is licensed under a Creative Commons CC0 1.0 Universal license. To the extent possible under law, the person who associated CC0 with this work has waived all copyright and related or neighboring rights to this work.
+ This work is licensed under a Creative Commons CC0 1.0 Universal license. To the extent possible under law, the person who associated CC0 with this work has waived all copyright and related or neighboring rights to this work.
 
 ### OpenStreetMap data
 
@@ -157,4 +157,4 @@
 
 Currently the [Google Roboto](https://fonts.google.com/specimen/Roboto)
 font is included which is available under an [Apache
-License](http://www.apache.org/licenses/LICENSE-2.0).
+License](https://www.apache.org/licenses/LICENSE-2.0).
diff -Nru sumo-1.17.0/docs/web/docs/Libsumo.md sumo-1.18.0/docs/web/docs/Libsumo.md
--- sumo-1.17.0/docs/web/docs/Libsumo.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Libsumo.md	2023-06-28 20:02:17.000000000 +0000
@@ -17,9 +17,9 @@
   classes for results which can be linked directly to the client code
 - Function signatures similar to [TraCI](TraCI.md)
 - Pre-built language bindings for Java and Python (using
-  [SWIG](http://www.swig.org/))
+  [SWIG](https://www.swig.org/))
 - Support for other programming languages via
-  [SWIG](http://www.swig.org/)
+  [SWIG](https://www.swig.org/)
   
 # Limitations
 
diff -Nru sumo-1.17.0/docs/web/docs/Libtraci.md sumo-1.18.0/docs/web/docs/Libtraci.md
--- sumo-1.17.0/docs/web/docs/Libtraci.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Libtraci.md	2023-06-28 20:02:17.000000000 +0000
@@ -20,7 +20,7 @@
 - C++ interface based on static functions and a few simple wrapper
   classes for results which can be linked directly to the client code
 - Pre-built language bindings for Java and Python (using
-  [SWIG](http://www.swig.org/))
+  [SWIG](https://www.swig.org/))
 - Future support for other programming languages via SWIG
 
 Unlike Libsumo, Libtraci allows
diff -Nru sumo-1.17.0/docs/web/docs/marouter.md sumo-1.18.0/docs/web/docs/marouter.md
--- sumo-1.17.0/docs/web/docs/marouter.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/marouter.md	2023-06-28 20:02:17.000000000 +0000
@@ -35,14 +35,22 @@
 
 - **SUE**: stochastic user equilibrium
 
+marouter reads OD matrices and creates route files. These route files
+contain route distributions between traffic assignment zones. Each route
+in the distribution is a fully specified list of network edges.
+
+## Capacity-constraint (volume-delay) function
+
 marouter uses a hard-coded capacity-constraint function based on speed
 limit, lane number and edge priority to compute traveltimes and flows
 based on density. For details, see functions
 *capacityConstraintFunction* and *getCapacity* in [{{SUMO}}/src/marouter/ROMAAssignments.cpp]({{Source}}src/marouter/ROMAAssignments.cpp).
 
-marouter reads OD matrices and creates route files. These route files
-contain route distributions between traffic assignment zones. Each route
-in the distribution is a fully specified list of network edges.
+By setting option **--capacities.default**, the following constraint function is used:
+```
+capacity = edge->getNumLanes() * 800;
+travelTime = edge->getLength() / edge->getSpeedLimit() * (1. + 1.*(flow / (capacity * 0.9)) * 3.);
+```
 
 ## Microscopic Outputs
 
@@ -76,7 +84,7 @@
 
 You may use a XML schema definition file for setting up a marouter
 configuration:
-[marouterConfiguration.xsd](http://sumo.dlr.de/xsd/marouterConfiguration.xsd).
+[marouterConfiguration.xsd](https://sumo.dlr.de/xsd/marouterConfiguration.xsd).
 
 ### Configuration
 
diff -Nru sumo-1.17.0/docs/web/docs/Models/Electric.md sumo-1.18.0/docs/web/docs/Models/Electric.md
--- sumo-1.17.0/docs/web/docs/Models/Electric.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Models/Electric.md	2023-06-28 20:02:17.000000000 +0000
@@ -35,7 +35,7 @@
 | vehicleMass             | float      | 1830 (kg)         | Vehicle mass *m_veh*                          |
 | frontSurfaceArea        | float      | 2.6 (m²)      | Front surface area *A_veh*                    |
 | airDragCoefficient      | float      | 0.35              | Air drag coefficient *c_w*                    |
-| internalMomentOfInertia | float      | 0.01 (kg·m²)  | Mom. of inertia of int. rot. elements *J_int* |
+| internalMomentOfInertia | float      | 0.01 (kg)  | Not a *moment*, but the (equivalent) mass of internal rotating elements |
 | radialDragCoefficient   | float      | 0.1               | Radial drag coefficient c_rad                 |
 | rollDragCoefficient     | float      | 0.01              | Rolling resistance coefficient *c_roll*       |
 | constantPowerIntake     | float      | 100 (W)           | Avg. (constant) power of consumers *P_const*  |
@@ -297,7 +297,7 @@
 M., Krajzewicz, D., Weber, M. (eds.) Simulation of Urban Mobility.
 Lecture Notes in Computer Science, vol. 8594 , pp. 33--43. Springer,
 Heidelberg
-(2014)](http://elib.dlr.de/93885/1/Proceeding_SUMO2013_15-17May%202013_Berlin-Adlershof.pdf)
+(2014)](https://elib.dlr.de/93885/1/Proceeding_SUMO2013_15-17May%202013_Berlin-Adlershof.pdf)
 
 # Example Configurations
 
diff -Nru sumo-1.17.0/docs/web/docs/Models/Emissions/HBEFA3-based.md sumo-1.18.0/docs/web/docs/Models/Emissions/HBEFA3-based.md
--- sumo-1.17.0/docs/web/docs/Models/Emissions/HBEFA3-based.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Models/Emissions/HBEFA3-based.md	2023-06-28 20:02:17.000000000 +0000
@@ -17,7 +17,7 @@
 ## Vehicle Emission Classes
 
 The vehicle classes below map directly to vehicle classes supplied by
-[HBEFA](http://www.hbefa.net/). This is a major difference to the
+[HBEFA](https://www.hbefa.net/). This is a major difference to the
 clustering done with [HBEFA
 2.1](../../Models/Emissions/HBEFA-based.md). Note, that within HBEFA
 these classes are aggregates of more specific vehicle classes. To use
diff -Nru sumo-1.17.0/docs/web/docs/Models/Emissions/HBEFA4-based.md sumo-1.18.0/docs/web/docs/Models/Emissions/HBEFA4-based.md
--- sumo-1.17.0/docs/web/docs/Models/Emissions/HBEFA4-based.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Models/Emissions/HBEFA4-based.md	2023-06-28 20:02:17.000000000 +0000
@@ -18,7 +18,7 @@
 ## Vehicle Emission Classes
 
 The vehicle classes below map directly to vehicle subsegments supplied by
-[HBEFA](http://www.hbefa.net/), the SUMO names just remove special characters.
+[HBEFA](https://www.hbefa.net/), the SUMO names just remove special characters.
 The original name and the numeric HBEFA id are also given in the table below
 To use the emission classes below prepend the class name with the HBEFA4
 prefix, e.g. `emissionClass="HBEFA4/PC_petrol_Euro-4"`.
diff -Nru sumo-1.17.0/docs/web/docs/Models/Emissions/HBEFA-based.md sumo-1.18.0/docs/web/docs/Models/Emissions/HBEFA-based.md
--- sumo-1.17.0/docs/web/docs/Models/Emissions/HBEFA-based.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Models/Emissions/HBEFA-based.md	2023-06-28 20:02:17.000000000 +0000
@@ -3,10 +3,10 @@
 ---
 
 *"The [Handbook Emission Factors for Road Transport
-(HBEFA)](http://www.hbefa.net/) provides emission factors for all
+(HBEFA)](https://www.hbefa.net/) provides emission factors for all
 current vehicle categories (PC, LDV, HDV and motor cycles), each divided
 into different categories, for a wide variety of traffic situations."*
-(from , 30.01.2008). Since version 0.10.2, SUMO
+(from , 30.01.2008). Since version 0.10.2, SUMO
 is able to simulate vehicular pollutant emissions based on this database
 application. Though HBEFA contains information about other pollutants,
 we decided to implement only the following, major ones:
@@ -18,20 +18,20 @@
 - PM_x
 - fuel consumption
 
-We have remodeled [HBEFA](http://www.hbefa.net/) data for the following
+We have remodeled [HBEFA](https://www.hbefa.net/) data for the following
 reasons:
 
 1.  The goal was to have an emission model be directly embedded in SUMO,
-    [HBEFA](http://www.hbefa.net/) is a database application for itself
+    [HBEFA](https://www.hbefa.net/) is a database application for itself
 2.  To allow computation of vehicular emissions on a continuous range as
-    the original [HBEFA](http://www.hbefa.net/) data cover certain
+    the original [HBEFA](https://www.hbefa.net/) data cover certain
     speeds only
 3.  To avoid having the need to deal with all of
-    [HBEFA](http://www.hbefa.net/)'s emission classes
+    [HBEFA](https://www.hbefa.net/)'s emission classes
 
 # Vehicle Emission Classes
 
-The original vehicle classes supplied by [HBEFA](http://www.hbefa.net/)
+The original vehicle classes supplied by [HBEFA](https://www.hbefa.net/)
 have been clustered. In order to improve the quality, passengers and
 light delivery vehicles have been clustered independent to heavy duty
 vehicles. For the first set (passenger and light delivery vehicles), two
diff -Nru sumo-1.17.0/docs/web/docs/Models/Emissions/PHEMlight.md sumo-1.18.0/docs/web/docs/Models/Emissions/PHEMlight.md
--- sumo-1.17.0/docs/web/docs/Models/Emissions/PHEMlight.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Models/Emissions/PHEMlight.md	2023-06-28 20:02:17.000000000 +0000
@@ -15,7 +15,7 @@
 embedded into SUMO, was developed. The [PHEMlight](https://www.ivt.tugraz.at/assets/files/areas/em/PHEMlight_en.pdf) model is the result of
 this work. An in-depth description can be found in
 [COLOMBO](https://verkehrsforschung.dlr.de/en/projects/colombo)'s deliverable
-[D4.2](https://web.archive.org/web/20170808122505/http://www.colombo-fp7.eu/results_deliverables.php). The model
+[D4.2](https://web.archive.org/web/20170808122505/https://www.colombo-fp7.eu/results_deliverables.php). The model
 received a major update to version 2.0.0.0 in the beginning of 2016
 which also used new names for all vehicle classes, most notably all
 classes now have an english prefix distinguishing passenger cars (PC_),
@@ -225,7 +225,7 @@
 
 - [COLOMBO: Deliverable 4.2; Extended Simulation Tool PHEM coupled to
   SUMO with User
-  Guide](https://web.archive.org/web/20170808122505/http://www.colombo-fp7.eu/results_deliverables.php); February,
+  Guide](https://web.archive.org/web/20170808122505/https://www.colombo-fp7.eu/results_deliverables.php); February,
   2014
 
  
diff -Nru sumo-1.17.0/docs/web/docs/Models/Emissions.md sumo-1.18.0/docs/web/docs/Models/Emissions.md
--- sumo-1.17.0/docs/web/docs/Models/Emissions.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Models/Emissions.md	2023-06-28 20:02:17.000000000 +0000
@@ -7,13 +7,13 @@
 SUMO includes the following emission models:
 
 - [HBEFA v2.1-based](../Models/Emissions/HBEFA-based.md): A
-  continuous reformulation of the [HBEFA](http://www.hbefa.net/) v2.1
+  continuous reformulation of the [HBEFA](https://www.hbefa.net/) v2.1
   emissions data base (open source);
 - [HBEFA v3.1-based](../Models/Emissions/HBEFA3-based.md): A
-  continuous reformulation of the [HBEFA](http://www.hbefa.net/) v3.1
+  continuous reformulation of the [HBEFA](https://www.hbefa.net/) v3.1
   emissions data base (open source);
 - [HBEFA v4.2-based](../Models/Emissions/HBEFA4-based.md): A
-  continuous reformulation of the [HBEFA](http://www.hbefa.net/) v4.2
+  continuous reformulation of the [HBEFA](https://www.hbefa.net/) v4.2
   emissions data base (open source);
 - [PHEMlight](../Models/Emissions/PHEMlight.md), a derivation of
   the original
@@ -32,7 +32,7 @@
 
 Literature on the Models and their implementation can be found at [the
 DLR electronic library
-(http://elib.dlr.de/89398/)](http://elib.dlr.de/89398/).
+(https://elib.dlr.de/89398/)](https://elib.dlr.de/89398/).
 
 # Using Models
 
@@ -219,6 +219,6 @@
 
 
 
-
+
 This part of SUMO was developed, reworked, or extended within the project 
-"AMITRAN", co-funded by the European Commission within the Seventh Framework Programme.
+"AMITRAN", co-funded by the European Commission within the Seventh Framework Programme.
diff -Nru sumo-1.17.0/docs/web/docs/netconvert.md sumo-1.18.0/docs/web/docs/netconvert.md
--- sumo-1.17.0/docs/web/docs/netconvert.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/netconvert.md	2023-06-28 20:02:17.000000000 +0000
@@ -246,6 +246,7 @@
 | **--geometry.remove.keep-ptstops** {{DT_BOOL}} | Ensure that edges with public transport stops are not modified; *default:* **false** |
 | **--geometry.remove.min-length** {{DT_FLOAT}} | Allow merging edges with differing attributes when their length is below min-length; *default:* **0** |
 | **--geometry.remove.width-tolerance** {{DT_FLOAT}} | Allow merging edges with differing lane widths if the difference is below FLOAT; *default:* **0** |
+| **--geometry.remove.max-junction-size** {{DT_FLOAT}} | Prevent removal of junctions with a size above FLOAT as defined by custom edge endpoints; *default:* **-1** |
 | **--geometry.max-segment-length** {{DT_FLOAT}} | splits geometry to restrict segment length; *default:* **0** |
 | **--geometry.min-dist** {{DT_FLOAT}} | reduces too similar geometry points; *default:* **-1** |
 | **--geometry.max-angle** {{DT_FLOAT}} | Warn about edge geometries with an angle above DEGREES in successive segments; *default:* **99** |
@@ -316,6 +317,7 @@
 | **--tls.guess.joining** {{DT_BOOL}} | Includes node clusters into guess; *default:* **false** |
 | **--tls.join** {{DT_BOOL}} | Tries to cluster tls-controlled nodes; *default:* **false** |
 | **--tls.join-dist** {{DT_FLOAT}} | Determines the maximal distance for joining traffic lights (defaults to 20); *default:* **20** |
+| **--tls.join-exclude** {{DT_STR[]}} | Interprets STR[] as list of tls ids to exclude from joining |
 | **--tls.uncontrolled-within** {{DT_BOOL}} | Do not control edges that lie fully within a joined traffic light. This may cause collisions but allows old traffic light plans to be used; *default:* **false** |
 | **--tls.ignore-internal-junction-jam** {{DT_BOOL}} | Do not build mutually conflicting response matrix, potentially ignoring vehicles that are stuck at an internal junction when their phase has ended; *default:* **false** |
 | **--tls.guess-signals** {{DT_BOOL}} | Interprets tls nodes surrounding an intersection as signal positions for a larger TLS. This is typical pattern for OSM-derived networks; *default:* **false** |
@@ -418,6 +420,7 @@
 | **--junctions.limit-turn-speed.warn.turn** {{DT_FLOAT}} | Warn about turn speed limits that reduce the speed of turning connections (no u-turns) by more than FLOAT; *default:* **22** |
 | **--junctions.small-radius** {{DT_FLOAT}} | Default radius for junctions that do not require wide vehicle turns; *default:* **1.5** |
 | **--junctions.higher-speed** {{DT_BOOL}} | Use maximum value of incoming and outgoing edge speed on junction instead of average; *default:* **false** |
+| **--junctions.minimal-shape** {{DT_BOOL}} | Build junctions with minimal shapes (igoring edge overlap); *default:* **false** |
 | **--internal-junctions.vehicle-width** {{DT_FLOAT}} | Assumed vehicle width for computing internal junction positions; *default:* **1.8** |
 | **--rectangular-lane-cut** {{DT_BOOL}} | Forces rectangular cuts between lanes and intersections; *default:* **false** |
 | **--check-lane-foes.roundabout** {{DT_BOOL}} | Allow driving onto a multi-lane road if there are foes on other lanes (at roundabouts); *default:* **true** |
@@ -456,10 +459,12 @@
 | **--railway.topology.repair.minimal** {{DT_BOOL}} | Repair topology of the railway network just enough to let loaded public transport lines to work; *default:* **false** |
 | **--railway.topology.repair.connect-straight** {{DT_BOOL}} | Allow bidirectional rail use wherever rails with opposite directions meet at a straight angle; *default:* **false** |
 | **--railway.topology.repair.stop-turn** {{DT_BOOL}} | Add turn-around connections at all loaded stops.; *default:* **false** |
+| **--railway.topology.repair.bidi-penalty** {{DT_FLOAT}} | Penalty factor for adding new bidi edges to connect public transport stops; *default:* **1.2** |
 | **--railway.topology.all-bidi** {{DT_BOOL}} | Make all rails usable in both direction; *default:* **false** |
 | **--railway.topology.all-bidi.input-file** {{DT_FILE}} | Make all rails edge ids from FILE usable in both direction |
 | **--railway.topology.direction-priority** {{DT_BOOL}} | Set edge priority values based on estimated main direction; *default:* **false** |
 | **--railway.topology.extend-priority** {{DT_BOOL}} | Extend loaded edge priority values based on estimated main direction; *default:* **false** |
+| **--railway.signal.guess.by-stops** {{DT_BOOL}} | Guess signals that guard public transport stops; *default:* **false** |
 | **--railway.access-distance** {{DT_FLOAT}} | The search radius for finding suitable road accesses for rail stops; *default:* **150** |
 | **--railway.max-accesses** {{DT_INT}} | The maximum road accesses registered per rail stops; *default:* **5** |
 | **--railway.access-factor** {{DT_FLOAT}} | The walking length of the access is computed as air-line distance multiplied by FLOAT; *default:* **1.5** |
@@ -485,7 +490,7 @@
 | **--osm.stop-output.length.tram** {{DT_FLOAT}} | The default length of a tram stop in FLOAT m; *default:* **25** |
 | **--osm.stop-output.length.train** {{DT_FLOAT}} | The default length of a train stop in FLOAT m; *default:* **200** |
 | **--osm.all-attributes** {{DT_BOOL}} | Whether additional attributes shall be imported; *default:* **false** |
-| **--osm.extra-attributes** {{DT_STR[]}} | List of additional attributes that shall be imported from OSM via osm.all-attributes (set 'all' to import all); *default:* **bridge,tunnel,layer,postal_code** |
+| **--osm.extra-attributes** {{DT_STR[]}} | List of additional attributes that shall be imported from OSM via osm.all-attributes (set 'all' to import all); *default:* **all** |
 | **--osm.speedlimit-none** {{DT_FLOAT}} | The speed limit to be set when there is no actual speed limit in reality; *default:* **39.4444** |
 | **--matsim.keep-length** {{DT_BOOL}} | The edge lengths given in the MATSIM-file will be kept; *default:* **false** |
 | **--matsim.lanes-from-capacity** {{DT_BOOL}} | The lane number will be computed from the capacity; *default:* **false** |
@@ -528,6 +533,7 @@
 | **--opendrive.internal-shapes** {{DT_BOOL}} | Import internal lane shapes; *default:* **false** |
 | **--opendrive.position-ids** {{DT_BOOL}} | Sets edge-id based on road-id and offset in m (legacy); *default:* **false** |
 | **--opendrive.lane-shapes** {{DT_BOOL}} | Use custom lane shapes to compensate discarded lane types; *default:* **false** |
+| **--opendrive.signal-groups** {{DT_BOOL}} | Use the OpenDRIVE controller information for the generated signal program; *default:* **false** |
 
 ### Report
 
diff -Nru sumo-1.17.0/docs/web/docs/Netedit/attribute_help.md sumo-1.18.0/docs/web/docs/Netedit/attribute_help.md
--- sumo-1.17.0/docs/web/docs/Netedit/attribute_help.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Netedit/attribute_help.md	2023-06-28 20:02:17.000000000 +0000
@@ -176,6 +176,7 @@
 |width|non-negative float|The width of the road-side parking spaces *default:* **3.20**|
 |length|non-negative float|The length of the road-side parking spaces. By default (endPos - startPos) / roadsideCapacity *default:* **0.00**|
 |angle|angle[0, 360]|The angle of the road-side parking spaces relative to the lane angle, positive means clockwise *default:* **0.00**|
+|lefthand|boolean|Enable or disable lefthand position *default:* **0**|
 
 ### space
 child element of [parkingArea](#parkingarea)
@@ -467,6 +468,8 @@
 |depart|string|The departure time of the (first) trip which is generated using this trip definition *default:* **0.00**|
 |fromJunction|unique string|The name of the junction the trip starts at|
 |toJunction|unique string|The name of the junction the trip ends at|
+|fromTaz|unique string|The name of the TAZ the trip starts at|
+|toTaz|unique string|The name of the TAZ the trip ends at|
 
 ## vehicle
 | Attribute | Type | Description |
@@ -525,16 +528,19 @@
 |poisson|string|Insert flow expected vehicles per second with poisson distributed insertion rate (not together with period or vehsPerHour or probability) *default:* **0.5**|
 |fromJunction|unique string|The name of the junction the flow starts at|
 |toJunction|unique string|The name of the junction the flow ends at|
+|fromTaz|unique string|The name of the TAZ the flow starts at|
+|toTaz|unique string|The name of the TAZ the flow ends at|
 |departEdge|unique string|The index of the edge within route the flow starts at|
 |arrivalEdge|unique string|The index of the edge within route the flow ends at|
 
 ## vType
 | Attribute | Type | Description |
 |-----------|------|-------------|
-|id|unique string|The id of VehicleType|
-|VTypeDist.|string|Vehicle Type Distribution|
+|id|unique string|type ID|
+|typeDist.|string|Type distribution|
+|typeDistProb.|probability[0, 1]|Type distribution probability *default:* **1.0**|
 |vClass|discrete vClass|An abstract vehicle class *default:* **passenger**|
-|color|color|This vehicle type's color|
+|color|color|This type's color|
 |length|non-negative float|The vehicle's netto-length (length) [m]|
 |minGap|non-negative float|Empty space after leader [m]|
 |maxSpeed|non-negative float|The vehicle's maximum velocity [m/s]|
@@ -700,7 +706,7 @@
 |duration|non-negative SUMOTime|Minimum duration for stopping *default:* **60**|
 |until|non-negative SUMOTime|The time step at which the route continues *default:* **0.00**|
 |extension|SUMOTime|If set to a non-negative time value, then the stop duration can be extended at most by the extension value in seconds *default:* **0**|
-|triggered|discrete string|Whether a person or container or bth may end the stop *default:* **0**|
+|triggered|discrete string|Whether a person or container or both may end the stop *default:* **0**|
 |expected|list of strings|List of elements that must board the vehicle before it may continue|
 |permitted|list of strings|List of elements that can board the vehicle before it may continue|
 |parking|discrete string|Whether the vehicle stops on the road or beside *default:* **0**|
@@ -710,6 +716,7 @@
 |onDemand|boolean|Whether the stop may be skipped if no passengers wants to embark or disembark *default:* **0**|
 |jump|SUMOTime|transfer time if there shall be a jump from this stop to the next route edge *default:* **-1**|
 |busStop|list of unique strings|BusStop associated with this stop|
+|trainStop|list of unique strings|TrainStop associated with this stop|
 |containerStop|list of unique strings|ContainerStop associated with this stop|
 |chargingStation|list of unique strings|ChargingStation associated with this stop|
 |parkingArea|list of unique strings|ParkingArea associated with this stop|
@@ -809,6 +816,7 @@
 |modes|list of strings|List of possible traffic modes. Walking is always possible regardless of this value|
 |lines|list of strings|list of vehicle alternatives to take for the person trip *default:* **ANY**|
 |toBusStop|unique string|Id of the destination busStop|
+|toTrainStop|unique string|Id of the destination trainStop|
 |fromJunction|unique string|The name of the junction the person trip starts at|
 |toJunction|unique string|The name of the junction the person trip ends at|
 
@@ -822,6 +830,7 @@
 |arrivalPos|float|arrival position on the destination edge *default:* **-1**|
 |lines|list of strings|list of vehicle alternatives to take for the ride *default:* **ANY**|
 |toBusStop|unique string|ID of the destination bus stop|
+|toTrainStop|unique string|ID of the destination train stop|
 
 ### walk
 child element of [person](#person), [personFlow](#personflow)
@@ -832,6 +841,7 @@
 |to|unique string|The ID of the edge the walk ends at|
 |arrivalPos|float|arrival position on the destination edge *default:* **-1**|
 |toBusStop|unique string|Id of the destination bus stop|
+|toTrainStop|unique string|Id of the destination train stop|
 |edges|list of unique strings|id of the edges to walk|
 |route|list of unique strings|The id of the route to walk|
 |fromJunction|unique string|The name of the junction the walk starts at|
diff -Nru sumo-1.17.0/docs/web/docs/Netedit/shortcuts.md sumo-1.18.0/docs/web/docs/Netedit/shortcuts.md
--- sumo-1.17.0/docs/web/docs/Netedit/shortcuts.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Netedit/shortcuts.md	2023-06-28 20:02:17.000000000 +0000
@@ -18,14 +18,14 @@
 | Shortcut | Network mode | Demand Mode | Data Mode |
 |:---:|:---:|:-:|:---:|
 | A | Additional mode | Stop Mode | - |
-| C | Connection Mode | Person Plan mode | Connection Data Mode |
+| C | Connection Mode | Container mode | Connection Data Mode |
 | D | Delete Mode | Delete Mode | Delete Mode |
 | E | Edge Mode | - | Edge Data Mode |
-| G | - | Container mode | - |
+| G | - | - | - |
 | H | Prohibition mode | Container Plan mode | - |
 | I | Inspect Mode | Inspect Mode | Inspect Mode |
 | J | - | - | Junction Data Mode |
-| L | - | - | Lane Data Mode |
+| L | - |  Person plan mode | Lane Data Mode |
 | M | Move Mode | Move Mode | - |
 | P | Polygon Mode | Person Mode | - |
 | R | Crossing Mode | Route Mode | Edge Rel Data Mode |
@@ -50,7 +50,7 @@
 | F2 | Supermode Network |
 | F3 | Supermode Demand |
 | F4 | Supermode Data |
-| F9 | Edit viewport |
+| F9 | Visualization settings |
 | F10 | Open Options dialog |
 | F11 | Set / Clear front element |
 | F12 | About dialog |
@@ -64,7 +64,7 @@
 | Ctrl + C | Copy |
 | Ctrl + D | Load demand elements |
 | Ctrl + H | Load edge type elements |
-| Ctrl + I | Edit visualization |
+| Ctrl + I | Edit view port |
 | Ctrl + J | Show junction shape |
 | Ctrl + K | Load traffic lights |
 | Ctrl + L | Save plain XML |
diff -Nru sumo-1.17.0/docs/web/docs/netedit.md sumo-1.18.0/docs/web/docs/netedit.md
--- sumo-1.17.0/docs/web/docs/netedit.md	1970-01-01 00:00:00.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/netedit.md	2023-06-28 20:02:17.000000000 +0000
@@ -0,0 +1,492 @@
+---
+title: netedit
+---
+
+# From 30.000 feet
+
+**netedit** is the graphical editor for networks, additional infastructure,
+traffic objects and traffic data.
+
+- **Purpose:** Create and modify simulation scenarios
+- **System:** portable (Linux/Windows/Mac is tested); opens a window
+- **Input (optional):** a network and any files belonging to a scenario
+- **Output:** a netork and any files belonging to a scenario
+- **Programming Language:** C++
+
+# Usage Description
+
+For an overview of features see [Netedit Usage Documentation](Netedit/index.md).
+
+## Options
+
+You may use a XML schema definition file for setting up a Netedit
+configuration: [sumoConfiguration.xsd](https://sumo.dlr.de/xsd/neteditConfiguration.xsd).
+
+### Configuration
+| Option | Description |
+|--------|-------------|
+| **-c** {{DT_FILE}}
 **--configuration-file** {{DT_FILE}} | Loads the named config on startup |
+| **-C** {{DT_FILE}}
 **--save-configuration** {{DT_FILE}} | Saves current configuration into FILE |
+| **--save-configuration.relative** {{DT_BOOL}} | Enforce relative paths when saving the configuration; *default:* **false** |
+| **--save-template** {{DT_FILE}} | Saves a configuration template (empty) into FILE |
+| **--save-schema** {{DT_FILE}} | Saves the configuration schema into FILE |
+| **--save-commented** {{DT_BOOL}} | Adds comments to saved template, configuration, or schema; *default:* **false** |
+
+### Input
+| Option | Description |
+|--------|-------------|
+| **--sumocfg-file** {{DT_FILE}} | Load sumo config |
+| **-a** {{DT_FILE}}
 **--additional-files** {{DT_FILE}} | Load additional and shapes descriptions from FILE(s) |
+| **-r** {{DT_FILE}}
 **--route-files** {{DT_FILE}} | Load demand elements descriptions from FILE(s) |
+| **-d** {{DT_FILE}}
 **--data-files** {{DT_FILE}} | Load data elements descriptions from FILE(s) |
+| **-m** {{DT_FILE}}
 **--meandata-files** {{DT_FILE}} | Load meanData descriptions from FILE(s) |
+| **-s** {{DT_FILE}}
 **--sumo-net-file** {{DT_FILE}} | Read SUMO-net from FILE |
+| **-n** {{DT_FILE}}
 **--node-files** {{DT_FILE}} | Read XML-node defs from FILE |
+| **-e** {{DT_FILE}}
 **--edge-files** {{DT_FILE}} | Read XML-edge defs from FILE |
+| **-x** {{DT_FILE}}
 **--connection-files** {{DT_FILE}} | Read XML-connection defs from FILE |
+| **-i** {{DT_FILE}}
 **--tllogic-files** {{DT_FILE}} | Read XML-traffic light defs from FILE |
+| **-t** {{DT_FILE}}
 **--type-files** {{DT_FILE}} | Read XML-type defs from FILE |
+| **--shapefile-prefix** {{DT_FILE}} | Read shapefiles (ArcView, Tiger, ...) from files starting with 'FILE' |
+| **--dlr-navteq-prefix** {{DT_FILE}} | Read converted Navteq GDF data (unsplitted Elmar-network) from path 'FILE' |
+| **--osm-files** {{DT_FILE}} | Read OSM-network from path 'FILE(s)' |
+| **--opendrive-files** {{DT_FILE}} | Read OpenDRIVE-network from FILE |
+| **--visum-file** {{DT_FILE}} | Read VISUM-net from FILE |
+| **--vissim-file** {{DT_FILE}} | Read VISSIM-net from FILE |
+| **--robocup-dir** {{DT_FILE}} | Read RoboCup-net from DIR |
+| **--matsim-files** {{DT_FILE}} | Read MATsim-net from FILE |
+| **--itsumo-files** {{DT_FILE}} | Read ITSUMO-net from FILE |
+| **--heightmap.shapefiles** {{DT_FILE}} | Read heightmap from ArcGIS shapefile |
+| **--heightmap.geotiff** {{DT_FILE}} | Read heightmap from GeoTIFF |
+
+### Output
+| Option | Description |
+|--------|-------------|
+| **--tls-file** {{DT_STR}} | File in which TLS Programs must be saved |
+| **--edgetypes-file** {{DT_STR}} | File in which edgeTypes must be saved |
+| **--write-license** {{DT_BOOL}} | Include license info into every output file; *default:* **false** |
+| **--output-prefix** {{DT_STR}} | Prefix which is applied to all output files. The special string 'TIME' is replaced by the current time. |
+| **--precision** {{DT_INT}} | Defines the number of digits after the comma for floating point output; *default:* **2** |
+| **--precision.geo** {{DT_INT}} | Defines the number of digits after the comma for lon,lat output; *default:* **6** |
+| **-H** {{DT_BOOL}}
 **--human-readable-time** {{DT_BOOL}} | Write time values as hour:minute:second or day:hour:minute:second rather than seconds; *default:* **false** |
+| **-o** {{DT_FILE}}
 **--output-file** {{DT_FILE}} | The generated net will be written to FILE |
+| **-p** {{DT_FILE}}
 **--plain-output-prefix** {{DT_FILE}} | Prefix of files to write plain xml nodes, edges and connections to |
+| **--plain-output.lanes** {{DT_BOOL}} | Write all lanes and their attributes even when they are not customized; *default:* **false** |
+| **--junctions.join-output** {{DT_FILE}} | Writes information about joined junctions to FILE (can be loaded as additional node-file to reproduce joins |
+| **--prefix** {{DT_STR}} | Defines a prefix for edge and junction names |
+| **--amitran-output** {{DT_FILE}} | The generated net will be written to FILE using Amitran format |
+| **--matsim-output** {{DT_FILE}} | The generated net will be written to FILE using MATsim format |
+| **--opendrive-output** {{DT_FILE}} | The generated net will be written to FILE using OpenDRIVE format |
+| **--dlr-navteq-output** {{DT_FILE}} | The generated net will be written to dlr-navteq files with the given PREFIX |
+| **--dlr-navteq.precision** {{DT_INT}} | The network coordinates are written with the specified level of output precision; *default:* **2** |
+| **--output.street-names** {{DT_BOOL}} | Street names will be included in the output (if available); *default:* **false** |
+| **--output.original-names** {{DT_BOOL}} | Writes original names, if given, as parameter; *default:* **false** |
+| **--street-sign-output** {{DT_FILE}} | Writes street signs as POIs to FILE |
+| **--ptstop-output** {{DT_FILE}} | Writes public transport stops to FILE |
+| **--ptline-output** {{DT_FILE}} | Writes public transport lines to FILE |
+| **--ptline-clean-up** {{DT_BOOL}} | Clean-up pt stops that are not served by any line; *default:* **false** |
+| **--parking-output** {{DT_FILE}} | Writes parking areas to FILE |
+| **--railway.topology.output** {{DT_FILE}} | Analyze topology of the railway network |
+| **--polygon-output** {{DT_FILE}} | Write shapes that are embedded in the network input and that are not supported by polyconvert (OpenDRIVE) |
+| **--opendrive-output.straight-threshold** {{DT_FLOAT}} | Builds parameterized curves whenever the angular change  between straight segments exceeds FLOAT degrees; *default:* **1e-08** |
+| **--opendrive-output.lefthand-left** {{DT_BOOL}} | Write lanes in lefthand networks on the left side (positive indices); *default:* **false** |
+| **--opendrive-output.shape-match-dist** {{DT_FLOAT}} | Match loaded shapes to the closest edge within FLOAT and export as road objects; *default:* **-1** |
+
+### Projection
+| Option | Description |
+|--------|-------------|
+| **--simple-projection** {{DT_BOOL}} | Uses a simple method for projection; *default:* **false** |
+| **--proj.scale** {{DT_FLOAT}} | Scaling factor for input coordinates; *default:* **1** |
+| **--proj.rotate** {{DT_FLOAT}} | Rotation (clockwise degrees) for input coordinates; *default:* **0** |
+| **--proj.utm** {{DT_BOOL}} | Determine the UTM zone (for a universal transversal mercator projection based on the WGS84 ellipsoid); *default:* **false** |
+| **--proj.dhdn** {{DT_BOOL}} | Determine the DHDN zone (for a transversal mercator projection based on the bessel ellipsoid, "Gauss-Krueger"); *default:* **false** |
+| **--proj** {{DT_STR}} | Uses STR as proj.4 definition for projection; *default:* **!** |
+| **--proj.inverse** {{DT_BOOL}} | Inverses projection; *default:* **false** |
+| **--proj.dhdnutm** {{DT_BOOL}} | Convert from Gauss-Krueger to UTM; *default:* **false** |
+| **--proj.plain-geo** {{DT_BOOL}} | Write geo coordinates in plain-xml; *default:* **false** |
+
+### Processing
+| Option | Description |
+|--------|-------------|
+| **--default.action-step-length** {{DT_FLOAT}} | Length of the default interval length between action points for the car-following and lane-change models (in seconds). If not specified, the simulation step-length is used per default. Vehicle- or VType-specific settings override the default. Must be a multiple of the simulation step-length.; *default:* **0** |
+| **--default.speeddev** {{DT_FLOAT}} | Select default speed deviation. A negative value implies vClass specific defaults (0.1 for the default passenger class; *default:* **-1** |
+| **--speed-in-kmh** {{DT_BOOL}} | vmax is parsed as given in km/h; *default:* **false** |
+| **--construction-date** {{DT_STR}} | Use YYYY-MM-DD date to determine the readiness of features under construction |
+| **--flatten** {{DT_BOOL}} | Remove all z-data; *default:* **false** |
+| **--plain.extend-edge-shape** {{DT_BOOL}} | If edge shapes do not end at the node positions, extend them; *default:* **false** |
+| **--numerical-ids** {{DT_BOOL}} | Remaps alphanumerical IDs of nodes and edges to ensure that all IDs are integers; *default:* **false** |
+| **--numerical-ids.node-start** {{DT_INT}} | Remaps IDs of nodes to integers starting at INT; *default:* **2147483647** |
+| **--numerical-ids.edge-start** {{DT_INT}} | Remaps IDs of edges to integers starting at INT; *default:* **2147483647** |
+| **--reserved-ids** {{DT_FILE}} | Ensures that generated ids do not included any of the typed IDs from FILE (sumo-gui selection file format) |
+| **--dismiss-vclasses** {{DT_BOOL}} | Removes vehicle class restrictions from imported edges; *default:* **false** |
+| **--geometry.split** {{DT_BOOL}} | Splits edges across geometry nodes; *default:* **false** |
+| **-R** {{DT_BOOL}}
 **--geometry.remove** {{DT_BOOL}} | Replace nodes which only define edge geometry by geometry points (joins edges); *default:* **false** |
+| **--geometry.remove.keep-edges.explicit** {{DT_STR[]}} | Ensure that the given list of edges is not modified |
+| **--geometry.remove.keep-edges.input-file** {{DT_FILE}} | Ensure that the edges in FILE are not modified (Each id on a single line. Selection files from sumo-gui are also supported) |
+| **--geometry.remove.keep-ptstops** {{DT_BOOL}} | Ensure that edges with public transport stops are not modified; *default:* **false** |
+| **--geometry.remove.min-length** {{DT_FLOAT}} | Allow merging edges with differing attributes when their length is below min-length; *default:* **0** |
+| **--geometry.remove.width-tolerance** {{DT_FLOAT}} | Allow merging edges with differing lane widths if the difference is below FLOAT; *default:* **0** |
+| **--geometry.remove.max-junction-size** {{DT_FLOAT}} | Prevent removal of junctions with a size above FLOAT as defined by custom edge endpoints; *default:* **-1** |
+| **--geometry.max-segment-length** {{DT_FLOAT}} | splits geometry to restrict segment length; *default:* **0** |
+| **--geometry.min-dist** {{DT_FLOAT}} | reduces too similar geometry points; *default:* **-1** |
+| **--geometry.max-angle** {{DT_FLOAT}} | Warn about edge geometries with an angle above DEGREES in successive segments; *default:* **99** |
+| **--geometry.min-radius** {{DT_FLOAT}} | Warn about edge geometries with a turning radius less than METERS at the start or end; *default:* **9** |
+| **--geometry.min-radius.fix** {{DT_BOOL}} | Straighten edge geometries to avoid turning radii less than geometry.min-radius; *default:* **false** |
+| **--geometry.min-radius.fix.railways** {{DT_BOOL}} | Straighten edge geometries to avoid turning radii less than geometry.min-radius (only railways); *default:* **true** |
+| **--geometry.junction-mismatch-threshold** {{DT_FLOAT}} | Warn if the junction shape is to far away from the original node position; *default:* **20** |
+| **--geometry.check-overlap** {{DT_FLOAT}} | Warn if edges overlap by more than the given threshold value; *default:* **0** |
+| **--geometry.check-overlap.vertical-threshold** {{DT_FLOAT}} | Ignore overlapping edges if they are separated vertically by the given threshold.; *default:* **4** |
+| **--geometry.avoid-overlap** {{DT_BOOL}} | Modify edge geometries to avoid overlap at junctions; *default:* **true** |
+| **--join-lanes** {{DT_BOOL}} | join adjacent lanes that have the same permissions and which do not admit lane-changing (sidewalks and disallowed lanes); *default:* **false** |
+| **--ptline.match-dist** {{DT_FLOAT}} | Matches stops outside the road network to the referencing pt line when below the given distance; *default:* **100** |
+| **--ptstop-output.no-bidi** {{DT_BOOL}} | Skips automatic generation of stops on the bidi-edge of a loaded stop; *default:* **false** |
+| **--geometry.max-grade** {{DT_FLOAT}} | Warn about edge geometries with a grade in % above FLOAT.; *default:* **10** |
+| **--geometry.max-grade.fix** {{DT_BOOL}} | Smooth edge geometries with a grade above the warning threshold.; *default:* **true** |
+| **--offset.disable-normalization** {{DT_BOOL}} | Turn off normalizing node positions |
+| **--offset.x** {{DT_FLOAT}} | Adds FLOAT to net x-positions; *default:* **0** |
+| **--offset.y** {{DT_FLOAT}} | Adds FLOAT to net y-positions; *default:* **0** |
+| **--offset.z** {{DT_FLOAT}} | Adds FLOAT to net z-positions; *default:* **0** |
+| **--flip-y-axis** {{DT_BOOL}} | Flips the y-coordinate along zero; *default:* **false** |
+| **--roundabouts.guess** {{DT_BOOL}} | Enable roundabout-guessing; *default:* **true** |
+| **--roundabouts.visibility-distance** {{DT_FLOAT}} | Default visibility when approaching a roundabout; *default:* **9** |
+| **--opposites.guess** {{DT_BOOL}} | Enable guessing of opposite direction lanes usable for overtaking; *default:* **false** |
+| **--opposites.guess.fix-lengths** {{DT_BOOL}} | Ensure that opposite edges have the same length; *default:* **true** |
+| **--fringe.guess** {{DT_BOOL}} | Enable guessing of network fringe nodes; *default:* **false** |
+| **--fringe.guess.speed-threshold** {{DT_FLOAT}} | Guess disconnected edges above the given speed as outer fringe; *default:* **13.8889** |
+| **--lefthand** {{DT_BOOL}} | Assumes left-hand traffic on the network; *default:* **false** |
+| **--edges.join** {{DT_BOOL}} | Merges edges which connect the same nodes and are close to each other (recommended for VISSIM import); *default:* **false** |
+| **--speed.offset** {{DT_FLOAT}} | Modifies all edge speeds by adding FLOAT; *default:* **0** |
+| **--speed.factor** {{DT_FLOAT}} | Modifies all edge speeds by multiplying by FLOAT; *default:* **1** |
+| **--speed.minimum** {{DT_FLOAT}} | Modifies all edge speeds to at least FLOAT; *default:* **0** |
+| **--edges.join-tram-dist** {{DT_FLOAT}} | Joins tram edges into road lanes with similar geometry (within FLOAT distance); *default:* **-1** |
+
+### Building Defaults
+| Option | Description |
+|--------|-------------|
+| **-L** {{DT_INT}}
 **--default.lanenumber** {{DT_INT}} | The default number of lanes in an edge; *default:* **1** |
+| **--default.lanewidth** {{DT_FLOAT}} | The default width of lanes; *default:* **-1** |
+| **--default.spreadtype** {{DT_STR}} | The default method for computing lane shapes from edge shapes; *default:* **right** |
+| **-S** {{DT_FLOAT}}
 **--default.speed** {{DT_FLOAT}} | The default speed on an edge (in m/s); *default:* **13.89** |
+| **--default.friction** {{DT_FLOAT}} | The default friction on an edge; *default:* **1** |
+| **-P** {{DT_INT}}
 **--default.priority** {{DT_INT}} | The default priority of an edge; *default:* **-1** |
+| **--default.type** {{DT_STR}} | The default edge type |
+| **--default.sidewalk-width** {{DT_FLOAT}} | The default width of added sidewalks; *default:* **2** |
+| **--default.bikelane-width** {{DT_FLOAT}} | The default width of added bike lanes; *default:* **1** |
+| **--default.crossing-width** {{DT_FLOAT}} | The default width of a pedestrian crossing; *default:* **4** |
+| **--default.crossing-speed** {{DT_FLOAT}} | The default speed 'limit' on a pedestrian crossing (in m/s); *default:* **2.78** |
+| **--default.walkingarea-speed** {{DT_FLOAT}} | The default speed 'limit' on a pedestrian walkingarea (in m/s); *default:* **2.78** |
+| **--default.allow** {{DT_STR}} | The default for allowed vehicle classes |
+| **--default.disallow** {{DT_STR}} | The default for disallowed vehicle classes |
+| **--default.junctions.keep-clear** {{DT_BOOL}} | Whether junctions should be kept clear by default; *default:* **true** |
+| **--default.junctions.radius** {{DT_FLOAT}} | The default turning radius of intersections; *default:* **4** |
+| **--default.connection-length** {{DT_FLOAT}} | The default length when overriding connection lengths; *default:* **-1** |
+| **--default.right-of-way** {{DT_STR}} | The default algorithm for computing right of way rules ('default', 'edgePriority'); *default:* **default** |
+
+### Tls Building
+| Option | Description |
+|--------|-------------|
+| **--tls.discard-loaded** {{DT_BOOL}} | Does not instatiate traffic lights loaded from other formats than plain-XML; *default:* **false** |
+| **--tls.discard-simple** {{DT_BOOL}} | Does not instatiate traffic lights at geometry-like nodes loaded from other formats than plain-XML; *default:* **false** |
+| **--tls.set** {{DT_STR[]}} | Interprets STR[] as list of junctions to be controlled by TLS |
+| **--tls.unset** {{DT_STR[]}} | Interprets STR[] as list of junctions to be not controlled by TLS |
+| **--tls.guess** {{DT_BOOL}} | Turns on TLS guessing; *default:* **false** |
+| **--tls.guess.threshold** {{DT_FLOAT}} | Sets minimum value for the sum of all incoming lane speeds when guessing TLS; *default:* **69.4444** |
+| **--tls.taz-nodes** {{DT_BOOL}} | Sets district nodes as tls-controlled; *default:* **false** |
+| **--tls.guess.joining** {{DT_BOOL}} | Includes node clusters into guess; *default:* **false** |
+| **--tls.join** {{DT_BOOL}} | Tries to cluster tls-controlled nodes; *default:* **false** |
+| **--tls.join-dist** {{DT_FLOAT}} | Determines the maximal distance for joining traffic lights (defaults to 20); *default:* **20** |
+| **--tls.join-exclude** {{DT_STR[]}} | Interprets STR[] as list of tls ids to exclude from joining |
+| **--tls.uncontrolled-within** {{DT_BOOL}} | Do not control edges that lie fully within a joined traffic light. This may cause collisions but allows old traffic light plans to be used; *default:* **false** |
+| **--tls.ignore-internal-junction-jam** {{DT_BOOL}} | Do not build mutually conflicting response matrix, potentially ignoring vehicles that are stuck at an internal junction when their phase has ended; *default:* **false** |
+| **--tls.guess-signals** {{DT_BOOL}} | Interprets tls nodes surrounding an intersection as signal positions for a larger TLS. This is typical pattern for OSM-derived networks; *default:* **false** |
+| **--tls.guess-signals.dist** {{DT_FLOAT}} | Distance for interpreting nodes as signal locations; *default:* **25** |
+| **--tls.guess-signals.slack** {{DT_INT}} | Number of uncontrolled entry edges to accept and still consider the central node as a traffic light; *default:* **0** |
+| **--tls.cycle.time** {{DT_INT}} | Use INT as cycle duration; *default:* **90** |
+| **--tls.green.time** {{DT_INT}} | Use INT as green phase duration; *default:* **31** |
+| **-D** {{DT_FLOAT}}
 **--tls.yellow.min-decel** {{DT_FLOAT}} | Defines smallest vehicle deceleration; *default:* **3** |
+| **--tls.yellow.patch-small** {{DT_BOOL}} | Given yellow times are patched even if being too short; *default:* **false** |
+| **--tls.yellow.time** {{DT_INT}} | Set INT as fixed time for yellow phase durations; *default:* **-1** |
+| **--tls.red.time** {{DT_INT}} | Set INT as fixed time for red phase duration at traffic lights that do not have a conflicting flow; *default:* **5** |
+| **--tls.allred.time** {{DT_INT}} | Set INT as fixed time for intermediate red phase after every switch; *default:* **0** |
+| **--tls.minor-left.max-speed** {{DT_FLOAT}} | Use FLOAT as threshold for allowing left-turning vehicles to move in the same phase as oncoming straight-going vehicles; *default:* **19.44** |
+| **--tls.left-green.time** {{DT_INT}} | Use INT as green phase duration for left turns (s). Setting this value to 0 disables additional left-turning phases; *default:* **6** |
+| **--tls.nema.vehExt** {{DT_INT}} | Set INT as fixed time for intermediate vehext phase after every switch; *default:* **2** |
+| **--tls.nema.yellow** {{DT_INT}} | Set INT as fixed time for intermediate NEMA yelow phase after every switch; *default:* **3** |
+| **--tls.nema.red** {{DT_INT}} | Set INT as fixed time for intermediate NEMA red phase after every switch; *default:* **2** |
+| **--tls.crossing-min.time** {{DT_INT}} | Use INT as minimum green duration for pedestrian crossings (s).; *default:* **4** |
+| **--tls.crossing-clearance.time** {{DT_INT}} | Use INT as clearance time for pedestrian crossings (s).; *default:* **5** |
+| **--tls.scramble.time** {{DT_INT}} | Use INT as green phase duration for pedestrian scramble phase (s).; *default:* **5** |
+| **--tls.half-offset** {{DT_STR[]}} | TLSs in STR[] will be shifted by half-phase |
+| **--tls.quarter-offset** {{DT_STR[]}} | TLSs in STR[] will be shifted by quarter-phase |
+| **--tls.default-type** {{DT_STR}} | TLSs with unspecified type will use STR as their algorithm; *default:* **static** |
+| **--tls.layout** {{DT_STR}} | Set phase layout four grouping opposite directions or grouping all movements for one incoming edge ['opposites', 'incoming']; *default:* **opposites** |
+| **--tls.no-mixed** {{DT_BOOL}} | Avoid phases with green and red signals for different connections from the same lane; *default:* **false** |
+| **--tls.min-dur** {{DT_INT}} | Default minimum phase duration for traffic lights with variable phase length; *default:* **5** |
+| **--tls.max-dur** {{DT_INT}} | Default maximum phase duration for traffic lights with variable phase length; *default:* **50** |
+| **--tls.group-signals** {{DT_BOOL}} | Assign the same tls link index to connections that share the same states; *default:* **false** |
+| **--tls.ungroup-signals** {{DT_BOOL}} | Assign a distinct tls link index to every connection; *default:* **false** |
+| **--tls.rebuild** {{DT_BOOL}} | rebuild all traffic light plans in the network; *default:* **false** |
+
+### Ramp Guessing
+| Option | Description |
+|--------|-------------|
+| **--ramps.guess** {{DT_BOOL}} | Enable ramp-guessing; *default:* **false** |
+| **--ramps.guess-acceleration-lanes** {{DT_BOOL}} | Guess on-ramps and mark acceleration lanes if they exist but do not add new lanes; *default:* **true** |
+| **--ramps.max-ramp-speed** {{DT_FLOAT}} | Treat edges with speed > FLOAT as no ramps; *default:* **-1** |
+| **--ramps.min-highway-speed** {{DT_FLOAT}} | Treat edges with speed < FLOAT as no highways; *default:* **21.9444** |
+| **--ramps.ramp-length** {{DT_FLOAT}} | Use FLOAT as ramp-length; *default:* **100** |
+| **--ramps.min-weave-length** {{DT_FLOAT}} | Use FLOAT as minimum ramp-length; *default:* **50** |
+| **--ramps.set** {{DT_STR[]}} | Tries to handle the given edges as ramps |
+| **--ramps.unset** {{DT_STR[]}} | Do not consider the given edges as ramps |
+| **--ramps.no-split** {{DT_BOOL}} | Avoids edge splitting; *default:* **false** |
+
+### Edge Removal
+| Option | Description |
+|--------|-------------|
+| **--keep-edges.min-speed** {{DT_FLOAT}} | Only keep edges with speed in meters/second > FLOAT; *default:* **-1** |
+| **--remove-edges.explicit** {{DT_STR[]}} | Remove edges in STR[] |
+| **--keep-edges.explicit** {{DT_STR[]}} | Only keep edges in STR[] or those which are kept due to other keep-edges or remove-edges options |
+| **--keep-edges.input-file** {{DT_FILE}} | Only keep edges in FILE (Each id on a single line. Selection files from sumo-gui are also supported) or those which are kept due to other keep-edges or remove-edges options |
+| **--remove-edges.input-file** {{DT_FILE}} | Remove edges in FILE. (Each id on a single line. Selection files from sumo-gui are also supported) |
+| **--keep-edges.postload** {{DT_BOOL}} | Remove edges after joining; *default:* **false** |
+| **--keep-edges.in-boundary** {{DT_STR[]}} | Only keep edges which are located within the given boundary (given either as CARTESIAN corner coordinates  or as polygon ) |
+| **--keep-edges.in-geo-boundary** {{DT_STR[]}} | Only keep edges which are located within the given boundary (given either as GEODETIC corner coordinates  or as polygon ) |
+| **--keep-edges.by-vclass** {{DT_STR[]}} | Only keep edges which allow one of the vclasses in STR[] |
+| **--remove-edges.by-vclass** {{DT_STR[]}} | Remove edges which allow only vclasses from STR[] |
+| **--keep-edges.by-type** {{DT_STR[]}} | Only keep edges where type is in STR[] |
+| **--keep-edges.components** {{DT_INT}} | Only keep the INT largest weakly connected components; *default:* **0** |
+| **--remove-edges.by-type** {{DT_STR[]}} | Remove edges where type is in STR[] |
+| **--remove-edges.isolated** {{DT_BOOL}} | Removes isolated edges; *default:* **false** |
+
+### Unregulated Nodes
+| Option | Description |
+|--------|-------------|
+| **--keep-nodes-unregulated** {{DT_BOOL}} | All nodes will be unregulated; *default:* **false** |
+| **--keep-nodes-unregulated.explicit** {{DT_STR[]}} | Do not regulate nodes in STR[] |
+| **--keep-nodes-unregulated.district-nodes** {{DT_BOOL}} | Do not regulate district nodes; *default:* **false** |
+
+### Junctions
+| Option | Description |
+|--------|-------------|
+| **--junctions.right-before-left.speed-threshold** {{DT_FLOAT}} | Allow building right-before-left junctions when the incoming edge speeds are below FLOAT (m/s); *default:* **13.6111** |
+| **--junctions.left-before-right** {{DT_BOOL}} | Build left-before-right junctions instead of right-before-left junctions; *default:* **false** |
+| **--no-internal-links** {{DT_BOOL}} | Omits internal links; *default:* **false** |
+| **--no-turnarounds** {{DT_BOOL}} | Disables building turnarounds |
+| **--no-turnarounds.tls** {{DT_BOOL}} | Disables building turnarounds at tls-controlled junctions; *default:* **false** |
+| **--no-turnarounds.geometry** {{DT_BOOL}} | Disables building turnarounds at geometry-like junctions; *default:* **true** |
+| **--no-turnarounds.except-deadend** {{DT_BOOL}} | Disables building turnarounds except at dead end junctions; *default:* **false** |
+| **--no-turnarounds.except-turnlane** {{DT_BOOL}} | Disables building turnarounds except at at junctions with a dedicated turning lane; *default:* **false** |
+| **--no-turnarounds.fringe** {{DT_BOOL}} | Disables building turnarounds at fringe junctions; *default:* **false** |
+| **--no-left-connections** {{DT_BOOL}} | Disables building connections to left; *default:* **false** |
+| **--junctions.join** {{DT_BOOL}} | Joins junctions that are close to each other (recommended for OSM import); *default:* **false** |
+| **--junctions.join-dist** {{DT_FLOAT}} | Determines the maximal distance for joining junctions (defaults to 10); *default:* **10** |
+| **--junctions.join-exclude** {{DT_STR[]}} | Interprets STR[] as list of junctions to exclude from joining |
+| **--junctions.join-same** {{DT_BOOL}} | Joins junctions that have the same coordinates even if not connected; *default:* **false** |
+| **--max-join-ids** {{DT_INT}} | Abbreviate junction or TLS id if it joins more than INT junctions; *default:* **4** |
+| **--junctions.corner-detail** {{DT_INT}} | Generate INT intermediate points to smooth out intersection corners; *default:* **5** |
+| **--junctions.internal-link-detail** {{DT_INT}} | Generate INT intermediate points to smooth out lanes within the intersection; *default:* **5** |
+| **--junctions.scurve-stretch** {{DT_FLOAT}} | Generate longer intersections to allow for smooth s-curves when the number of lanes changes; *default:* **0** |
+| **--junctions.join-turns** {{DT_BOOL}} | Builds common edges for turning connections with common from- and to-edge. This causes discrepancies between geometrical length and assigned length due to averaging but enables lane-changing while turning; *default:* **false** |
+| **--junctions.limit-turn-speed** {{DT_FLOAT}} | Limits speed on junctions to an average lateral acceleration of at most FLOAT m/s^2); *default:* **5.5** |
+| **--junctions.limit-turn-speed.min-angle** {{DT_FLOAT}} | Do not limit turn speed for angular changes below FLOAT (degrees). The value is subtracted from the geometric angle before computing the turning radius.; *default:* **15** |
+| **--junctions.limit-turn-speed.min-angle.railway** {{DT_FLOAT}} | Do not limit turn speed for angular changes below FLOAT (degrees) on railway edges. The value is subtracted from the geometric angle before computing the turning radius.; *default:* **35** |
+| **--junctions.limit-turn-speed.warn.straight** {{DT_FLOAT}} | Warn about turn speed limits that reduce the speed of straight connections by more than FLOAT; *default:* **5** |
+| **--junctions.limit-turn-speed.warn.turn** {{DT_FLOAT}} | Warn about turn speed limits that reduce the speed of turning connections (no u-turns) by more than FLOAT; *default:* **22** |
+| **--junctions.small-radius** {{DT_FLOAT}} | Default radius for junctions that do not require wide vehicle turns; *default:* **1.5** |
+| **--junctions.higher-speed** {{DT_BOOL}} | Use maximum value of incoming and outgoing edge speed on junction instead of average; *default:* **false** |
+| **--junctions.minimal-shape** {{DT_BOOL}} | Build junctions with minimal shapes (igoring edge overlap); *default:* **false** |
+| **--internal-junctions.vehicle-width** {{DT_FLOAT}} | Assumed vehicle width for computing internal junction positions; *default:* **1.8** |
+| **--rectangular-lane-cut** {{DT_BOOL}} | Forces rectangular cuts between lanes and intersections; *default:* **false** |
+| **--check-lane-foes.roundabout** {{DT_BOOL}} | Allow driving onto a multi-lane road if there are foes on other lanes (at roundabouts); *default:* **true** |
+| **--check-lane-foes.all** {{DT_BOOL}} | Allow driving onto a multi-lane road if there are foes on other lanes (everywhere); *default:* **false** |
+
+### Pedestrian
+| Option | Description |
+|--------|-------------|
+| **--sidewalks.guess** {{DT_BOOL}} | Guess pedestrian sidewalks based on edge speed; *default:* **false** |
+| **--sidewalks.guess.max-speed** {{DT_FLOAT}} | Add sidewalks for edges with a speed equal or below the given limit; *default:* **13.89** |
+| **--sidewalks.guess.min-speed** {{DT_FLOAT}} | Add sidewalks for edges with a speed above the given limit; *default:* **5.8** |
+| **--sidewalks.guess.from-permissions** {{DT_BOOL}} | Add sidewalks for edges that allow pedestrians on any of their lanes regardless of speed; *default:* **false** |
+| **--sidewalks.guess.exclude** {{DT_STR[]}} | Do not guess sidewalks for the given list of edges |
+| **--crossings.guess** {{DT_BOOL}} | Guess pedestrian crossings based on the presence of sidewalks; *default:* **false** |
+| **--crossings.guess.speed-threshold** {{DT_FLOAT}} | At uncontrolled nodes, do not build crossings across edges with a speed above the threshold; *default:* **13.89** |
+| **--walkingareas** {{DT_BOOL}} | Always build walking areas even if there are no crossings; *default:* **false** |
+| **--walkingareas.join-dist** {{DT_FLOAT}} | Do not create a walkingarea between sidewalks that are connected by a pedestrian junction within FLOAT; *default:* **15** |
+
+### Bicycle
+| Option | Description |
+|--------|-------------|
+| **--bikelanes.guess** {{DT_BOOL}} | Guess bike lanes based on edge speed; *default:* **false** |
+| **--bikelanes.guess.max-speed** {{DT_FLOAT}} | Add bike lanes for edges with a speed equal or below the given limit; *default:* **22.22** |
+| **--bikelanes.guess.min-speed** {{DT_FLOAT}} | Add bike lanes for edges with a speed above the given limit; *default:* **5.8** |
+| **--bikelanes.guess.from-permissions** {{DT_BOOL}} | Add bike lanes for edges that allow bicycles on any of their lanes regardless of speed; *default:* **false** |
+| **--bikelanes.guess.exclude** {{DT_STR[]}} | Do not guess bikelanes for the given list of edges |
+
+### Railway
+| Option | Description |
+|--------|-------------|
+| **--railway.signals.discard** {{DT_BOOL}} | Discard all railway signal information loaded from other formats than plain-xml; *default:* **false** |
+| **--railway.topology.repair** {{DT_BOOL}} | Repair topology of the railway network; *default:* **false** |
+| **--railway.topology.repair.minimal** {{DT_BOOL}} | Repair topology of the railway network just enough to let loaded public transport lines to work; *default:* **false** |
+| **--railway.topology.repair.connect-straight** {{DT_BOOL}} | Allow bidirectional rail use wherever rails with opposite directions meet at a straight angle; *default:* **false** |
+| **--railway.topology.repair.stop-turn** {{DT_BOOL}} | Add turn-around connections at all loaded stops.; *default:* **false** |
+| **--railway.topology.repair.bidi-penalty** {{DT_FLOAT}} | Penalty factor for adding new bidi edges to connect public transport stops; *default:* **1.2** |
+| **--railway.topology.all-bidi** {{DT_BOOL}} | Make all rails usable in both direction; *default:* **false** |
+| **--railway.topology.all-bidi.input-file** {{DT_FILE}} | Make all rails edge ids from FILE usable in both direction |
+| **--railway.topology.direction-priority** {{DT_BOOL}} | Set edge priority values based on estimated main direction; *default:* **false** |
+| **--railway.topology.extend-priority** {{DT_BOOL}} | Extend loaded edge priority values based on estimated main direction; *default:* **false** |
+| **--railway.signal.guess.by-stops** {{DT_BOOL}} | Guess signals that guard public transport stops; *default:* **false** |
+| **--railway.access-distance** {{DT_FLOAT}} | The search radius for finding suitable road accesses for rail stops; *default:* **150** |
+| **--railway.max-accesses** {{DT_INT}} | The maximum road accesses registered per rail stops; *default:* **5** |
+| **--railway.access-factor** {{DT_FLOAT}} | The walking length of the access is computed as air-line distance multiplied by FLOAT; *default:* **1.5** |
+
+### Formats
+| Option | Description |
+|--------|-------------|
+| **--discard-params** {{DT_STR[]}} | Remove the list of keys from all params |
+| **--ignore-change-restrictions** {{DT_STR[]}} | List vehicle classes that may ignore lane changing restrictions ('all' discards all restrictions); *default:* **authority** |
+| **--osm.skip-duplicates-check** {{DT_BOOL}} | Skips the check for duplicate nodes and edges; *default:* **false** |
+| **--osm.elevation** {{DT_BOOL}} | Imports elevation data; *default:* **false** |
+| **--osm.layer-elevation** {{DT_FLOAT}} | Reconstruct (relative) elevation based on layer data. Each layer is raised by FLOAT m; *default:* **0** |
+| **--osm.layer-elevation.max-grade** {{DT_FLOAT}} | Maximum grade threshold in % at 50km/h when reconstrucing elevation based on layer data. The value is scaled according to road speed.; *default:* **10** |
+| **--osm.oneway-spread-right** {{DT_BOOL}} | Whether one-way roads should be spread to the side instead of centered; *default:* **false** |
+| **--osm.lane-access** {{DT_BOOL}} | Import lane-specific access restrictions; *default:* **false** |
+| **--osm.bike-access** {{DT_BOOL}} | Import bike lanes and fix directions and permissions on bike paths; *default:* **false** |
+| **--osm.sidewalks** {{DT_BOOL}} | Import sidewalks; *default:* **false** |
+| **--osm.crossings** {{DT_BOOL}} | Import crossings; *default:* **false** |
+| **--osm.turn-lanes** {{DT_BOOL}} | Import turning arrows from OSM to help with connection building; *default:* **false** |
+| **--osm.stop-output.length** {{DT_FLOAT}} | The default length of a public transport stop in FLOAT m; *default:* **25** |
+| **--osm.stop-output.length.bus** {{DT_FLOAT}} | The default length of a bus stop in FLOAT m; *default:* **15** |
+| **--osm.stop-output.length.tram** {{DT_FLOAT}} | The default length of a tram stop in FLOAT m; *default:* **25** |
+| **--osm.stop-output.length.train** {{DT_FLOAT}} | The default length of a train stop in FLOAT m; *default:* **200** |
+| **--osm.all-attributes** {{DT_BOOL}} | Whether additional attributes shall be imported; *default:* **false** |
+| **--osm.extra-attributes** {{DT_STR[]}} | List of additional attributes that shall be imported from OSM via osm.all-attributes (set 'all' to import all); *default:* **all** |
+| **--osm.speedlimit-none** {{DT_FLOAT}} | The speed limit to be set when there is no actual speed limit in reality; *default:* **39.4444** |
+| **--matsim.keep-length** {{DT_BOOL}} | The edge lengths given in the MATSIM-file will be kept; *default:* **false** |
+| **--matsim.lanes-from-capacity** {{DT_BOOL}} | The lane number will be computed from the capacity; *default:* **false** |
+| **--shapefile.street-id** {{DT_STR}} | Read edge ids from column STR |
+| **--shapefile.from-id** {{DT_STR}} | Read from-node ids from column STR |
+| **--shapefile.to-id** {{DT_STR}} | Read to-node ids from column STR |
+| **--shapefile.type-id** {{DT_STR}} | Read type ids from column STR |
+| **--shapefile.laneNumber** {{DT_STR}} | Read lane number from column STR |
+| **--shapefile.speed** {{DT_STR}} | Read speed from column STR |
+| **--shapefile.length** {{DT_STR}} | Read custom edge length from column STR |
+| **--shapefile.width** {{DT_STR}} | Read total edge width from column STR |
+| **--shapefile.name** {{DT_STR}} | Read (non-unique) name from column STR |
+| **--shapefile.node-join-dist** {{DT_FLOAT}} | Distance threshold for determining whether distinct shapes are connected (used when from-id and to-id are not available); *default:* **0** |
+| **--shapefile.add-params** {{DT_STR[]}} | Add the list of field names as edge params |
+| **--shapefile.use-defaults-on-failure** {{DT_BOOL}} | Uses edge type defaults on problems; *default:* **false** |
+| **--shapefile.all-bidirectional** {{DT_BOOL}} | Insert edges in both directions; *default:* **false** |
+| **--shapefile.guess-projection** {{DT_BOOL}} | Guess the proper projection; *default:* **false** |
+| **--shapefile.traditional-axis-mapping** {{DT_BOOL}} | Use traditional axis order (lon, lat); *default:* **false** |
+| **--dlr-navteq.tolerant-permissions** {{DT_BOOL}} | Allow more vehicle classes by default; *default:* **false** |
+| **--dlr-navteq.keep-length** {{DT_BOOL}} | The edge lengths given in the DLR Navteq-file will be kept; *default:* **false** |
+| **--vissim.join-distance** {{DT_FLOAT}} | Structure join offset; *default:* **5** |
+| **--vissim.default-speed** {{DT_FLOAT}} | Use FLOAT as default speed; *default:* **50** |
+| **--vissim.speed-norm** {{DT_FLOAT}} | Factor for edge velocity; *default:* **1** |
+| **--vissim.report-unset-speeds** {{DT_BOOL}} | Writes lanes without an explicit speed set; *default:* **false** |
+| **--visum.language-file** {{DT_FILE}} | Load language mappings from FILE |
+| **--visum.use-type-priority** {{DT_BOOL}} | Uses priorities from types; *default:* **false** |
+| **--visum.use-type-laneno** {{DT_BOOL}} | Uses lane numbers from types; *default:* **false** |
+| **--visum.use-type-speed** {{DT_BOOL}} | Uses speeds from types; *default:* **false** |
+| **--visum.connector-speeds** {{DT_FLOAT}} | Sets connector speed; *default:* **100** |
+| **--visum.connectors-lane-number** {{DT_INT}} | Sets connector lane number; *default:* **3** |
+| **--visum.no-connectors** {{DT_BOOL}} | Excludes connectors; *default:* **true** |
+| **--visum.recompute-lane-number** {{DT_BOOL}} | Computes the number of lanes from the edges' capacities; *default:* **false** |
+| **--visum.verbose-warnings** {{DT_BOOL}} | Prints all warnings, some of which are due to VISUM misbehaviour; *default:* **false** |
+| **--visum.lanes-from-capacity.norm** {{DT_FLOAT}} | The factor for flow to no. lanes conversion; *default:* **1800** |
+| **--opendrive.import-all-lanes** {{DT_BOOL}} | Imports all lane types; *default:* **false** |
+| **--opendrive.ignore-widths** {{DT_BOOL}} | Whether lane widths shall be ignored.; *default:* **false** |
+| **--opendrive.curve-resolution** {{DT_FLOAT}} | The geometry resolution in m when importing curved geometries as line segments.; *default:* **2** |
+| **--opendrive.advance-stopline** {{DT_FLOAT}} | Allow stop lines to be built beyond the start of the junction if the geometries allow so; *default:* **0** |
+| **--opendrive.min-width** {{DT_FLOAT}} | The minimum lane width for determining start or end of variable-width lanes; *default:* **1.8** |
+| **--opendrive.internal-shapes** {{DT_BOOL}} | Import internal lane shapes; *default:* **false** |
+| **--opendrive.position-ids** {{DT_BOOL}} | Sets edge-id based on road-id and offset in m (legacy); *default:* **false** |
+| **--opendrive.lane-shapes** {{DT_BOOL}} | Use custom lane shapes to compensate discarded lane types; *default:* **false** |
+| **--opendrive.signal-groups** {{DT_BOOL}} | Use the OpenDRIVE controller information for the generated signal program; *default:* **false** |
+
+### Netedit
+| Option | Description |
+|--------|-------------|
+| **--new-network** {{DT_BOOL}} | Start netedit with a new network; *default:* **false** |
+| **--attribute-help-output** {{DT_FILE}} | Write attribute help to file |
+| **--node-prefix** {{DT_STR}} | Prefix for node naming; *default:* **J** |
+| **--edge-prefix** {{DT_STR}} | Prefix for edge naming; *default:* **E** |
+| **--edge-infix** {{DT_STR}} | Enable edge-infix () |
+| **--busStop-prefix** {{DT_STR}} | Prefix for busStop naming; *default:* **bs** |
+| **--trainStop-prefix** {{DT_STR}} | Prefix for trainStop naming; *default:* **ts** |
+| **--containerStop-prefix** {{DT_STR}} | Prefix for containerStop naming; *default:* **ct** |
+| **--chargingStation-prefix** {{DT_STR}} | Prefix for chargingStation naming; *default:* **cs** |
+| **--parkingArea-prefix** {{DT_STR}} | Prefix for parkingArea naming; *default:* **pa** |
+| **--e1Detector-prefix** {{DT_STR}} | Prefix for e1Detector naming; *default:* **e1** |
+| **--e2Detector-prefix** {{DT_STR}} | Prefix for e2Detector naming; *default:* **e2** |
+| **--e3Detector-prefix** {{DT_STR}} | Prefix for e3Detector naming; *default:* **e3** |
+| **--e1InstantDetector-prefix** {{DT_STR}} | Prefix for e1InstantDetector naming; *default:* **e1i** |
+| **--rerouter-prefix** {{DT_STR}} | Prefix for rerouter naming; *default:* **rr** |
+| **--calibrator-prefix** {{DT_STR}} | Prefix for calibrator naming; *default:* **ca** |
+| **--routeProbe-prefix** {{DT_STR}} | Prefix for routeProbe naming; *default:* **rp** |
+| **--vss-prefix** {{DT_STR}} | Prefix for variable speed sign naming; *default:* **vs** |
+| **--tractionSubstation-prefix** {{DT_STR}} | prefix for traction substation naming; *default:* **tr** |
+| **--overheadWire-prefix** {{DT_STR}} | Prefix for overhead wire naming; *default:* **ow** |
+| **--polygon-prefix** {{DT_STR}} | Prefix for polygon naming; *default:* **po** |
+| **--poi-prefix** {{DT_STR}} | Prefix for poi naming; *default:* **poi** |
+| **--route-prefix** {{DT_STR}} | Prefix for route naming; *default:* **r** |
+| **--vType-prefix** {{DT_STR}} | Prefix for type naming; *default:* **t** |
+| **--vTypeDistribution-prefix** {{DT_STR}} | Prefix for type distribution naming; *default:* **td** |
+| **--vehicle-prefix** {{DT_STR}} | Prefix for vehicle naming; *default:* **v** |
+| **--trip-prefix** {{DT_STR}} | Prefix for trip naming; *default:* **t** |
+| **--flow-prefix** {{DT_STR}} | Prefix for flow naming; *default:* **f** |
+| **--person-prefix** {{DT_STR}} | Prefix for person naming; *default:* **p** |
+| **--personflow-prefix** {{DT_STR}} | Prefix for personFlow naming; *default:* **pf** |
+| **--container-prefix** {{DT_STR}} | Prefix for container naming; *default:* **c** |
+| **--containerflow-prefix** {{DT_STR}} | Prefix for containerFlow naming; *default:* **cf** |
+| **--meanDataEdge-prefix** {{DT_STR}} | Prefix for meanDataEdge naming; *default:* **ed** |
+| **--meanDataLane-prefix** {{DT_STR}} | Prefix for meanDataLane naming; *default:* **ld** |
+
+### Visualisation
+| Option | Description |
+|--------|-------------|
+| **--disable-laneIcons** {{DT_BOOL}} | Disable icons of special lanes; *default:* **false** |
+| **-T** {{DT_BOOL}}
 **--disable-textures** {{DT_BOOL}} | Disable textures; *default:* **false** |
+| **-g** {{DT_FILE}}
 **--gui-settings-file** {{DT_FILE}} | Load visualisation settings from FILE |
+| **--registry-viewport** {{DT_BOOL}} | Load current viewport from registry; *default:* **false** |
+| **--window-size** {{DT_STR[]}} | Create initial window with the given x,y size |
+| **--window-pos** {{DT_STR[]}} | Create initial window at the given x,y position |
+| **--gui-testing** {{DT_BOOL}} | Enable overlay for screen recognition; *default:* **false** |
+| **--gui-testing-debug** {{DT_BOOL}} | Enable output messages during GUI-Testing; *default:* **false** |
+| **--gui-testing-debug-gl** {{DT_BOOL}} | Enable output messages during GUI-Testing specific of gl functions; *default:* **false** |
+| **--gui-testing.setting-output** {{DT_FILE}} | Save gui settings in the given settings-output file |
+
+### Time
+| Option | Description |
+|--------|-------------|
+| **--begin** {{DT_TIME}} | Defines the begin time in seconds; The simulation starts at this time; *default:* **0** |
+| **--end** {{DT_TIME}} | Defines the end time in seconds; The simulation ends at this time; *default:* **-1** |
+
+### Report
+| Option | Description |
+|--------|-------------|
+| **-v** {{DT_BOOL}}
 **--verbose** {{DT_BOOL}} | Switches to verbose output; *default:* **false** |
+| **--print-options** {{DT_BOOL}} | Prints option values before processing; *default:* **false** |
+| **-?** {{DT_BOOL}}
 **--help** {{DT_BOOL}} | Prints this screen or selected topics; *default:* **false** |
+| **-V** {{DT_BOOL}}
 **--version** {{DT_BOOL}} | Prints the current version; *default:* **false** |
+| **-X** {{DT_STR}}
 **--xml-validation** {{DT_STR}} | Set schema validation scheme of XML inputs ("never", "local", "auto" or "always"); *default:* **local** |
+| **--xml-validation.net** {{DT_STR}} | Set schema validation scheme of SUMO network inputs ("never", "local", "auto" or "always"); *default:* **never** |
+| **--xml-validation.routes** {{DT_STR}} | Set schema validation scheme of SUMO route inputs ("never", "local", "auto" or "always"); *default:* **local** |
+| **-W** {{DT_BOOL}}
 **--no-warnings** {{DT_BOOL}} | Disables output of warnings; *default:* **false** |
+| **--aggregate-warnings** {{DT_INT}} | Aggregate warnings of the same type whenever more than INT occur; *default:* **-1** |
+| **-l** {{DT_FILE}}
 **--log** {{DT_FILE}} | Writes all messages to FILE (implies verbose) |
+| **--message-log** {{DT_FILE}} | Writes all non-error messages to FILE (implies verbose) |
+| **--error-log** {{DT_FILE}} | Writes all warnings and errors to FILE |
+| **--language** {{DT_STR}} | Language to use in messages; *default:* **C** |
+| **--ignore-errors** {{DT_BOOL}} | Continue on broken input; *default:* **false** |
+| **--ignore-errors.connections** {{DT_BOOL}} | Continue on invalid connections; *default:* **false** |
+| **--show-errors.connections-first-try** {{DT_BOOL}} | Show errors in connections at parsing; *default:* **false** |
+| **--ignore-errors.edge-type** {{DT_BOOL}} | Continue on unknown edge types; *default:* **false** |
+
+### Random Number
+| Option | Description |
+|--------|-------------|
+| **--random** {{DT_BOOL}} | Initialises the random number generator with the current system time; *default:* **false** |
+| **--seed** {{DT_INT}} | Initialises the random number generator with the given value; *default:* **23423** |
+
+
diff -Nru sumo-1.17.0/docs/web/docs/netgenerate.md sumo-1.18.0/docs/web/docs/netgenerate.md
--- sumo-1.17.0/docs/web/docs/netgenerate.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/netgenerate.md	2023-06-28 20:02:17.000000000 +0000
@@ -23,7 +23,7 @@
 
 You may use a XML schema definition file for setting up a netgenerate
 configuration:
-[netgenerateConfiguration.xsd](http://sumo.dlr.de/xsd/netgenerateConfiguration.xsd).
+[netgenerateConfiguration.xsd](https://sumo.dlr.de/xsd/netgenerateConfiguration.xsd).
 
 ### Configuration
 
@@ -151,6 +151,7 @@
 | **--geometry.remove.keep-edges.input-file** {{DT_FILE}} | Ensure that the edges in FILE are not modified (Each id on a single line. Selection files from sumo-gui are also supported) |
 | **--geometry.remove.min-length** {{DT_FLOAT}} | Allow merging edges with differing attributes when their length is below min-length; *default:* **0** |
 | **--geometry.remove.width-tolerance** {{DT_FLOAT}} | Allow merging edges with differing lane widths if the difference is below FLOAT; *default:* **0** |
+| **--geometry.remove.max-junction-size** {{DT_FLOAT}} | Prevent removal of junctions with a size above FLOAT as defined by custom edge endpoints; *default:* **-1** |
 | **--geometry.max-segment-length** {{DT_FLOAT}} | splits geometry to restrict segment length; *default:* **0** |
 | **--geometry.max-grade** {{DT_FLOAT}} | Warn about edge geometries with a grade in % above FLOAT.; *default:* **10** |
 | **--geometry.max-grade.fix** {{DT_BOOL}} | Smooth edge geometries with a grade above the warning threshold.; *default:* **true** |
@@ -205,6 +206,7 @@
 | **--tls.guess.joining** {{DT_BOOL}} | Includes node clusters into guess; *default:* **false** |
 | **--tls.join** {{DT_BOOL}} | Tries to cluster tls-controlled nodes; *default:* **false** |
 | **--tls.join-dist** {{DT_FLOAT}} | Determines the maximal distance for joining traffic lights (defaults to 20); *default:* **20** |
+| **--tls.join-exclude** {{DT_STR[]}} | Interprets STR[] as list of tls ids to exclude from joining |
 | **--tls.uncontrolled-within** {{DT_BOOL}} | Do not control edges that lie fully within a joined traffic light. This may cause collisions but allows old traffic light plans to be used; *default:* **false** |
 | **--tls.ignore-internal-junction-jam** {{DT_BOOL}} | Do not build mutually conflicting response matrix, potentially ignoring vehicles that are stuck at an internal junction when their phase has ended; *default:* **false** |
 | **--tls.cycle.time** {{DT_INT}} | Use INT as cycle duration; *default:* **90** |
@@ -283,6 +285,7 @@
 | **--junctions.limit-turn-speed.warn.turn** {{DT_FLOAT}} | Warn about turn speed limits that reduce the speed of turning connections (no u-turns) by more than FLOAT; *default:* **22** |
 | **--junctions.small-radius** {{DT_FLOAT}} | Default radius for junctions that do not require wide vehicle turns; *default:* **1.5** |
 | **--junctions.higher-speed** {{DT_BOOL}} | Use maximum value of incoming and outgoing edge speed on junction instead of average; *default:* **false** |
+| **--junctions.minimal-shape** {{DT_BOOL}} | Build junctions with minimal shapes (igoring edge overlap); *default:* **false** |
 | **--internal-junctions.vehicle-width** {{DT_FLOAT}} | Assumed vehicle width for computing internal junction positions; *default:* **1.8** |
 | **--rectangular-lane-cut** {{DT_BOOL}} | Forces rectangular cuts between lanes and intersections; *default:* **false** |
 | **--check-lane-foes.roundabout** {{DT_BOOL}} | Allow driving onto a multi-lane road if there are foes on other lanes (at roundabouts); *default:* **true** |
diff -Nru sumo-1.17.0/docs/web/docs/Networks/Export.md sumo-1.18.0/docs/web/docs/Networks/Export.md
--- sumo-1.17.0/docs/web/docs/Networks/Export.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Networks/Export.md	2023-06-28 20:02:17.000000000 +0000
@@ -36,13 +36,13 @@
 ## Amitran
 
 The Amitran network format consists of a single XML file conforming to
-the schema at . The option **--amitran-output** {{DT_FILE}}
+the schema at . The option **--amitran-output** {{DT_FILE}}
 writes the data to a file with the following format
 
 ```xml
 
 
-
+
    
    
    ...
@@ -56,6 +56,6 @@
 
 
 
-
+
 This part of SUMO was developed, reworked, or extended within the project 
-"AMITRAN", co-funded by the European Commission within the Seventh Framework Programme.
\ No newline at end of file
+"AMITRAN", co-funded by the European Commission within the Seventh Framework Programme.
\ No newline at end of file
diff -Nru sumo-1.17.0/docs/web/docs/Networks/Import/ArcView.md sumo-1.18.0/docs/web/docs/Networks/Import/ArcView.md
--- sumo-1.17.0/docs/web/docs/Networks/Import/ArcView.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Networks/Import/ArcView.md	2023-06-28 20:02:17.000000000 +0000
@@ -147,7 +147,7 @@
 ## 'Frida' network (city of Osnabrück)
 
 The network is available at the
-[Frida-homepage](http://frida.intevation.org/) and is licensed under the
+[Frida-homepage](https://frida.intevation.org/) and is licensed under the
 GPL.
 
 Our main interest is of course the street network. The following files
@@ -165,7 +165,7 @@
 - Different field naming
 
   The only problem with this is that we can not extract street names
-  properly. Still, within [FRIDA](http://frida.intevation.org/), the
+  properly. Still, within [FRIDA](https://frida.intevation.org/), the
   edges are numbered, and we may use the street id as name.
   The call has to be extended by: **--arcview.street-id strShapeID**
 
@@ -266,4 +266,4 @@
 for highways.
 
 
-This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 Unported License. The authors are listed in the history.
+This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 Unported License. The authors are listed in the history.
diff -Nru sumo-1.17.0/docs/web/docs/Networks/Import/OpenDRIVE.md sumo-1.18.0/docs/web/docs/Networks/Import/OpenDRIVE.md
--- sumo-1.17.0/docs/web/docs/Networks/Import/OpenDRIVE.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Networks/Import/OpenDRIVE.md	2023-06-28 20:02:17.000000000 +0000
@@ -2,7 +2,7 @@
 title: OpenDRIVE
 ---
 
-For reading [OpenDRIVE networks](http://www.opendrive.org/), give
+For reading [OpenDRIVE networks](https://www.opendrive.org/), give
 [netconvert](../../netconvert.md) the option **--opendrive-files** {{DT_FILE}}\[,{{DT_FILE}}\]\* or **--opendrive** {{DT_FILE}}\[,{{DT_FILE}}\]\* for short.
 
 ```
@@ -116,6 +116,12 @@
 
 Geometry in OpenDRIVE takes the form of parametric curves (arcs, spirals and splines). These are all sampled with a configurable precision (**--opendrive.curve-resolution** {{DT_FLOAT}}) to produce polylines in the .net.xml. Junction shapes are not encoded in OpenDRIVE. They are generated based on points where the shapes of normal roads and connecting roads meet. 
 
+## Handling of traffic light signaling
+
+OpenDRIVE considers traffic lights by the physical aspect of the signals, their position and the lanes they control. Optionally, signals can be grouped in a `` element.
+The car signals are imported into SUMO by default and organised into one traffic light per intersection. If the option **--opendrive.signal-groups** {{DT_FLOAT}} is set to true, netconvert will try to build the same signal groups in SUMO
+as given by the OpenDRIVE `` items. **This can generate invalid SUMO signal programs (minor "g" vs. major green "G", see [signal state](../../Simulation/Traffic_Lights.md#signal_state_definitions)) or fail due to complex signal group settings.** Currently, signals for cyclists and pedestrians are not imported.
+
 ## Referencing original IDs
 
 When using the option **--output.original-names**, each lane will receive a `` which can be used with
diff -Nru sumo-1.17.0/docs/web/docs/Networks/Import/OpenStreetMapDownload.md sumo-1.18.0/docs/web/docs/Networks/Import/OpenStreetMapDownload.md
--- sumo-1.17.0/docs/web/docs/Networks/Import/OpenStreetMapDownload.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Networks/Import/OpenStreetMapDownload.md	2023-06-28 20:02:17.000000000 +0000
@@ -2,22 +2,22 @@
 title: OpenStreetMapDownload
 ---
 
-From :
+From :
 
-> *"[OpenStreetMap](http://www.openstreetmap.org/) is a free editable
+> *"[OpenStreetMap](https://www.openstreetmap.org/) is a free editable
 > map of the whole world. It is made by people like you."*
 >
-> *"[OpenStreetMap](http://www.openstreetmap.org/) creates and provides
+> *"[OpenStreetMap](https://www.openstreetmap.org/) creates and provides
 > free geographic data such as street maps to anyone who wants them. The
 > project was started because most maps you think of as free actually
 > have legal or technical restrictions on their use, holding back people
 > from using them in creative, productive, or unexpected ways."*
 
 The amount of data contained within
-[OpenStreetMap](http://www.openstreetmap.org/), and their quality, is
+[OpenStreetMap](https://www.openstreetmap.org/), and their quality, is
 really amazing. Even though no demand data is available, the quality of
 the road networks makes it worth to regard
-[OpenStreetMap](http://www.openstreetmap.org/) as a data source for
+[OpenStreetMap](https://www.openstreetmap.org/) as a data source for
 traffic simulations, especially if one is interested in multi- or
 inter-modal simulations.
 
@@ -38,15 +38,15 @@
 ## Directly from the Browser
 
 Data can be downloaded comfortably at
- by selecting a rectangular area.
+ by selecting a rectangular area.
 However, this page limits the amount of data that can be downloaded.
 Depending on the data-density in the selected area this may limit the
 downloadable area to less than a square kilometer (although downloading
 a whole city may be possible).
 
-## With the [Java OpenStreetMap Editor (JOSM)](http://josm.openstreetmap.de/)
+## With the [Java OpenStreetMap Editor (JOSM)](https://josm.openstreetmap.de/)
 
-The [Java OpenStreetMap Editor (JOSM)](http://josm.openstreetmap.de/) is
+The [Java OpenStreetMap Editor (JOSM)](https://josm.openstreetmap.de/) is
 a mature tool for handling OSM-data. It allows for comfortable
 downloading of rectangular areas using an interactive map. It even
 supports searching for an area by name (i.e. Berlin). It also supports
@@ -56,8 +56,8 @@
 
 Larger amounts of OSM-data can be downloaded using a web browser or
 preferably with a program such as
-[wget](http://wget.addictivecode.org/). For detailed information refer
-to the [API overview](http://wiki.openstreetmap.org/wiki/API)
+[wget](https://wget.addictivecode.org/). For detailed information refer
+to the [API overview](https://wiki.openstreetmap.org/wiki/API)
 
 Downloading OSM-data via the API is a two step process: First you must
 determine the geo-coordinates for your area. Then you can download
@@ -67,7 +67,7 @@
 
 You need the (longitude, latitude)-numbers for the south-west corner and
 for the north-east corner of your chosen area. You can get them at [this
-page](http://www.openstreetmap.de/karte.html) by pointing your mouse at
+page](https://www.openstreetmap.de/karte.html) by pointing your mouse at
 the appropriate map location and observing the coordinates in the status
 bar. The inner city of Berlin lies within the following coordinates:
 
@@ -79,35 +79,35 @@
 ## Download the area
 
 Construct an [URI (web
-adress)](http://en.wikipedia.org/wiki/Uniform_Resource_Identifier) from
+adress)](https://en.wikipedia.org/wiki/Uniform_Resource_Identifier) from
 the geo-coordinates and download the data from that URI. The URI takes
 the following form:
 
 ```
-http://api.openstreetmap.org/api/0.6/map?bbox=
+https://api.openstreetmap.org/api/0.6/map?bbox=
 ```
 
 for the above example this becomes
 
 ```
-http://api.openstreetmap.org/api/0.6/map?bbox=13.278,52.473,13.471,52.552
+https://api.openstreetmap.org/api/0.6/map?bbox=13.278,52.473,13.471,52.552
 ```
 
 you can download your data by entering the URI in a web-browers or by
-using another program such as [wget](http://wget.addictivecode.org/).
+using another program such as [wget](https://wget.addictivecode.org/).
 
 ```
-wget.exe "http://api.openstreetmap.org/api/0.6/map?bbox=13.278,52.473,13.471,52.552" -O berlin.osm.xml
+wget.exe "https://api.openstreetmap.org/api/0.6/map?bbox=13.278,52.473,13.471,52.552" -O berlin.osm.xml
 ```
 
 **Important:** the API version number *0.6* will eventually be outdated.
 Refer to the [openstreetmap API
-page](http://wiki.openstreetmap.org/wiki/API) for the latest version.
+page](https://wiki.openstreetmap.org/wiki/API) for the latest version.
 
 # Downloading a City
 
 Modelling a single city is a common simulation use case. [OSM Overpass
-API](http://www.overpass-api.de/) provides a comfortable interface to
+API](https://www.overpass-api.de/) provides a comfortable interface to
 obtain the road network and infrastructure within a city boundary (or
 other administrative region).
 
@@ -118,7 +118,7 @@
 ## Obtaining an area Id
 
 Copy the following query into the input box on the the [OSM Overpass API
-query page](http://www.overpass-api.de/query_form.html). Replace
+query page](https://www.overpass-api.de/query_form.html). Replace
 *Berlin* by the city name of your choice and click the accompanying
 button "Explore".
 
@@ -145,7 +145,7 @@
    
    
    
-   
+   
    
  
  
@@ -161,7 +161,7 @@
    
    
    
-   
+   
    
    
    ...
@@ -177,7 +177,7 @@
 distinguish between *Berlin,Germany* and *Berlin,USA/Georgia*. If the
 output does not contain the region you were looking for, it might be
 helpful to add the type of region e.g. *Berlin, city*. If problems
-persist read on at the [OSM Overpass API](http://www.overpass-api.de/)
+persist read on at the [OSM Overpass API](https://www.overpass-api.de/)
 site.
 
 ## Downloading an area by Id
@@ -189,7 +189,7 @@
 
 Using this number we construct another query for an input box on the
 [OSM Overpass API query
-page](http://www.overpass-api.de/query_form.html).
+page](https://www.overpass-api.de/query_form.html).
 
 ```
  
@@ -219,7 +219,7 @@
 ## Pre-packaged Areas
 
 A large amount of pre-packaged areas are available at
-. Many of these are quite
+. Many of these are quite
 large and will probably require filtering before they can be reasonably
 processed. Importing the whole of Germany with \[netconvert\] takes
 about 60GB of RAM\!
diff -Nru sumo-1.17.0/docs/web/docs/Networks/Import/OpenStreetMap.md sumo-1.18.0/docs/web/docs/Networks/Import/OpenStreetMap.md
--- sumo-1.17.0/docs/web/docs/Networks/Import/OpenStreetMap.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Networks/Import/OpenStreetMap.md	2023-06-28 20:02:17.000000000 +0000
@@ -2,9 +2,9 @@
 title: OpenStreetMap
 ---
 
-*"[OpenStreetMap](http://www.openstreetmap.org/) is a free editable map
+*"[OpenStreetMap](https://www.openstreetmap.org/) is a free editable map
 of the whole world. It is made by people like you."* (from
-[](https://www.openstreetmap.org/)). This
+[](https://www.openstreetmap.org/)). This
 page describes the conversion of files containing data from OpenStreetMap to
 SUMO network files.
 
@@ -256,19 +256,19 @@
 ## SRTM
 
 When using option **--osm.elevation**, z-data is imported from [tags with `key="ele"`
-](http://wiki.openstreetmap.org/wiki/Key:ele) in OSM nodes. Since this
+](https://wiki.openstreetmap.org/wiki/Key:ele) in OSM nodes. Since this
 tag is not yet in wide use, tools exist to overlay OSM data with
 elevation data sources
-(http://wiki.openstreetmap.org/wiki/Srtm_to_Nodes). When using the
+(https://wiki.openstreetmap.org/wiki/Srtm_to_Nodes). When using the
 osmosis-srtm pluging the option **tagName=ele** must be used since only the ['ele'
-tag](http://wiki.openstreetmap.org/wiki/Key:ele) is evaluated and the
+tag](https://wiki.openstreetmap.org/wiki/Key:ele) is evaluated and the
 plugin would use the ['height'
-tag](http://wiki.openstreetmap.org/wiki/Key:height) by default.
+tag](https://wiki.openstreetmap.org/wiki/Key:height) by default.
 
 ## Layer Information
 
 When using option **--osm.layer-elevation**, z-data is imported from [tags with `key="layer"`
-](http://wiki.openstreetmap.org/wiki/Key:layer) in OSM ways. Since this
+](https://wiki.openstreetmap.org/wiki/Key:layer) in OSM ways. Since this
 data does not encode full elevation information, a heuristic is used to
 interpret the given information. Manual correction may be necessary.
 
@@ -407,11 +407,19 @@
 In the OSM database, shared space for tram and road vehicles is often modelled with distinct elements that occupy the same space. When imported directly, this would allow those modes of traffic to ignore each other due to running on different edges.
 To fix this, the option **--edges.join-tram-dist FLOAT** may be used. When this option is set (values between 1 and 2 are recommended), overlapping OSM elements will be converted to road lanes with shared permissions (indicated by a dark purple in [sumo-gui](../../sumo-gui.md#default_coloring)).
 
+
+## Further way/edge attributes
+
+When setting option **--output.street-names**, the 'name' attribute of every edge will be set to the street name defined in the OSM data.
+
+When setting option **--osm.all-attributes**, all OSM tags of a way are exported as [generic params](../../Simulation/GenericParameters.md) of the edge.
+If only a specific selection of tags should be imported, this can be set with option **--osm.extra-attributes**.
+
 # Editing OSM networks
 
 ## JOSM
 
-*From George Dita, on 01.07.2009* [JOSM](http://josm.openstreetmap.de/)
+*From George Dita, on 01.07.2009* [JOSM](https://josm.openstreetmap.de/)
 can be used to edit OSM-data (i.e. for trimming a rectangular map and
 deleting unwanted features). After you delete the part that does not
 interest you, you have to alter the file using xmlstarlet which actually
@@ -430,7 +438,7 @@
 
 *From Christian Klotz, on 01.07.2009, tip by Christoph Sommmer*
 
-The java tool osmosis (http://wiki.openstreetmap.org/index.php/Osmosis)
+The java tool osmosis (https://wiki.openstreetmap.org/index.php/Osmosis)
 can be used to filter out unwanted features from an OSM-file. The
 following command keeps motorways and motorway links while filtering out
 everything else:
@@ -629,7 +637,7 @@
 ```
    def getData(lsouthern-most latitude, western-most longitude, northern-most latitude, eastern-most longitude):
      query = 'way["waterway"="river"]["ship"="yes"](bbox:%s, %s, %s, %s)' %(southern-most latitude, western-most longitude, northern-most latitude, eastern-most longitude)
-     overpass_url = "http://overpass-api.de/api/interpreter"
+     overpass_url = "https://overpass-api.de/api/interpreter"
      overpass_query = """
      [out:json][timeout:25];
      (
diff -Nru sumo-1.17.0/docs/web/docs/Networks/Import/Vissim.md sumo-1.18.0/docs/web/docs/Networks/Import/Vissim.md
--- sumo-1.17.0/docs/web/docs/Networks/Import/Vissim.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Networks/Import/Vissim.md	2023-06-28 20:02:17.000000000 +0000
@@ -24,7 +24,7 @@
 
 Furthermore, as we have to use geometrical heuristics for joining
 connections to nodes, a further factor steers the process of converting
-Vissim-networks: simply spoken, **--vissim.offset** {{DT_FLOAT}} holds the information how near two
+Vissim-networks: simply spoken, **--vissim.join-distance** {{DT_FLOAT}} holds the information how near two
 nodes must be (in meters) to be joined.
 
 During import, different actions must be done which may yield in some
@@ -90,4 +90,4 @@
   Options)
 - Select tab Sprache & Einheiten
 - Select Sprache, English
-- Click OK
\ No newline at end of file
+- Click OK
diff -Nru sumo-1.17.0/docs/web/docs/Networks/PlainXML.md sumo-1.18.0/docs/web/docs/Networks/PlainXML.md
--- sumo-1.17.0/docs/web/docs/Networks/PlainXML.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Networks/PlainXML.md	2023-06-28 20:02:17.000000000 +0000
@@ -63,15 +63,15 @@
 available as XML Schema Definitions:
 
 - [nodes files](#node_descriptions):
-  
+  
 - [edges files](#edge_descriptions):
-  
+  
 - [types files](#type_descriptions):
-  
+  
 - [connections files](#connection_descriptions):
-  
+  
 - [tllogic files](#traffic_light_program_definition):
-  
+  
 
 # Node Descriptions
 
@@ -83,7 +83,7 @@
 | Type of content    | Nodes (intersections/junctions) |
 | Open format?       | Yes                             |
 | SUMO specific?     | Yes                             |
-| XML Schema         | [nodes_file.xsd](http://sumo.dlr.de/xsd/nodes_file.xsd)                  |
+| XML Schema         | [nodes_file.xsd](https://sumo.dlr.de/xsd/nodes_file.xsd)                  |
 
 
 
@@ -404,7 +404,7 @@
 | Type of content    | Edges (roads/streets) |
 | Open format?       | Yes                   |
 | SUMO specific?     | Yes                   |
-| XML Schema         | [edges_file.xsd](http://sumo.dlr.de/xsd/edges_file.xsd)        |
+| XML Schema         | [edges_file.xsd](https://sumo.dlr.de/xsd/edges_file.xsd)        |
 
 Within the edges file, each description of a single edge looks like
 this: ``.
@@ -769,7 +769,7 @@
 | Type of content    | Edge Types     |
 | Open format?       | Yes            |
 | SUMO specific?     | Yes            |
-| XML Schema         | [types_file.xsd](http://sumo.dlr.de/xsd/types_file.xsd) |
+| XML Schema         | [types_file.xsd](https://sumo.dlr.de/xsd/types_file.xsd) |
 
 As mentioned, [edge types](../SUMO_edge_type_file.md) are meant to
 be used to ease the definition of edges. Each description of an edge
@@ -862,7 +862,7 @@
 | Type of content    | Connections          |
 | Open format?       | Yes                  |
 | SUMO specific?     | Yes                  |
-| XML Schema         | [connections_file.xsd](http://sumo.dlr.de/xsd/connections_file.xsd) |
+| XML Schema         | [connections_file.xsd](https://sumo.dlr.de/xsd/connections_file.xsd) |
 
 "Connections" describe how a node's incoming and outgoing edges are
 connected (for example to prohibit left-turns at some junctions). Your
@@ -1075,7 +1075,7 @@
 | Type of content    | traffic light definition |
 | Open format?       | Yes                      |
 | SUMO specific?     | Yes                      |
-| XML Schema         | [tllogic_file.xsd](http://sumo.dlr.de/xsd/tllogic_file.xsd)         |
+| XML Schema         | [tllogic_file.xsd](https://sumo.dlr.de/xsd/tllogic_file.xsd)         |
 
 This file describes traffic lights, signal plans and defines which
 connections they control. It consists of two types of elements described
diff -Nru sumo-1.17.0/docs/web/docs/Networks/SUMO_Road_Networks.md sumo-1.18.0/docs/web/docs/Networks/SUMO_Road_Networks.md
--- sumo-1.17.0/docs/web/docs/Networks/SUMO_Road_Networks.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Networks/SUMO_Road_Networks.md	2023-06-28 20:02:17.000000000 +0000
@@ -11,7 +11,7 @@
 | Type of content    | Map          |
 | Open format?       | Yes          |
 | SUMO specific?     | Yes          |
-| XML Schema         | [net_file.xsd](http://sumo.dlr.de/xsd/net_file.xsd) |
+| XML Schema         | [net_file.xsd](https://sumo.dlr.de/xsd/net_file.xsd) |
 
 A **SUMO network file** describes the traffic-related part of a map, the
 roads and intersections the simulated vehicles run along or across. At a
diff -Nru sumo-1.17.0/docs/web/docs/od2trips.md sumo-1.18.0/docs/web/docs/od2trips.md
--- sumo-1.17.0/docs/web/docs/od2trips.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/od2trips.md	2023-06-28 20:02:17.000000000 +0000
@@ -25,7 +25,7 @@
 
 You may use a XML schema definition file for setting up a od2trips
 configuration:
-[od2tripsConfiguration.xsd](http://sumo.dlr.de/xsd/od2tripsConfiguration.xsd).
+[od2tripsConfiguration.xsd](https://sumo.dlr.de/xsd/od2tripsConfiguration.xsd).
 
 ### Configuration
 
diff -Nru sumo-1.17.0/docs/web/docs/OpenStreetMap_file.md sumo-1.18.0/docs/web/docs/OpenStreetMap_file.md
--- sumo-1.17.0/docs/web/docs/OpenStreetMap_file.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/OpenStreetMap_file.md	2023-06-28 20:02:17.000000000 +0000
@@ -8,8 +8,8 @@
 | Type of content                  | Map               |
 | Open format?                     | Yes               |
 | SUMO specific?                   | No                |
-| XML Schema                       | [XSD of API v0.6](http://wiki.openstreetmap.org/wiki/API_v0.6/XSD)   |
-| [wiki.openstreetmap.org/wiki/.osm](http://wiki.openstreetmap.org/wiki/.osm) |                   |
+| XML Schema                       | [XSD of API v0.6](https://wiki.openstreetmap.org/wiki/API_v0.6/XSD)   |
+| [wiki.openstreetmap.org/wiki/.osm](https://wiki.openstreetmap.org/wiki/.osm) |                   |
 
 ![Eichstaett.osm.png](images/Eichstaett.osm.png "The screenshot of an OpenStreetMap file opened in JOSM. It shows the map of the German city Eichstätt.")
 
@@ -62,11 +62,11 @@
 ## Software for Viewing, Editing and Processing
 
 The OpenStreetMap wiki lists [a few tools to process OpenStreetMap
-files](http://wiki.openstreetmap.org/wiki/Category:OSM_processing). As a
-graphical editor, **[JOSM](http://josm.openstreetmap.de/)** is very
+files](https://wiki.openstreetmap.org/wiki/Category:OSM_processing). As a
+graphical editor, **[JOSM](https://josm.openstreetmap.de/)** is very
 popular. You can modify roads and tags with it and also run some
 validation checks. The command line editor
-**[Osmosis](http://wiki.openstreetmap.org/wiki/Osmosis)** allows
+**[Osmosis](https://wiki.openstreetmap.org/wiki/Osmosis)** allows
 automated processing of OpenStreetMap data (see, for example,
 [Networks/Import/OpenStreetMap\#Editing OSM
 networks](Networks/Import/OpenStreetMap.md#editing_osm_networks)).
diff -Nru sumo-1.17.0/docs/web/docs/OsmNetconvert.typ.xml.md sumo-1.18.0/docs/web/docs/OsmNetconvert.typ.xml.md
--- sumo-1.17.0/docs/web/docs/OsmNetconvert.typ.xml.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/OsmNetconvert.typ.xml.md	2023-06-28 20:02:17.000000000 +0000
@@ -14,4 +14,4 @@
 
 | Author | Source | History | License |
 | ------ | ------ | ------- | ------- |
-| [W. Bamberger](http://sourceforge.net/users/w-bamberger)| Own work (see also [SUMO edge type file](SUMO_edge_type_file.md)) | This file is located in the SUMO repository. See the log there. | This work is licensed under a Creative Commons CC0 1.0 Universal license. To the extent possible under law, the person who associated CC0 with this work has waived all copyright and related or neighboring rights to this work. |
\ No newline at end of file
+| [W. Bamberger](https://sourceforge.net/users/w-bamberger)| Own work (see also [SUMO edge type file](SUMO_edge_type_file.md)) | This file is located in the SUMO repository. See the log there. | This work is licensed under a Creative Commons CC0 1.0 Universal license. To the extent possible under law, the person who associated CC0 with this work has waived all copyright and related or neighboring rights to this work. |
\ No newline at end of file
diff -Nru sumo-1.17.0/docs/web/docs/Osm-urban-de.typ.xml.md sumo-1.18.0/docs/web/docs/Osm-urban-de.typ.xml.md
--- sumo-1.17.0/docs/web/docs/Osm-urban-de.typ.xml.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Osm-urban-de.typ.xml.md	2023-06-28 20:02:17.000000000 +0000
@@ -14,4 +14,4 @@
 
 | Author | Source | History | License |
 | ------ | ------ | ------- | ------- |
-| [W. Bamberger](http://sourceforge.net/users/w-bamberger)| Own work (see also [SUMO edge type file](SUMO_edge_type_file.md)) | This file is located in the SUMO repository. See the log there. | This work is licensed under a Creative Commons CC0 1.0 Universal license. To the extent possible under law, the person who associated CC0 with this work has waived all copyright and related or neighboring rights to this work. |
\ No newline at end of file
+| [W. Bamberger](https://sourceforge.net/users/w-bamberger)| Own work (see also [SUMO edge type file](SUMO_edge_type_file.md)) | This file is located in the SUMO repository. See the log there. | This work is licensed under a Creative Commons CC0 1.0 Universal license. To the extent possible under law, the person who associated CC0 with this work has waived all copyright and related or neighboring rights to this work. |
\ No newline at end of file
diff -Nru sumo-1.17.0/docs/web/docs/Other/File_Extensions.md sumo-1.18.0/docs/web/docs/Other/File_Extensions.md
--- sumo-1.17.0/docs/web/docs/Other/File_Extensions.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Other/File_Extensions.md	2023-06-28 20:02:17.000000000 +0000
@@ -19,56 +19,56 @@
 corresponding executable with "cfg" appended)
   - **\*.sumocfg** (formerly .sumo.cfg): Configuration file for
     [sumo](../sumo.md) and [sumo-gui](../sumo-gui.md)
-    ([xsd](http://sumo.dlr.de/xsd/sumoConfiguration.xsd))
+    ([xsd](https://sumo.dlr.de/xsd/sumoConfiguration.xsd))
   - **\*.netccfg** (formerly .netc.cfg): Configuration file for
     [netconvert](../netconvert.md)
-    ([xsd](http://sumo.dlr.de/xsd/netconvertConfiguration.xsd))
+    ([xsd](https://sumo.dlr.de/xsd/netconvertConfiguration.xsd))
   - **\*.netgcfg** (formerly .netg.cfg): Configuration file for
     [netgenerate](../netgenerate.md)
-    ([xsd](http://sumo.dlr.de/xsd/netgenerateConfiguration.xsd))
+    ([xsd](https://sumo.dlr.de/xsd/netgenerateConfiguration.xsd))
   - **\*.duarcfg** (formerly .rou.cfg): Configuration file for
     [duarouter](../duarouter.md)
-    ([xsd](http://sumo.dlr.de/xsd/duarouterConfiguration.xsd))
+    ([xsd](https://sumo.dlr.de/xsd/duarouterConfiguration.xsd))
   - **\*.jtrrcfg** (formerly .jtr.cfg): Configuration file for
     [jtrrouter](../jtrrouter.md)
-    ([xsd](http://sumo.dlr.de/xsd/jtrrouterConfiguration.xsd))
+    ([xsd](https://sumo.dlr.de/xsd/jtrrouterConfiguration.xsd))
   - **\*.dfrocfg** (formerly .df.cfg): Configuration file for
     [dfrouter](../dfrouter.md)
-    ([xsd](http://sumo.dlr.de/xsd/dfrouterConfiguration.xsd))
+    ([xsd](https://sumo.dlr.de/xsd/dfrouterConfiguration.xsd))
   - **\*.od2tcfg** (formerly .od2t.cfg): Configuration file for
     [od2trips](../od2trips.md)
-    ([xsd](http://sumo.dlr.de/xsd/od2tripsConfiguration.xsd))
+    ([xsd](https://sumo.dlr.de/xsd/od2tripsConfiguration.xsd))
   - **\*.acticfg** (formerly .act.cfg): Configuration file for
     [activitygen](../activitygen.md)
-    ([xsd](http://sumo.dlr.de/xsd/activitygenConfiguration.xsd))
+    ([xsd](https://sumo.dlr.de/xsd/activitygenConfiguration.xsd))
 
 - Data files
   - **\*.net.xml**: network file
-    ([xsd](http://sumo.dlr.de/xsd/net_file.xsd),
+    ([xsd](https://sumo.dlr.de/xsd/net_file.xsd),
     [description](../Networks/SUMO_Road_Networks.md))
   - **\*.rou.xml**: routes file
-    ([xsd](http://sumo.dlr.de/xsd/routes_file.xsd),
+    ([xsd](https://sumo.dlr.de/xsd/routes_file.xsd),
     [description](../Definition_of_Vehicles,_Vehicle_Types,_and_Routes.md))
   - **\*.rou.alt.xml**: route alternatives file
-    ([xsd](http://sumo.dlr.de/xsd/routes_file.xsd),
+    ([xsd](https://sumo.dlr.de/xsd/routes_file.xsd),
     [description](../Demand/Dynamic_User_Assignment.md#general_behavior))
   - **\*.add.xml**:
     [sumo](../sumo.md)/[sumo-gui](../sumo-gui.md) - {{AdditionalFile}}
-    ([xsd](http://sumo.dlr.de/xsd/additional_file.xsd), missing description)
+    ([xsd](https://sumo.dlr.de/xsd/additional_file.xsd), missing description)
     - traffic lights only
-      ([xsd](http://sumo.dlr.de/xsd/tllogic_file.xsd), missing
+      ([xsd](https://sumo.dlr.de/xsd/tllogic_file.xsd), missing
       description)
   - **\*.edg.xml**: [netconvert](../netconvert.md) - edges file
-    ([xsd](http://sumo.dlr.de/xsd/edges_file.xsd),
+    ([xsd](https://sumo.dlr.de/xsd/edges_file.xsd),
     [description](../Networks/PlainXML.md#edge_descriptions))
   - **\*.nod.xml**: [netconvert](../netconvert.md) - nodes file
-    ([xsd](http://sumo.dlr.de/xsd/nodes_file.xsd),
+    ([xsd](https://sumo.dlr.de/xsd/nodes_file.xsd),
     [description](../Networks/PlainXML.md#node_descriptions))
   - **\*.con.xml**: [netconvert](../netconvert.md)- connection
-    file ([xsd](http://sumo.dlr.de/xsd/connections_file.xsd),
+    file ([xsd](https://sumo.dlr.de/xsd/connections_file.xsd),
     [description](../Networks/PlainXML.md#connection_descriptions))
   - **\*.typ.xml**: [netconvert](../netconvert.md)- edge types
-    file ([xsd](http://sumo.dlr.de/xsd/types_file.xsd),
+    file ([xsd](https://sumo.dlr.de/xsd/types_file.xsd),
     [description](../SUMO_edge_type_file.md))
   - **\*.trips.xml**: trip definitions for
     [duarouter](../duarouter.md),[sumo](../sumo.md)
@@ -78,55 +78,55 @@
     ([description](../Definition_of_Vehicles,_Vehicle_Types,_and_Routes.md#incomplete_routes_trips_and_flows))
   - **\*.turns.xml**: turn and sink definitions for
     [jtrrouter](../jtrrouter.md)
-    ([xsd](http://sumo.dlr.de/xsd/turns_file.xsd),
+    ([xsd](https://sumo.dlr.de/xsd/turns_file.xsd),
     [description](../Demand/Routing_by_Turn_Probabilities.md))
   - **\*.taz.xml**: traffic analysis zones (or districts) file
     mainly for
     [od2trips](../od2trips.md),[duarouter](../duarouter.md),[sumo](../sumo.md)
-    ([xsd](http://sumo.dlr.de/xsd/taz_file.xsd))
+    ([xsd](https://sumo.dlr.de/xsd/taz_file.xsd))
     ([description](../Demand/Importing_O/D_Matrices.md#describing_the_taz))
 
 - Output files
   - **\*.xml**: inductive loop output
-    ([xsd](http://sumo.dlr.de/xsd/det_e1_file.xsd),
+    ([xsd](https://sumo.dlr.de/xsd/det_e1_file.xsd),
     [description](../Simulation/Output/Induction_Loops_Detectors_(E1).md)
   - **\*.xml**: areal lane detector output
-    ([xsd](http://sumo.dlr.de/xsd/det_e2_file.xsd),
+    ([xsd](https://sumo.dlr.de/xsd/det_e2_file.xsd),
     [description](../Simulation/Output/Lanearea_Detectors_(E2).md))
   - **\*.xml**: areal lane detector output
-    ([xsd](http://sumo.dlr.de/xsd/det_e3_file.xsd),
+    ([xsd](https://sumo.dlr.de/xsd/det_e3_file.xsd),
     [description](../Simulation/Output/Multi-Entry-Exit_Detectors_(E3).md))
   - **\*.xml**: emissions output
-    ([xsd](http://sumo.dlr.de/xsd/emission_file.xsd),
+    ([xsd](https://sumo.dlr.de/xsd/emission_file.xsd),
     [description](../Simulation/Output/EmissionOutput.md))
   - **\*.xml**: fcd output
-    ([xsd](http://sumo.dlr.de/xsd/fcd_file.xsd),
+    ([xsd](https://sumo.dlr.de/xsd/fcd_file.xsd),
     [description](../Simulation/Output/FCDOutput.md))
   - **\*.xml**: full output
-    ([xsd](http://sumo.dlr.de/xsd/full_file.xsd),
+    ([xsd](https://sumo.dlr.de/xsd/full_file.xsd),
     [description](../Simulation/Output/FullOutput.md))
   - **\*.xml**: meandata output
-    ([xsd](http://sumo.dlr.de/xsd/meandata_file.xsd),
+    ([xsd](https://sumo.dlr.de/xsd/meandata_file.xsd),
     [description](../Simulation/Output/VTypeProbe.md))
   - **\*.xml**: netstate output
-    ([xsd](http://sumo.dlr.de/xsd/netstate_file.xsd),
+    ([xsd](https://sumo.dlr.de/xsd/netstate_file.xsd),
     [description](../Simulation/Output/VTypeProbe.md))
   - **\*.xml**: queue output
-    ([xsd](http://sumo.dlr.de/xsd/queue_file.xsd),
+    ([xsd](https://sumo.dlr.de/xsd/queue_file.xsd),
     [description](../Simulation/Output/QueueOutput.md))
   - **\*.xml**: summary output
-    ([xsd](http://sumo.dlr.de/xsd/summary_file.xsd),
+    ([xsd](https://sumo.dlr.de/xsd/summary_file.xsd),
     [description](../Simulation/Output/Summary.md))
   - **\*.xml**: tripinfo output
-    ([xsd](http://sumo.dlr.de/xsd/tripinfo_file.xsd),
+    ([xsd](https://sumo.dlr.de/xsd/tripinfo_file.xsd),
     [description](../Simulation/Output/TripInfo.md))
   - **\*.xml**: vtypeprobe output
-    ([xsd](http://sumo.dlr.de/xsd/vtypeprobe_file.xsd),
+    ([xsd](https://sumo.dlr.de/xsd/vtypeprobe_file.xsd),
     [description](../Simulation/Output/VTypeProbe.md))
 
 - Other files
   - **\*.xml**: edge diff
-    ([xsd](http://sumo.dlr.de/xsd/edgediff_file.xsd), missing
+    ([xsd](https://sumo.dlr.de/xsd/edgediff_file.xsd), missing
     description)
 
 ## Imported Files
diff -Nru sumo-1.17.0/docs/web/docs/Other/Glossary.md sumo-1.18.0/docs/web/docs/Other/Glossary.md
--- sumo-1.17.0/docs/web/docs/Other/Glossary.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Other/Glossary.md	2023-06-28 20:02:17.000000000 +0000
@@ -222,8 +222,8 @@
 - **XML**:
 "e**X**tensible **M**arkup **L**anguage is a universal format
 for structured documents and data" as the w3c says. Further
-information may be found at  or
-. Most of the data read and
+information may be found at  or
+. Most of the data read and
 written by SUMO is stored as XML, see also the page on [file
 types](../Other/File_Extensions.md).
   
@@ -231,7 +231,7 @@
 **X**ML **S**chema **D**efinitions "... provide a means for
 defining the structure, content and semantics of XML documents" as
 the w3c says. Further information may be found at
- or
-. A part of the
+ or
+. A part of the
 XML data formats used by SUMO is covered by xsd, see the page on
 [file types](../Other/File_Extensions.md).
diff -Nru sumo-1.17.0/docs/web/docs/Other/Links.md sumo-1.18.0/docs/web/docs/Other/Links.md
--- sumo-1.17.0/docs/web/docs/Other/Links.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Other/Links.md	2023-06-28 20:02:17.000000000 +0000
@@ -18,16 +18,16 @@
 
 ### Documentation
 
-- [Doxygen](http://www.doxygen.nl/) A class
+- [Doxygen](https://www.doxygen.nl/) A class
   documentation utility.
-- [XMLMind XML Editor](http://www.xmlmind.com/xmleditor/) An editor
+- [XMLMind XML Editor](https://www.xmlmind.com/xmleditor/) An editor
   supporting DocBook.
 - [MkDocs](https://www.mkdocs.org/)
   MkDocs, the tool used to build the SUMO-documentation.
 
 ### Software Engineering
 
-- [SourceMonitor](http://www.campwoodsw.com/sourcemonitor.html) A
+- [SourceMonitor](https://www.campwoodsw.com/sourcemonitor.html) A
   great source code metrics tool.
 
 ### Configuration Tools
@@ -39,19 +39,19 @@
 
 ### Road Traffic in General
 
-- [Matsim](http://www.matsim.org/) A mesoscopic simulation package.
-- [Trafix](http://trafix.sourceforge.net/) A road traffic simulation
+- [Matsim](https://www.matsim.org/) A mesoscopic simulation package.
+- [Trafix](https://trafix.sourceforge.net/) A road traffic simulation
   based on cellular automata written in C++. \[not revised\].
 - [Visual Traffic
-  Simulation](http://mysite.wanadoo-members.co.uk/tomfotherby/Contents/Uni/Project/index.html)
+  Simulation](https://mysite.wanadoo-members.co.uk/tomfotherby/Contents/Uni/Project/index.html)
   A java application which allows to build own networks and simulate
   them. \[not revised\].
-- [MITRASIM-2000](http://www.maerivoet.org/index.php?page=traffic-mitrasim-2000)
+- [MITRASIM-2000](https://www.maerivoet.org/index.php?page=traffic-mitrasim-2000)
   An (open source?) traffic simulation in Java. \[not revised\].
 - [BABSIM](https://www.inf.bi.ruhr-uni-bochum.de/index.php?option=com_content&view=article&id=17:babsim&catid=81&Itemid=116&lang=de) A simulation mainly concentrating on
   highways (BAB=BundesAutoBahnen, Federal Highways). Not yet given o
   the public.
-- [TraffSpot](http://traffspot.db-nico.de/) A microscopic simulation
+- [TraffSpot](https://traffspot.db-nico.de/) A microscopic simulation
   with a nice 3D-view.
 
 ### Traffic Lights Optimisation
@@ -64,6 +64,6 @@
 
 ### Applets
 
-- [Microsimulation of Road Traffic](http://www.traffic-simulation.de/)
+- [Microsimulation of Road Traffic](https://www.traffic-simulation.de/)
   A very neat simulation applet based on the IDM-model that includes
   lane changing by Martin Treiber.
\ No newline at end of file
diff -Nru sumo-1.17.0/docs/web/docs/Other/Projects.md sumo-1.18.0/docs/web/docs/Other/Projects.md
--- sumo-1.17.0/docs/web/docs/Other/Projects.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Other/Projects.md	2023-06-28 20:02:17.000000000 +0000
@@ -6,7 +6,7 @@
 
 ### Current Projects
 
-- [MAVEN](http://www.maven-its.eu/) Managing Automated Vehicles
+- [MAVEN](https://www.maven-its.eu/) Managing Automated Vehicles
   Enhances Network
 - [TransAID](https://ec.europa.eu/inea/en/horizon-2020/projects/H2020-Transport/Automated-Road-Transport/TransAID)
   new hierarchical traffic management procedures to allow the smooth
@@ -17,11 +17,11 @@
   large-scale traffic for disaster and public event management
 - [I.MoVe](https://verkehrsforschung.dlr.de/de/projekte/imove)
   developing additional car following models
-- [Urban Mobility](http://www.urmo.info/) Intermodal routing and
+- [Urban Mobility](https://www.urmo.info/) Intermodal routing and
   modeling of transfer between vehicles in SUMO
-- [Mobility Inside](http://www.mobilityinside.de/) Using SUMO's
+- [Mobility Inside](https://www.mobilityinside.de/) Using SUMO's
   intermodal routing engine
-- [HubChain (german)](http://komob.de/projekte/hub-chain/) simulating
+- [HubChain (german)](https://komob.de/projekte/hub-chain/) simulating
   autonomous public transport in rural areas
 
 ### Past Projects
@@ -30,27 +30,27 @@
   simulated the traffic of Berlin
 - [COLOMBO](https://verkehrsforschung.dlr.de/en/projects/colombo) Cooperative Self-Organizing
   System for low Carbon Mobility at low Penetration Rates
-- [AMITRAN](https://web.archive.org/web/20180815190303/http://www.amitran.eu/)
-- [MODUM](https://web.archive.org/web/20180831121624/http://modum-project.eu/)
-- [iTetris](http://www.ict-itetris.eu/) An Integrated Wireless and
+- [AMITRAN](https://web.archive.org/web/20180815190303/https://www.amitran.eu/)
+- [MODUM](https://web.archive.org/web/20180831121624/https://modum-project.eu/)
+- [iTetris](https://www.ict-itetris.eu/) An Integrated Wireless and
   Traffic Platform for Real-Time Road Traffic Management Solutions
 - [Delphi](https://www.dlr.de/sc/desktopdefault.aspx/tabid-1262/1765_read-9581): country-wide traffic analysis and prognosis for Germany
 - [ORINOKO](https://www.nuernberg.de/imperia/md/verkehrsplanung/dokumente/orinoko_final_internet.pdf): improvements on mobility in the
   city of Nürnberg
 - TrafficOnline: traffic flow estimation using cellular phones
-- [Soccer2006](https://web.archive.org/web/20150705081516/http://www.dlr.de/desktopdefault.aspx/tabid-1296):
+- [Soccer2006](https://web.archive.org/web/20150705081516/https://www.dlr.de/desktopdefault.aspx/tabid-1296):
   Traffic prognosis during the FIFA-WorldCup 2006
 - Weltjugendtag2005: Traffic prognosis during the world youth day 2005
 - [TrafficTower](https://www.dlr.de/fs/desktopdefault.aspx/tabid-1237/5441_read-12154/):
   A virtual traffic management centre
-- [INVENT](http://www.invent-online.de/): Evaluation of modern traffic
+- [INVENT](https://www.invent-online.de/): Evaluation of modern traffic
   management approaches
-- [OIS](https://web.archive.org/web/20040826034935/http://www.dlr.de/vf/forschung/projekte/ois): Verification of
+- [OIS](https://web.archive.org/web/20040826034935/https://www.dlr.de/vf/forschung/projekte/ois): Verification of
   using optical sensors for optimization of traffic lights
-- [CityMobil](https://web.archive.org/web/20191204150245/http://www.citymobil-project.eu:80/) Automatic urban
+- [CityMobil](https://web.archive.org/web/20191204150245/http://www.citymobil-project.eu/) Automatic urban
   transportation. A [simulation for a parking lot](../Tutorials/CityMobil.md) inspired by the Rome
   demonstrator is included with SUMO.
-- [DRIVE C2X](https://web.archive.org/web/20170311043037/http://www.drive-c2x.eu/project) Driving implementation
+- [DRIVE C2X](https://web.archive.org/web/20170311043037/https://www.drive-c2x.eu/project) Driving implementation
   and evaluation of C2X communication technology
 - [MENDEL](https://www.busundbahn.de/fileadmin/user_upload/Dossiers/Elektrobusse/DNV_2019_12_Naumann_FA_WA.pdf) modeling electric
   buses and optimizing charging with respect to grid load
@@ -61,27 +61,27 @@
 
 - [MultiAgent Control of Traffic
   Signals](https://github.com/k0emt/macts)
-- [VENTOS](http://maniam.github.io/VENTOS/) a VEhicular NeTwork Open
+- [VENTOS](https://maniam.github.io/VENTOS/) a VEhicular NeTwork Open
   Simulator
 - [Webots](https://www.cyberbotics.com/) a 3D physics robot simulator
   connected to SUMO
-- [eWorld](https://web.archive.org/web/20161205050209/http://eworld.sourceforge.net/) - an application that
+- [eWorld](https://web.archive.org/web/20161205050209/https://eworld.sourceforge.net/) - an application that
   allows to convert and enrich roads networks; interaction is done via
   the [TraCI](../TraCI.md)-protocol
-- [Environmental Monitoring in/of Metropolitan Areas](http://www.ibr.cs.tu-bs.de/projects/emma/index.xml?lang=en)
+- [Environmental Monitoring in/of Metropolitan Areas](https://www.ibr.cs.tu-bs.de/projects/emma/index.xml?lang=en)
   by Sven Lahde, Michael Doering, Wolf-Bastian Pöttner, Moritz Rosin,
   Gerrit Lammert and Lars Wolf from the University of Braunschweig,
   Germany
-- [AutoNomos - A Distributed and Self-Regulating Approach for Organizing a Large System of Mobile Objects.](https://web.archive.org/web/20180307071524/http://auto-nomos.de/) Axel Wegener, Horst Hellbrück
+- [AutoNomos - A Distributed and Self-Regulating Approach for Organizing a Large System of Mobile Objects.](https://web.archive.org/web/20180307071524/https://auto-nomos.de/) Axel Wegener, Horst Hellbrück
   and Stefan Fischer from the University of Luebeck, Germany in
   cooperation with Sándor Fekete from Braunschweig Technical
   University, Germany
 - [TraNS - Traffic and Network Simulation environment for design, implementation
   and realistic evaluation of VANET
-  applications](http://trans.epfl.ch)
+  applications](https://trans.epfl.ch)
   by Michal Piorkowski, Maxim Raya, Ada Lezama Lugo and Jean-Pierre
   Hubaux from [Laboratory for Computer Communications and Applications
-  (LCA)](http://lcawww.epfl.ch), [EPFL](http://www.epfl.ch),
+  (LCA)](https://lcawww.epfl.ch), [EPFL](https://www.epfl.ch),
   Switzerland
   TraNS is the first open-source project providing a full-blown
   application-centric evaluation framework for VANETs. It has a unique
@@ -99,7 +99,7 @@
   (2)](../Publications.md#sommeryaogermandressler2008_2)
 - "Assessment of traffic regulation policies for the minimization of
   pollutants emissions"
-  by Mauro Bianchi at [CEFRIEL](http://www.cefriel.it/), Italy.
+  by Mauro Bianchi at [CEFRIEL](https://www.cefriel.it/), Italy.
   This project uses SUMO in combination with EMEP/CORINAIR methodology
   for evaluating the impact of different traffic regulation strategies
   on pollutants emissions. Traffic simulations are performed offline
@@ -108,7 +108,7 @@
   hypothesize an online regulation system with a network of sensors
   that is used to recognize the current traffic situations and deploy
   the optimal traffic regulation policies.
-- [Fidens – Trust between Cooperative Systems in Application to VANETs](https://web.archive.org/web/20120313075112/http://www.ldv.ei.tum.de/en/research/fidens/)
+- [Fidens – Trust between Cooperative Systems in Application to VANETs](https://web.archive.org/web/20120313075112/https://www.ldv.ei.tum.de/en/research/fidens/)
   This project investigates trust in vehicular networks (VANETs).
   Besides the trust research, it features a simulation environment for
   large scale vehicular network applications. Our typical scenario
@@ -144,7 +144,7 @@
 - "Analyse und Simulation von Verkettbarkeitsmaßen in pseudonymer,
   mobiler
   Kommunikation" by Clemens Honomichl; Diploma thesis; 2008
-- [emil - Elektrobusse mit induktiver Ladetechnik (german only)](https://web.archive.org/web/20150722031908/http://www.verkehr-bs.de/unternehmen/forschungsprojekt-emil.html)
+- [emil - Elektrobusse mit induktiver Ladetechnik (german only)](https://web.archive.org/web/20150722031908/https://www.verkehr-bs.de/unternehmen/forschungsprojekt-emil.html)
 - [Metro Traffic Simulator](https://www.youtube.com/watch?v=P9rHo6yHRNc)
 
 ## Code repositories with SUMO related stuff
diff -Nru sumo-1.17.0/docs/web/docs/polyconvert.md sumo-1.18.0/docs/web/docs/polyconvert.md
--- sumo-1.17.0/docs/web/docs/polyconvert.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/polyconvert.md	2023-06-28 20:02:17.000000000 +0000
@@ -44,7 +44,7 @@
 
 You may use a XML schema definition file for setting up a polyconvert
 configuration:
-[polyconvertConfiguration.xsd](http://sumo.dlr.de/xsd/polyconvertConfiguration.xsd).
+[polyconvertConfiguration.xsd](https://sumo.dlr.de/xsd/polyconvertConfiguration.xsd).
 
 ### Configuration
 
diff -Nru sumo-1.17.0/docs/web/docs/Publications.md sumo-1.18.0/docs/web/docs/Publications.md
--- sumo-1.17.0/docs/web/docs/Publications.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Publications.md	2023-06-28 20:02:17.000000000 +0000
@@ -28,10 +28,10 @@
 
 | Topic                                       | Authors          | Title            | Publication                        | Year |
 | ------------------------------------------- | ---------------- | ---------------- | ---------------------------------- | ---- |
-| SUMO Conference                                                    | [SUMO Conference Page](http://www.dlr.de/ts/en/desktopdefault.aspx/tabid-10042/17127_read-41437)                                                                                                               | [1st SUMO User Conference Proceedings](http://elib.dlr.de/93885/1/Proceeding_SUMO2013_15-17May%202013_Berlin-Adlershof.pdf)                                                                                                                                                               | Berichte aus dem DLR-Institut für Verkehrssystemtechnik, Band 21                                                                                                                                                            | 2013 { .cellNoWrap } |
+| SUMO Conference                                                    | [SUMO Conference Page](https://www.dlr.de/ts/en/desktopdefault.aspx/tabid-10042/17127_read-41437)                                                                                                               | [1st SUMO User Conference Proceedings](https://elib.dlr.de/93885/1/Proceeding_SUMO2013_15-17May%202013_Berlin-Adlershof.pdf)                                                                                                                                                               | Berichte aus dem DLR-Institut für Verkehrssystemtechnik, Band 21                                                                                                                                                            | 2013 { .cellNoWrap } |
 | SUMO Conference                                                    | [SUMO Conference Page](https://sumo.dlr.de/2014/conference.html)                                                                                                                                               | [Proceedings](https://elib.dlr.de/94006/1/Proceeding_SUMO2014_15%2B16May2014_Berlin-Adlershof.pdf)                                                                                                                                                                                         | Berichte aus dem DLR-Institut für Verkehrssystemtechnik, Band 24                                                                                                                                                            | 2014 |
-| SUMO Conference                                                    | [SUMO Conference Page](http://www.dlr.de/ts/en/desktopdefault.aspx/tabid-10490/18168_read-42578)                                                                                                               | [SUMO2015 - Intermodal Simulation for Intermodal Transport](http://elib.dlr.de/97714/1/SUMO2015_Proceeding.pdf)                                                                                                                                                                           | Berichte aus dem DLR-Institut für Verkehrssystemtechnik, Band 28                                                                                                                                                            | 2015 |
-| SUMO Conference                                                    | [SUMO Conference Page](http://www.dlr.de/ts/en/desktopdefault.aspx/tabid-10848/18984_read-44970/)                                                                                                              | [SUMO2016 - Traffic, Mobility, and Logistics](http://elib.dlr.de/106342/1/SUMOconference_proceedings_2016.pdf)                                                                                                                                                                            | Berichte aus dem DLR-Institut für Verkehrssystemtechnik, Band 30                                                                                                                                                            | 2016 |
+| SUMO Conference                                                    | [SUMO Conference Page](https://www.dlr.de/ts/en/desktopdefault.aspx/tabid-10490/18168_read-42578)                                                                                                               | [SUMO2015 - Intermodal Simulation for Intermodal Transport](https://elib.dlr.de/97714/1/SUMO2015_Proceeding.pdf)                                                                                                                                                                           | Berichte aus dem DLR-Institut für Verkehrssystemtechnik, Band 28                                                                                                                                                            | 2015 |
+| SUMO Conference                                                    | [SUMO Conference Page](https://www.dlr.de/ts/en/desktopdefault.aspx/tabid-10848/18984_read-44970/)                                                                                                              | [SUMO2016 - Traffic, Mobility, and Logistics](https://elib.dlr.de/106342/1/SUMOconference_proceedings_2016.pdf)                                                                                                                                                                            | Berichte aus dem DLR-Institut für Verkehrssystemtechnik, Band 30                                                                                                                                                            | 2016 |
 | SUMO Conference                                                    | [SUMO Conference Page](https://sumo.dlr.de/2017)                                                                                                                                                                | [SUMO 2017 Towards Simulation for Autonomous Mobility](https://elib.dlr.de/118438/1/SUMO_proceedings_online.pdf)                                                                                                                                                                          | Berichte aus dem DLR-Institut für Verkehrssystemtechnik, Band 31                                                                                                                                                            | 2017 |
 | SUMO Conference    | [SUMO Conference Page](https://sumo.dlr.de/2018)    | [SUMO 2018- Simulating Autonomous and Intermodal Transport Systems](https://easychair.org/publications/volume/SUMO2018)          | EPiC Series in Engineering, Vol 2         | 2018 |
 | SUMO Conference    | [SUMO Conference Page](https://sumo.dlr.de/2019)    | [SUMO 2019- Simulating Connected Urban Mobility](https://easychair.org/publications/volume/SUMO2019)          | EPiC Series in Computing, Vol 62         | 2019 |
@@ -44,53 +44,53 @@
 
 | Topic                                       | Authors          | Title            | Publication                        | Year |
 | ------------------------------------------- | ---------------- | ---------------- | ---------------------------------- | ---- |
-| SUMO Software Description                                          | Behrisch, Michael and Laura Bieker, Jakob Erdmann, Daniel Krajzewicz                                                                                                                                           | [SUMO - Simulation of Urban MObility: An Overview](https://sumo.dlr.de/pdf/simul_2011_3_40_50150.pdf), [publications page](http://www.thinkmind.org/index.php?view=article&articleid=simul_2011_3_40_50150)                                                                               | SIMUL 2011, The Third International Conference on Advances in System Simulation, pp. 63-68                                                                                                                                    | 2011 { .cellNoWrap } |
+| SUMO Software Description                                          | Behrisch, Michael and Laura Bieker, Jakob Erdmann, Daniel Krajzewicz                                                                                                                                           | [SUMO - Simulation of Urban MObility: An Overview](https://sumo.dlr.de/pdf/simul_2011_3_40_50150.pdf), [publications page](https://www.thinkmind.org/index.php?view=article&articleid=simul_2011_3_40_50150)                                                                               | SIMUL 2011, The Third International Conference on Advances in System Simulation, pp. 63-68                                                                                                                                    | 2011 { .cellNoWrap } |
 | SUMO Software Description                                          | Krajzewicz, Daniel and Georg Hertkorn, Christian Rössel, Peter Wagner                                                                                                                                          | [SUMO (Simulation of Urban MObility); An open-source traffic simulation](https://sumo.dlr.de/pdf/dkrajzew_MESM2002_SUMO.pdf), [Presentation Slides](https://sumo.dlr.de/pdf/dkrajzew_mesm2002_SUMO_transparencies.pdf)                                                                    | Proceedings of the 4th Middle East Symposium on Simulation and Modelling (MESM2002), Sharjah (UAE), SCS European Publishing House, pp. 183-187                                                                                | 2002 |
 | SUMO Software Description                                          | Krajzewicz, Daniel and Michael Bonert, Peter Wagner                                                                                                                                                            | [The Open Source Traffic Simulation Package SUMO](https://sumo.dlr.de/pdf/RoboCup2006_dkrajzew_SUMO.pdf)                                                                                                                                                                                  | RoboCup 2006 Infrastructure Simulation Competition, Bremen                                                                                                                                                                    | 2006 |
 | SUMO Software Description                                          | Krajzewicz, Daniel and Michael Behrisch                                                                                                                                                                        | [Simulation of Urban MObility: SUMO - Eine freie Verkehrssimulation](https://sumo.dlr.de/pdf/de_SUMO_HU.pdf) (Presentation in German)                                                                                                                                                     |                                                                                                                                                                                                                               | 2008 |
-| SUMO Software Description                                          | Krajzewicz, Daniel and Jakob Erdmann, Michael Behrisch, and Laura Bieker                                                                                                                                       | [Recent Development and Applications of SUMO - Simulation of Urban MObility](https://sumo.dlr.de/pdf/sysmea_v5_n34_2012_4.pdf), [Journal Page](http://www.iariajournals.org/systems_and_measurements/tocv5n34.html)                                                                       | International Journal On Advances in Systems and Measurements, 5 (3&4), pp. 128-138                                                                                                                                           | 2012 |
+| SUMO Software Description                                          | Krajzewicz, Daniel and Jakob Erdmann, Michael Behrisch, and Laura Bieker                                                                                                                                       | [Recent Development and Applications of SUMO - Simulation of Urban MObility](https://sumo.dlr.de/pdf/sysmea_v5_n34_2012_4.pdf), [Journal Page](https://www.iariajournals.org/systems_and_measurements/tocv5n34.html)                                                                       | International Journal On Advances in Systems and Measurements, 5 (3&4), pp. 128-138                                                                                                                                           | 2012 |
 
 
 # Publications using SUMO
 
 Most of the following entries and many more can also be found in this
 [bibtex-file](https://sourceforge.net/projects/sumo/files/traffic_data/sumo.bib/download).
-We advice to use [JabRef](http://jabref.sourceforge.net/) for editing
+We advice to use [JabRef](https://jabref.sourceforge.net/) for editing
 this list of publications.
 
 | Topic                                       | Authors          | Title            | Publication                        | Year |
 | ------------------------------------------- | ---------------- | ---------------- | ---------------------------------- | ---- |
-| Simulation Theory                                                  | Chowdhury, D., L. Santen, A. Schadschneider                                                                                                                                                                    | [Statistical Physics of Vehicular Traffic and Some Related Systems](http://arxiv.org/abs/cond-mat/0007053)                                                                                                                                                                                | Physics Reports 329, (4-6), pp. 199-329, Elsevier, ISSN 0370-1573                                                                                                                                                             | 2000 { .cellNoWrap } |
+| Simulation Theory                                                  | Chowdhury, D., L. Santen, A. Schadschneider                                                                                                                                                                    | [Statistical Physics of Vehicular Traffic and Some Related Systems](https://arxiv.org/abs/cond-mat/0007053)                                                                                                                                                                                | Physics Reports 329, (4-6), pp. 199-329, Elsevier, ISSN 0370-1573                                                                                                                                                             | 2000 { .cellNoWrap } |
 | Car-Following Models                                               | Stefan Krauß, Peter Wagner, and Christian Gawron                                                                                                                                                               | [Metastable States in a Microscopic Model of Traffic Flow](https://sumo.dlr.de/pdf/sk.pdf)                                                                                                                                                                                                | Physical Review E 55, pp. 5597-5602                                                                                                                                                                                           | 1997 |
 | Car-Following Models                                               | Krauß, Stefan                                                                                                                                                                                                  | [Microscopic Modeling of Traffic Flow: Investigation of Collision Free Vehicle Dynamics](https://sumo.dlr.de/pdf/KraussDiss.pdf)                                                                                                                                                          | Hauptabteilung Mobilität und Systemtechnik des DLR Köln, ISSN 1434-8454                                                                                                                                                       | 1998 |
 | Lane-Change Models                                                 | Krajzewicz, Daniel                                                                                                                                                                                             | Kombination von taktischen und strategischen Einflüssen in einer mikroskopischen Verkehrsflusssimulation                                                                                                                                                                                 | Fahrermodellierung in Wissenschaft und Wirtschaft, 2. Berliner Fachtagung für Fahrermodellierung, VDI-Reihe 22 (Mensch-Maschine-Systeme), ISBN 978-3-18-302822-1                                                             | 2009 |
-| Lane-Change Models                                                 | Erdmann, Jakob                                                                                                                                                                                                 | [Lane-Changing Model in SUMO](http://elib.dlr.de/89233)                                                                                                                                                                                                                                   | Proceedings of the SUMO2014 Modeling Mobility with Open Data, pp. 77-88, Berlin, ISSN 1866-721X                                                                                                                               | 2014 |
-| Intermodality                                                      | Behrisch, Michael and Erdmann, Jakob and Krajzewicz, Daniel                                                                                                                                                    | [Adding intermodality to the microscopic simulation package SUMO](http://elib.dlr.de/65964)                                                                                                                                                                                               | MESM 2010, Alexandria (Egypt)                                                                                                                                                                                                 | 2010 |
+| Lane-Change Models                                                 | Erdmann, Jakob                                                                                                                                                                                                 | [Lane-Changing Model in SUMO](https://elib.dlr.de/89233)                                                                                                                                                                                                                                   | Proceedings of the SUMO2014 Modeling Mobility with Open Data, pp. 77-88, Berlin, ISSN 1866-721X                                                                                                                               | 2014 |
+| Intermodality                                                      | Behrisch, Michael and Erdmann, Jakob and Krajzewicz, Daniel                                                                                                                                                    | [Adding intermodality to the microscopic simulation package SUMO](https://elib.dlr.de/65964)                                                                                                                                                                                               | MESM 2010, Alexandria (Egypt)                                                                                                                                                                                                 | 2010 |
 | Traffic Assignment                                                 | Gawron, Christian                                                                                                                                                                                              | [Simulation-Based Traffic Assignment](https://sumo.dlr.de/pdf/GawronDiss.pdf)                                                                                                                                                                                                             | PhD thesis, University of Cologne                                                                                                                                                                                             | 1998 |
 | Traffic Assignment                                                 | Gawron, Christian                                                                                                                                                                                              | [An Iterative Algorithm to Determine the Dynamic User Equilibrium in a Traffic Simulation Model](https://doi.org/10.1142/S0129183198000303)                                                                                                                                            | International Journal of Modern Physics C Vol. 9 (3), pp. 393-407                                                                                                                                                             | 1998 |
 | Road Network Preparation                                           | Krajzewicz, Daniel and Georg Hertkorn, Julia Ringel, Peter Wagner                                                                                                                                              | [Preparation of Digital Maps for Traffic Simulation; Part 1: Approach and Algorithms](https://sumo.dlr.de/pdf/dkrajzew_TRAF5_DigitalMaps1.pdf)                                                                                                                                            | Proceedings of the 3rd Industrial Simulation Conference 2005, EUROSIS-ETI, pp. 285-290, Berlin, ISBN 90-77381-18-X                                                                                                            | 2005 |
 | Validation, Calibration, and Tests                                 | Krajzewicz, Daniel and Georg Hertkorn, Christian Rössel, Peter Wagner                                                                                                                                          | [An Example of Microscopic Car Models Validation using the open source Traffic Simulation SUMO](https://sumo.dlr.de/pdf/dkrajzew_ESS2002_LOG14_Validation.pdf)                                                                                                                            | Proceedings of Simulation in Industry, 14th European Simulation Symposium 2002, SCS European Publishing House, pp. 318-322, Dresden                                                                                           | 2002 |
 | Validation, Calibration, and Tests                                 | Heppner, Matthias                                                                                                                                                                                              | [Einführung von Unit Tests in das bestehende C++ Softwaresystem SUMO](https://web.archive.org/web/20140701052250/https://www2.informatik.hu-berlin.de/swt/dipl/MatthiasHeppner.2010.pdf)                                                                                                                                             | Diploma Thesis, Humboldt-Universität zu Berlin                                                                                                                                                                                | 2010 |
 | Traffic Lights                                                     | Krajzewicz, Daniel and Elmar Brockfeld, Jürgen Mikat, Julia Ringel, Christian Rössel, Wolfram Tuchscheerer, Peter Wagner, Richard Woesler                                                                      | [Simulation of modern Traffic Lights Control Systems using the open source Traffic Simulation SUMO](https://sumo.dlr.de/pdf/dkrajzew_TRAF9_AgentbasedTLS.pdf)                                                                                                                             | Proceedings of the 3rd Industrial Simulation Conference 2005, EUROSIS-ETI, pp. 299-302, Berlin, ISBN 90-77381-18-X                                                                                                            | 2005 |
-| Traffic Lights                                                     | Zubillaga D, Cruz G, Aguilar LD, Zapot‚catl J, Fern ndez N, Aguilar J, Rosenblueth DA, Gershenson C                                                                                                            | [Measuring the Complexity of Self-Organizing Traffic Lights](http://www.mdpi.com/1099-4300/16/5/2384)                                                                                                                                                                                     | Entropy 2014, 16(5), 2384-2407                                                                                                                                                                                                | 2014 |
-| Car2Car Communication                                              | Bauza, R. and J. Gozalvez and M. Sepulcre                                                                                                                                                                      | [Operation and Performance of Vehicular Ad-hoc Routing Protocols in Realistic Environments](http://www.uwicore.umh.es/files/paper/2008_international/uwicore_WiVeC08_Operation%20and%20Performance%20of%20Vehicular%20Ad-hoc%20Routing%20Protocols%20in%20Realistic%20Environments.pdf)   | Proceedings of the 2nd IEEE International Symposium on Wireless Vehicular Communications (WiVeC), Calgary (Canada)                                                                                                            | 2008 |
+| Traffic Lights                                                     | Zubillaga D, Cruz G, Aguilar LD, Zapot‚catl J, Fern ndez N, Aguilar J, Rosenblueth DA, Gershenson C                                                                                                            | [Measuring the Complexity of Self-Organizing Traffic Lights](https://www.mdpi.com/1099-4300/16/5/2384)                                                                                                                                                                                     | Entropy 2014, 16(5), 2384-2407                                                                                                                                                                                                | 2014 |
+| Car2Car Communication                                              | Bauza, R. and J. Gozalvez and M. Sepulcre                                                                                                                                                                      | [Operation and Performance of Vehicular Ad-hoc Routing Protocols in Realistic Environments](https://uwicore.umh.es/files/paper/2008_international/uwicore_WiVeC08_Operation%20and%20Performance%20of%20Vehicular%20Ad-hoc%20Routing%20Protocols%20in%20Realistic%20Environments.pdf)   | Proceedings of the 2nd IEEE International Symposium on Wireless Vehicular Communications (WiVeC), Calgary (Canada)                                                                                                            | 2008 |
 | Car2Car Communication                                              | Cottingham, David N. and Jonathan J. Davies and Alastair R. Beresford                                                                                                                                          | [Congestion-Aware Vehicular Traffic Routing Using WiFi Hotspots](https://www.cl.cam.ac.uk/research/dtg/www/publications/public/jjd27/ciiHandout.pdf)                                                                                                                                                     | Proceedings of Communications Innovation Institute Workshop, Cambridge-MIT Institute, pp. 4-6                                                                                                                                 | 2005 |
-| Car2Car Communication                                              | Kristianto Karnadi, Feliz and Zhi Hai Mo and Kun-chan Lan                                                                                                                                                      | [Rapid Generation of Realistic Mobility Models for VANET](https://web.archive.org/web/20070226210528/http://www.cse.unsw.edu.au/~klan/paper/sumo.pdf)                                                                                                                                                                                | ACM MOBICOMM                                                                                                                                                                                                                  | 2005 |
-| Car2Car Communication                                              | Gozalvez, J. and M. Sepulcre                                                                                                                                                                                   | [Channel Efficiency of Adaptive Transmission Techniques for Wireless Vehicular Communications](http://www.uwicore.umh.es/files/paper/2008_international/uwicore_ITS08_Channel%20Efficiency%20of%20Adaptive%20Transmission%20Techniques%20for%20Wireless%20Vehicular%20Communications.pdf) | Proceedings of the 15th World Congress on Intelligent Transport Systems, New York (USA)                                                                                                                                       | 2008 |
+| Car2Car Communication                                              | Kristianto Karnadi, Feliz and Zhi Hai Mo and Kun-chan Lan                                                                                                                                                      | [Rapid Generation of Realistic Mobility Models for VANET](https://web.archive.org/web/20070226210528/https://www.cse.unsw.edu.au/~klan/paper/sumo.pdf)                                                                                                                                                                                | ACM MOBICOMM                                                                                                                                                                                                                  | 2005 |
+| Car2Car Communication                                              | Gozalvez, J. and M. Sepulcre                                                                                                                                                                                   | [Channel Efficiency of Adaptive Transmission Techniques for Wireless Vehicular Communications](https://uwicore.umh.es/files/paper/2008_international/uwicore_ITS08_Channel%20Efficiency%20of%20Adaptive%20Transmission%20Techniques%20for%20Wireless%20Vehicular%20Communications.pdf) | Proceedings of the 15th World Congress on Intelligent Transport Systems, New York (USA)                                                                                                                                       | 2008 |
 | Car2Car Communication                                              | Honomichl, Clemens                                                                                                                                                                                             | Analyse und Simulation von Verkettbarkeitsmaßen in pseudonymer, mobiler Kommunikation                                                                                                                                                | Diploma Thesis                                                                                                                                                                                                                | 2008 |
 | Car2Car Communication                                              | Lehr, Sebastian                                                                                                                                                                                                | [Optimierung der Kommunikation zwischen am Verkehr beteiligten Strukturen](https://sumo.dlr.de/pdf/DiplomarbeitSebastianLehr.pdf)                                                                                                                                                         | Diploma Thesis, Fachhochschule für Technik und Wirtschaft Berlin                                                                                                                                                             | 2005 |
-| Car2Car Communication                                              | Piorkowski, Michal and Maxim Raya, Ada Lezama Lugo, Panos Papadimitratos, Matthias Grossglauser and Jean-Pierre Hubaux                                                                                         | [TraNS: Realistic Joint Traffic and Network Simulator for VANETs](http://infoscience.epfl.ch/record/113879)                                                                                                                                                                               | The 13th ACM Annual International Conference on Mobile Computing and Networking MobiCom'07, Montreal (Canada)                                                                                                                 | 2007 |
+| Car2Car Communication                                              | Piorkowski, Michal and Maxim Raya, Ada Lezama Lugo, Panos Papadimitratos, Matthias Grossglauser and Jean-Pierre Hubaux                                                                                         | [TraNS: Realistic Joint Traffic and Network Simulator for VANETs](https://infoscience.epfl.ch/record/113879)                                                                                                                                                                               | The 13th ACM Annual International Conference on Mobile Computing and Networking MobiCom'07, Montreal (Canada)                                                                                                                 | 2007 |
 | Car2Car Communication                                              | Sommer, Christoph and Zheng Yao, Reinhard German and Falko Dressler                                                                                                                                            | [Simulating the Influence of IVC on Road Traffic using Bidirectionally Coupled Simulators](https://web.archive.org/web/20070716055158/http://univis.uni-erlangen.de/prg?url=http://www7.informatik.uni-erlangen.de/~sommer/publications/index.shtml?univis=true)                                                                                                                                   | Proceedings of 27th IEEE Conference on Computer Communications (IEEE INFOCOM 2008): Mobile Networking for Vehicular Environments (MOVE 2008), Phoenix, AZ                                                                     | 2008 |
 | Car2Car Communication                                              | Sommer, Christoph and Zheng Yao, Reinhard German and Falko Dressler                                                                                                                                            | [On the Need for Bidirectional Coupling of Road Traffic Microsimulation and Network Simulation](https://web.archive.org/web/20070716055158/http://univis.uni-erlangen.de/prg?url=http://www7.informatik.uni-erlangen.de/~sommer/publications/index.shtml?univis=true)                                                                                                                              | Proceedings of 9th ACM International Symposium on Mobile Ad Hoc Networking and Computing (ACM Mobihoc 2008): 1st ACM International Workshop on Mobility Models for Networking Research (MobilityModels'08), Hong Kong (China) | 2008 |
-| Car2Car Communication                                              | Wegener, Axel and Michal Piorkowski, Maxim Raya, Horst Hellbrck, Stefan Fischer, and Jean-Pierre Hubaux                                                                                                       | [TraCI: An Interface for Coupling Road Traffic and Network Simulators](http://infoscience.epfl.ch/record/115106)                                                                                                                                                                          | The 11th Communications and Networking Simulation Symposium CNS'08, Ottawa (Canada)                                                                                                                                           | 2008 |
+| Car2Car Communication                                              | Wegener, Axel and Michal Piorkowski, Maxim Raya, Horst Hellbrck, Stefan Fischer, and Jean-Pierre Hubaux                                                                                                       | [TraCI: An Interface for Coupling Road Traffic and Network Simulators](https://infoscience.epfl.ch/record/115106)                                                                                                                                                                          | The 11th Communications and Networking Simulation Symposium CNS'08, Ottawa (Canada)                                                                                                                                           | 2008 |
 | Car2Car Communication                                              | Wegener, Axel and Horst Hellbrck, Christian Wewetzer and Andreas Lbke                                                                                                                                        | VANET Simulation Environment with Feedback Loop and its Application to Traffic Light Assistance                                                                                                                                                                                           | Proceedings of the 3rd IEEE Workshop on Automotive Networking and Applications, New Orleans, LA (USA)                                                                                                                         | 2008 |
 | Car2Car Communication                                              | Barber, Anthony                                                                                                                                                                                                | [Sharing the Roads Using Route Information Sharing](https://sumo.dlr.de/pdf/BarberThesis.pdf)                                                                                                                                                                                             | Master Thesis, The University of Tulsa                                                                                                                                                                                        | 2011 |
 | Car2Car Communication, Vehicle Navigation, Road Network Generation | Edelkamp, Stefan and Shahidd Jabar, Tilman Mehrer                                                                                                                                                              | GPS-Route, Endbericht                                                                                                                                                                                                                   | Universität Dortmund, Fachbereich Informatik                                                                                                                                                                                 | 2004 |
 | ITS - other topics                                                 | Morenz, Tino                                                                                                                                                                                                   | [iTranSIM - Simulation-based Vehicle Location](https://www.cs.tcd.ie/publications/tech-reports/reports.07/TCD-CS-2007-56.pdf)                                                                                                                                                             | Master thesis, University of Dublin                                                                                                                                                                                           | 2008 |
 | ITS - other topics                                                 | Willigens, Michael                                                                                                                                                                                             | Development and Evaluation of a Centralized Traffic Information System using UMTS and GPS                                                                                                                                                                                                 | Master Thesis, Universität Düsseldorf                                                                                                                                                                                      | 2008 |
-| ITS - other topics                                                 | Kerekes, John P. and Michael D. Presnar, Kenneth D. Fourspring, Zoran Ninkov, David R. Pogorzala, Alan D. Raisanen, Andrew C. Rice, Juan R. Vasquez, Jeffrey P. Patel, Robert T. MacIntyre, and Scott D. Brown | [Sensor modeling and demonstration of a multi-object spectrometer for performance-driven sensing](http://spie.org/x648.html?product_id=819265)                                                                                                                                            | Proc. SPIE 7334, 73340J,                                                                                                                                                                               | 2009 |
+| ITS - other topics                                                 | Kerekes, John P. and Michael D. Presnar, Kenneth D. Fourspring, Zoran Ninkov, David R. Pogorzala, Alan D. Raisanen, Andrew C. Rice, Juan R. Vasquez, Jeffrey P. Patel, Robert T. MacIntyre, and Scott D. Brown | [Sensor modeling and demonstration of a multi-object spectrometer for performance-driven sensing](https://spie.org/x648.html?product_id=819265)                                                                                                                                            | Proc. SPIE 7334, 73340J,                                                                                                                                                                               | 2009 |
 | ITS - other topics                                                 | Pereira, Jos‚ Luis Ferr s                                                                                                                                                                                      | [An Integrated Architecture for Autonomous Vehicles Simulation](https://sumo.dlr.de/pdf/mieec1.pdf)                                                                                                                                                                                       | Master Thesis, Faculdade de Engenharia da Universidade do Porto                                                                                                                                                               | 2011 |
 | ITS - other topics                                                 | Bajpai, Ashutosh and Tom V Mathew                                                                                                                                                                              | [Development of an Interface between Signal Controller and Traffic Simulator](https://sumo.dlr.de/pdf/CTRG_Interface-SUMO.pdf)                                                                                                                                                            | 1st Conference of Transportation Research Group of India (CTRG)                                                                                                                                                               | 2011 |
-| ITS - other topics                                                 | Xie, X.-F. and Y. Feng, K. Larry Head                                                                                                                                                                          | [Unified route choice framework: Specification and application to urban traffic control](http://www.wiomax.com/team/xie/paper/TRB14RCTC.pdf)                                                                                                                                              | Transportation Research Record: Journal of the Transportation Research Board, 2466: 105-113                                                                                                                                   | 2014 |
-| Traffic Lights                                                     | Xie, X.-F. et al.                                                                                                                                                                                              | [Schedule-driven intersection control](http://www.wiomax.com/team/xie/paper/TRC12.pdf)                                                                                                                                                                                                    | Transportation Research Part C: Emerging Technologies, 24: 168-189                                                                                                                                                            | 2012 |
-| ITS - other topics                                                 | Xie, X.-F. et al.                                                                                                                                                                                              | [Schedule-driven coordination for real-time traffic network control](http://www.wiomax.com/team/xie/paper/ICAPS12.pdf)                                                                                                                                                                    | International Conference on Automated Planning and Scheduling (ICAPS), pp. 323-331, Sao Paulo (Brazil)                                                                                                                        | 2012 |
+| ITS - other topics                                                 | Xie, X.-F. and Y. Feng, K. Larry Head                                                                                                                                                                          | [Unified route choice framework: Specification and application to urban traffic control](https://www.wiomax.com/team/xie/paper/TRB14RCTC.pdf)                                                                                                                                              | Transportation Research Record: Journal of the Transportation Research Board, 2466: 105-113                                                                                                                                   | 2014 |
+| Traffic Lights                                                     | Xie, X.-F. et al.                                                                                                                                                                                              | [Schedule-driven intersection control](https://www.wiomax.com/team/xie/paper/TRC12.pdf)                                                                                                                                                                                                    | Transportation Research Part C: Emerging Technologies, 24: 168-189                                                                                                                                                            | 2012 |
+| ITS - other topics                                                 | Xie, X.-F. et al.                                                                                                                                                                                              | [Schedule-driven coordination for real-time traffic network control](https://www.wiomax.com/team/xie/paper/ICAPS12.pdf)                                                                                                                                                                    | International Conference on Automated Planning and Scheduling (ICAPS), pp. 323-331, Sao Paulo (Brazil)                                                                                                                        | 2012 |
diff -Nru sumo-1.17.0/docs/web/docs/Screenshots/index.md sumo-1.18.0/docs/web/docs/Screenshots/index.md
--- sumo-1.17.0/docs/web/docs/Screenshots/index.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Screenshots/index.md	2023-06-28 20:02:17.000000000 +0000
@@ -22,20 +22,20 @@
 ## From 'TraNS'
 
 [TraNS
-website](http://trans.epfl.ch/)
+website](https://trans.epfl.ch/)
 
 ![](../images/Trans.gif)Main TraNS v1.2 screen
 
 ## From 'eWorld'
 
-[eWorld website](https://web.archive.org/web/20140115034358/http://sourceforge.net/projects/eworld/)
+[eWorld website](https://web.archive.org/web/20140115034358/https://sourceforge.net/projects/eworld/)
 
 ![](../images/Scr_eworld.jpg "eWorld Main Screen") eWorld Main Screen
 
 ## From 'SUMO Traffic Modeler'
 
 [SUMO Traffic Modeler
-website](http://sourceforge.net/projects/trafficmodeler/)
+website](https://sourceforge.net/projects/trafficmodeler/)
 
 ![](../images/Trafficmodeller.gif "Plain Bologna import")Plain Bologna import
 
diff -Nru sumo-1.17.0/docs/web/docs/Simpla.md sumo-1.18.0/docs/web/docs/Simpla.md
--- sumo-1.17.0/docs/web/docs/Simpla.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Simpla.md	2023-06-28 20:02:17.000000000 +0000
@@ -203,6 +203,16 @@
 | **laneID**        | string         | The ID of the lane the leader vehicle is currently on.                              |
 | **members**       | list(string)   | The IDs of the vehicles in the platoon.                                             |
 
+## getPlatoonID()
+This utility function allows to check if a given vehicle is part of a platoon in simpla. If the vehicle given by its ID is controlled by 
+simpla, the function returns the numerical platoon ID (-1 otherwise). The platoon ID can be used as an input to getPlatoonInfo to 
+get information about the platoon structure.
+```python
+vehID = "myExampleVehicle"
+platoonID = simpla.getPlatoonID(vehID)
+```
+
+
 # Example
 
 An example can be downloaded [from the nightly test suite](https://sumo.dlr.de/extractTest.php?path=complex/simpla/basic)
diff -Nru sumo-1.17.0/docs/web/docs/Simulation/Basic_Definition.md sumo-1.18.0/docs/web/docs/Simulation/Basic_Definition.md
--- sumo-1.17.0/docs/web/docs/Simulation/Basic_Definition.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Simulation/Basic_Definition.md	2023-06-28 20:02:17.000000000 +0000
@@ -161,7 +161,7 @@
 more realistic dynamics for car-following models based on continuous
 dynamics. See also [*Martin Treiber, Venkatesan Kanagaraj*, Comparing
 Numerical Integration Schemes for Time-Continuous Car-Following
-Models](http://arxiv.org/abs/1403.4881).
+Models](https://arxiv.org/abs/1403.4881).
 
 Ballistic update causes positions to be updated with the average speed
 between time steps instead of the speed of the current time step.
diff -Nru sumo-1.17.0/docs/web/docs/Simulation/Bluetooth.md sumo-1.18.0/docs/web/docs/Simulation/Bluetooth.md
--- sumo-1.17.0/docs/web/docs/Simulation/Bluetooth.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Simulation/Bluetooth.md	2023-06-28 20:02:17.000000000 +0000
@@ -18,7 +18,7 @@
 detection process can be found in the following publication: [Behrisch,
 Michael and Gurczik, Gaby (2014) Modelling Bluetooth Inquiry for SUMO.
 In: SUMO2014 Modeling Mobility with Open Data. SUMO2014, 15.-16.
-Mai 2014, Berlin](http://elib.dlr.de/95237/)
+Mai 2014, Berlin](https://elib.dlr.de/95237/)
 
 # Enabling Sender / Receiver devices
 
diff -Nru sumo-1.17.0/docs/web/docs/Simulation/Calibrator.md sumo-1.18.0/docs/web/docs/Simulation/Calibrator.md
--- sumo-1.17.0/docs/web/docs/Simulation/Calibrator.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Simulation/Calibrator.md	2023-06-28 20:02:17.000000000 +0000
@@ -91,7 +91,7 @@
 The algorithm for deciding when exactly to insert (and remove) vehicles
 is described in [Erdmann, Jakob (2012) Online-Kalibrierung einer
 Mikroskopischen Verkehrssimulation. ViMOS 2012, 29.11.2012, Dresden,
-Deutschland.](http://elib.dlr.de/79428/)
+Deutschland.](https://elib.dlr.de/79428/)
 
 ## Routes of generated Vehicles
 
diff -Nru sumo-1.17.0/docs/web/docs/Simulation/Friction.md sumo-1.18.0/docs/web/docs/Simulation/Friction.md
--- sumo-1.17.0/docs/web/docs/Simulation/Friction.md	1970-01-01 00:00:00.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Simulation/Friction.md	2023-06-28 20:02:17.000000000 +0000
@@ -0,0 +1,54 @@
+---
+title: Friction
+---
+
+# Introduction
+Thanks to [Thomas Weber et al](https://easychair.org/publications/paper/3S4X) SUMO supports simulation of friction on streets since version 1.14.0
+via network annotation and the friction device. This forces vehicles to reduce their
+maximum speed when they are on a slippery road.
+
+# Equipping vehicles
+To attach a friction device to a vehicle, the [standard device-equipment
+procedures](../Definition_of_Vehicles,_Vehicle_Types,_and_Routes.md#devices) can
+be applied using `friction` as device name.
+
+For instance, a single vehicle can be equipped as in the following minimal example
+
+```xml
+    
+        
+    
+```
+
+# Network modification
+The friction device will work with the lanes friction attribute, which defaults to 1 and can be modfied
+either directly in the network or dynamically using traci/libsumo.
+
+# Vehicle Behavior
+A vehicle with a friction device will determine a perceived friction by adding random noise to friction
+coefficient of the lane and then calculate a new maximum speed for the lane by applying the following factor:
+
+```
+factor = -0.3491 * fric * fric + 0.8922 * fric + 0.4493
+```
+
+# Parameters
+
+The following parameters affect the operation of the friction device.
+
+- device.friction.stdDev: standard deviation when adding gaussian noise (default 1)
+- device.friction.offset: constant offset to apply to all friction values (default 0)
+
+All device parameters may be set via sumo option, vType parameter or vehicle parameter
+
+# TraCI
+
+## Friction Modification
+
+Lanes support the setFriction and getFriction functions.
+
+## Parameter Retrieval
+
+Vehicles allow to retrieve `frictionCoefficient` (the perceived friction with noise),
+`rawFriction` (the friction value of the current lane), `stdDev`, and `offset` using
+the parameter API e.g. `vehicle.getParameter(id, "device.friction.offset")`.
diff -Nru sumo-1.17.0/docs/web/docs/Simulation/GenericParameters.md sumo-1.18.0/docs/web/docs/Simulation/GenericParameters.md
--- sumo-1.17.0/docs/web/docs/Simulation/GenericParameters.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Simulation/GenericParameters.md	2023-06-28 20:02:17.000000000 +0000
@@ -13,6 +13,7 @@
 - Lane
 - Person
 - Vehicle
+- Stop
 - VehicleType
 - PoI
 - Polygon
diff -Nru sumo-1.17.0/docs/web/docs/Simulation/Intersections.md sumo-1.18.0/docs/web/docs/Simulation/Intersections.md
--- sumo-1.17.0/docs/web/docs/Simulation/Intersections.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Simulation/Intersections.md	2023-06-28 20:02:17.000000000 +0000
@@ -4,7 +4,7 @@
 
 The vehicle dynamics at intersection are governed by the intersection
 model described in
-[\[Road Intersection Model in SUMO, Krajzewicz et al\]](http://elib.dlr.de/93669/1/LNCS_SUMOIntersections.pdf). Of course, the model in
+[\[Road Intersection Model in SUMO, Krajzewicz et al\]](https://elib.dlr.de/93669/1/LNCS_SUMOIntersections.pdf). Of course, the model in
 the latest revision may deviate somewhat due to the ongoing evolution of
 the model. This page gives an overview over the configuration options
 governing the intersection model.
diff -Nru sumo-1.17.0/docs/web/docs/Simulation/Meso.md sumo-1.18.0/docs/web/docs/Simulation/Meso.md
--- sumo-1.17.0/docs/web/docs/Simulation/Meso.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Simulation/Meso.md	2023-06-28 20:02:17.000000000 +0000
@@ -33,7 +33,7 @@
 
 # Model Description
 
-The simulation model is based on the work of [Eissfeldt, Vehicle-based modelling of traffic](http://kups.ub.uni-koeln.de/1274/). The original
+The simulation model is based on the work of [Eissfeldt, Vehicle-based modelling of traffic](https://kups.ub.uni-koeln.de/1274/). The original
 model was focused on motorway traffic. The current implementation
 contains significant extensions to support the simulation of
 heterogeneous urban traffic as well.
@@ -204,6 +204,11 @@
 ```
 All attributes are optional and default to the value of the option with the corresponding option name. (i.e. tauff ~ **meso-tauff**, tlsPenalty ~ **meso-tls-penalty**, ...).
 
+## Multimodal simulation
+
+By default, meso is meant to be used for road vehicles (i.e. cars and trucks). To make use of bicycles and edges that do not permit paasenger cars, option **--meso-lane-queue** must be set.
+This will turn every lane into a distinct queue instead of treating parallel lanes as a single queue.
+
 ## Outputs
 
 Many of the output options of SUMO are supported but the resulting files
diff -Nru sumo-1.17.0/docs/web/docs/Simulation/Output/AmitranOutput.md sumo-1.18.0/docs/web/docs/Simulation/Output/AmitranOutput.md
--- sumo-1.17.0/docs/web/docs/Simulation/Output/AmitranOutput.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Simulation/Output/AmitranOutput.md	2023-06-28 20:02:17.000000000 +0000
@@ -4,7 +4,7 @@
 
 The Amitran trajectories output contains information about type, current
 speed and acceleration of each vehicle according to the schema at
-
+
 
 ## Instantiating within the Simulation
 
@@ -17,7 +17,7 @@
 The generated XML file looks like this:
 
 ```xml
-
+
     
     
     
@@ -37,10 +37,10 @@
 
 All numbers and ids are integers, where all the times are in
 milliseconds. For details and further information on the types please
-see the schema .
+see the schema .
 
 
 
-
+
 This part of SUMO was developed, reworked, or extended within the project 
-"AMITRAN", co-funded by the European Commission within the Seventh Framework Programme.
\ No newline at end of file
+"AMITRAN", co-funded by the European Commission within the Seventh Framework Programme.
\ No newline at end of file
diff -Nru sumo-1.17.0/docs/web/docs/Simulation/Output/Amitran_Traffic_Measures.md sumo-1.18.0/docs/web/docs/Simulation/Output/Amitran_Traffic_Measures.md
--- sumo-1.17.0/docs/web/docs/Simulation/Output/Amitran_Traffic_Measures.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Simulation/Output/Amitran_Traffic_Measures.md	2023-06-28 20:02:17.000000000 +0000
@@ -29,7 +29,7 @@
 ## Generated Output
 
 ```xml
-
+
    
    
        
@@ -82,6 +82,6 @@
 
 
 
-
+
 This part of SUMO was developed, reworked, or extended within the project 
-"AMITRAN", co-funded by the European Commission within the Seventh Framework Programme.
\ No newline at end of file
+"AMITRAN", co-funded by the European Commission within the Seventh Framework Programme.
\ No newline at end of file
diff -Nru sumo-1.17.0/docs/web/docs/Simulation/Output/FCDOutput.md sumo-1.18.0/docs/web/docs/Simulation/Output/FCDOutput.md
--- sumo-1.17.0/docs/web/docs/Simulation/Output/FCDOutput.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Simulation/Output/FCDOutput.md	2023-06-28 20:02:17.000000000 +0000
@@ -155,8 +155,8 @@
 
 In combination with the given geometry of the vehicles (shapes) you can
 build some nice animations, e.g [NASA
-WorldWind](http://worldwind.arc.nasa.gov/java/) or [Google
-Earth](http://earth.google.com).
+WorldWind](https://worldwind.arc.nasa.gov/java/) or [Google
+Earth](https://earth.google.com).
 
 ## Visualization example
 
diff -Nru sumo-1.17.0/docs/web/docs/Simulation/Output/FullOutput.md sumo-1.18.0/docs/web/docs/Simulation/Output/FullOutput.md
--- sumo-1.17.0/docs/web/docs/Simulation/Output/FullOutput.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Simulation/Output/FullOutput.md	2023-06-28 20:02:17.000000000 +0000
@@ -83,8 +83,8 @@
 | pmx\@lane            | mg/s                 | The complete amount of PMX emitted by the vehicles on this lane during the actual simulation step                       |
 | noise\@vehicle       | dB                   | The noise emitted by the vehicle in the actual simulation step                                                          |
 | noise\@lane          | dB                   | The noise emitted by the vehicles on the specific lane                                                                  |
-| fuel\@vehicle        | ml/s                 | The fuel consumed by the vehicle in the actual simulation step                                                          |
-| fuel\@lane           | ml/s                 | The fuel consumed by the vehicles on the specific lane                                                                  |
+| fuel\@vehicle        | mg/s                 | The fuel consumed by the vehicle in the actual simulation step                                                          |
+| fuel\@lane           | mg/s                 | The fuel consumed by the vehicles on the specific lane                                                                  |
 | electricity\@vehicle | Wh/s                 | The electricity consumed by the vehicle in the actual simulation step                                                   |
 | electricity\@lane    | Wh/s                 | The electricity consumed by the vehicles on the specific lane                                                           |
 | route               | id                   | The name of the route                                                                                                   |
@@ -110,4 +110,4 @@
 directly to a compression tool like bzip2. The advantage of this large
 file is that you can write some nice XML Stylesheets to export
 everything what is important to you, for example the states of the
-traffic lights and the travel times for the lanes.
\ No newline at end of file
+traffic lights and the travel times for the lanes.
diff -Nru sumo-1.17.0/docs/web/docs/Simulation/Output/index.md sumo-1.18.0/docs/web/docs/Simulation/Output/index.md
--- sumo-1.17.0/docs/web/docs/Simulation/Output/index.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Simulation/Output/index.md	2023-06-28 20:02:17.000000000 +0000
@@ -52,7 +52,7 @@
   informations for all edges, lanes and vehicles (good for
   visualisation purposes)
 - [vtk output](VTKOutput.md): generates
-  Files in the well known [VTK](http://www.vtk.org/) (Visualization
+  Files in the well known [VTK](https://www.vtk.org/) (Visualization
   Toolkit) format, to show the positions the speed value for every
   vehicle
 - [fcd output](FCDOutput.md): Floating Car
@@ -115,7 +115,7 @@
   or separate the approaching edges and to include or exclude the
   junction interior. (area-based detection on edges)
 
-Alternatively, the [values for edges or lanes](#values_for_edges_or_lanes) can be manually aggregated to obtain the flow at at a junction.
+Alternatively, the [values for edges or lanes](#values_for_edges_or_lanes) can be aggregated to obtain the flow at at a junction by using edgeData attribute `edges` and `aggregate="true"`.
 
 ## vehicle-based information
 
diff -Nru sumo-1.17.0/docs/web/docs/Simulation/Output/Lane-_or_Edge-based_Noise_Measures.md sumo-1.18.0/docs/web/docs/Simulation/Output/Lane-_or_Edge-based_Noise_Measures.md
--- sumo-1.17.0/docs/web/docs/Simulation/Output/Lane-_or_Edge-based_Noise_Measures.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Simulation/Output/Lane-_or_Edge-based_Noise_Measures.md	2023-06-28 20:02:17.000000000 +0000
@@ -4,10 +4,10 @@
 
 The edge/lane based noise output based on Harmonoise writes information
 about the noise produced on edges/lanes. The model was generated within
-the EC-project [Imagine](http://www.imagine-project.org/). Its
+the EC-project [Imagine](https://www.imagine-project.org/). Its
 description can be found in the deliverable 18 of this project ([D18 The
 Harmonoise Engineering
-model](http://www.imagine-project.org/bestanden/D18_WP3_HAR32TR-040922-DGMR20.pdf)).
+model](https://www.imagine-project.org/bestanden/D18_WP3_HAR32TR-040922-DGMR20.pdf)).
 
 !!! missing
     Add a model description here
diff -Nru sumo-1.17.0/docs/web/docs/Simulation/Output/Lane-_or_Edge-based_Traffic_Measures.md sumo-1.18.0/docs/web/docs/Simulation/Output/Lane-_or_Edge-based_Traffic_Measures.md
--- sumo-1.17.0/docs/web/docs/Simulation/Output/Lane-_or_Edge-based_Traffic_Measures.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Simulation/Output/Lane-_or_Edge-based_Traffic_Measures.md	2023-06-28 20:02:17.000000000 +0000
@@ -254,7 +254,7 @@
 ## Visualization / Plotting
 
 - [sumo-gui](../../sumo-gui.md#visualizing_edge-related_data) can load edgeData files and color network edges/lanes according to any of it's attributes
-- [sumo-gui](../../sumo-gui.md#edgelane_visualisation_settings) can color edges/lanes by any of the attributse being collected while the simulation is running
+- [sumo-gui](../../sumo-gui.md#edgelane_visualisation_settings) can color edges/lanes by any of the attributes being collected while the simulation is running
 - [netedit](../../Netedit/editModesData.md) can be used to load/view/edit edgeData files
 - The [mpl_dump_onNet.py](../../Tools/Visualization.md#mpl_dump_onnetpy)
   script can display values of this output as a colored net (and
diff -Nru sumo-1.17.0/docs/web/docs/Simulation/Output/Multi-Entry-Exit_Detectors_(E3).md sumo-1.18.0/docs/web/docs/Simulation/Output/Multi-Entry-Exit_Detectors_(E3).md
--- sumo-1.17.0/docs/web/docs/Simulation/Output/Multi-Entry-Exit_Detectors_(E3).md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Simulation/Output/Multi-Entry-Exit_Detectors_(E3).md	2023-06-28 20:02:17.000000000 +0000
@@ -58,6 +58,7 @@
 | timeThreshold  | float       | The time-based threshold that describes how much time has to pass until a vehicle is recognized as halting; *in s, default: 1s*.    |
 | speedThreshold | float       | The speed-based threshold that describes how slow a vehicle has to be to be recognized as halting; *in m/s, default: 5/3.6m/s*.    |
 | openEntry      | bool        | If set to *true*, no error will be reported if vehicles leave the detector without first entering it. This can be useful when tracking vehicles for a particular combination of entry and exit lane at an intersection and other vehicles may also use the exit lane. *default: false*. |
+| expectArrival  | bool        | Whether no warning should be issued when a vehicle arrives within the detector area. *default: false*. |
 | vTypes         | string      | space separated list of vehicle type ids to consider, "" means all; default "".       |
 | detectPersons   | string            | [detect persons instead of vehicles (pedestrians or passengers)](../Pedestrians.md#detectors_for_pedestrians)       |
 
diff -Nru sumo-1.17.0/docs/web/docs/Simulation/Output/RouteProbe.md sumo-1.18.0/docs/web/docs/Simulation/Output/RouteProbe.md
--- sumo-1.17.0/docs/web/docs/Simulation/Output/RouteProbe.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Simulation/Output/RouteProbe.md	2023-06-28 20:02:17.000000000 +0000
@@ -6,7 +6,7 @@
 all vehicles that passed an edge in a given interval. Their real-world
 equivalent would be a police stop with questionnaire or a look into the
 database of navigation providers such as
-[TomTom](http://www.tomtom.com/).
+[TomTom](https://www.tomtom.com/).
 
 ## Instantiating within the Simulation
 
diff -Nru sumo-1.17.0/docs/web/docs/Simulation/Output/SSM_Device.md sumo-1.18.0/docs/web/docs/Simulation/Output/SSM_Device.md
--- sumo-1.17.0/docs/web/docs/Simulation/Output/SSM_Device.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Simulation/Output/SSM_Device.md	2023-06-28 20:02:17.000000000 +0000
@@ -36,9 +36,10 @@
     ...
     
         
-        
-         
+        
+         
         
+        
         
         
         
@@ -46,6 +47,7 @@
         
         
         
+        
     
     ....
 
@@ -58,7 +60,7 @@
 | Parameter  |  Type  |  Default  | Remark  |
 |---|---|---|---|
 | measures  | list of strings  | All available SSMs  | This space or comma-separated  list of SSM-identifiers determines, which encounter-specific SSMs are calculated for the equipped vehicle's encounters and which global measures are recorded (see [below](#available_ssms))   |
-| thresholds  | list of floats  | TTC < 3.0[s]
DRAC > 3.0[m/s^2]
PET < 2.0[s]
BR > 0.0[m/s^2]
SGAP < 0.2[m]
TGAP < 0.5[s]
  | This space or comma-separated list of SSM-thresholds determines, which encounters are classified as conflicts (if their measurements exceed a threshold) and thus written to the output file as a ``-element. This list is required to have the same length as the list of measures if given.

**Note:** Currently the global measures are recorded as a single timeline for the whole simulation span and thresholds have only effect insofar a leader is looked for in the distance corresponding to the SGAP and, respectively, TGAP values.   |
+| thresholds  | list of floats  | TTC < 3.0[s]
DRAC > 3.0[m/s^2]
MDRAC > 3.4[m/s^2]
PET < 2.0[s]
BR > 0.0[m/s^2]
SGAP < 0.2[m]
TGAP < 0.5[s]
  | This space or comma-separated list of SSM-thresholds determines, which encounters are classified as conflicts (if their measurements exceed a threshold) and thus written to the output file as a ``-element. This list is required to have the same length as the list of measures if given.

**Note:** Currently the global measures are recorded as a single timeline for the whole simulation span and thresholds have only effect insofar a leader is looked for in the distance corresponding to the SGAP and, respectively, TGAP values.   |
 | range  | double  | 50.0 [m]  | The devices detection range in meters. Other vehicles are tracked as soon as they are closer than `` to the the equipped vehicle *along the road-network*. A tree search is performed to find all vehicles up to range upstream and downstream to the vehicle's current position. Further, for all downstream junctions in range, an upstream search for the given range is performed.  |
 | extratime  | double  | 5.0 [s]  | The extra time that an encounter is tracked on after not being associated to a potential conflict (either after crossing the conflict area, deviating from a common route, changing lanes, or because vehicles leave the device range, etc.).  |
 | file  | string  | "ssm_.xml"  | The filename for storing the conflict information of the equipped vehicle. Several vehicles may write to the same file. Conflicts of a single vehicle are written in the order of the log-begin of the encounter.   |
@@ -67,6 +69,7 @@
 | write-positions  | bool  | false  | Whether to write the positions (coordinates) to the output.  |
 | write-lane-positions  | bool  | false  | Whether to write the lanes and the positions on the lanes to the output.  |
 | filter-edges.input-file | string | - | If defined, only conflicts occured at the provided edges and junctions are measured. See [Restricting SSM Device to Edges and Junctions](#restricting_ssm_device_to_edges_and_junctions)  |
+| exclude-conflict-types | list of strings | - | This space or comma-separated list of SSM device conflict type codes determines which conflicts will appear in the output file. Any conflict which has been classified during at least one time step as one of the mentioned types is excluded from the output. Special values **"foe"** (types {3,7,11,13,15}) and **"ego"** (types {2,6,10,12,14}) add predefined sets to the list. |
 
 ## Encounter types
 Different types of encounters, e.g. crossing, merging, or lead/follow situations, may imply different calculation procedures for the safety measures. Therefore the SSM-device keeps track of these classifications and provides them in the output to allow the correct interpretation of the corresponding values.
@@ -131,6 +134,7 @@
 - [TTC](#ttc) (time to collision)
 - [DRAC](#drac) (deceleration rate to avoid a crash)
 - [PET](#pet) (post encroachment time)
+- [MDRAC](#mdrac) (modified DRAC) 
 
 Further, the following additional safety-relevant output can be generated, which will not be linked to a specific encounter:
 
@@ -181,6 +185,19 @@
 !!! note
     This has still to be implemented, currently only one variant is used.
 
+### MDRAC
+A modified indicator of the DRAC called MDRAC considering a perception-reaction-time (PRT) is defined as 
+
+```
+MDRAC = 0.5*speed_difference/(TTC - PRT).
+
+```
+
+The `PRT` is configured with param key `device.ssm.mdrac.prt` or via option **--device.ssm.mdrac.prt** and defaults to a value of `1` second.
+
+!!! note
+	This metric is not fully implemented for all conflict types yet! (only type 0 - 8 are partly tested so far)
+	
 ### PET
 For merging and crossing situations, the PET (post encroachment time) is defined as the difference of the leading vehicle's conflict area exit time tA and the following vehicle's conflict area entry time tB:
 
@@ -232,11 +249,11 @@
          
          
          
-         
+         
          
          
-         
+value="3.66" speed="12.95"/>
+         
      
      
          ...
@@ -278,14 +295,17 @@
 |              | position  | 2D-coordinate     | Coordinate of the corresponding conflict point.               | --device.ssm.measures "TTC" |
 |              | type    | integer (Encounter type code)  | [Type code](#encounter_types) of the corresponding encounter type. (Defines the variant of [TTC-calculation](#ttc).) | --device.ssm.measures "TTC" |
 |              | value   | float >= 0          | The minimal measured TTC-value.                               | --device.ssm.measures "TTC" |
+|              | speed   | float >= 0          | The speed of the reporting vehicle at the occurence of minTTC.| --device.ssm.measures "TTC" |
 | maxDRAC      | time    | float               | Time point of the maximal measured value for the DRAC.        | --device.ssm.measures "DRAC" |
 |              | position  | 2D-coordinate     | Coordinate of the corresponding conflict point.               | --device.ssm.measures "DRAC" |
 |              | type    | integer (Encounter type code)  | [Type code](#encounter_types) of the corresponding encounter type. (Defines the variant of [DRAC-calculation](#drac).)  | --device.ssm.measures "DRAC" |
 |              | value   | float >= 0          | The maximal measured DRAC-value.                              | --device.ssm.measures "DRAC" |
+|              | speed   | float >= 0          | The speed of the reporting vehicle at the occurence of maxDRAC.| --device.ssm.measures "DRAC" |
 | PET          | time    | float               | Time point of the minimal measured value for the PET. (Usually the PET is only measured once, therefore no PETSpan is reported.)  | --device.ssm.measures "PET" |
 |              | position  | 2D-coordinate     | Coordinate of the corresponding encroachment point.           | --device.ssm.measures "PET" |
 |              | type    | integer (Encounter type code)  | [Type code](#encounter_types) of the corresponding encounter type.  | --device.ssm.measures "PET" |
 |              | value   | float >= 0          | The measured PET-value.                                       | --device.ssm.measures "PET" |
+|              | speed   | float >= 0          | The speed of the reporting vehicle at the occurence of PET.   | --device.ssm.measures "PET" |
 
 
 The `` element has the following structure:
@@ -337,4 +357,4 @@
 
 The SSM output file can be used as input to [plotXMLAttributes.py](https://sumo.dlr.de/docs/Tools/Visualization.html#time_to_collision_over_simulation_time). Here is an example:
 
-
\ No newline at end of file
+
diff -Nru sumo-1.17.0/docs/web/docs/Simulation/Output/StatisticOutput.md sumo-1.18.0/docs/web/docs/Simulation/Output/StatisticOutput.md
--- sumo-1.17.0/docs/web/docs/Simulation/Output/StatisticOutput.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Simulation/Output/StatisticOutput.md	2023-06-28 20:02:17.000000000 +0000
@@ -15,10 +15,12 @@
 
 ```xml
 
+    
     
     
     
     
+    
     
     
     
@@ -28,6 +30,22 @@
 
 The following output attributes are generated:
 
+## performance
+
+| Attribute Name              | Value Type | Description                                                                  |
+| --------------------------- | ---------- | ---------------------------------------------------------------------------- |
+| **clockBegin**              | time       | Unix time (or hh:mm:ss if `--human-readable-time` is set) when the simulation started                      |
+| **clockEnd**                | time       | Unix time (or hh:mm:ss if `--human-readable-time` is set) when simulation ended                                                 |
+| **clockDuration**           | time       | Time spent executing the simulation (clockEnd - clockBegin)              |
+| **traciDuration**           | s          | Time spent using TraCI |
+| **realTimeFactor**          | #          | Factor describing the (simulated / real) time relation |
+| **vehicleUpdatesPerSecond** | #          | Vehicles present in the simulation per second |
+| **personUpdatesPerSecond**  | #          | Persons present in the simulation per second |
+| **begin**                   | int (time) | Begin time of the simulation |
+| **end**                     | int (time) | End time of the simulation |
+| **duration**                | int (time) | Duration of the simulation (begin - end) |
+
+
 ## vehicles
 
 | Attribute Name | Value Type | Description                                                                  |
@@ -40,10 +58,10 @@
 
 ## teleports
 
-| Attribute Name  | Value Type | Description                                                                                                                        |
-| --------------- | ---------- | ---------------------------------------------------------------------------------------------------------------------------------- |
-| **total**       | #          | The total number of teleportations that occured                                                                                    |
-| **jam**         | #          | Number of teleportations due to traffic jam                                                                                        |
+| Attribute Name  | Value Type | Description                                                            |
+| --------------- | ---------- | -------------------------------------------------------------------------------------------------- |
+| **total**       | #          | The total number of teleportations that occurred                                                    |
+| **jam**         | #          | Number of teleportations due to traffic jam                                                          |
 | **yield**       | #          | Number of teleportations due to yield (vehicle is stuck on a low-priority road and did not find a gap in the prioritized traffic)  |
 | **wrongLane**   | #          | Number of teleportations due to the vehicle being stuck on a lane which has no connection to the next edge on its route            |
 
@@ -65,6 +83,15 @@
 | **jammed**     | #          | Number of persons that were jammed during the simulation  |
 
 
+## personTeleports
+
+| Attribute Name | Value Type | Description                                                |
+| -------------- | ---------- | ---------------------------------------------------------- |
+| **total**      | #          | Total number of person teleports that occurred             |
+| **abortWait**  | #          | Number of teleports due to excessive waiting for a ride    |
+| **wrongDest**  | #          | Number of teleports due to riding to the wrong destination |
+
+
 ## vehicleTripStatistics
 
 | Attribute Name         | Value Type | Description                                                                                 |
@@ -124,7 +151,7 @@
 To include statistics for these vehicles, the options **--tripinfo-output.write-unfinished --duration-log.statistics** must be set.
 The general idea is to add up the travel time (duration) and the time that was spent waiting for departure (departDelay) for all vehicles that were defined in the input.
 
-To simplify comparison between simulations that have the same number of vehiclles, the attributes 'totalTravelTime' and 'totalDepartDelay' are provided.
+To simplify comparison between simulations that have the same number of vehicles, the attributes 'totalTravelTime' and 'totalDepartDelay' are provided.
 
 An alternative way to compute the sum of travel time and delays is to multiply the averages:
 
diff -Nru sumo-1.17.0/docs/web/docs/Simulation/Output/TripInfo.md sumo-1.18.0/docs/web/docs/Simulation/Output/TripInfo.md
--- sumo-1.17.0/docs/web/docs/Simulation/Output/TripInfo.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Simulation/Output/TripInfo.md	2023-06-28 20:02:17.000000000 +0000
@@ -97,7 +97,8 @@
 | `HC_abs`   | mg   | The complete amount of HC emitted by the vehicle during the trip             |
 | `PMx_abs`  | mg   | The complete amount of PM_x emitted by the vehicle during the trip |
 | `NOx_abs`  | mg   | The complete amount of NO_x emitted by the vehicle during the trip |
-| `fuel_abs` | ml   | The complete amount of fuel the vehicle used during the trip                 |
+| `fuel_abs` | mg   | The complete amount of fuel the vehicle used during the trip                 |
+| `electricity_abs` | Wh   | The complete amount of electricity the vehicle used during the trip   |
 
 ## Output for vehicles that have not arrived at simulation end
 By default, tripinfo-output is only written on vehicle arrival. This means vehicles that have not arrived at simulation end (i.e. due to option **--end**) generate no output.
diff -Nru sumo-1.17.0/docs/web/docs/Simulation/Output/VTKOutput.md sumo-1.18.0/docs/web/docs/Simulation/Output/VTKOutput.md
--- sumo-1.17.0/docs/web/docs/Simulation/Output/VTKOutput.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Simulation/Output/VTKOutput.md	2023-06-28 20:02:17.000000000 +0000
@@ -5,7 +5,7 @@
 This output option offers you the possibility to visualise/analyse your
 simulation data using the famous VTK file format. There are several
 Tools and Frameworks to get started with VTK e.g.
-[ParaView](http://paraview.org/).
+[ParaView](https://paraview.org/).
 
 The generated output file is very basic, so each vehicle is presented by
 only one point. In the VTK file the vehicles were stored in
diff -Nru sumo-1.17.0/docs/web/docs/Simulation/ParkingArea.md sumo-1.18.0/docs/web/docs/Simulation/ParkingArea.md
--- sumo-1.17.0/docs/web/docs/Simulation/ParkingArea.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Simulation/ParkingArea.md	2023-06-28 20:02:17.000000000 +0000
@@ -58,6 +58,7 @@
 | width            | float          | positive                                                                                     | 3.2                                    | The width of the road-side parking spaces                                                                                  |
 | length           | float          | positive                                                                                     | (endPos - startPos) / roadsideCapacity | The length of the road-side parking spaces                                                                                 |
 | angle            | float (degree) |                                                                                              | 0                                      | The angle of the road-side parking spaces relative to the lane angle, positive means clockwise                             |
+| lefthand            | bool |     | *false*    | Whether roadside parking spaces should be drawn on the left side of the lane   |
 
 ## Custom parking spaces
 
diff -Nru sumo-1.17.0/docs/web/docs/Simulation/Public_Transport.md sumo-1.18.0/docs/web/docs/Simulation/Public_Transport.md
--- sumo-1.17.0/docs/web/docs/Simulation/Public_Transport.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Simulation/Public_Transport.md	2023-06-28 20:02:17.000000000 +0000
@@ -66,7 +66,7 @@
 following example shows how this can be done (taken from {{SUMO}}*/examples/sumo/busses*):
 
 ```xml
-
+
     
     
     
diff -Nru sumo-1.17.0/docs/web/docs/Simulation/Railways.md sumo-1.18.0/docs/web/docs/Simulation/Railways.md
--- sumo-1.17.0/docs/web/docs/Simulation/Railways.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Simulation/Railways.md	2023-06-28 20:02:17.000000000 +0000
@@ -98,15 +98,28 @@
   here](../Netedit/neteditUsageExamples.md#creating_bidirectional_railway_tracks)
 
 ### Routing in bidirectional networks
-When computing train routes in a network with parallel tracks which are usable in both directions, it may be
-desirable that trains preferentially use one of the tracks (i.e. to always keep on
-the right side) and thereby preventing conflicts between oncoming trains.
+
+When train tracks can be used in both directions, there is considerable freedom for trains when search a path through the network. To reduce the number of conflicts (when two vehicles want to use the same track in opposite directions), the preferred direction for each track can be defined and factored into the routing decision.
 
 To express this preference, the edges in the preferred direction and on the
 preferred side may be assigned a higher priority value. This value will be taken
-into account when setting option **--weights.priority-factor** which applies to
+into account when setting option **--weights.priority-factor FLOAT** which applies to
 [sumo](../sumo.md) and [duarouter](../duarouter.md).
 
+At the default option value of 0. Edge priority is ignored when routing. When setting a positive value, the edges with the lowest priority receive a penalty factor to their estimated travel time of 1 + FLOAT (where FLOAT is the option argument) whereas the edges with the highest priority receive no penalty. Edges with medium priority will receive a penalty of 1 + x * FLOAT where 
+
+```
+  x = (edgePriority - minPriority) / (maxPriority - minPriority)
+```
+
+The priority values can either be assigned by the user or computed heuristically by [netconvert](../netconvert.md) by setting the option **--railway.topology.direction-priority**. This requires that some of the tracks in the network are uni-directional (to unambiguously define the main direction). The assigned priority values are:
+
+- 4: unidirectional track
+- 3: main direction of bidirectional track
+- 2: undetermined main direction (straight continuation from different directions of unidirectional track)
+- 1: undetermined main direction (no continuation from unidirectional track)
+- 0: reverse of main direction of bidirectional track
+
 ### Importing bidirectional tracks from OSM
 
 When importing networks from
@@ -198,24 +211,6 @@
 !!! note
     Negative distance values are not currently supported (pending introduction of another attribute)
 
-# Routing on Bidirectional Tracks
-When train tracks can be used in both directions, there is considerable freedom for trains when search a path through the network. To reduce the number of conflicts (when two vehicles want to use the same track in opposite directions), the preferred direction for each track can be defined and factored into the routing decision.
-
-When routes are computed in the simulation, this is done by setting the option **--device.rerouting.priority-factor FLOAT**. This causes the priority values of edges to be factored into the routing decision with higher values being preferred. 
-At the default value of 0. Edge priority is ignored when routing. When setting a positive value, the edges with the lowest priority receive a penalty factor to their estimated travel time of 1 + FLOAT whereas the edges with the highest priority receive no penalty. Edges with medium priority will receive a penalty of 1 + x * FLOAT where 
-
-```
-  x = (edgePriority - minPriority) / (maxPriority - minPriority)
-```
-
-The priority values can either be assigned by the user or computed heuristically by [netconvert](../netconvert.md) by setting the option **--railway.topology.direction-priority**. This requires that some of the tracks in the network are uni-directional (to unambiguously define the main direction). The assigned priority values are:
-
-- 4: unidirectional track
-- 3: main direction of bidirectional track
-- 2: undetermined main direction (straight continuation from different directions of unidirectional track)
-- 1: undetermined main direction (no continuation from unidirectional track)
-- 0: reverse of main direction of bidirectional track
-
 # Modelling Trains
 
 There is a dedicated carFollowMode for trains which can be activated by
@@ -321,7 +316,7 @@
 
 To switch a single signal into moving-block-mode, the following additional file may be loaded:
 ```xml
-
+
     
         
     
diff -Nru sumo-1.17.0/docs/web/docs/Simulation/Randomness.md sumo-1.18.0/docs/web/docs/Simulation/Randomness.md
--- sumo-1.17.0/docs/web/docs/Simulation/Randomness.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Simulation/Randomness.md	2023-06-28 20:02:17.000000000 +0000
@@ -9,7 +9,7 @@
 # Random number generation (RNG)
 
 Sumo implements the [Mersenne
-Twister](http://en.wikipedia.org/wiki/Mersenne_twister) algorithm for
+Twister](https://en.wikipedia.org/wiki/Mersenne_twister) algorithm for
 generating random numbers. This random number generator (RNG) is
 initialized with a seed value which defaults to the (arbitrary) value
 **23423**. This setup makes all applications deterministic by default as
@@ -30,6 +30,10 @@
 The decoupling is done to ensure that loading vehicles does not affect
 simulation behavior of earlier vehicles. All RNGs use the same seed.
 
+## Running repeatedly with different Seeds
+
+The tool [runSeeds.py](../Tools/Misc.md#runseedspy) may be used to efficiently repeat simulations with multiple seeds. See the [FAQ](../FAQ.md#how_to_perform_repeated_simulations_with_different_results) for a guide on how this is done.
+
 # Route Distributions
 
 Vehicles can be added to the simulation with a fixed route (``) or with an origin-destination pair (``).
diff -Nru sumo-1.17.0/docs/web/docs/Simulation/Safety.md sumo-1.18.0/docs/web/docs/Simulation/Safety.md
--- sumo-1.17.0/docs/web/docs/Simulation/Safety.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Simulation/Safety.md	2023-06-28 20:02:17.000000000 +0000
@@ -34,6 +34,12 @@
 and traffic disturbance. To enable stopping, the option **--collision.stoptime** {{DT_TIME}} must be set
 with the stopping time in seconds.
 
+## Intermodal Collisions
+
+The collision action only gets triggered on vehicle-vehicle collision but not on vehicle-pedestrian collisions. Instead, intermodal collisiosn raise warning by default.
+
+The behavior can be changed by setting the options **--intermodal-collision.action** and **--intermodal-collision.stoptime** which work like the vehicle-on-vehicle collision options described above.
+
 !!! note
     The pedestrian model *striping* detects collisions between pedestrians. This only serves to detect issues with the model.
 
diff -Nru sumo-1.17.0/docs/web/docs/Simulation/SublaneModel.md sumo-1.18.0/docs/web/docs/Simulation/SublaneModel.md
--- sumo-1.17.0/docs/web/docs/Simulation/SublaneModel.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Simulation/SublaneModel.md	2023-06-28 20:02:17.000000000 +0000
@@ -28,7 +28,7 @@
 This model is activated using the option **--lateral-resolution** {{DT_FLOAT}}. The model is described in
 *Simulation framework for testing ADAS in Chinese traffic situations*
 [in proceedings of
-SUMO2016](http://elib.dlr.de/106342/1/SUMOconference_proceedings_2016.pdf)
+SUMO2016](https://elib.dlr.de/106342/1/SUMOconference_proceedings_2016.pdf)
 
 
 ## Lateral Resolution and Vehicle Position
diff -Nru sumo-1.17.0/docs/web/docs/Simulation/Taxi.md sumo-1.18.0/docs/web/docs/Simulation/Taxi.md
--- sumo-1.17.0/docs/web/docs/Simulation/Taxi.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Simulation/Taxi.md	2023-06-28 20:02:17.000000000 +0000
@@ -104,10 +104,44 @@
 
 - "stop" (default): stop at the current location (off-road) after delivering the last customer of the current service request.
 - "randomCircling": continue driving to random edges until the next request is received. (caution: taxi might get stuck in a cul-de-sac if the network has those)
+- "taxistand": drive to a taxi stand and wait there for the next customer / dispatch. Defining the set of taxi stands and the strategy of chosing among them is described below
 
 !!! note
     When using "randomCircling", the default value for parameter "device.taxi.end" is 8 hours after vehicle departure.
 
+### Defining taxi stands
+
+When using idle-algorithm **taxistand**, the following inputs must be provided:
+
+- each taxi stand must be defined as a [parkingAreas](ParkingArea.md)
+- the list of parkingAreas that may be used for a particular taxi or taxi fleet must be defined as a ``-element according to the [description for parking search simulation](Rerouter.md#rerouting_to_an_alternative_parking_area).
+- the taxi must define the parameter `device.taxi.stands-rerouter` either as a child element of the `` or its `` and decelare the rerouter id. 
+
+The strategy for chosing among the alternative taxi stands follows the description for parking search simulation (i.e. with respect to prior knowledge of remaining capacity).
+
+Example declerations for the rerouter and the taxi vType that references it:
+
+```
+
+        
+            
+            
+        
+
+```
+
+!!! note
+    To avoid warnings, the `edges` attribute of the rerouter should match the edges which contain taxi stands.
+
+```
+
+        
+        
+
+```
+ 
+ 
+
 ## Customer Stops
 
 Taxis will stop to pick-up and drop-off customers. The 'actType' attribute of a stop indicates the purpose ('pickup' / 'dropOff') as well as the ids of the customers and their reservation id. Stop attributes can be configured using [generic parameters]() `` or `` definition of the taxi:
diff -Nru sumo-1.17.0/docs/web/docs/Simulation/Traffic_Lights.md sumo-1.18.0/docs/web/docs/Simulation/Traffic_Lights.md
--- sumo-1.17.0/docs/web/docs/Simulation/Traffic_Lights.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Simulation/Traffic_Lights.md	2023-06-28 20:02:17.000000000 +0000
@@ -113,11 +113,10 @@
     If the network was created by [osmWebWizard.py](../Tutorials/OSMWebWizard.md) the traffic lights are 'actuated' by default
 
 To convert an existing .net.xml file so that all traffic lights are actuated,
-perform the following steps:
+perform the following call: 
 
 ```
-netconvert -s orig.net.xml --plain-output-prefix plain
-netconvert -e plain.edg.xml -n plain.nod.xml -x plain.con.xml -o updated.net.xml --ignore-errors.edge-type --tls.default-type actuated
+netconvert -s orig.net.xml --o new.net.xml --tls.rebuild --tls.default-type actuated
 ```
 
 ### Adapting fixed timings (green split) to known traffic
@@ -248,7 +247,7 @@
 TLS Link indices can be access using either
 
 - [sumolib](../Tools/Sumolib.md) using
-  [tls.getConnections()](http://sumo.dlr.de/daily/pydoc/sumolib.net.html#TLS)
+  [tls.getConnections()](https://sumo.dlr.de/daily/pydoc/sumolib.net.html#TLS)
 - or [TraCI](../TraCI.md) using
   [traci.trafficlight.getControlledLinks()](../TraCI/Traffic_Lights_Value_Retrieval.md#structure_of_compound_object_controlled_links)
 
diff -Nru sumo-1.17.0/docs/web/docs/SUMO_at_a_Glance.md sumo-1.18.0/docs/web/docs/SUMO_at_a_Glance.md
--- sumo-1.17.0/docs/web/docs/SUMO_at_a_Glance.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/SUMO_at_a_Glance.md	2023-06-28 20:02:17.000000000 +0000
@@ -225,7 +225,7 @@
 

 
 Christoph Sommer
-TraCI merge with Veins, Subscription Interface, Misc.
+TraCI merge with Veins, Subscription Interface, Misc.
 
 
 David Eckhoff
@@ -253,7 +253,7 @@
 
 
 Walter Bamberger
-Development of activitygen as a base for the evaluation of trust scenarios in VANETs. The work is part of the project Fidens: Trust between Cooperative Systems featuring trusted probabilistic knowledge processing in vehicular networks.
+Development of activitygen as a base for the evaluation of trust scenarios in VANETs. The work is part of the project Fidens: Trust between Cooperative Systems featuring trusted probabilistic knowledge processing in vehicular networks.
 
 
 Matthew Fullerton
@@ -269,7 +269,7 @@
 
 
 Enrico Gueli
-TraCI4J
+TraCI4J
 
 
 
diff -Nru sumo-1.17.0/docs/web/docs/SUMO_edge_type_file.md sumo-1.18.0/docs/web/docs/SUMO_edge_type_file.md
--- sumo-1.17.0/docs/web/docs/SUMO_edge_type_file.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/SUMO_edge_type_file.md	2023-06-28 20:02:17.000000000 +0000
@@ -191,7 +191,7 @@
 
 Only few data is available about the railway types. The most important
 document might be the [Eisenbahn-Bau- und Betriebsordnung
-(EBO)](http://www.gesetze-im-internet.de/bundesrecht/ebo/gesamt.pdf),
+(EBO)](https://www.gesetze-im-internet.de/bundesrecht/ebo/gesamt.pdf),
 but even that did not help me much. So the given values are mostly
 personal opinion, except if a reference is given. More references are
 very welcome.
diff -Nru sumo-1.17.0/docs/web/docs/sumo-gui.md sumo-1.18.0/docs/web/docs/sumo-gui.md
--- sumo-1.17.0/docs/web/docs/sumo-gui.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/sumo-gui.md	2023-06-28 20:02:17.000000000 +0000
@@ -902,7 +902,7 @@
 # 3D Visualization
 
 When sumo-gui was compiled with [OpenSceneGraph 
-(OSG)](http://www.openscenegraph.org/) support an additional
+(OSG)](https://www.openscenegraph.org/) support an additional
 (![NewView3D.gif](images/NewView3D.gif "New 3D view"))-button is
 present to open a new 3D view. A pre-compiled Windows version for testing is available
 [here](https://sumo.dlr.de/daily/sumo-win64extra-git.zip). Optionally sumo-gui will open a 3D view already from the start by 
diff -Nru sumo-1.17.0/docs/web/docs/sumo.md sumo-1.18.0/docs/web/docs/sumo.md
--- sumo-1.17.0/docs/web/docs/sumo.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/sumo.md	2023-06-28 20:02:17.000000000 +0000
@@ -41,7 +41,7 @@
 
 You may use a XML schema definition file for setting up a SUMO
 configuration:
-[sumoConfiguration.xsd](http://sumo.dlr.de/xsd/sumoConfiguration.xsd).
+[sumoConfiguration.xsd](https://sumo.dlr.de/xsd/sumoConfiguration.xsd).
 
 ### Configuration
 
@@ -177,7 +177,9 @@
 | **--ignore-route-errors** {{DT_BOOL}} | Do not check whether routes are connected; *default:* **false** |
 | **--ignore-accidents** {{DT_BOOL}} | Do not check whether accidents occur; *default:* **false** |
 | **--collision.action** {{DT_STR}} | How to deal with collisions: [none,warn,teleport,remove]; *default:* **teleport** |
+| **--intermodal-collision.action** {{DT_STR}} | How to deal with collisions between vehicle and pedestrian: [none,warn,teleport,remove]; *default:* **warn** |
 | **--collision.stoptime** {{DT_TIME}} | Let vehicle stop for TIME before performing collision.action (except for action 'none'); *default:* **0** |
+| **--intermodal-collision.stoptime** {{DT_TIME}} | Let vehicle stop for TIME before performing intermodal-collision.action (except for action 'none'); *default:* **0** |
 | **--collision.check-junctions** {{DT_BOOL}} | Enables collisions checks on junctions; *default:* **false** |
 | **--collision.check-junctions.mingap** {{DT_FLOAT}} | Increase or decrease sensitivity for junction collision check; *default:* **0** |
 | **--collision.mingap-factor** {{DT_FLOAT}} | Sets the fraction of minGap that must be maintained to avoid collision detection. If a negative value is given, the carFollowModel parameter is used; *default:* **-1** |
@@ -336,6 +338,17 @@
 
 | Option | Description |
 |--------|-------------|
+| **--device.stationfinder.probability** {{DT_FLOAT}} | The probability for a vehicle to have a 'stationfinder' device; *default:* **-1** |
+| **--device.stationfinder.explicit** {{DT_STR[]}} | Assign a 'stationfinder' device to named vehicles |
+| **--device.stationfinder.deterministic** {{DT_BOOL}} | The 'stationfinder' devices are set deterministic using a fraction of 1000; *default:* **false** |
+| **--device.stationfinder.rescueTime** {{DT_TIME}} | Time to wait for a rescue vehicle on the road side when the battery is empty; *default:* **1800** |
+| **--device.stationfinder.reserveFactor** {{DT_FLOAT}} | Additional battery buffer for unexpected traffic situation when estimating the battery need; *default:* **1.1** |
+| **--device.stationfinder.emptyThreshold** {{DT_FLOAT}} | Battery percentage to go into rescue mode; *default:* **5** |
+| **--device.stationfinder.radius** {{DT_TIME}} | Search radius in travel time seconds; *default:* **180** |
+| **--device.stationfinder.repeat** {{DT_TIME}} | When to trigger a new search if no station has been found; *default:* **60** |
+| **--device.stationfinder.maxChargePower** {{DT_FLOAT}} | The maximum charging speed of the vehicle battery; *default:* **1000** |
+| **--device.stationfinder.chargeType** {{DT_STR}} | Type of energy transfer; *default:* **charging** |
+| **--device.stationfinder.waitForCharge** {{DT_TIME}} | After this waiting time vehicle searches for a new station when the initial one is blocked; *default:* **600** |
 | **--device.battery.probability** {{DT_FLOAT}} | The probability for a vehicle to have a 'battery' device; *default:* **-1** |
 | **--device.battery.explicit** {{DT_STR[]}} | Assign a 'battery' device to named vehicles |
 | **--device.battery.deterministic** {{DT_BOOL}} | The 'battery' devices are set deterministic using a fraction of 1000; *default:* **false** |
@@ -357,15 +370,17 @@
 | **--device.ssm.probability** {{DT_FLOAT}} | The probability for a vehicle to have a 'ssm' device; *default:* **-1** |
 | **--device.ssm.explicit** {{DT_STR[]}} | Assign a 'ssm' device to named vehicles |
 | **--device.ssm.deterministic** {{DT_BOOL}} | The 'ssm' devices are set deterministic using a fraction of 1000; *default:* **false** |
-| **--device.ssm.measures** {{DT_STR}} | Specifies which measures will be logged (as a space or comma-separated sequence of IDs in ('TTC', 'DRAC', 'PET')) |
+| **--device.ssm.measures** {{DT_STR}} | Specifies which measures will be logged (as a space or comma-separated sequence of IDs in ('TTC', 'DRAC', 'PET', 'PPET','MDRAC')) |
 | **--device.ssm.thresholds** {{DT_STR}} | Specifies space or comma-separated thresholds corresponding to the specified measures (see documentation and watch the order!). Only events exceeding the thresholds will be logged. |
 | **--device.ssm.trajectories** {{DT_BOOL}} | Specifies whether trajectories will be logged (if false, only the extremal values and times are reported).; *default:* **false** |
 | **--device.ssm.range** {{DT_FLOAT}} | Specifies the detection range in meters. For vehicles below this distance from the equipped vehicle, SSM values are traced.; *default:* **50** |
 | **--device.ssm.extratime** {{DT_FLOAT}} | Specifies the time in seconds to be logged after a conflict is over. Required >0 if PET is to be calculated for crossing conflicts.; *default:* **5** |
+| **--device.ssm.mdrac.prt** {{DT_FLOAT}} | Specifies the perception reaction time for MDRAC computation.; *default:* **1** |
 | **--device.ssm.file** {{DT_STR}} | Give a global default filename for the SSM output |
 | **--device.ssm.geo** {{DT_BOOL}} | Whether to use coordinates of the original reference system in output; *default:* **false** |
 | **--device.ssm.write-positions** {{DT_BOOL}} | Whether to write positions (coordinates) for each timestep; *default:* **false** |
 | **--device.ssm.write-lane-positions** {{DT_BOOL}} | Whether to write lanes and their positions for each timestep; *default:* **false** |
+| **--device.ssm.exclude-conflict-types** {{DT_STR}} | Which conflicts will be excluded from the log according to the conflict type they have been classified (combination of values in 'ego', 'foe' , '', any numerical valid conflict type code). An empty value will log all and 'ego'/'foe' refer to a certain conflict type subset. |
 
 ### Toc Device
 
diff -Nru sumo-1.17.0/docs/web/docs/SumoWorkshop2010.md sumo-1.18.0/docs/web/docs/SumoWorkshop2010.md
--- sumo-1.17.0/docs/web/docs/SumoWorkshop2010.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/SumoWorkshop2010.md	2023-06-28 20:02:17.000000000 +0000
@@ -93,7 +93,7 @@
 allows to navigate further down with fewer clicks and which presents
 possibilities to navigate through SUMO documentation more easily.
 
-Now, the new entry page is available at . The
+Now, the new entry page is available at . The
 navigation bar at the top points you to all the available support tools
 as trac, blog, etc. The links in the central area mainly point you to
 the according, old wiki sections.
diff -Nru sumo-1.17.0/docs/web/docs/Tools/Assign.md sumo-1.18.0/docs/web/docs/Tools/Assign.md
--- sumo-1.17.0/docs/web/docs/Tools/Assign.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Tools/Assign.md	2023-06-28 20:02:17.000000000 +0000
@@ -48,6 +48,10 @@
 !!! caution
     Options, prefixed with **duarouter--** must be the last in the list of all options
 
+
+##  duaIterateMix.py 
+This tool is designed to solve the multiclass traffic assignment problem for mixed traffic flow. Most of the options in this tool are similar to those in duaIterate.py, with a few exceptions. To solve the multiclass traffic assignment problem, you need to provide two demand files. Use the option -t to specify the demand for UE-seeking vehicles, and use the option -r to specify the demand for SO-seeking vehicles. To obtain the multiclass traffic assignment solution, you should set the following options: --mix, --marginal-cost, and --marginal-cost.exp.
+
 ## duaIterate_analysis.py
 
 To check the evolution of different simulation parameters during the dua
diff -Nru sumo-1.17.0/docs/web/docs/Tools/Build.md sumo-1.18.0/docs/web/docs/Tools/Build.md
--- sumo-1.17.0/docs/web/docs/Tools/Build.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Tools/Build.md	2023-06-28 20:02:17.000000000 +0000
@@ -22,7 +22,7 @@
 Checks .java, .cpp, .h and .py files for the correct license header and
 applies [autopep8](https://github.com/hhatto/autopep8) and
 [flake8](https://github.com/PyCQA/flake8) for PEP 8 compatibility. Also
-applies [astyle](http://astyle.sourceforge.net/) to all .java, .cpp, and
+applies [astyle](https://astyle.sourceforge.net/) to all .java, .cpp, and
 .h files. The position of the source tree(s) to check is given as
 optional arguments or determined relative to the position of the script.
 This call is part of our nightly tests. The script is able to fix some
diff -Nru sumo-1.17.0/docs/web/docs/Tools/Import/GTFS.md sumo-1.18.0/docs/web/docs/Tools/Import/GTFS.md
--- sumo-1.17.0/docs/web/docs/Tools/Import/GTFS.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Tools/Import/GTFS.md	2023-06-28 20:02:17.000000000 +0000
@@ -6,7 +6,8 @@
 
 [The General Transit Feed Specification](https://developers.google.com/transit/gtfs) defines a common format
 for public transportation schedules and associated geographic information. The tools described here 
-facilitate the import of schedules (and also routes to a limited degree) into SUMO.
+facilitate the import of schedules (and also routes to a limited degree) into SUMO. They require the installation
+of the pandas library. For best performance it is recommended to use at least pandas 2.0.
 
 See also the [GTFS tutorial](../../Tutorials/GTFS.md).
 
@@ -62,4 +63,4 @@
 # gtfs2osm.py
 
 This helper script contains the necessary functions to import public transport
-from GTFS and OSM. It is used by the script gtfs2pt.py when the **--osm-routes** option is given.
\ No newline at end of file
+from GTFS and OSM. It is used by the script gtfs2pt.py when the **--osm-routes** option is given.
diff -Nru sumo-1.17.0/docs/web/docs/Tools/Import/VISSIM.md sumo-1.18.0/docs/web/docs/Tools/Import/VISSIM.md
--- sumo-1.17.0/docs/web/docs/Tools/Import/VISSIM.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Tools/Import/VISSIM.md	2023-06-28 20:02:17.000000000 +0000
@@ -199,7 +199,7 @@
 
 Allgemeine Informationen zur Definition von Routen und Zuflüssen finden
 sich unter
-
+
 (zuletzt geprüft am 28.07.2015).
 
 ## Umsetzung
@@ -425,7 +425,7 @@
 ```
 
 Nähere Beschreibungen zur Definition von Lichtsignalanlagen befinden
-sich unter  (zuletzt
+sich unter  (zuletzt
 geprüft am 28.07.2015).
 
 ## Umsetzung
diff -Nru sumo-1.17.0/docs/web/docs/Tools/index.md sumo-1.18.0/docs/web/docs/Tools/index.md
--- sumo-1.17.0/docs/web/docs/Tools/index.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Tools/index.md	2023-06-28 20:02:17.000000000 +0000
@@ -8,13 +8,16 @@
 them are tiny - they were written for a certain purpose and worked well
 under certain input, but may be not verified for other cases.
 
-All tools should work with Python 3.7 or later on Windows, Linux and MacOS.
-We try to keep them compatible with Python 3.5 and 2.7 as well.
+All tools should work with Python 3.7 or later on Windows, Linux and macOS.
+We try to keep them compatible with Python 3.5 and 2.7 as well. Some of them
+depend on external libraries, which can be installed using
+`pip install -r tools/requirements.txt`. For details on installation
+and required versions see also the [Linux installation instructions](../Installing/Linux_Build.md#installing_python_packages_for_the_tools).
 
 # How to use python tools
 
-Python tools must be called from the [command
-line](../Basics/Basic_Computer_Skills.md#running_programs_from_the_command_line)
+Python tools are usually called from the [command
+line](../Basics/Basic_Computer_Skills.md#running_programs_from_the_command_line).
 In the documentation linked below, the tools are described with a command like
 
 ```
@@ -23,13 +26,13 @@
 
 This works only, if the current working directory is {{SUMO}}.
 
-For the Windows OS, to run the tool from any directory, you can use use
+For the Windows OS, to run the tool from any directory, you can use
 
 ```
 python %SUMO_HOME%\tools\xml\xml2csv.py input.xml
 ```
 
-The equivalent command For Linux is
+The equivalent command for Linux is
 
 ```
 $SUMO_HOME/tools/xml/xml2csv.py input.xml
@@ -43,6 +46,9 @@
 
 For scripts in other subdirectories of tools you have to replace xml in this example by the name of the subdirectory
 
+## Using tools from netedit
+
+Since version 1.17.0, netedit supports calling many tools via configuration dialog by using the 'Tools' menu. For a demonstration, see the [SUMO 2023 Confererence tutorial](../Tutorials/index.md#sumo_user_conference_tutorials).
 
 # Tools by category
 
diff -Nru sumo-1.17.0/docs/web/docs/Tools/LiSuM.md sumo-1.18.0/docs/web/docs/Tools/LiSuM.md
--- sumo-1.17.0/docs/web/docs/Tools/LiSuM.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Tools/LiSuM.md	2023-06-28 20:02:17.000000000 +0000
@@ -22,7 +22,7 @@
 
 LiSuM was built on Java technology and thus can be run on any operating
 system supporting Java. LiSuM is licensed (just like SUMO) under the
-[EPLv2](http://www.eclipse.org/legal/epl-v20.html).
+[EPLv2](https://www.eclipse.org/legal/epl-v20.html).
 
 ![flowws.png](../images/Flowws.png "flowws.png")
 SUMO communicates with the LISA+ virtual controller through LiSuM
diff -Nru sumo-1.17.0/docs/web/docs/Tools/Misc.md sumo-1.18.0/docs/web/docs/Tools/Misc.md
--- sumo-1.17.0/docs/web/docs/Tools/Misc.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Tools/Misc.md	2023-06-28 20:02:17.000000000 +0000
@@ -235,7 +235,7 @@
 The resulting bus definition may look like this:
 
 ```xml
-
+
     
     
          
diff -Nru sumo-1.17.0/docs/web/docs/Tools/Railways.md sumo-1.18.0/docs/web/docs/Tools/Railways.md
--- sumo-1.17.0/docs/web/docs/Tools/Railways.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Tools/Railways.md	2023-06-28 20:02:17.000000000 +0000
@@ -146,9 +146,13 @@
 
 - **--xml-output FILE** (**-o**): write statistics to FILE in xml format
 - **--statistic-type** (**-t**): select among statistics to be computed
-  - 'd' : depart delay
-  - 'a' : arrival delay
+  - 'd' : stop depart delay
+  - 'a' : stop arrival delay
   - 's' : stop duration difference
+  - 'de' : stop depart delay comppared to 'ended' in input
+  - 'as' : stop arrivalt delay comppared to recorded 'started' in input
+  - 't'  : traveltime according to schedule versus traveltime in simulation (between stops)
+  - 'T'  : traveltime according to recording versus traveltime in simulation (between stops)
   
 - **--group-by** (**-g**): group results by one or more attributes (vehID,tripId,stopID,priorStop)
 - **--group-statistic-type** (**-T**): select among statistics over the group values (i.e. to compare the groups by their mean depart delay). permitted values are mean, median, min, max
diff -Nru sumo-1.17.0/docs/web/docs/Tools/Routes.md sumo-1.18.0/docs/web/docs/Tools/Routes.md
--- sumo-1.17.0/docs/web/docs/Tools/Routes.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Tools/Routes.md	2023-06-28 20:02:17.000000000 +0000
@@ -486,6 +486,32 @@
 ```
 
 When setting option **--stop-table STOP_ID** a time table for all vehicles that service the given ``-id is written to standard output.
+The option accepts a list of stops and also the `*` wildcard to generate a combined table for multiple busStops (i.e belonging to the same station).
+
+The resulting stop table may look as in the below example, where the columns correspond to the [attributes of the stop](../Definition_of_Vehicles%2C_Vehicle_Types%2C_and_Routes.md#stops_and_waypoints) execpt for the following two columns:
+- **veh**: the id of the vehicle to which this stop belongs
+- **flags**:
+  - p: parking
+  - F: first stop of the vehicle
+  - L: last stop of the vehicle
+  - w: waypoint
+  - o: vehicle is overtaken (some other vehicle arrives later at the same stop and departs earlier)
+  - O: vehicle ovetakes (some other vehicle arrives earlier and departs later)
+
+```
+# busStop: stop_A,stop_B
+arrival  until	    veh      tripId	started	  ended	    flags	busStop
+12:20:30  12:24:12  H2303_6  4199   12:23:22	12:26:23		    stop_B
+12:21:42  12:21:42  H2303_8  11010  12:25:15	12:25:15	F	    stop_A
+12:50:36  12:53:48  H2303_7  11023  12:50:26	12:52:57		    stop_B
+13:20:36  13:23:42  H2303_9  11073			                      stop_B
+13:35:00  13:38:42  H2303_8  11025			                      stop_B
+13:36:24  13:36:24  H2303_3  11012			                      stop_A
+14:04:36  14:07:24  Z2602_2  1435			                        stop_B
+14:21:12  14:24:12  H2303_1  11027		                        stop_B
+14:35:18  14:37:18  H3458_2  28915	                       		stop_B
+14:51:36  14:54:12  Z1351_9  2075			                        stop_B
+```
 
 # splitRandom.py
 
diff -Nru sumo-1.17.0/docs/web/docs/Tools/Sumolib.md sumo-1.18.0/docs/web/docs/Tools/Sumolib.md
--- sumo-1.17.0/docs/web/docs/Tools/Sumolib.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Tools/Sumolib.md	2023-06-28 20:02:17.000000000 +0000
@@ -5,7 +5,7 @@
 **sumolib** is a set of python modules for working with sumo networks,
 simulation output and other simulation artifacts. For a detailed list of
 available functions see the [pydoc generated
-documentation](http://sumo.dlr.de/pydoc/sumolib.html). You can
+documentation](https://sumo.dlr.de/pydoc/sumolib.html). You can
 [browse the code here](https://github.com/eclipse/sumo/tree/main/tools/sumolib).
 
 # importing **sumolib** in a script
@@ -71,7 +71,7 @@
 !!! note
     This is just a processing example. To compute average travel speeds in a network, process [edgeData](../Simulation/Output/Lane-_or_Edge-based_Traffic_Measures.md), [tripinfos](../Simulation/Output/TripInfo.md) or [summary-output](../Simulation/Output/Summary.md) instead.
 
-## compute the median speed using the [Statistics](http://sumo.dlr.de/pydoc/sumolib.miscutils.html#Statistics) module
+## compute the median speed using the [Statistics](https://sumo.dlr.de/pydoc/sumolib.miscutils.html#Statistics) module
 
 ```python
 edgeStats = sumolib.miscutils.Statistics("edge speeds")
diff -Nru sumo-1.17.0/docs/web/docs/Tools/tls.md sumo-1.18.0/docs/web/docs/Tools/tls.md
--- sumo-1.17.0/docs/web/docs/Tools/tls.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Tools/tls.md	2023-06-28 20:02:17.000000000 +0000
@@ -26,11 +26,11 @@
 
 # tlsCycleAdaptation.py
 
-This script modifies the duration of green phases according to Websters
+This script modifies the cycle lenth and the duration of green phases according to Websters
 formula to best accommodate a given traffic demand. Example call:
 
 ```
-python tools/tlsCycleAdaptation.py -n net.net.xml -r routes.rou.xml -o newTLS.add.xml
+python tools/tlsCycleAdaptation.py -n net.net.xml -r routes.rou.xml -o newTLS.add.xml -b begin_time
 ```
 
 This would generate the file *newTLS.add.xml* which can be loaded into
@@ -41,8 +41,30 @@
 ```
 
 !!! caution
-    The route input must contain ``s with ``-child-elements. Flows and trips are not supported.
+    The route input must contain ``s with ``-child-elements. Flows and trips are not supported. Vehicles with departure time = 'triggered' are not considered.
 
+!!! note
+    The begin time is not mandatory. However, the begin time will be the earliest departure time in the given route file, if it is not given. The flows within 1 hour from the begin time on are considered. If the whole period in the given route file is less than 1 hour, the flows will be proportionally scaled up to 1-hour flows. If the period is longer than 1 hour and no begin time is given, the 1-hour 
+  peak-flows will be used. 
+
+## Remarks
+
+The calcuation in this script are based on static hourly traffic flows. Therefore, the flow pattern (e.g. vehicles arriving only in the first 10 minutes) within a hourly flow cannot be reflected in the Webster's equation. Accordingly, the suggested signal timing plans may not correspond to the traffic situation in the microscopic simulation. Several parameters in the options may need to be adjusted according to the given use case. Some remarks for helping to get proper results are listed below.
+
+- Hourly flow: 
+    Currently, this script only considers flows for one hour corresponding to the basic Webster's equation. So, the begin time needs to be given for getting the correct flows from the route file. Otherwise, the begin time = 0 is used as default, and the end time is then 3600 s. If the given period is longer than 1 hour, it is recommended to firstly find out the peak-hour begin time and use it in the script. If the given period is less than 1 hour, this script will still treat the respective flow as hourly flow. It is planned to scale/extract hourly flow from a given route file.
+
+- Allocation of the movements at intersections: 
+    In the basic Webster's equation, critical flows are calculated according to the given signal groups. So, generally speaking, flows with the same direction and in the same green time phase are summed up. The capacity is then calculated according to the number of lanes, which the respective flows are allowed to use. Accordingly, the critical flow group for each signal phase can be identified. This script does the same thing. If through and right-turn movements share the same green time phase at an intersection and they can only respectively use one lane in the microscopic simulation, i.e. there is no shared lane for both through and right-turn movements, the respective capacity will be over-estimated for through-movement. To avoid such situation, the rightmost lane needs to be set as shared lane for both right-turn and through movements. 
+   
+- Lane capacity: 
+    In this script, the capacity is controlled by the option saturation-headway. As default, saturation-headway is set to 2 s. So, the default capacity is 1800 veh/lane/hour, which is for a longer road section normally. If the distance between any two intersections is quite short, e.g. 500 m in a city area, it is expected that the capacity is lower than the default capacity. It is needed to consider increasing the saturation-headway for adjusting the lane capacity.
+
+- Currently, the considered road users (veh.type) include car, truck, trailer, bus, coach, moped, motorcycle, bicycle. PCE (Passenger Car Equivalents) is used as flow unit. 
+
+- Synchronizaton of traffic signals: 
+    This script only deals with the signal timing optimization at one intersection at a time, and does not synchronize the traffic signals across all intersections. So, poor results could happen if there is any conflict between signal plans. The script [tlsCoordinator.py](#tlscoordinatorpy) can be used to coordinate traffic signals.
+    
 # tls_csv2SUMO.py
 
 This tool requires the program definition and the SUMO-network it shall
@@ -134,7 +156,7 @@
 ## Example
 
 The example shows what is tested in
-[\[1\]](http://sourceforge.net/apps/trac/sumo/browser/trunk/sumo/tests/tools/tls/csv2sumo/both_ok).
+[\[1\]](https://sourceforge.net/apps/trac/sumo/browser/trunk/sumo/tests/tools/tls/csv2sumo/both_ok).
 It is not a real-world program plan, only a demonstration for using the
 script.
 
diff -Nru sumo-1.17.0/docs/web/docs/Tools/TraceExporter.md sumo-1.18.0/docs/web/docs/Tools/TraceExporter.md
--- sumo-1.17.0/docs/web/docs/Tools/TraceExporter.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Tools/TraceExporter.md	2023-06-28 20:02:17.000000000 +0000
@@ -29,7 +29,7 @@
   \*.tcl)
 - PHEM: .dri-files, .str-files, .fzp-files, .flt-files
 - GPSDAT csv traces (id,date,x,y,status,speedKMH)
-- [GPX](http://en.wikipedia.org/wiki/GPS_eXchange_Format)
+- [GPX](https://en.wikipedia.org/wiki/GPS_eXchange_Format)
 - [KML](https://en.wikipedia.org/wiki/Keyhole_Markup_Language)
 - [Kepler-JSON](https://kepler.gl/)
 - IPG Traces (experimental)
@@ -54,7 +54,7 @@
 traceExporter.py --fcd-input myFCDoutput.xml --omnet-output myOMNETfile.xml
 ```
 
-In the case given above, a file for [OMNET](http://www.omnetpp.org/)
+In the case given above, a file for [OMNET](https://www.omnetpp.org/)
 will be built.
 
 In the following, the command line options are described.
diff -Nru sumo-1.17.0/docs/web/docs/Tools/Trip.md sumo-1.18.0/docs/web/docs/Tools/Trip.md
--- sumo-1.17.0/docs/web/docs/Tools/Trip.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Tools/Trip.md	2023-06-28 20:02:17.000000000 +0000
@@ -203,6 +203,10 @@
 they use public transport, a personal car or walking.
   - walking or public transport: **--trip-attributes "modes=\"public\""**
   - walking, public transport or car **--trip-attributes "modes=\"public car\""**
+- Using the option **--personrides ** will generated persons with `` definitions.
+- using option **--from-stops busStop** will make persons start with an initial `` at a random busStop
+- using option **--to-stops busStop** will make persons end their journey at a random busStop
+
 
 !!! caution
     Quoting of trip attributes on Linux must use the style **--trip-attributes 'modes="public"'**
diff -Nru sumo-1.17.0/docs/web/docs/Tools/Turns.md sumo-1.18.0/docs/web/docs/Tools/Turns.md
--- sumo-1.17.0/docs/web/docs/Tools/Turns.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Tools/Turns.md	2023-06-28 20:02:17.000000000 +0000
@@ -63,6 +63,7 @@
 
 ```
 
+Example call:
 ```
 python tools/routeSampler.py -r  --turn-files  -o 
 ```
@@ -70,6 +71,34 @@
 
 In case an existing scenario should be modified (i.e. in combination with different kinds of counting data) it is also possible to [convert an existing file with vehicles into a turn-count file](#generateturnratiospy).
 
+!!! note
+    When working with turning counts at a roundabout, the incoming and outgoing edges are not directly connected (since vehicles must pass a number of edges within the roundabout first). In this case, the option [--turn-max-gap](#generalized_route_restrictions) must be used and should be set to the number of edges within the largest roundabout.
+
+## turn ratios
+
+Traffic data related to turning traffic can also be provided as ratios in the following format:
+```xml
+
+  
+    
+        
+    
+    
+        
+  
+
+```
+
+Example call:
+```
+python tools/routeSampler.py -r  --turn-ratio-files  -o 
+```
+
+The attributes for reading the ratios from the turn-data file can be set with option **--turn-ratio-attribute** (default *probability*)
+
+!!! caution
+    Turning ratios must be combined with some other counting data to define the absolute level of traffic. This can be any of the other counting data formats or by setting option **--total-count**.
+
 ## Obtaining initial routes
 Routes generated by randomTrips.py (**--route-output**) can be a good input source. The following randomTrips.py options may be helpful:
 
@@ -100,11 +129,40 @@
 When setting option **--turn-max-gap 2**, the edgeRelation `` would apply to routes containing "A B", "A X D" or "A X Y D" but not "A X Y Z D".
         
 ## Origin-Destination restrictions
+
+The following section describes counts that refer to the origin and destination of a route rather than to some intermediate route edges.
+Using such counts with routeSampler.py permits to combine thenm with other forms of counts or ratios. (Unlike [od2trips](../od2trips.md) which only imports OD-counts and nothing else).
+    
+If origin destination counts are loaded, it is assumed that they give complete coverage of the scenario. This means, if no count is given for a particular Origin-Destination-pair, it is assumed that the count is 0 and no traffic is generated between the respective edges or TAZ.  To change this, the option **--extra-od** may be set. In this case, traffic between any relations can be generated as long as it does not exceed the loaded counts.
+    
+### Edge Based
   
 When loading an edgeRelation file with the option **--od-files**, origin-destination counts will be added.
-This can be used to combine (edge-based) OD-relations with other counting data.  
+This can be used to combine (edge-based) OD-relations with other counting data. 
+    
+```xml
+
+```    
+
+The above counting data example will match routes which start on edge `A` and end on edge `D`.   
   
 The tool [route2OD.py](Routes.md#route2odpy) supports option **--edge-relations** to transform any kind of route file into a suitable file of edge-based origin-destination edgeRelations.
+    
+### TAZ (district) Based
+    
+When loading an [TAZ-file](../Demand/Importing_O/D_Matrices.md#describing_the_taz) with option **--taz-files**, it is possible to define counts between Traffic Assignment Zones (TAZ, also called districts).
+The counting data itself must be given in the following from and loaded with option **--od-files**:
+    
+``` 
+
+    
+        
+    
+    
+```  
+
+The TAZ ids which are referenced by the `tazRelation` attributes `from` and `to` must be defined within the loaded **--taz-files**.
+The above counting data example will match routes which start on any edge of TAZ `1_2` and end on any edge of taz `2_0`.    
 
 ## Depart / Arrival restrictions
 
@@ -186,17 +244,26 @@
 ```
 
 ## Sampling
-By default, sampling will be performed iteratively by 
-1) selecting a random counting location that has not yet reached it's count (and which still has viable routes)
-2) selecting a random route that passes this counting location
-
-until all counting locations have reached their measured count or there are no viable routes (routes which have all their passed counting locations below the input count)
-
-By setting the option **--weighted**. The sampling algorithm is changed. For each route a probability value is loaded from the input. The probability can either be specified explicitly using route attribute 'probability' or implicitly if a route with the same sequence of edges appears multiple times in the the route input. Sampling will be performed iteratively by
-1) selecting a random viable route sampled by probability
+In this stage, routes are selected randomly within the limits imposed by the input counts.
+Only routes that pass a minimum number of counting locations (option **--min-count**, default *1*) are eligible for sampling.
+    
+### Default Sampling
+    
+By default, sampling will be performed iteratively by:
+    
+1. selecting a random counting location that has not yet reached it's count (and which still has viable routes)
+2. selecting a random route that passes this counting location
 
 until all counting locations have reached their measured count or there are no viable routes (routes which have all their passed counting locations below the input count)
-
+    
+### Weighted Sampling    
+    
+By setting the option **--weighted**. The sampling algorithm is changed. For each route a probability value is loaded from the input. The probability can either be specified explicitly using route attribute 'probability' or implicitly if a route with the same sequence of edges appears multiple times in the the route input. Sampling will be performed iteratively by:
+    
+1. selecting a random viable route sampled by probability 
+    
+until all counting locations have reached their measured count or there are no viable routes (routes which have all their passed counting locations below the input count)    
+   
 ## Optimization
 By default, routes will be sampled from the input route set until no further routes can be added without exceeding one of the counts. This may still leave some counts below their target values.
 
@@ -219,6 +286,46 @@
 It is possible to load the resulting output into routeSampler.py for another round of optimization. By setting the option **--optimize-input** the sampling step is skipped and the optimizer is run directly on the input route set.
 
 By removing specific routes or adding new ones, the user can thus tailor the generating traffic in an iterative manner.
+    
+## Quality Control
+
+There is a range of reasons that could lead to a deviation between the routeSampler results and the user expectation. This section lists common reasons and documents which outputs can be used to judge the quality of the results.
+    
+### Problem areas
+
+- Selecting a set of routes to match a given set of counts is generally an underdetermined problem which means there is of not a unique solution. If there are insufficient constraints on the solution space (not enough counts), the chosen solution may appear implausible
+- Input routes are not representative of the real routes
+     - not covering the counting locations 
+     - containing unlikely routes
+- Temporal patterns are not captured by the given internval data (i.e. by only having counts for the whole day)
+- Traffic counts are not stationary within an interval (i.e. a single vehicle passing a long a list of widely spaced counting locations and each interval registers a different location). In this case the route that covers all counting locations will not be sampled. (Longer intervals must be chosen in this case).
+- Inconsistency in the counting data
+- Many short routes (can be prevented by setting option **--min-count**)
+    
+### Textual quality metrics
+    
+- underflow locations: Statistics on all counting locations with less traffic than defined in the input
+- overflow locations: Statistics on all counting locations with more traffic than defined in the input (only happens due to rounding of fractional counts after optimization)
+- [GEH](https://en.wikipedia.org/wiki/GEH_statistic) statistics: Statistics on locations that reach a defined GEH threshold (configurable with option **--geh-ok**, default *5*)
+- total number and percentage of matched counts (note that this is distinct from the number of vehicles since each vehicle may be counted multiple times) 
+    
+### Spatial quality data
+    
+By setting option **--mismatch-output FILE** an [edgeData] file will be created that holds the mismatch between input and output count (`deficit`) as well as the input count (`measuredCount`) for each time interval:
+    
+Example:
+```
+
+    
+        
+        
+        
+        ...
+    
+  
+```
+
+Such a data file can be visualized in [sumo-gui](../sumo-gui.md#visualizing_edge-related_data) and also plotted with [plot_net_dump.py](Visualization.md#plot_net_dumppy).    
  
 # generateTurnRatios.py
 
@@ -282,7 +389,9 @@
 # jtcrouter.py
 The **J**unction**T**urn**C**ountRouter generates vehicle routes from turn-count data.
 It does so by converting the turn counts into into flows and turn-ratio files that are suitable as [jtrrouter](../jtrrouter.md) input.
-Then it calls jtrrouter in the background. The turn
+Then it calls jtrrouter in the background.
+    
+Example call:
 
 ```
 python tools/jtcrouter.py -n  -t  -o 
diff -Nru sumo-1.17.0/docs/web/docs/Tools/Visualization.md sumo-1.18.0/docs/web/docs/Tools/Visualization.md
--- sumo-1.17.0/docs/web/docs/Tools/Visualization.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Tools/Visualization.md	2023-06-28 20:02:17.000000000 +0000
@@ -10,15 +10,15 @@
 suite as they offer a similar interface.
 
 All these tools are just wrappers around the wonderful
-[matplotlib](http://matplotlib.org/) library. If you are familiar with
+[matplotlib](https://matplotlib.org/) library. If you are familiar with
 Python, you must have a look.
 
 The tools share a set of [common options](#common_options) to
 fine-tune the appearance of the generated figures. These options' names
-where chosen similar to the [matplotlib](http://matplotlib.org/) calls.
+where chosen similar to the [matplotlib](https://matplotlib.org/) calls.
 
 The tools are implemented in Python and need
-[matplotlib](http://matplotlib.org/) to be installed. The tools can be
+[matplotlib](https://matplotlib.org/) to be installed. The tools can be
 found in {{SUMO}}/tools/visualization.
 
 # Current Tools
@@ -28,7 +28,7 @@
 generate. To run them, you'll need:
 
 - to install Python
-- to install [matplotlib](http://matplotlib.org/)
+- to install [matplotlib](https://matplotlib.org/)
 - to set {{SUMO}}
 
 All scripts are executed from the command line and you have to give the
@@ -159,7 +159,7 @@
 
 The plot is created from the output file of a SUMO simulation for which a global [SSM device](https://sumo.dlr.de/docs/Simulation/Output/SSM_Device.html) has been added. For this example, starting from the [Bologna "acosta" scenario](https://github.com/DLR-TS/sumo-scenarios/tree/main/bologna/acosta), the SUMO configuration file had been modified in order to compute time to collision:
 ```xml
-
+
 	
 	
 	
diff -Nru sumo-1.17.0/docs/web/docs/Tools/Xml.md sumo-1.18.0/docs/web/docs/Tools/Xml.md
--- sumo-1.17.0/docs/web/docs/Tools/Xml.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Tools/Xml.md	2023-06-28 20:02:17.000000000 +0000
@@ -6,7 +6,7 @@
 
 This converts any of the sumo xml files into a flat csv (character
 separated values) representation. CSV-Files are easy to parse and can be
-opened in [LibreOffice](http://www.libreoffice.org/) or Microsoft Excel.
+opened in [LibreOffice](https://www.libreoffice.org/) or Microsoft Excel.
 Usage:
 
 ```
@@ -19,7 +19,7 @@
 using **--xsd** {{DT_FILE}} to aid the parsing and get headings also for attributes which may
 be not in the current file. If you give the additional **--validation** option the input
 file will be validated against the schema. This requires
-[lxml](http://lxml.de/) to be installed.
+[lxml](https://lxml.de/) to be installed.
 
 If you do not use the **--xsd** option
 the script will determine the attributes to parse from the first line (or block) it parses.
@@ -84,9 +84,9 @@
 
 
 
-
+
 This part of SUMO was developed, reworked, or extended within the project 
-"AMITRAN", co-funded by the European Commission within the Seventh Framework Programme.
+"AMITRAN", co-funded by the European Commission within the Seventh Framework Programme.
 
 
 ## changeAttribute.py
diff -Nru sumo-1.17.0/docs/web/docs/Topics/Environmental_Issues.md sumo-1.18.0/docs/web/docs/Topics/Environmental_Issues.md
--- sumo-1.17.0/docs/web/docs/Topics/Environmental_Issues.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Topics/Environmental_Issues.md	2023-06-28 20:02:17.000000000 +0000
@@ -55,7 +55,7 @@
 SUMO includes the following emission models:
 
 - [HBEFA v2.1-based](../Models/Emissions/HBEFA-based.md): A
-  continuous reformulation of the [HBEFA](http://www.hbefa.net/) [\[1\]](#references)
+  continuous reformulation of the [HBEFA](https://www.hbefa.net/) [\[1\]](#references)
   v2.1 emissions data base;
 - [PHEMlight](../Models/Emissions/PHEMlight.md), a derivation of
   the original
@@ -121,7 +121,7 @@
 fifteen reviewed models as well as the derivation of the [HBEFA
 v2.1-based](../Models/Emissions/HBEFA-based.md) model are given in
 the deliverable "*D3.1 – Traffic Modelling: Environmental Factors*"[\[3\]](#references)
-of the [iTETRIS](http://www.ict-itetris.eu/)[\[4\]](#references) project. The
+of the [iTETRIS](https://www.ict-itetris.eu/)[\[4\]](#references) project. The
 development of [PHEMlight](../Models/Emissions/PHEMlight.md) is
 described in the deliverable "*Deliverable 4.1 - Extended Simulation
 Tool PHEM coupled to SUMO with User Guide* (Draft)"[\[5\]](#references) of the
@@ -133,7 +133,7 @@
 for the edges of a road network. But what if one would use the emitted
 pollutants instead? Would their emission be reduced? The first
 investigations on this topic were performed using a real-world network
-within the [iTETRIS](http://www.ict-itetris.eu/)[\[7\]](#references) project and were
+within the [iTETRIS](https://www.ict-itetris.eu/)[\[7\]](#references) project and were
 reported in its deliverable D3.1[\[3\]](#references). Further steps using real-world
 scenarios are given in [\[7\]](#references), [\[8\]](#references) and [\[9\]](#references). To gain deeper
 knowledge about the dynamics of the processes, later investigations
@@ -147,7 +147,7 @@
 quality. Traffic management, usually operated by local authorities, has
 the duty to perform corrective actions that reduce road traffic's
 impact, if needed.
-[MARLIS](https://web.archive.org/web/20070123154331/http://www.bast.de/nn_42544/DE/Publikationen/Datenbanken/MARLIS/MARLIS.html)[\[13\]](#references)
+[MARLIS](https://web.archive.org/web/20070123154331/https://www.bast.de/nn_42544/DE/Publikationen/Datenbanken/MARLIS/MARLIS.html)[\[13\]](#references)
 is a database that lists such actions performed by traffic management
 authorities. A proof-of-concept for simulating such actions using SUMO
 is presented in [\[14\]](#references). Tomàs Josep Vergés used this approach to
@@ -179,7 +179,7 @@
 
 
 1.  [*HBEFA* - Handbook emission factors for road
-    transport](http://www.hbefa.net/) (German). INFRAS. Last visited on
+    transport](https://www.hbefa.net/) (German). INFRAS. Last visited on
     8th of January 2014.
 
 2.  [*Emissionen und Energieverbrauch von
@@ -193,7 +193,7 @@
 
 4.  [*iTETRIS* - An Integrated Wireless and Traffic Platform for
     Real-Time Road Traffic Management
-    Solutions](http://www.ict-itetris.eu/). iTETRIS web site. iTETRIS
+    Solutions](https://www.ict-itetris.eu/). iTETRIS web site. iTETRIS
     consortium. Last visited on 8th of January 2014.
 
 5.  N. Furian, S. Hausberger and D. Krajzewicz *Deliverable 4.1 -
@@ -230,7 +230,7 @@
 
 13. [*MARLIS* - Datenbank mit Maßnahmen zur Reinhaltung der Luft in
     Bezug auf Immissionen an Straßen, Version
-    3.1](https://web.archive.org/web/20070123154331/http://www.bast.de/nn_42544/DE/Publikationen/Datenbanken/MARLIS/MARLIS.html)
+    3.1](https://web.archive.org/web/20070123154331/https://www.bast.de/nn_42544/DE/Publikationen/Datenbanken/MARLIS/MARLIS.html)
     (German). BASt database index. Last visited on 8th of January 2014.
 
 14. D. Krajzewicz and Y.-P. Flötteröd. *Simulative Untersuchung
diff -Nru sumo-1.17.0/docs/web/docs/Topics/V2X.md sumo-1.18.0/docs/web/docs/Topics/V2X.md
--- sumo-1.17.0/docs/web/docs/Topics/V2X.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Topics/V2X.md	2023-06-28 20:02:17.000000000 +0000
@@ -24,14 +24,14 @@
 
 ### Veins
 
-See [the Veins Homepage](http://veins.car2x.org/) for a short overview,
+See [the Veins Homepage](https://veins.car2x.org/) for a short overview,
 download links, beginner's tutorial, full publication list, and
 documentation.
 
 ### iCS
 
 iCS is the "iTETRIS Control System", a middleware developed in the
-[iTETRIS](http://www.ict-itetris.eu/) project to join SUMO, ns-3, and
+[iTETRIS](https://www.ict-itetris.eu/) project to join SUMO, ns-3, and
 V2X application simulators. It is currently used and extended within the
 [TransAID](https://www.transaid.eu/) project.
 
diff -Nru sumo-1.17.0/docs/web/docs/TraCI/Change_PoI_State.md sumo-1.18.0/docs/web/docs/TraCI/Change_PoI_State.md
--- sumo-1.17.0/docs/web/docs/TraCI/Change_PoI_State.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/TraCI/Change_PoI_State.md	2023-06-28 20:02:17.000000000 +0000
@@ -26,7 +26,7 @@
 | angle (0x43)      | float                              | sets the angle for the rendered image file                                                               | [setAngle](https://sumo.dlr.de/pydoc/traci._poi.html#PoiDomain-setAngle)         |
 | ADD (0x80)        | PoI-definition, see below          | Adds the defined PoI                                                                                     | [add](https://sumo.dlr.de/pydoc/traci._poi.html#PoiDomain-add)                   |
 | REMOVE (0x81)     | int (layer), see below             | Removes the defined PoI                                                                                  | [remove](https://sumo.dlr.de/pydoc/traci._poi.html#PoiDomain-remove)             |
-| highlight (0x6c)  | highlight specification, see below | Adds a highlight to the PoI                                                                              | [remove](https://sumo.dlr.de/pydoc/traci._poi.html#PoiDomain-remove)             |
+| highlight (0x6c)  | highlight specification, see below | Adds a highlight to the PoI                                                                              | [highlight](https://sumo.dlr.de/pydoc/traci._poi.html#PoiDomain-highlight)             |
 |                   |                                    |                                                                                                          |                                                                                  |
 
 
@@ -80,4 +80,4 @@
 The highlight method adds a circle of the specified size and color
 centered at the POI. The circles alpha value is animated over the
 specified duration (fade in and out) if a positive value is given,
-maxAlpha <= 0 implies persistent highlighting without animation.
\ No newline at end of file
+maxAlpha <= 0 implies persistent highlighting without animation.
diff -Nru sumo-1.17.0/docs/web/docs/TraCI/Change_Vehicle_State.md sumo-1.18.0/docs/web/docs/TraCI/Change_Vehicle_State.md
--- sumo-1.17.0/docs/web/docs/TraCI/Change_Vehicle_State.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/TraCI/Change_Vehicle_State.md	2023-06-28 20:02:17.000000000 +0000
@@ -45,7 +45,7 @@
 | move to XY (0xb4) | compound (edgeID, laneIndex, x, y, angle, keepRoute) (see below)  | Moves the vehicle to a new position after normal vehicle movements have taken place. Also forces the angle of the vehicle to the given value (navigational angle in degree). [See below for additional details](../TraCI/Change_Vehicle_State.md#move_to_xy_0xb4) | [moveToXY](https://sumo.dlr.de/pydoc/traci._vehicle.html#VehicleDomain-moveToXY) |
 | replaceStop (0x17) | compound (edgeID, vehID, nextStopIndex, edgeID, pos, laneIndex, duration, flags, startPos, until, teleport) (see below)  | Replaces stop at the given index with a new stop. Automatically modifies the route if the replacement stop is at another location. [See below for additional details](../TraCI/Change_Vehicle_State.md#replaceStop-0x17) | [replaceStop](https://sumo.dlr.de/pydoc/traci._vehicle.html#VehicleDomain-replaceStop) |
 | insertStop (0x18) | compound (edgeID, vehID, nextStopIndex, edgeID, pos, laneIndex, duration, flags, startPos, until, teleport) (see below)  | inserts stop at the given index. Automatically modifies the route to accomodate the new stop. [See below for additional details](../TraCI/Change_Vehicle_State.md#insertStop-0x18) | [insertStop](https://sumo.dlr.de/pydoc/traci._vehicle.html#VehicleDomain-insertStop) |
-| setStopParameter (0x55) | compound (nextStopIndex, param, value) (see below)  | modifies attribute of stop at the given index. Changing location ('edge', 'busStop', etc.) behave like replaceRoute. [See below for additional details](../TraCI/Change_Vehicle_State.md#setStopParameter-0x55) | [setStopParameter](https://sumo.dlr.de/pydoc/traci._vehicle.html#VehicleDomain-setStopParameter) |
+| setStopParameter (0x55) | compound (nextStopIndex, param, value, customParam) (see below)  | modifies attribute of stop at the given index. Changing location ('edge', 'busStop', etc.) behave like replaceRoute. If customParam is set to 1, modifes a user defined param instead.[See below for additional details](../TraCI/Change_Vehicle_State.md#setStopParameter-0x55) | [setStopParameter](https://sumo.dlr.de/pydoc/traci._vehicle.html#VehicleDomain-setStopParameter) |
 | reroute (compute new route) by travel time (0x90)  | compound (), see below  | Computes a new route to the current destination that minimizes travel time. The assumed values for each edge in the network can be customized in various ways. See [Simulation/Routing#Travel-time_values_for_routing](../Simulation/Routing.md#travel-time_values_for_routing). Replaces the current route by the found⁽²⁾.  | [rerouteTraveltime](https://sumo.dlr.de/pydoc/traci._vehicle.html#VehicleDomain-rerouteTraveltime) |
 | reroute (compute new route) by effort (0x91) | compound (), see below  | Computes a new route using the vehicle's internal and the global edge effort information. Replaces the current route by the found. | [rerouteEffort](https://sumo.dlr.de/pydoc/traci._vehicle.html#VehicleDomain-rerouteEffort) |
 | speed mode (0xb3) | int bitset (see below)  | Sets how the values set by speed (0x40) and slowdown (0x14) shall be treated. Also allows to configure the behavior at junctions. [See below](#speed_mode_0xb3).  | [setSpeedMode](https://sumo.dlr.de/pydoc/traci._vehicle.html#VehicleDomain-setSpeedMode) |
@@ -72,11 +72,12 @@
 | max lateral speed (0xba)  | double                                                         | Sets the maximum lateral speed in m/s for this vehicle.                                                                                                            | [setMaxSpeedLat](https://sumo.dlr.de/pydoc/traci._vehicle.html#VehicleDomain-setMaxSpeedLat)      |
 | lateral gap (0xbb)        | double                                                         | Sets the minimum lateral gap of the vehicle at 50km/h in m.                                                                                                        | [setMinGapLat](https://sumo.dlr.de/pydoc/traci._vehicle.html#VehicleDomain-setMinGapLat)        |
 | lateral alignment (0xb9)  | string                                                         | Sets the preferred lateral alignment for this vehicle.                                                                                                             | [setLateralAlignment](https://sumo.dlr.de/pydoc/traci._vehicle.html#VehicleDomain-setLateralAlignment) |
+| boarding duration (0x2f)        | double   | Sets the boarding duration for passengers entering/leaving this vehicle.                                                                                                   | [setBoardingDuration](https://sumo.dlr.de/pydoc/traci._vehicle.html#VehicleDomain-setBoardingDuration)        |
+| impatience (0x26)  | string      | sets the current [dynamic impatience](../Definition_of_Vehicles%2C_Vehicle_Types%2C_and_Routes.md#impatience) of this vehicle. This value gets reset when the vehicle starts driving.                                                                                                             | [setImpatience](https://sumo.dlr.de/pydoc/traci._vehicle.html#VehicleDomain-setImpatience) |
 | parameter (0x7e)          | string, string                                                 | [Sets the string value for the given string parameter](../TraCI/Change_Vehicle_State.md#setting_device_and_lanechangemodel_parameters_0x7e)                                                                                                               | [setParameter](https://sumo.dlr.de/pydoc/traci._vehicle.html#VehicleDomain-setParameter)        |
 | action step length (0x7d) | double (new action step length), boolean (reset action offset) | Sets the current action step length for the vehicle in s. If the boolean value resetActionOffset is true, an action step is scheduled immediately for the vehicle. | [setActionStepLength](https://sumo.dlr.de/pydoc/traci._vehicle.html#VehicleDomain-setActionStepLength) |
 | highlight (0x6c)          | highlight specification, see below                             | Adds a highlight to the vehicle                                                                                                                                    | [highlight](https://sumo.dlr.de/pydoc/traci._vehicle.html#VehicleDomain-highlight)           |
 
-
 Please note:
 
 1.  The first occurrence of the edge is currently at is searched within
@@ -97,7 +98,7 @@
 
 |         byte          |       integer        |        byte         | string  |        byte         |    double    |       byte        |    byte    |        byte         |       double        |             byte             |           int           |              byte              |     double     |              byte              |      double      |
 | :-------------------: | :------------------: | :-----------------: | :-----: | :-----------------: | :----------: | :---------------: | :--------: | :-----------------: | :-----------------: | :--------------------------: | :---------------------: | :----------------------------: | :------------: | :----------------------------: | :--------------: |
-| value type *compound* | item number (4 to 7) | value type *string* | Edge ID | value type *double* | end position | value type *byte* | Lane Index | value type *double* | Duration in seconds | value type *byte* (optional) | stop flags: (see below) | value type *double* (optional) | start position | value type *double* (optional) | Until in seconds |
+| value type *compound* | item number (4 to 7) | value type *string* | Edge ID | value type *double* | end position | value type *byte* | Lane Index | value type *double* | Duration in seconds | value type *int* (optional) | stop flags: (see below) | value type *double* (optional) | start position | value type *double* (optional) | Until in seconds |
 
 The stop flags are a bitset with the following additive components
 
@@ -220,9 +221,9 @@
 
 ### replaceStop (0x17)
 
-| string | int           | string | double  | integer     | double                 | integer | double                 | double              | int        |
-| :----: | :-----------: | :----: | :-----: | :---------: | :--------------------: | :-----: | :--------------------: | :-----------------: | :--------: |
-| vehID  | nextStopIndex | edgeID | pos=1.0 | laneIndex=0 | duration=-1073741824.0 | flags=0 | startPos=-1073741824.0 | until=-1073741824.0 | teleport=0 |
+|         byte          |       integer        |        byte         | string  |        byte         |    double    |       byte        |    byte    |        byte         |       double        |             byte             |           int           |              byte              |     double     |              byte              |      double      | byte | int | byte | byte | 
+| :-------------------: | :------------------: | :-----------------: | :-----: | :-----------------: | :----------: | :---------------: | :--------: | :-----------------: | :-----------------: | :--------------------------: | :---------------------: | :----------------------------: | :------------: | :----------------------------: | :--------------: | :---: | :---: | :---: | :---: |
+| value type *compound* | item number (8 or 9) | value type *string* | Edge ID | value type *double* | end position | value type *byte* | Lane Index | value type *double* | Duration in seconds | value type *int* | stop flags (see [stop](#stop_0x12)) | value type *double* | start position | value type *double* | Until in seconds | value type *int* | nextStopIndex | value type *byte* (optional) | teleport |
 
 Replaces stop at the given index with a new stop. Automatically modifies the route if the replacement stop is at another location
 
@@ -236,9 +237,9 @@
 
 ### insertStop (0x18)
 
-| string | int           | string | double  | integer     | double                 | integer | double                 | double              | int        |
-| :----: | :-----------: | :----: | :-----: | :---------: | :--------------------: | :-----: | :--------------------: | :-----------------: | :--------: |
-| vehID  | nextStopIndex | edgeID | pos=1.0 | laneIndex=0 | duration=-1073741824.0 | flags=0 | startPos=-1073741824.0 | until=-1073741824.0 | teleport=0 |
+|         byte          |       integer        |        byte         | string  |        byte         |    double    |       byte        |    byte    |        byte         |       double        |             byte             |           int           |              byte              |     double     |              byte              |      double      | byte | int | byte | byte | 
+| :-------------------: | :------------------: | :-----------------: | :-----: | :-----------------: | :----------: | :---------------: | :--------: | :-----------------: | :-----------------: | :--------------------------: | :---------------------: | :----------------------------: | :------------: | :----------------------------: | :--------------: | :---: | :---: | :---: | :---: |
+| value type *compound* | item number (8 or 9) | value type *string* | Edge ID | value type *double* | end position | value type *byte* | Lane Index | value type *double* | Duration in seconds | value type *int* | stop flags (see [stop](#stop_0x12)) | value type *double* | start position | value type *double* | Until in seconds | value type *int* | nextStopIndex | value type *byte* (optional) | teleport |
 
 Inserts stop at the given index. Automatically modifies the route to accomodate the new stop
 
@@ -251,15 +252,16 @@
 
 ### setStopParameter (0x55)
 
-| string | int           | string | string  |
-| :----: | :-----------: | :----: | :-----: |
-| vehID  | nextStopIndex | param  | value   |
+| byte | integer         |int           | string | string  | byte  |
+| :----: | :--------------------: |:-----------: | :----: | :-----: |:-----: |
+| value type *compound*  item number (always 4) | nextStopIndex | param  | value   | customParam
 
 Updates stop parameter at the given index.
 
 - nextStopIndex must be a non-negative number smaller than the number of remaining stops
 - param may be [any value permitted as xml-attribute for stops](../Definition_of_Vehicles%2C_Vehicle_Types%2C_and_Routes.md#stops) (except `index`)
 - if param changes the location ('edge', 'busStop', ...), the function behaves like [replaceStop](#replacestop_0x17)
+- if customParam is set to 1, param may be an arbitrary string and the function will set a custom parameter instead of an attribute
 
 ### resume (0x19)
 
diff -Nru sumo-1.17.0/docs/web/docs/TraCI/Change_VehicleType_State.md sumo-1.18.0/docs/web/docs/TraCI/Change_VehicleType_State.md
--- sumo-1.17.0/docs/web/docs/TraCI/Change_VehicleType_State.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/TraCI/Change_VehicleType_State.md	2023-06-28 20:02:17.000000000 +0000
@@ -40,6 +40,8 @@
 | max lateral speed (0xba)  | double                                                         | Sets the maximum lateral speed in m/s of this type.                                                                                                                                  | [setMaxSpeedLat](https://sumo.dlr.de/pydoc/traci._vehicletype.html#VehicleTypeDomain-setMaxSpeedLat)           |
 | lateral gap (0xbb)        | double                                                         | Sets the minimal lateral gap of this type at 50km/h in m.                                                                                                                            | [setMinGapLat](https://sumo.dlr.de/pydoc/traci._vehicletype.html#VehicleTypeDomain-setMinGapLat)               |
 | lateral alignment (0xb9)  | string                                                         | Sets the preferred lateral alignment of the type.                                                                                                                                    | [setLateralAlignment](https://sumo.dlr.de/pydoc/traci._vehicletype.html#VehicleTypeDomain-setLateralAlignment) |
+| boarding duration (0x2f)        | double   | Sets the boarding duration for passengers entering/leaving this vehicle.                                                                                                   | [setBoardingDuration](https://sumo.dlr.de/pydoc/traci._vehicletype.html#VehicleTypeDomain-setBoardingDuration)        |
+| impatience (0x26)  | string      | Sets the current [base impatience](../Definition_of_Vehicles%2C_Vehicle_Types%2C_and_Routes.md#impatience) of this vehicle.                                                                                                              | [setImpatience](https://sumo.dlr.de/pydoc/traci._vehicletype.html#VehicleTypeDomain-setImpatience) |
 | copy (0x88)               | string                                                         | Creates a new vehicle type with the given ID as a duplicate of the original type.                                                                                                    | [copy](https://sumo.dlr.de/pydoc/traci._vehicletype.html#VehicleTypeDomain-copy)                               |
 | action step length (0x7d) | double (new action step length), boolean (reset action offset) | Sets the current action step length for the vehicle type in s. If the boolean value resetActionOffset is true, an action step is scheduled immediately for all vehicles of the type. | [setActionStepLength](https://sumo.dlr.de/pydoc/traci._vehicletype.html#VehicleTypeDomain-setActionStepLength)         |
 | scale (0x8e) | double | Sets the traffic scaling factor for vehicles of this type | [setScale](https://sumo.dlr.de/pydoc/traci._vehicletype.html#VehicleTypeDomain-setScale)         |
diff -Nru sumo-1.17.0/docs/web/docs/TraCI/C++TraCIAPI.md sumo-1.18.0/docs/web/docs/TraCI/C++TraCIAPI.md
--- sumo-1.17.0/docs/web/docs/TraCI/C++TraCIAPI.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/TraCI/C++TraCIAPI.md	2023-06-28 20:02:17.000000000 +0000
@@ -9,11 +9,11 @@
 
 The C++ TraCIAPI is client library that is part of the SUMO-source tree.
 The library can be downloaded [as part of the source
-distribution](http://sumo.dlr.de/daily/sumo-src-git.zip). Example code
+distribution](https://sumo.dlr.de/daily/sumo-src-git.zip). Example code
 that uses the library is at
 {{SUMO}}*/src/traci_testclient/TraCITestClient.cpp*. Doxygen-generated
 documentation can be found
-[here](http://sumo.dlr.de/daily/doxygen/d8/d1c/class_tra_c_i_a_p_i.html)
+[here](https://sumo.dlr.de/daily/doxygen/d8/d1c/class_tra_c_i_a_p_i.html)
 
 ## Building the Library
 
diff -Nru sumo-1.17.0/docs/web/docs/TraCI/Edge_Value_Retrieval.md sumo-1.18.0/docs/web/docs/TraCI/Edge_Value_Retrieval.md
--- sumo-1.17.0/docs/web/docs/TraCI/Edge_Value_Retrieval.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/TraCI/Edge_Value_Retrieval.md	2023-06-28 20:02:17.000000000 +0000
@@ -22,12 +22,12 @@
 | lane number (0x52)                   | int        | Returns the number of lanes for the given edge ID                                                                                                                       | [getLaneNumber](https://sumo.dlr.de/pydoc/traci._edge.html#EdgeDomain-getLaneNumber)                         |
 | street name (0x1b)                   | string     | Returns the street name for the given edge ID                                                                                                                           | [getStreetName](https://sumo.dlr.de/pydoc/traci._edge.html#EdgeDomain-getStreetName)                         |
 | current travel time (0x5a)           | double     | Returns the current travel time (length/mean speed).
**Note:** This definition of travel time has to be reverified.                                                                                                                    | [getTraveltime](https://sumo.dlr.de/pydoc/traci._edge.html#EdgeDomain-getTraveltime)                         |
-| CO2 emissions (id 0x60)              | double     | Sum of CO2 emissions on this edge in mg during this time step.                                                                                                          | [getCO2Emission](https://sumo.dlr.de/pydoc/traci._edge.html#EdgeDomain-getCO2Emission)                       |
-| CO emissions (id 0x61)               | double     | Sum of CO emissions on this edge in mg during this time step.                                                                                                           | [getCOEmission](https://sumo.dlr.de/pydoc/traci._edge.html#EdgeDomain-getCOEmission)                         |
-| HC emissions (id 0x62)               | double     | Sum of HC emissions on this edge in mg during this time step.                                                                                                           | [getHCEmission](https://sumo.dlr.de/pydoc/traci._edge.html#EdgeDomain-getHCEmission)                         |
-| PMx emissions (id 0x63)              | double     | Sum of PMx emissions on this edge in mg during this time step.                                                                                                          | [getPMxEmission](https://sumo.dlr.de/pydoc/traci._edge.html#EdgeDomain-getPMxEmission)                       |
-| NOx emissions (id 0x64)              | double     | Sum of NOx emissions on this edge in mg during this time step.                                                                                                          | [getNOxEmission](https://sumo.dlr.de/pydoc/traci._edge.html#EdgeDomain-getNOxEmission)                       |
-| fuel consumption (id 0x65)           | double     | Sum of fuel consumption on this edge in ml during this time step.                                                                                                       | [getFuelConsumption](https://sumo.dlr.de/pydoc/traci._edge.html#EdgeDomain-getFuelConsumption)               |
+| CO2 emissions (id 0x60)              | double     | Sum of CO2 emissions on this edge in mg/s during this time step.                                                                                                          | [getCO2Emission](https://sumo.dlr.de/pydoc/traci._edge.html#EdgeDomain-getCO2Emission)                       |
+| CO emissions (id 0x61)               | double     | Sum of CO emissions on this edge in mg/s during this time step.                                                                                                           | [getCOEmission](https://sumo.dlr.de/pydoc/traci._edge.html#EdgeDomain-getCOEmission)                         |
+| HC emissions (id 0x62)               | double     | Sum of HC emissions on this edge in mg/s during this time step.                                                                                                           | [getHCEmission](https://sumo.dlr.de/pydoc/traci._edge.html#EdgeDomain-getHCEmission)                         |
+| PMx emissions (id 0x63)              | double     | Sum of PMx emissions on this edge in mg/s during this time step.                                                                                                          | [getPMxEmission](https://sumo.dlr.de/pydoc/traci._edge.html#EdgeDomain-getPMxEmission)                       |
+| NOx emissions (id 0x64)              | double     | Sum of NOx emissions on this edge in mg/s during this time step.                                                                                                          | [getNOxEmission](https://sumo.dlr.de/pydoc/traci._edge.html#EdgeDomain-getNOxEmission)                       |
+| fuel consumption (id 0x65)           | double     | Sum of fuel consumption on this edge in mg/s during this time step.                                                                                                       | [getFuelConsumption](https://sumo.dlr.de/pydoc/traci._edge.html#EdgeDomain-getFuelConsumption)               |
 | noise emission (id 0x66)             | double     | Sum of noise generated on this edge in dBA.                                                                                                                             | [getNoiseEmission](https://sumo.dlr.de/pydoc/traci._edge.html#EdgeDomain-getNoiseEmission)                   |
 | electricity consumption (id 0x71)    | double     | Sum of electricity consumption on this edge in kWh during this time step.                                                                                               | [getElectricityConsumption](https://sumo.dlr.de/pydoc/traci._edge.html#EdgeDomain-getElectricityConsumption) |
 | last step vehicle number (0x10)      | int        | The number of vehicles on this edge within the last time step.                                                                                                          | [getLastStepVehicleNumber](https://sumo.dlr.de/pydoc/traci._edge.html#EdgeDomain-getLastStepVehicleNumber)   |
@@ -38,6 +38,7 @@
 | waiting time (0x7a)                  | double     | Returns the sum of the waiting times for all vehicles on the edge \[s\]                                                                                                             | [getWaitingTime](https://sumo.dlr.de/pydoc/traci._edge.html#EdgeDomain-getWaitingTime)                       |
 | last step person ids (0x1a)          | stringList | Returns the list of ids of persons that were on the named edge in the last simulation step                                                                              | [getLastStepPersonIDs](https://sumo.dlr.de/pydoc/traci._edge.html#EdgeDomain-getLastStepPersonIDs)           |
 | last step halting number (0x14)      | int        | Returns the total number of halting vehicles for the last time step on the given edge. A speed of less than 0.1 m/s is considered a halt.                               | [getLastStepHaltingNumber](https://sumo.dlr.de/pydoc/traci._edge.html#EdgeDomain-getLastStepHaltingNumber)   |
+| angle (0x43) | double | Returns the heading of the straight line segment formed by the edge at the given position. | [getAngle](https://sumo.dlr.de/pydoc/traci._edge.html#EdgeDomain-getAngle)   | 
 
 ### Response 0xba: Edge Variable
 
@@ -56,4 +57,4 @@
 | Variable                            | Request ValueType | Response ValueType | Description       | [Python Method](../TraCI/Interfacing_TraCI_from_Python.md)             |
 | ----------------------------------- | ----------------- | ------------------ | ---------------------- | --------------------------------- |
 | edge travel time information (0x58) | time (double)     | double             | Returns the edge travel time for the given time as stored in the global container. If such a value does not exist, -1 is returned. | [getAdaptedTraveltime](https://sumo.dlr.de/pydoc/traci._edge.html#EdgeDomain-getAdaptedTraveltime) |
-| edge effort information (0x59)      | time (double)     | double             | Returns the edge effort for the given time as stored in the global container. If such a value does not exist, -1 is returned.      | [getEffort](https://sumo.dlr.de/pydoc/traci._edge.html#EdgeDomain-getEffort)                       |
\ No newline at end of file
+| edge effort information (0x59)      | time (double)     | double             | Returns the edge effort for the given time as stored in the global container. If such a value does not exist, -1 is returned.      | [getEffort](https://sumo.dlr.de/pydoc/traci._edge.html#EdgeDomain-getEffort)                       |
diff -Nru sumo-1.17.0/docs/web/docs/TraCI/Interfacing_TraCI_from_Python.md sumo-1.18.0/docs/web/docs/TraCI/Interfacing_TraCI_from_Python.md
--- sumo-1.17.0/docs/web/docs/TraCI/Interfacing_TraCI_from_Python.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/TraCI/Interfacing_TraCI_from_Python.md	2023-06-28 20:02:17.000000000 +0000
@@ -3,25 +3,28 @@
 ---
 
 The [TraCI](../TraCI.md#traci_commands) commands are split into the
-13 domains gui, lane, poi, simulation, trafficlight, vehicletype, edge,
-inductionloop, junction, multientryexit, polygon, route, person and
+domains busstop, calibrator, chargingstation, edge, gui, inductionloop, junction, lane,
+lanearea, meandata, multientryexit, overheadwire, parkingarea, person, poi, polygon,
+rerouter, route, routeprobe, simulation, trafficlight, variablespeedsign, vehicle, and vehicletype,
 vehicle, which correspond to individual modules. For a detailed list of
 available functions see the [pydoc generated documentation](https://sumo.dlr.de/pydoc/traci.html). The source code
 can be found at
-[\[1\]](https://github.com/eclipse/sumo/tree/main/tools/traci)
+[\[1\]](https://github.com/eclipse/sumo/tree/main/tools/traci).
+
+Please note that if performance is an issue and you don't a need GUI, it is almost always better
+to use [libsumo](../Libsumo.md) instead of traci, which has the same API.
 
 ## importing **traci** in a script
 
-To use the library, the {{SUMO}}/tools directory must be on the python load
-path. This is typically done with a stanza like this:
+To use the library, you can install it using `pip install traci` or add the {{SUMO}}/tools directory
+to your Python load path. This is typically done with a stanza like this:
 
 ```python
-import os, sys
+import os
+import sys
 if 'SUMO_HOME' in os.environ:
-    tools = os.path.join(os.environ['SUMO_HOME'], 'tools')
-    sys.path.append(tools)
-else:
-    sys.exit("please declare environment variable 'SUMO_HOME'")
+    sys.path.append(os.path.join(os.environ['SUMO_HOME'], 'tools'))
+import traci
 ```
 
 This assumes that the [environment variable
@@ -33,6 +36,14 @@
 sys.path.append(os.path.join('c:', os.sep, 'whatever', 'path', 'to', 'sumo', 'tools'))
 ```
 
+If you decide to switch to libsumo at a later stage or want to be flexible here,
+you can replace the import line later by:
+
+```python
+import libsumo as traci
+```
+
+
 ## First Steps
 
 In general it is very easy to interface with SUMO from Python (the
@@ -100,6 +111,10 @@
 The values retrieved are always the ones from the last time step, it is
 not possible to retrieve older values.
 
+!!! note
+    Before version 1.18.0 `traci.simulationStep()` returned all subscription results, now it returns None.
+    If you need the old behavior, use `traci.simulationStepLegacy()`.
+
 ## Context Subscriptions
 
 Context subscriptions work like subscriptions in that they retrieve a
@@ -134,6 +149,11 @@
 The values retrieved are always the ones from the last time step, it is
 not possible to retrieve older values.
 
+!!! note
+    Before version 1.18.0 `traci.junction.getAllContextSubscriptionResults` would not contain
+    the ids of the junctions which did not have objects in their context.
+    Now it returns their id mapped to an empty dictionary (similar to libsumo). This holds for the other domains as well.
+
 ## Context Subscription Filters
 
 For vehicle-to-vehicle context subscriptions (i.e., context
@@ -175,7 +195,7 @@
 - VClass: Only return vehicles of the specified vClasses
 
 See the [pydoc
-documentation](http://sumo.dlr.de/daily/pydoc/traci._vehicle.html#VehicleDomain-addSubscriptionFilterCFManeuver)
+documentation](https://sumo.dlr.de/daily/pydoc/traci._vehicle.html#VehicleDomain-addSubscriptionFilterCFManeuver)
 for detailed specifications.
 
 !!! caution
@@ -309,7 +329,8 @@
 
 ## Pitfalls and Solutions
 
-- Note that strings, if exchanged, have to be ASCII-encoded.
+- Note that strings, if exchanged, had to be plain ASCII before 1.18.0.
+  Currently UTF-8 should be possible for all the strings.
 - If you start sumo from within your python script using
   subprocess.Popen, be sure to call wait() on the resulting process
   object before quitting your script. You might loose output
@@ -325,7 +346,8 @@
 sys.exit()
 ```
 Make sure that the TRACIPATH corresponds to the sumo version that you wish to use. 
-If it does not, then the order of directories in LOADPATH (sys.path) must be changed or the SUMO installation must be removed from any directories that come before the wanted directory.
+If it does not, then the order of directories in LOADPATH (sys.path) must be changed
+or the SUMO installation must be removed from any directories that come before the wanted directory.
 
 ### Debugging a TraCI session on Linux
 
diff -Nru sumo-1.17.0/docs/web/docs/TraCI/Lane_Value_Retrieval.md sumo-1.18.0/docs/web/docs/TraCI/Lane_Value_Retrieval.md
--- sumo-1.17.0/docs/web/docs/TraCI/Lane_Value_Retrieval.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/TraCI/Lane_Value_Retrieval.md	2023-06-28 20:02:17.000000000 +0000
@@ -31,12 +31,12 @@
 | vmax (0x41)                          | double     | Returns the maximum speed allowed on this lane \[m/s\]                                                                                    | [getMaxSpeed](https://sumo.dlr.de/pydoc/traci._lane.html#LaneDomain-getMaxSpeed)                             |
 | shape (0x4e)                         | shape      | Returns this lane's shape                                                                                                                 | [getShape](https://sumo.dlr.de/pydoc/traci._lane.html#LaneDomain-getShape)                                   |
 | width (0x4d)                         | double     | Returns the width of the named lane \[m\]                                                                                                 | [getWidth](https://sumo.dlr.de/pydoc/traci._lane.html#LaneDomain-getWidth)                                   |
-| CO2 emissions (id 0x60)              | double     | Sum of CO2 emissions on this lane in mg during this time step.                                                                            | [getCO2Emission](https://sumo.dlr.de/pydoc/traci._lane.html#LaneDomain-getCO2Emission)                       |
-| CO emissions (id 0x61)               | double     | Sum of CO emissions on this lane in mg during this time step.                                                                             | [getCOEmission](https://sumo.dlr.de/pydoc/traci._lane.html#LaneDomain-getCOEmission)                         |
-| HC emissions (id 0x62)               | double     | Sum of HC emissions on this lane in mg during this time step.                                                                             | [getHCEmission](https://sumo.dlr.de/pydoc/traci._lane.html#LaneDomain-getHCEmission)                         |
-| PMx emissions (id 0x63)              | double     | Sum of PMx emissions on this lane in mg during this time step.                                                                            | [getPMxEmission](https://sumo.dlr.de/pydoc/traci._lane.html#LaneDomain-getPMxEmission)                       |
-| NOx emissions (id 0x64)              | double     | Sum of NOx emissions on this lane in mg during this time step.                                                                            | [getNOxEmission](https://sumo.dlr.de/pydoc/traci._lane.html#LaneDomain-getNOxEmission)                       |
-| fuel consumption (id 0x65)           | double     | Sum of fuel consumption on this lane in ml during this time step.                                                                         | [getFuelConsumption](https://sumo.dlr.de/pydoc/traci._lane.html#LaneDomain-getFuelConsumption)               |
+| CO2 emissions (id 0x60)              | double     | Sum of CO2 emissions on this lane in mg/s during this time step.                                                                            | [getCO2Emission](https://sumo.dlr.de/pydoc/traci._lane.html#LaneDomain-getCO2Emission)                       |
+| CO emissions (id 0x61)               | double     | Sum of CO emissions on this lane in mg/s during this time step.                                                                             | [getCOEmission](https://sumo.dlr.de/pydoc/traci._lane.html#LaneDomain-getCOEmission)                         |
+| HC emissions (id 0x62)               | double     | Sum of HC emissions on this lane in mg/s during this time step.                                                                             | [getHCEmission](https://sumo.dlr.de/pydoc/traci._lane.html#LaneDomain-getHCEmission)                         |
+| PMx emissions (id 0x63)              | double     | Sum of PMx emissions on this lane in mg/s during this time step.                                                                            | [getPMxEmission](https://sumo.dlr.de/pydoc/traci._lane.html#LaneDomain-getPMxEmission)                       |
+| NOx emissions (id 0x64)              | double     | Sum of NOx emissions on this lane in mg/s during this time step.                                                                            | [getNOxEmission](https://sumo.dlr.de/pydoc/traci._lane.html#LaneDomain-getNOxEmission)                       |
+| fuel consumption (id 0x65)           | double     | Sum of fuel consumption on this lane in mg/s during this time step.                                                                         | [getFuelConsumption](https://sumo.dlr.de/pydoc/traci._lane.html#LaneDomain-getFuelConsumption)               |
 | noise emission (id 0x66)             | double     | Sum of noise generated on this lane in dBA.                                                                                               | [getNoiseEmission](https://sumo.dlr.de/pydoc/traci._lane.html#LaneDomain-getNoiseEmission)                   |
 | electricity consumption (id 0x71)    | double     | Sum of electricity consumption on this lane in kWh during this time step.                                                                 | [getElectricityConsumption](https://sumo.dlr.de/pydoc/traci._lane.html#LaneDomain-getElectricityConsumption) |
 | last step vehicle number (0x10)      | int        | The number of vehicles on this lane within the last time step.                                                                            | [getLastStepVehicleNumber](https://sumo.dlr.de/pydoc/traci._lane.html#LaneDomain-getLastStepVehicleNumber)   |
@@ -46,7 +46,9 @@
 | last step mean vehicle length (0x15) | double     | The mean length of vehicles which were on this lane in the last step \[m\]                                                                | [getLastStepLength](https://sumo.dlr.de/pydoc/traci._lane.html#LaneDomain-getLastStepLength)                 |
 | waiting time (0x7a)                  | double     | Returns the waiting time for all vehicles on the lane \[s\]                                                                               | [getWaitingTime](https://sumo.dlr.de/pydoc/traci._lane.html#LaneDomain-getWaitingTime)                       |
 | traveltime (0x5a)                    | double     | Returns the estimated travel time for the last time step on the given lane \[s\]                                                          | [getTraveltime](https://sumo.dlr.de/pydoc/traci._lane.html#LaneDomain-getTraveltime)                         |
-| last step halting number (0x14)      | int        | Returns the total number of halting vehicles for the last time step on the given lane. A speed of less than 0.1 m/s is considered a halt. | [getLastStepHaltingNumber](https://sumo.dlr.de/pydoc/traci._lane.html#LaneDomain-getLastStepHaltingNumber)   |
+| last step halting number (0x14)      | int        | Returns the total number of halting vehicles for the last time step on the given lane. A speed of less than 0.1 m/s is considered a halt. | [getLastStepHaltingNumber](https://sumo.dlr.de/pydoc/traci._lane.html#LaneDomain-getLastStepHaltingNumber)   | 
+| angle (0x43) | double | Returns the heading of the straight line segment formed by the lane at the given position. | [getAngle](https://sumo.dlr.de/pydoc/traci._lane.html#LaneDomain-getAngle)   | 
+
 
 ## Response 0xb3: Lane Variable
 
@@ -86,4 +88,4 @@
 
 | Variable    | Request ValueType | Response ValueType | Description      | [Python Method](../TraCI/Interfacing_TraCI_from_Python.md)          |
 | ----------- | ----------------- | ------------------ | ------------------------------------------- | ------------------------------------------------------------------------ |
-| foes (0x37) | toLane (string)   | stringVector       | Returns the list of foe lanes. There are two modes for calling this method. If **toLane** is a normal road lane that is reachable from the laneID argument, the list contains all lanes that are the origin of a connection with right-of-way over the connection between **laneID** and **toLane**. If **toLane** is empty and **laneID** is an internal lane, the list contains all internal lanes that intersect with *laneID*. | [getFoes](https://sumo.dlr.de/pydoc/traci._lane.html#LaneDomain-getFoes) |
\ No newline at end of file
+| foes (0x37) | toLane (string)   | stringVector       | Returns the list of foe lanes. There are two modes for calling this method. If **toLane** is a normal road lane that is reachable from the laneID argument, the list contains all lanes that are the origin of a connection with right-of-way over the connection between **laneID** and **toLane**. If **toLane** is empty and **laneID** is an internal lane, the list contains all internal lanes that intersect with *laneID*. | [getFoes](https://sumo.dlr.de/pydoc/traci._lane.html#LaneDomain-getFoes) |
diff -Nru sumo-1.17.0/docs/web/docs/TraCI/Object_Context_Subscription.md sumo-1.18.0/docs/web/docs/TraCI/Object_Context_Subscription.md
--- sumo-1.17.0/docs/web/docs/TraCI/Object_Context_Subscription.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/TraCI/Object_Context_Subscription.md	2023-06-28 20:02:17.000000000 +0000
@@ -139,10 +139,10 @@
 - In the [python
   library](../TraCI/Interfacing_TraCI_from_Python.md#context_subscriptions),
   all domains support the methods [*subscribeContext* and
-  *unsubscribeContext*](http://sumo.dlr.de/daily/pydoc/traci.domain.html#Domain)
+  *unsubscribeContext*](https://sumo.dlr.de/daily/pydoc/traci.domain.html#Domain)
 - For the python client several [methods for adding context filters
   for vehicle-to-vehicle context
-  subscriptions](http://sumo.dlr.de/daily/pydoc/traci._vehicle.html#VehicleDomain-addSubscriptionFilterCFManeuver)
+  subscriptions](https://sumo.dlr.de/daily/pydoc/traci._vehicle.html#VehicleDomain-addSubscriptionFilterCFManeuver)
   are included.
 - In the [C++ library](../TraCI/C++TraCIAPI.md), the method
   *simulation.subscribeContext* takes an additional argument that
diff -Nru sumo-1.17.0/docs/web/docs/TraCI/Simulation_Value_Retrieval.md sumo-1.18.0/docs/web/docs/TraCI/Simulation_Value_Retrieval.md
--- sumo-1.17.0/docs/web/docs/TraCI/Simulation_Value_Retrieval.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/TraCI/Simulation_Value_Retrieval.md	2023-06-28 20:02:17.000000000 +0000
@@ -31,187 +31,187 @@
 current simulation time (0x66)
 double
 Returns the current simulation time (in s)
-getTime
+getTime
 
 
 current simulation time (0x70) (deprecated)
 int
 Returns the current simulation time (in ms)
-getCurrentTime
+getCurrentTime
 
 
 number of loaded vehicles (id 0x71)
 int
 The number of vehicles which were loaded in this time step.
-getLoadedNumber
+getLoadedNumber
 
 
 ids of loaded vehicles (id 0x72)
 stringList
 A list of ids of vehicles which were loaded in this time step.
-getLoadedIDList
+getLoadedIDList
 
 
 number of departed vehicles (id 0x73)
 int
 The number of vehicles which departed (were inserted into the road network) in this time step.
-getDepartedNumber
+getDepartedNumber
 
 
 ids of departed vehicles (id 0x74)
 stringList
 A list of ids of vehicles which departed (were inserted into the road network) in this time step.
-getDepartedIDList
+getDepartedIDList
 
 
 number of vehicles that start to teleport

 (id 0x75)
 int
 The number of vehicles which started to teleport in this time step.
-getStartingTeleportNumber
+getStartingTeleportNumber
 
 
 ids of vehicles that start to teleport (id 0x76)
 stringList
 A list of ids of vehicles which started to teleport in this time step.
-getStartingTeleportIDList
+getStartingTeleportIDList
 
 
 number of vehicles that end being teleported

 (id 0x77)
 int
 The number of vehicles which ended to be teleported in this time step.
-getEndingTeleportNumber
+getEndingTeleportNumber
 
 
 ids of vehicles that end being teleported

 (id 0x78)
 stringList
 A list of ids of vehicles which ended to be teleported in this time step.
-getEndingTeleportIDList
+getEndingTeleportIDList
 
 
 number of arrived vehicles (id 0x79)
 int
 The number of vehicles which arrived (have reached their destination and are removed from the road network) in this time step.
-getArrivedNumber
+getArrivedNumber
 
 
 ids of arrived vehicles (id 0x7a)
 stringList
 A list of ids of vehicles which arrived (have reached their destination and are removed from the road network) in this time step.
-getArrivedIDList
+getArrivedIDList
 
 
 network bounding box (id 0x7c)
 2D polygon
 The lower left and the upper right corner of the bounding box of the simulation network.
-getNetBoundary
+getNetBoundary
 
 
 minimum number of vehicles that are still expected to leave the net (id 0x7d)
 int
 The number of vehicles which are in the net plus the ones still waiting to start. This number may be smaller than the actual number of vehicles still to come because of delayed route file parsing.
-getMinExpectedNumber
+getMinExpectedNumber
 
 
 number of vehicles that begin a stop (id 0x68)
 int
 The number of vehicles that halted on a scheduled stop in this time step.
-getStopStartingVehiclesNumber
+getStopStartingVehiclesNumber
 
 
 ids of vehicles that begin a stop (id 0x69)
 stringList
 A list of ids of vehicles that halted on a scheduled stop in this time step.
-getStopStartingVehiclesIDList
+getStopStartingVehiclesIDList
 
 
 number of vehicles that end a stop (id 0x6a)
 int
 The number of vehicles that begin to continue their journey, leaving a scheduled stop in this time step.
-getStopEndingVehiclesNumber
+getStopEndingVehiclesNumber
 
 
 ids of vehicles that end a stop (id 0x6b)
 stringList
 A list of ids of vehicles that begin to continue their journey, leaving a scheduled stop in this time step.
-getStopEndingVehiclesIDList
+getStopEndingVehiclesIDList
 
 
 number of vehicles involved in a collision (id 0x80)
 int
 The number of vehicles that were involved in a collision in this time step.
-getCollidingVehiclesNumber
+getCollidingVehiclesNumber
 
 
 ids of vehicles involved in a collision (id 0x81)
 stringList
 A list of ids of vehicles that were involved in a collision in this time step.
-getCollidingVehiclesIDList
+getCollidingVehiclesIDList
 
 
 number of vehicles that begin to be parked

 (id 0x6c)
 int
 The number of vehicles that enter a parking position in this time step.
-getParkingStartingVehiclesNumber
+getParkingStartingVehiclesNumber
 
 
 ids of vehicles that begin to be parked

 (id 0x6d)
 stringList
 A list of ids of vehicles that enter a parking position in this time step.
-getParkingStartingVehiclesIDList
+getParkingStartingVehiclesIDList
 
 
 number of vehicles that end to be parked

 (id 0x6e)
 int
 The number of vehicles that begin to continue their journey, leaving a scheduled parking in this time step.
-getParkingEndingVehiclesNumber
+getParkingEndingVehiclesNumber
 
 
 ids of vehicles that end being parked (id 0x6f)
 stringList
 A list of ids of vehicles that begin to continue their journey, leaving a scheduled parking in this time step.
-getParkingEndingVehiclesIDList
+getParkingEndingVehiclesIDList
 
 
 bus stop waiting (id 0x67)
 int
 Get the total number of waiting persons at the named bus stop.
-getBusStopWaiting
+getBusStopWaiting
 
 
 bus stop waiting ids (id 0xef)
 stringList
 Get the ids of waiting persons at the named bus stop.
-getBusStopWaitingIDList
+getBusStopWaitingIDList
 
 
 delta T (id 0x7b)
 double
 Returns the length of one simulation step in seconds.
-getDeltaT
+getDeltaT
 
 
 parameter (0x7e)
 string
 Returns the value for the given string parameter.
-getParameter
+getParameter
 
 
 scale (id 0x8e)
 double
 Returns the traffic scaling factor.
-getScale
+getScale
 
 
 option (0x3f)
 string
 Returns the value of one of the global SUMO options.
-getOption
+getOption
 
 
 
diff -Nru sumo-1.17.0/docs/web/docs/TraCI/VehicleType_Value_Retrieval.md sumo-1.18.0/docs/web/docs/TraCI/VehicleType_Value_Retrieval.md
--- sumo-1.17.0/docs/web/docs/TraCI/VehicleType_Value_Retrieval.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/TraCI/VehicleType_Value_Retrieval.md	2023-06-28 20:02:17.000000000 +0000
@@ -38,6 +38,9 @@
 | action step length (0x7d) | double              | Returns the action step length for the vehicle type in s.                                      | [getActionStepLength](https://sumo.dlr.de/pydoc/traci._vehicletype.html#VehicleTypeDomain-getActionStepLength) |
 | person capacity (0x38)    | int                 | Returns the total number of persons that can ride in a vehicle of this type.                   | [getPersonCapacity](https://sumo.dlr.de/pydoc/traci._vehicletype.html#VehicleTypeDomain-getPersonCapacity)            |
 | scale (0x8e)    | double                 | Returns the traffic scaling factor for vehicles of this type | [getScale](https://sumo.dlr.de/pydoc/traci._vehicletype.html#VehicleTypeDomain-getScale)            |
+| boarding duration (0x2f)        | double   | Returns the boarding duration for passengers entering/leaving this vehicle.                                                                                                   | [setBoardingDuration](https://sumo.dlr.de/pydoc/traci._vehicletype.html#VehicleTypeDomain-setBoardingDuration)        |
+| impatience (0x26)  | string      | Returns the current [base impatience](../Definition_of_Vehicles%2C_Vehicle_Types%2C_and_Routes.md#impatience) of this vehicle.                                                                                                              | [setImpatience](https://sumo.dlr.de/pydoc/traci._vehicletype.html#VehicleTypeDomain-setImpatience) |
+
 
 **Overview Retrievable Vehicle Type Variables**
 
diff -Nru sumo-1.17.0/docs/web/docs/TraCI/Vehicle_Value_Retrieval.md sumo-1.18.0/docs/web/docs/TraCI/Vehicle_Value_Retrieval.md
--- sumo-1.17.0/docs/web/docs/TraCI/Vehicle_Value_Retrieval.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/TraCI/Vehicle_Value_Retrieval.md	2023-06-28 20:02:17.000000000 +0000
@@ -221,7 +221,7 @@
 
 
 stop state (id 0xb5)
-ubyte
+int
 value = 1 * stopped + 2 * parking + 4 * triggered + 8 * containerTriggered + 16 * atBusStop + 32 * atContainerStop + 64 * atChargingStation + 128 * atParkingArea
 getStopState

 isAtBusStop

@@ -417,6 +417,18 @@
 
getMaxSpeedLat
 
 
+boarding duration (0x2f)
+double
+Returns the boarding duration of the vehicle in s
+getBoarding
+
+
+current impatience (0x26)
+double
+Returns the current [dynamic impatience](../Definition_of_Vehicles%2C_Vehicle_Types%2C_and_Routes.md#impatience) of this vehicle.
+getImpatience
+  
+
 lateral gap (0xbb)
 double
 Returns the desired lateral gap of this vehicle at 50km/h in m.
@@ -594,6 +606,18 @@
 Return the safe speed for stopping at gap computed by the carFollowModel of vehicle
 getStopSpeed
 
+  
+  junction foes (0x37)
+  complex
+  Returns the list of foes within a certain distance of the ego vehicle.
+  getJunctionFoes
+
+
+  stop parameters (0x55)
+  string
+  Returns the attribute by the given name for the stop of the given index (0 is the next stop, -1 is the previous stop etc) for the specified vehicle. If customParam is set to True (1), the user defined custom parameter will returned instead.
+  
getStopParameter
+
 
 
 
@@ -698,6 +722,25 @@
 The returned value is the safe speed in m/s for stopping after gap when braking
 from the given speed.
 
+### junction foes (0x37)
+
+|         byte          |  double |
+| :-------------------: |  :----: |
+| value type *double*   |  lookahead distance in m   |
+
+The returned value is the safe speed in m/s for stopping after gap when braking
+from the given speed.
+
+### stopParameter (0x55)
+
+|         byte          | int   | int | string | byte
+| :-------------------: | :---: | :----: | :----: |:----: |
+| value type *compound* | 3     | stopIndex  | param    | customParam 
+
+The stopIndex must be in range [-numberOfPassedStops, numberORemaingStops - 1]
+The customParam is interpreted as a boolean and deterines whether an attribute values or a user defined parama is returned.
+
+
 ## Device and LaneChangeModel Parameter Retrieval 0x7e
 
 Vehicles supports retrieval of device parameters using the [generic
diff -Nru sumo-1.17.0/docs/web/docs/TraCI.md sumo-1.18.0/docs/web/docs/TraCI.md
--- sumo-1.17.0/docs/web/docs/TraCI.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/TraCI.md	2023-06-28 20:02:17.000000000 +0000
@@ -228,7 +228,7 @@
 - C++: [The C++ TraCIAPI](TraCI/C++TraCIAPI.md) is a client
   library that is part of the [sumo](sumo.md)-source tree. (API
   coverage is good but this client is no longer updated. Please use libtraci instead.)
-- C++: [The Veins project](http://veins.car2x.org) provides a
+- C++: [The Veins project](https://veins.car2x.org) provides a
   middle-ware for coupling [sumo](sumo.md) with
   [OMNET++](https://omnetpp.org/). As part of the infrastructure it
   provides a C++ client library for the TraCI API (API completeness is
@@ -239,7 +239,7 @@
 - .NET: libtracics is an experimental SWIG generated binding to the original libtraci.
   It has full API coverage but is untested and needs to be generated by the user from the source.
 - Matlab
-  [TraCI4Matlab](http://www.mathworks.com/matlabcentral/fileexchange/44805-traci4matlab).
+  [TraCI4Matlab](https://www.mathworks.com/matlabcentral/fileexchange/44805-traci4matlab).
   The client is included as part of each SUMO release in
   {{SUMO}}*/tools/contributed/traci4matlab*
   Not all TraCI commands have been implemented. It is recommended to 
diff -Nru sumo-1.17.0/docs/web/docs/Tutorials/Calibration/Berlin.md sumo-1.18.0/docs/web/docs/Tutorials/Calibration/Berlin.md
--- sumo-1.17.0/docs/web/docs/Tutorials/Calibration/Berlin.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Tutorials/Calibration/Berlin.md	2023-06-28 20:02:17.000000000 +0000
@@ -105,7 +105,7 @@
 ## References
 
 - \[1\]
-  
+  
   last visited 07 February 2012
 - \[2\] Bundesanstalt für Straßenverkehrswesen (2002): Technische
   Lieferbedingungen für Streckenstationen. Bundesministerium für
diff -Nru sumo-1.17.0/docs/web/docs/Tutorials/Calibration/San_Pablo_Dam.md sumo-1.18.0/docs/web/docs/Tutorials/Calibration/San_Pablo_Dam.md
--- sumo-1.17.0/docs/web/docs/Tutorials/Calibration/San_Pablo_Dam.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Tutorials/Calibration/San_Pablo_Dam.md	2023-06-28 20:02:17.000000000 +0000
@@ -25,11 +25,11 @@
 was collected on the San Pablo Dam Road "from 6:45 a.m. to 9:00 a.m. on
 Tuesday, November 18 and again on Thursday, November 20, 1997"
 (\[Smilowitz1999\]). Please look [here
-(OpenStreetMap)](http://www.openstreetmap.org/?lat=37.9191&lon=-122.2439&zoom=13&layers=M)
+(OpenStreetMap)](https://www.openstreetmap.org/?lat=37.9191&lon=-122.2439&zoom=13&layers=M)
 or [here
-(GoogleMaps)](http://maps.google.de/maps?q=San+Pablo+Reservoir,+Contra+Costa,+Kalifornien,+Vereinigte+Staaten&hl=de&ll=37.923482,-122.244015&spn=0.097632,0.118618&sll=51.151786,10.415039&sspn=19.919551,30.366211&vpsrc=6&geocode=FZu4QgId6rO2-A&t=m&z=13)
+(GoogleMaps)](https://maps.google.de/maps?q=San+Pablo+Reservoir,+Contra+Costa,+Kalifornien,+Vereinigte+Staaten&hl=de&ll=37.923482,-122.244015&spn=0.097632,0.118618&sll=51.151786,10.415039&sspn=19.919551,30.366211&vpsrc=6&geocode=FZu4QgId6rO2-A&t=m&z=13)
 for the location. The data set's pages are
-[here](https://web.archive.org/web/20140724080358/http://www.ce.berkeley.edu/~daganzo/spdr.html). It was also used
+[here](https://web.archive.org/web/20140724080358/https://www.ce.berkeley.edu/~daganzo/spdr.html). It was also used
 for benchmarking car-following models, see \[Brockfeld2003a\]. The data
 set consists of times at which vehicles pass count points and is assumed
 to be quite clean.
@@ -178,9 +178,9 @@
 \[Smilowitz1999\] K. Smilowitz, C. Daganzo, M.J. Cassidy and R.L.
 Bertini. 1999. Some observations of highway traffic in long queues.
 Transportation Research Records, 1678, pp. 225-233; available at
-[\[1\]](https://web.archive.org/web/20140724065055/http://www.its.berkeley.edu/publications/UCB/98/RR/UCB-ITS-RR-98-6.pdf)
+[\[1\]](https://web.archive.org/web/20140724065055/https://www.its.berkeley.edu/publications/UCB/98/RR/UCB-ITS-RR-98-6.pdf)
 
 \[Brockfeld2003a\] E. Brockfeld, R. Kühne, A. Skabardonis, P. Wagner.
 2003 Towards a benchmarking of Microscopic Traffic Flow Models.
 Transportation Research Records, 1852 (TRB2003-001164), pp. 124-129;
-available at [\[2\]](http://elib.dlr.de/6646/)
+available at [\[2\]](https://elib.dlr.de/6646/)
diff -Nru sumo-1.17.0/docs/web/docs/Tutorials/CityMobil.md sumo-1.18.0/docs/web/docs/Tutorials/CityMobil.md
--- sumo-1.17.0/docs/web/docs/Tutorials/CityMobil.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Tutorials/CityMobil.md	2023-06-28 20:02:17.000000000 +0000
@@ -63,7 +63,7 @@
 
-
+
 ```
 This gives complete information on how and when this file has been generated as well
 as a schema reference which allows for validating the input. This makes it easier to find mistakes 
diff -Nru sumo-1.17.0/docs/web/docs/Tutorials/HighwayDetector.md sumo-1.18.0/docs/web/docs/Tutorials/HighwayDetector.md
--- sumo-1.17.0/docs/web/docs/Tutorials/HighwayDetector.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Tutorials/HighwayDetector.md	2023-06-28 20:02:17.000000000 +0000
@@ -71,7 +71,7 @@
 of the output file is shown below.
 
 ```xml
-
+
 
 
 
@@ -98,7 +98,7 @@
 definition can also be applied.
 
 ```xml
-
+
 
 
 
@@ -148,7 +148,7 @@
 
 Moreover, it is also possible to set up a configuration file with use of
 a XML schema definition
-([dfrouterConfiguration.xsd](http://sumo.dlr.de/xsd/dfrouterConfiguration.xsd)).
+([dfrouterConfiguration.xsd](https://sumo.dlr.de/xsd/dfrouterConfiguration.xsd)).
 
 ### Comparison of the detected and the estimated flows
 
diff -Nru sumo-1.17.0/docs/web/docs/Tutorials/Import_from_OpenStreetMap.md sumo-1.18.0/docs/web/docs/Tutorials/Import_from_OpenStreetMap.md
--- sumo-1.17.0/docs/web/docs/Tutorials/Import_from_OpenStreetMap.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Tutorials/Import_from_OpenStreetMap.md	2023-06-28 20:02:17.000000000 +0000
@@ -44,7 +44,7 @@
 enhanced. The following steps are recommended for the same:
 
 1.  Complete the map directly in OpenStreetMap. Follow the guidelines on
-    the [OpenStreetMap wiki](http://wiki.openstreetmap.org) in the area
+    the [OpenStreetMap wiki](https://wiki.openstreetmap.org) in the area
     *Map Making*. They give valuable hints what software to use and how
     to encode all attributes of the map. You should ensure that the map
     contains all data related to traffic simulation. (At this stage,
diff -Nru sumo-1.17.0/docs/web/docs/Tutorials/index.md sumo-1.18.0/docs/web/docs/Tutorials/index.md
--- sumo-1.17.0/docs/web/docs/Tutorials/index.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Tutorials/index.md	2023-06-28 20:02:17.000000000 +0000
@@ -21,14 +21,15 @@
 The SUMO User Conference is an anual event organized by the German Aerospace Center (DLR) in Berlin. Since 2015, each conference begins with a SUMO tutorial session. Below you can find the tutorial material (slide deck and input files). Since 2019, the tutorials have also been recorded on video.
 
 ## Files
-* [SUMO 2015](http://sumo.dlr.de/daily/sumo2015_tutorial.zip): network editing with xml patch, persons, 
-* [SUMO 2016](http://sumo.dlr.de/daily/sumo2016_tutorial.zip): network editing, meso, containers, [New Features 2016 (Slides)](http://sumo.dlr.de/daily/SUMO2016_new_features.pdf)
-* [SUMO 2017](http://sumo.dlr.de/daily/sumo2017_tutorial.zip): network editing, randomTrips, calibrators (xml only), public transport (obsolete)
-* [SUMO 2018](http://sumo.dlr.de/daily/sumo2018_tutorial.zip): fixing intermodal junctions, calibrators in netedit, junction model parameters, editing shapes
-* [SUMO 2019](http://sumo.dlr.de/daily/sumo2019_tutorial.zip): network editing, visualizing traffic data, public transport from OSM, parking, netgenerate
-* [SUMO 2020](http://sumo.dlr.de/daily/sumo2020_tutorial.zip): turn lanes, routeSampler.py, defining counting data in netedit, taxi/DRT
-* [SUMO 2021](http://sumo.dlr.de/daily/sumo2021_tutorial.zip): traffic light layout, indirect left turn, TAZ, OD-traffic, GTFS
-* [SUMO 2022](http://sumo.dlr.de/daily/sumo2022_tutorial.zip): network editing, flows, opposite driving, pedestrian crossings, parking search
+* [SUMO 2015](https://sumo.dlr.de/daily/sumo2015_tutorial.zip): network editing with xml patch, persons, 
+* [SUMO 2016](https://sumo.dlr.de/daily/sumo2016_tutorial.zip): network editing, meso, containers, [New Features 2016 (Slides)](https://sumo.dlr.de/daily/SUMO2016_new_features.pdf)
+* [SUMO 2017](https://sumo.dlr.de/daily/sumo2017_tutorial.zip): network editing, randomTrips, calibrators (xml only), public transport (obsolete)
+* [SUMO 2018](https://sumo.dlr.de/daily/sumo2018_tutorial.zip): fixing intermodal junctions, calibrators in netedit, junction model parameters, editing shapes
+* [SUMO 2019](https://sumo.dlr.de/daily/sumo2019_tutorial.zip): network editing, visualizing traffic data, public transport from OSM, parking, netgenerate
+* [SUMO 2020](https://sumo.dlr.de/daily/sumo2020_tutorial.zip): turn lanes, routeSampler.py, defining counting data in netedit, taxi/DRT
+* [SUMO 2021](https://sumo.dlr.de/daily/sumo2021_tutorial.zip): traffic light layout, indirect left turn, TAZ, OD-traffic, GTFS
+* [SUMO 2022](https://sumo.dlr.de/daily/sumo2022_tutorial.zip): network editing, flows, opposite driving, pedestrian crossings, parking search
+* [SUMO 2023](https://sumo.dlr.de/daily/sumo2023_tutorial.zip): graphical diff, personFlow, plotting tools, analyzing repeated runs
 
 ## Videos
 
@@ -42,6 +43,9 @@
 

 
 Watch the 2022 Tutorial
+

+
+Watch the 2023 Tutorial
 
 # Advanced Tutorials
 * [Hello SUMO](Hello_SUMO.md) - The simplest net and a single car set up "by hand"
@@ -66,7 +70,7 @@
 
 ## ITSC 2015
 
-* Download the Tutorial Files at [http://sumo.dlr.de/daily/ITSC2015_tutorial.zip](http://sumo.dlr.de/daily/ITSC2015_tutorial.zip)
+* Download the Tutorial Files at [https://sumo.dlr.de/daily/ITSC2015_tutorial.zip](https://sumo.dlr.de/daily/ITSC2015_tutorial.zip)
 
 ## Im- and Export
 * [Trace File Generation](Trace_File_Generation.md) - Shows how to obtain vehicular trace files, usable for simulating vehicular communication
diff -Nru sumo-1.17.0/docs/web/docs/Tutorials/OSMActivityGen/eichstaett.net.xml.md sumo-1.18.0/docs/web/docs/Tutorials/OSMActivityGen/eichstaett.net.xml.md
--- sumo-1.17.0/docs/web/docs/Tutorials/OSMActivityGen/eichstaett.net.xml.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Tutorials/OSMActivityGen/eichstaett.net.xml.md	2023-06-28 20:02:17.000000000 +0000
@@ -26,12 +26,12 @@
 
 
 Author
-W. Bamberger
+W. Bamberger
 
 
 Source
 Tutorials/OSMActivityGen/eichstaett.osm by W. Bamberger.

-Map data © OpenStreetMap contributors, CC-BY-SA
+Map data © OpenStreetMap contributors, CC-BY-SA
 
 
 History
@@ -40,7 +40,7 @@
 
 License
 
-This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 Unported License. The authors are listed in the history.
+This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 Unported License. The authors are listed in the history.
 
 
 
diff -Nru sumo-1.17.0/docs/web/docs/Tutorials/OSMActivityGen/eichstaett.osm.md sumo-1.18.0/docs/web/docs/Tutorials/OSMActivityGen/eichstaett.osm.md
--- sumo-1.17.0/docs/web/docs/Tutorials/OSMActivityGen/eichstaett.osm.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Tutorials/OSMActivityGen/eichstaett.osm.md	2023-06-28 20:02:17.000000000 +0000
@@ -24,7 +24,7 @@
 
 
 Author
-W. Bamberger
+W. Bamberger
 
 
 Date
@@ -33,7 +33,7 @@
 
 Source
 
-Map data © OpenStreetMap contributors, CC-BY-SA
+Map data © OpenStreetMap contributors, CC-BY-SA
 
 
 History
@@ -42,7 +42,7 @@
 
 License
 
-This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 Unported License. The authors are listed in the history.
+This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 Unported License. The authors are listed in the history.
 
 
 
diff -Nru sumo-1.17.0/docs/web/docs/Tutorials/OSMWebWizard.md sumo-1.18.0/docs/web/docs/Tutorials/OSMWebWizard.md
--- sumo-1.17.0/docs/web/docs/Tutorials/OSMWebWizard.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Tutorials/OSMWebWizard.md	2023-06-28 20:02:17.000000000 +0000
@@ -15,7 +15,7 @@
 # Requirements
 
 - [SUMO](../Installing/index.md) installation
-- [Python](http://www.python.org) (\>= 2.7) installation
+- [Python](https://www.python.org) (\>= 2.7) installation
 
 # Getting started
 
diff -Nru sumo-1.17.0/docs/web/docs/Tutorials/Output_Parsing.md sumo-1.18.0/docs/web/docs/Tutorials/Output_Parsing.md
--- sumo-1.17.0/docs/web/docs/Tutorials/Output_Parsing.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Tutorials/Output_Parsing.md	2023-06-28 20:02:17.000000000 +0000
@@ -26,7 +26,7 @@
 ```xml
 
 
-
+
     
     
     
@@ -41,7 +41,7 @@
 ```xml
 
 
-
+
     
 
 ```
@@ -51,7 +51,7 @@
 ```xml
 
 
-
+
     
     
     
@@ -73,8 +73,8 @@
 ```xml
 
 
-
+
 
    
        
@@ -115,8 +115,8 @@
 ```xml
 
 
-
+
     
     
 
@@ -157,7 +157,7 @@
 ```xml
 
 
-
+
     
         
             
@@ -178,7 +178,7 @@
 ```xml
 
 
-
+
     
         
         
diff -Nru sumo-1.17.0/docs/web/docs/Tutorials/PublicTransport.md sumo-1.18.0/docs/web/docs/Tutorials/PublicTransport.md
--- sumo-1.17.0/docs/web/docs/Tutorials/PublicTransport.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Tutorials/PublicTransport.md	2023-06-28 20:02:17.000000000 +0000
@@ -149,7 +149,7 @@
 command line.
 
 ```xml
-
+
 
     
         
diff -Nru sumo-1.17.0/docs/web/docs/Tutorials/quick_start.md sumo-1.18.0/docs/web/docs/Tutorials/quick_start.md
--- sumo-1.17.0/docs/web/docs/Tutorials/quick_start.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Tutorials/quick_start.md	2023-06-28 20:02:17.000000000 +0000
@@ -329,8 +329,8 @@
 
 ```xml
 
-
+
     
         
         
diff -Nru sumo-1.17.0/docs/web/docs/Tutorials/Quick_Start_old_style.md sumo-1.18.0/docs/web/docs/Tutorials/Quick_Start_old_style.md
--- sumo-1.17.0/docs/web/docs/Tutorials/Quick_Start_old_style.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Tutorials/Quick_Start_old_style.md	2023-06-28 20:02:17.000000000 +0000
@@ -109,8 +109,8 @@
 
 ```xml
 
-
+
     
     
     
@@ -181,8 +181,8 @@
 
 ```xml
 
-
+
     
     
     
@@ -249,8 +249,8 @@
 
 ```xml
 
-
+
     
     
     
@@ -498,8 +498,8 @@
 
 ```xml
 
-
+
     
         
         
diff -Nru sumo-1.17.0/docs/web/docs/Tutorials/ScenarioGuide.md sumo-1.18.0/docs/web/docs/Tutorials/ScenarioGuide.md
--- sumo-1.17.0/docs/web/docs/Tutorials/ScenarioGuide.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Tutorials/ScenarioGuide.md	2023-06-28 20:02:17.000000000 +0000
@@ -32,7 +32,7 @@
 ## If you do not yet have any network data
 
 Use publicly available network data from
-[OpenStreetMap](http://www.openstreetmap.org/) as described here:
+[OpenStreetMap](https://www.openstreetmap.org/) as described here:
 [Networks/Import/OpenStreetMapDownload](../Networks/Import/OpenStreetMapDownload.md).
 Then import the network as described here:
 [Networks/Import/OpenStreetMap](../Networks/Import/OpenStreetMap.md).
diff -Nru sumo-1.17.0/docs/web/docs/Tutorials/SUMOlympics.md sumo-1.18.0/docs/web/docs/Tutorials/SUMOlympics.md
--- sumo-1.17.0/docs/web/docs/Tutorials/SUMOlympics.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Tutorials/SUMOlympics.md	2023-06-28 20:02:17.000000000 +0000
@@ -31,7 +31,7 @@
 different lanes side-by-side. Thus, we have to add lanes for each mode.
 To do so, right-click on the edge and hover over "add restricted lane"
 in the context menu. This will show you three choices for the creation
-of special purpose lanes: Sidewalk, Bikelane, and Buslane. Add one lane
+of special purpose lanes: Sidewalk, bike lane, and Bus lane. Add one lane
 for each type.
 
 
diff -Nru sumo-1.17.0/docs/web/docs/Tutorials/TraCI4Traffic_Lights.md sumo-1.18.0/docs/web/docs/Tutorials/TraCI4Traffic_Lights.md
--- sumo-1.17.0/docs/web/docs/Tutorials/TraCI4Traffic_Lights.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Tutorials/TraCI4Traffic_Lights.md	2023-06-28 20:02:17.000000000 +0000
@@ -62,7 +62,7 @@
 the API can be found at
 [TraCI/Interfacing_TraCI_from_Python](../TraCI/Interfacing_TraCI_from_Python.md).
 For a detailed list of available functions see the [pydoc generated
-documentation](http://sumo.dlr.de/daily/pydoc/traci.html).
+documentation](https://sumo.dlr.de/daily/pydoc/traci.html).
 
 # Simulation
 
diff -Nru sumo-1.17.0/docs/web/docs/Tutorials/TraCIPedCrossing.md sumo-1.18.0/docs/web/docs/Tutorials/TraCIPedCrossing.md
--- sumo-1.17.0/docs/web/docs/Tutorials/TraCIPedCrossing.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Tutorials/TraCIPedCrossing.md	2023-06-28 20:02:17.000000000 +0000
@@ -41,13 +41,13 @@
 The control logic resides in the python script *runner.py*. It builds
 the network (via [netconvert](../netconvert.md)) generates the
 pedestrian routes (via
-[\[1\]](http://sumo.dlr.de/wiki/Tools/Trip#randomTrips.py%7CrandomTrips.py),
+[\[1\]](https://sumo.dlr.de/wiki/Tools/Trip#randomTrips.py%7CrandomTrips.py),
 and interacts with the simulation to controls the traffic light. It
 makes use of the TraCI python API bundled with SUMO. A description of
 the API can be found at
 [TraCI/Interfacing_TraCI_from_Python](../TraCI/Interfacing_TraCI_from_Python.md).
 For a detailed list of available functions see the [pydoc generated
-documentation](http://sumo.dlr.de/daily/pydoc/traci.html).
+documentation](https://sumo.dlr.de/daily/pydoc/traci.html).
 
 ## Traffic light control
 
diff -Nru sumo-1.17.0/docs/web/docs/Vehicle_Type_Parameter_Defaults.md sumo-1.18.0/docs/web/docs/Vehicle_Type_Parameter_Defaults.md
--- sumo-1.17.0/docs/web/docs/Vehicle_Type_Parameter_Defaults.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Vehicle_Type_Parameter_Defaults.md	2023-06-28 20:02:17.000000000 +0000
@@ -444,7 +444,7 @@
 
 
 - (1): 
-- (2): 
+- (2): 
 - (3): 
 - (4): 
 - (5): 
@@ -452,7 +452,7 @@
 - (7): 
 - (8): 
 - (9): 
-- (10): 
+- (10): 
 - (11): 
 - (12): 
 - (14): 
@@ -461,25 +461,24 @@
 - (17): Fußgeher- und Fahrradverkehr: Planungsprinzipien; Hermann Knoflacher; Böhlau Verlag Wien, 1995
 - (18): RiLSA 2010
 - (19): 
-- (20): 
-- (21): 
-- (22):  (p48)
-- (23): `http://jml2012.indexcopernicus.com/fulltxt.php?ICID=1022800` (dead link) (pdf p.229-230)
+- (20): 
+- (21): 
+- (22):  (p48)
+- (23): `https://jml2012.indexcopernicus.com/fulltxt.php?ICID=1022800` (dead link) (pdf p.229-230)
 - (24): 
 - (25): 
-- (26): 
-- (27): 
+- (26): 
+- (27): 
 - (28): 
-- (29): 
+- (29): 
 - (30): 
-- (31): 
+- (31): 
 - (32): 
-- (33): `http://www.ice-fansite.com/index.php?option=com_content&view=article&id=195:ice1-techdat&catid=50:icet&Itemid=69` (dead link)
+- (33): `https://www.ice-fansite.com/index.php?option=com_content&view=article&id=195:ice1-techdat&catid=50:icet&Itemid=69` (dead link)
 - (34): 
 - (35): https://www.researchgate.net/publication/311633504_Improving_Road_Safety_of_Tank_Truck_in_Indonesia_by_Speed_Limiter_Installation
-- (36): 
+- (36): 
 - (37): https://www.rettungsdienst.brk.de/leichte-sprache/abteilung/beschaffung/rettungswagen-rtw/rtw-by-2010.html
-- (38): 
 - (39): 
 - (40): 
 - (\*): estimated
diff -Nru sumo-1.17.0/docs/web/docs/XMLValidation.md sumo-1.18.0/docs/web/docs/XMLValidation.md
--- sumo-1.17.0/docs/web/docs/XMLValidation.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/XMLValidation.md	2023-06-28 20:02:17.000000000 +0000
@@ -23,7 +23,7 @@
 root element of the input file such as
 
 ```xml
-
+
 ```
 
 When setting the validation options to *always* the schemata for networks, additional files and routes
@@ -50,8 +50,8 @@
 element as follows:
 
 ```xml
-    
+    
 ```
 
 where *ROOT_ELEMENT* and *SCHEMA_FILE* should be set according to the
@@ -79,7 +79,7 @@
 these files will be used when validating inputs.
 
 Otherwise, the files are loaded from
-** which may slow down the
+** which may slow down the
 application (or fail if there is no internet connection).
 
 # SUMO File Types
@@ -93,5 +93,5 @@
 To disable schema validation any of the following actions is sufficient
 
 - set the option **--xml-validation never**
-- Remove the `xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"` `xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/....xsd"`
+- Remove the `xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"` `xsi:noNamespaceSchemaLocation="https://sumo.dlr.de/xsd/....xsd"`
 attribute from the top of the XML input file.
\ No newline at end of file
diff -Nru sumo-1.17.0/docs/web/docs/Z/Changes_from_Version_0.10.3_to_Version_0.11.0.md sumo-1.18.0/docs/web/docs/Z/Changes_from_Version_0.10.3_to_Version_0.11.0.md
--- sumo-1.17.0/docs/web/docs/Z/Changes_from_Version_0.10.3_to_Version_0.11.0.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Z/Changes_from_Version_0.10.3_to_Version_0.11.0.md	2023-06-28 20:02:17.000000000 +0000
@@ -42,8 +42,8 @@
     - corrected behavior of using intervals in [edgelane traffic](../Simulation/Output/Lane-_or_Edge-based_Traffic_Measures.md),
       [edgelane hbefa](../Simulation/Output/Lane-_or_Edge-based_Emissions_Measures.md),
       and [edgelane harmonoise](../Simulation/Output/Lane-_or_Edge-based_Noise_Measures.md)
-      (solved [bug 2504162: multiple begins / ends should be defined in separate dumps](http://sourceforge.net/tracker/?func=detail&aid=2168007&group_id=45607&atid=443424)
-      and [bug 2504144: dump intervals are mandatory](http://sourceforge.net/tracker/?func=detail&aid=2168007&group_id=45607&atid=443424))
+      (solved [bug 2504162: multiple begins / ends should be defined in separate dumps](https://sourceforge.net/tracker/?func=detail&aid=2168007&group_id=45607&atid=443424)
+      and [bug 2504144: dump intervals are mandatory](https://sourceforge.net/tracker/?func=detail&aid=2168007&group_id=45607&atid=443424))
     - [edgelane hbefa](../Simulation/Output/Lane-_or_Edge-based_Emissions_Measures.md)
       now additionally writes per-vehicle values
   - fixed re-emission check for edges with multiple waiting vehicles
@@ -51,7 +51,7 @@
 - sumo-gui
   - Added the possibility to load view settings and
     [decals](../sumo-gui.md#using_decals_within_sumo-gui) from
-    a configuration file (implemented [request 2168007: add possibility to load view settings file with start of gui](http://sourceforge.net/tracker/?func=detail&aid=2168007&group_id=45607&atid=443424)).
+    a configuration file (implemented [request 2168007: add possibility to load view settings file with start of gui](https://sourceforge.net/tracker/?func=detail&aid=2168007&group_id=45607&atid=443424)).
     Added the possibility to generate snapshots on startup, defined
     in a configuration file.
   - Removed the "additional weight" dialog - was not known to be
diff -Nru sumo-1.17.0/docs/web/docs/Z/Changes_from_Version_0.11.0_to_Version_0.11.1.md sumo-1.18.0/docs/web/docs/Z/Changes_from_Version_0.11.0_to_Version_0.11.1.md
--- sumo-1.17.0/docs/web/docs/Z/Changes_from_Version_0.11.0_to_Version_0.11.1.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Z/Changes_from_Version_0.11.0_to_Version_0.11.1.md	2023-06-28 20:02:17.000000000 +0000
@@ -20,7 +20,7 @@
     correctly)
 
 - sumo-gui
-  - implemented [request 1641989: No view reset on reload](http://sourceforge.net/tracker/?func=detail&aid=1641989&group_id=45607&atid=443424).
+  - implemented [request 1641989: No view reset on reload](https://sourceforge.net/tracker/?func=detail&aid=1641989&group_id=45607&atid=443424).
   - the number of colors used for range visualization is now variable
   - debugged problems with not shown junction names
 
diff -Nru sumo-1.17.0/docs/web/docs/Z/Changes_from_Version_0.11.1_to_Version_0.12.0.md sumo-1.18.0/docs/web/docs/Z/Changes_from_Version_0.11.1_to_Version_0.12.0.md
--- sumo-1.17.0/docs/web/docs/Z/Changes_from_Version_0.11.1_to_Version_0.12.0.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Z/Changes_from_Version_0.11.1_to_Version_0.12.0.md	2023-06-28 20:02:17.000000000 +0000
@@ -5,7 +5,7 @@
 **Release date: 27.05.2010**
 
 - Simulation
-  - solved [regarding red light late blocks vehicles](http://sourceforge.net/apps/trac/sumo/ticket/173)
+  - solved [regarding red light late blocks vehicles](https://sourceforge.net/apps/trac/sumo/ticket/173)
   - corrected the documentation on using [an abstract vehicle class](../Definition_of_Vehicles,_Vehicle_Types,_and_Routes.md#abstract_vehicle_class);
     the attribute which defines it is named `vclass` not `class`.
   - introducing flows as replacement for vehicles with repno and
diff -Nru sumo-1.17.0/docs/web/docs/Z/Changes_from_Version_0.12.2_to_Version_0.12.3.md sumo-1.18.0/docs/web/docs/Z/Changes_from_Version_0.12.2_to_Version_0.12.3.md
--- sumo-1.17.0/docs/web/docs/Z/Changes_from_Version_0.12.2_to_Version_0.12.3.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Z/Changes_from_Version_0.12.2_to_Version_0.12.3.md	2023-06-28 20:02:17.000000000 +0000
@@ -22,5 +22,5 @@
   - please note that the encoding of a vehicle's angle has changed
 - sumo-gui
   - corrected vehicle's angle (was
-    [ticket\#430](http://sourceforge.net/apps/trac/sumo/ticket/430))
+    [ticket\#430](https://sourceforge.net/apps/trac/sumo/ticket/430))
   - Clipboard works under Linux
\ No newline at end of file
diff -Nru sumo-1.17.0/docs/web/docs/Z/Changes_from_Version_0.12.3_to_Version_0.13.0.md sumo-1.18.0/docs/web/docs/Z/Changes_from_Version_0.12.3_to_Version_0.13.0.md
--- sumo-1.17.0/docs/web/docs/Z/Changes_from_Version_0.12.3_to_Version_0.13.0.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Z/Changes_from_Version_0.12.3_to_Version_0.13.0.md	2023-06-28 20:02:17.000000000 +0000
@@ -98,8 +98,8 @@
   - removed the possibility to set and retrieve traffic lights by
     phase/brake/yellow-tuples (both, state 0x21 and program 0x25)
   - completely removed old API
-  - solved tickets [ticket\#273 (consolidate speed and acceleration manipulation methods)](http://sourceforge.net/apps/trac/sumo/ticket/273) and
-    [ticket\#330 (Speed adaptation after receiving SLOWDOWN command not working.)](http://sourceforge.net/apps/trac/sumo/ticket/330)
+  - solved tickets [ticket\#273 (consolidate speed and acceleration manipulation methods)](https://sourceforge.net/apps/trac/sumo/ticket/273) and
+    [ticket\#330 (Speed adaptation after receiving SLOWDOWN command not working.)](https://sourceforge.net/apps/trac/sumo/ticket/330)
   - introduced a way to decide whether safe velocity, maximum
     deceleration and maximum acceleration shall be considered when
     changing a vehicle's speed, see:
diff -Nru sumo-1.17.0/docs/web/docs/Z/Changes_from_Version_0.14.0_to_Version_0.15.0.md sumo-1.18.0/docs/web/docs/Z/Changes_from_Version_0.14.0_to_Version_0.15.0.md
--- sumo-1.17.0/docs/web/docs/Z/Changes_from_Version_0.14.0_to_Version_0.15.0.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Z/Changes_from_Version_0.14.0_to_Version_0.15.0.md	2023-06-28 20:02:17.000000000 +0000
@@ -17,7 +17,7 @@
     in front of the position. This effects the retrieval of a
     vehicle's position via TraCI, and also the measures collected by
     detectors - now, the collected vehicle lengths do not contain
-    the minimum distance anymore. see [blog entry](http://sourceforge.net/apps/wordpress/sumo/2012/02/14/request-for-comments-pulling-mingap-out-of-the-vehicle/)
+    the minimum distance anymore. see [blog entry](https://sourceforge.net/apps/wordpress/sumo/2012/02/14/request-for-comments-pulling-mingap-out-of-the-vehicle/)
   - consolidating right-of-way rules (again). **Networks must be
     rebuild**
   - fixed crash when using TraCI to set new TLS-programs with less
diff -Nru sumo-1.17.0/docs/web/docs/Z/Changes_from_Version_0.15.0_to_Version_0.16.0.md sumo-1.18.0/docs/web/docs/Z/Changes_from_Version_0.15.0_to_Version_0.16.0.md
--- sumo-1.17.0/docs/web/docs/Z/Changes_from_Version_0.15.0_to_Version_0.16.0.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Z/Changes_from_Version_0.15.0_to_Version_0.16.0.md	2023-06-28 20:02:17.000000000 +0000
@@ -10,7 +10,7 @@
   - Fixed building under gcc4.7; thanks to Karsten Roscher
 - Simulation
   - Fixed the bug which prevented vehicles to be inserted in the
-    middle of a street using `departPos="free"` ([ticket732](http://sourceforge.net/apps/trac/sumo/ticket/732),
+    middle of a street using `departPos="free"` ([ticket732](https://sourceforge.net/apps/trac/sumo/ticket/732),
     thanks to Björn Hendriks for reporting it)
   - Fixed several bugs that were causing collisions
   - Fixed bug in the default car-following model wich lead to
@@ -66,11 +66,11 @@
   - Options **--offset.x** and **--offset.y** are no longer ignored
   - Renamed to [netgenerate](../netgenerate.md) due to naming
     conflicts in Debian, was
-    [ticket717](http://sourceforge.net/apps/trac/sumo/ticket/717),
-    and [Debian-ticket 673931](http://bugs.debian.org/673931)
+    [ticket717](https://sourceforge.net/apps/trac/sumo/ticket/717),
+    and [Debian-ticket 673931](https://bugs.debian.org/673931)
 - TraCI
   - fixed geo conversion
-    [ticket804](http://sourceforge.net/apps/trac/sumo/ticket/804)
+    [ticket804](https://sourceforge.net/apps/trac/sumo/ticket/804)
 - TOOLS
   - method parse_fast in sumolib.output no longer fails when using
     attributes which are also python keywords.
diff -Nru sumo-1.17.0/docs/web/docs/Z/Changes_from_Version_0.20.0_to_Version_0.21.0.md sumo-1.18.0/docs/web/docs/Z/Changes_from_Version_0.20.0_to_Version_0.21.0.md
--- sumo-1.17.0/docs/web/docs/Z/Changes_from_Version_0.20.0_to_Version_0.21.0.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Z/Changes_from_Version_0.20.0_to_Version_0.21.0.md	2023-06-28 20:02:17.000000000 +0000
@@ -222,6 +222,6 @@
   - Referenze [typemap files](../SUMO_edge_type_file.md) for
     importing edges and polygon data from OSM networks as well as
     from other formats can now be found at {{SUMO}}/data
-  - SUMO builds now with [clang](http://clang.llvm.org/) as well
+  - SUMO builds now with [clang](https://clang.llvm.org/) as well
   - The shortcut **-p** for the option **--print-options** was removed because of possible
     name clashes
\ No newline at end of file
diff -Nru sumo-1.17.0/docs/web/docs/Z/Changes_from_Version_0.21.0_to_Version_0.22.0.md sumo-1.18.0/docs/web/docs/Z/Changes_from_Version_0.21.0_to_Version_0.22.0.md
--- sumo-1.17.0/docs/web/docs/Z/Changes_from_Version_0.21.0_to_Version_0.22.0.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Z/Changes_from_Version_0.21.0_to_Version_0.22.0.md	2023-06-28 20:02:17.000000000 +0000
@@ -134,8 +134,7 @@
         are now scrollable to allow work on smaller screens.
   - The attributes which can be used to customize lane colors can
         now also be used to scale their width. This is done in the view
-        customization dialog unter 'Streets' -\> 'Scale width'. See
-        [\[1\]](http://sumo-sim.org/blog/wp-content/uploads/2014/08/scaling_by_speed-300x281.png).
+        customization dialog unter 'Streets' -\> 'Scale width'.
   - Vehicle coloring *by time since lane change* now indicates the
         direction of the change by its color
   - Added new link state 'u' to encode red-yellow phase (shown as
diff -Nru sumo-1.17.0/docs/web/docs/Z/Changes_from_version_0.9.3_to_version_0.9.4.md sumo-1.18.0/docs/web/docs/Z/Changes_from_version_0.9.3_to_version_0.9.4.md
--- sumo-1.17.0/docs/web/docs/Z/Changes_from_version_0.9.3_to_version_0.9.4.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Z/Changes_from_version_0.9.3_to_version_0.9.4.md	2023-06-28 20:02:17.000000000 +0000
@@ -24,7 +24,7 @@
 rechecked and now allows to import networks stored in other schemes than
 the one NavTeq uses. The new options are described [here](../Networks/Import/ArcView.md).
 
-Some further comments on importing ArcView-files are available [here](../Networks/Import/ArcView.md#arcview_import_options). By now, they include only some comments on importing an open-source network of Osnabrück. You can take a look at this [here](../Networks/Import/ArcView.md#frida_network_city_of_osnabruck) and also download it from [here](http://frida.intevation.org/download.html).
+Some further comments on importing ArcView-files are available [here](../Networks/Import/ArcView.md#arcview_import_options). By now, they include only some comments on importing an open-source network of Osnabrück. You can take a look at this [here](../Networks/Import/ArcView.md#frida_network_city_of_osnabruck) and also download it from [here](https://frida.intevation.org/download.html).
 
 
 **3.** The developer documentation has been split into several parts.
diff -Nru sumo-1.17.0/docs/web/docs/Z/Changes_from_version_0.9.7_to_version_0.9.8.md sumo-1.18.0/docs/web/docs/Z/Changes_from_version_0.9.7_to_version_0.9.8.md
--- sumo-1.17.0/docs/web/docs/Z/Changes_from_version_0.9.7_to_version_0.9.8.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Z/Changes_from_version_0.9.7_to_version_0.9.8.md	2023-06-28 20:02:17.000000000 +0000
@@ -24,7 +24,7 @@
 - simulation
   - debugged tls-coupled e2-output
   - debugged [bug 1886198 Segmentation
-    Fault](http://sourceforge.net/tracker/index.php?func=detail&aid=1871037&group_id=45607&atid=443421);
+    Fault](https://sourceforge.net/tracker/index.php?func=detail&aid=1871037&group_id=45607&atid=443421);
     see comment; thanks to Helcio Bezerra de Mello for the bug
     report
   - further work on detectors
@@ -34,13 +34,13 @@
     his best lanes
   - simplified computation of best lanes
   - debugged [bug 1871859 vehicles do not wait on lane
-    end](http://sourceforge.net/tracker/index.php?func=detail&aid=1871859&group_id=45607&atid=443421);
+    end](https://sourceforge.net/tracker/index.php?func=detail&aid=1871859&group_id=45607&atid=443421);
     thanks to Jensen Chou for the bug report
   - debugged [bug 1871964 left-moving vehicles do not fill
-    junction](http://sourceforge.net/tracker/index.php?func=detail&aid=1871964&group_id=45607&atid=443421)
+    junction](https://sourceforge.net/tracker/index.php?func=detail&aid=1871964&group_id=45607&atid=443421)
   - patched error handling in emitters; tests added
   - debugged [bug 1873155 vehicles with depart lower than begin are
-    emitted](http://sourceforge.net/tracker/index.php?func=detail&aid=1873155&group_id=45607&atid=443421);
+    emitted](https://sourceforge.net/tracker/index.php?func=detail&aid=1873155&group_id=45607&atid=443421);
     tests added
   - tests for rerouter added; partially debugged
   - added inline-documentation for microsim/output
@@ -62,20 +62,20 @@
 
 - guisim
   - debugged [bug 1830296 guiemitter destroys event
-    que](http://sourceforge.net/tracker/index.php?func=detail&aid=1830296&group_id=45607&atid=443421)
+    que](https://sourceforge.net/tracker/index.php?func=detail&aid=1830296&group_id=45607&atid=443421)
     by introducing a thread-aware event control version for guisim
     (GUIEventControl)
   - implementing [feature request 1645216 Indicator / blinker
     depending on junction
-    distance](http://sourceforge.net/tracker/index.php?func=detail&aid=1645216&group_id=45607&atid=443424)
+    distance](https://sourceforge.net/tracker/index.php?func=detail&aid=1645216&group_id=45607&atid=443424)
   - debugged [bug 1862073 view is not refreshed when (de)selecting
-    item](http://sourceforge.net/tracker/index.php?func=detail&aid=1862073&group_id=45607&atid=443421)
+    item](https://sourceforge.net/tracker/index.php?func=detail&aid=1862073&group_id=45607&atid=443421)
   - added doxygen-documentation for utils/gui/div
 - work on problems with guisim (undeterministic termination)
 
 - netconvert
   - debugged [bug 1886198 User reports unknown error while importing
-    shapefile](http://sourceforge.net/tracker/index.php?func=detail&aid=1886198&group_id=45607&atid=443421);
+    shapefile](https://sourceforge.net/tracker/index.php?func=detail&aid=1886198&group_id=45607&atid=443421);
     see comment; thanks to Maxim Raya for the bug report
 
 - dfrouter
@@ -96,14 +96,14 @@
 - debugged problems with repetition of vehicles that have a color
   within guisim (application terminated)
 - patched XMLSubSys documentation (was
-  [bug 1828803](http://sourceforge.net/tracker/index.php?func=detail&aid=1828803&group_id=45607&atid=443421))
+  [bug 1828803](https://sourceforge.net/tracker/index.php?func=detail&aid=1828803&group_id=45607&atid=443421))
 - fixed vehicle decelerations when being on a higher priorised road
   (bug
-  [1830266](http://sourceforge.net/tracker/index.php?func=detail&aid=1830266&group_id=45607&atid=443421))
+  [1830266](https://sourceforge.net/tracker/index.php?func=detail&aid=1830266&group_id=45607&atid=443421))
 - fixed netconvert bugs occuring when connected nodes are too close
   together (bugs
-  [1639460](http://sourceforge.net/tracker/index.php?func=detail&aid=1639460&group_id=45607&atid=443421),
-  [1639436](http://sourceforge.net/tracker/index.php?func=detail&aid=1639436&group_id=45607&atid=443421))
+  [1639460](https://sourceforge.net/tracker/index.php?func=detail&aid=1639460&group_id=45607&atid=443421),
+  [1639436](https://sourceforge.net/tracker/index.php?func=detail&aid=1639436&group_id=45607&atid=443421))
 - moved color out of MSVehicle (affects loading classes)
 - router import classes now process input colors as strings
 - consolidated XML-definitions
@@ -116,17 +116,17 @@
 of benefit. You may read some further information on this in the
 following tracker items: [bug 1840935: exchange of vehicles over
 lanes disallow fails with two
-vehs](http://sourceforge.net/tracker/index.php?func=detail&aid=1840935&group_id=45607&atid=443421),
+vehs](https://sourceforge.net/tracker/index.php?func=detail&aid=1840935&group_id=45607&atid=443421),
 [bug 1840938: lane exchange mechanism ignores undefined lane
-order](http://sourceforge.net/tracker/index.php?func=detail&aid=1840938&group_id=45607&atid=443421),
+order](https://sourceforge.net/tracker/index.php?func=detail&aid=1840938&group_id=45607&atid=443421),
 [bug 1840952: drop vehicle exchange in lane
-changer](http://sourceforge.net/tracker/index.php?func=detail&aid=1840952&group_id=45607&atid=443421),
+changer](https://sourceforge.net/tracker/index.php?func=detail&aid=1840952&group_id=45607&atid=443421),
 [bug 1840944: replace approaching information in
-lanes](http://sourceforge.net/tracker/index.php?func=detail&aid=1840944&group_id=45607&atid=443421)
+lanes](https://sourceforge.net/tracker/index.php?func=detail&aid=1840944&group_id=45607&atid=443421)
 
 - Further work on inner-junction traffic (still not 100% complete)
   - bug [1840950: take into account inner-junction
-    state](http://sourceforge.net/tracker/index.php?func=detail&aid=1840950&group_id=45607&atid=443421)
+    state](https://sourceforge.net/tracker/index.php?func=detail&aid=1840950&group_id=45607&atid=443421)
 - speeding up simulation by not touching empty lanes
 - C2C was made optional (using defines) in order to reduce memory
   footprint; was: feature 1843267: make extensions optional
\ No newline at end of file
diff -Nru sumo-1.17.0/docs/web/docs/Z/Changes_from_version_0.9.8_to_version_0.9.9.md sumo-1.18.0/docs/web/docs/Z/Changes_from_version_0.9.8_to_version_0.9.9.md
--- sumo-1.17.0/docs/web/docs/Z/Changes_from_version_0.9.8_to_version_0.9.9.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Z/Changes_from_version_0.9.8_to_version_0.9.9.md	2023-06-28 20:02:17.000000000 +0000
@@ -6,16 +6,16 @@
 
 - All
   - debugged [bug 1976405 Saving invalid dump
-    configuration](http://sourceforge.net/tracker/index.php?func=detail&aid=1976405&group_id=45607&atid=443421);
+    configuration](https://sourceforge.net/tracker/index.php?func=detail&aid=1976405&group_id=45607&atid=443421);
     Was a false encoding in Option_IntVector
   - builds under 64bit Linux (solved bugs
-    [bug 1927822](http://sourceforge.net/tracker/index.php?func=detail&aid=1927822&group_id=45607&atid=443421),
-    [bug 1928370](http://sourceforge.net/tracker/index.php?func=detail&aid=1928370&group_id=45607&atid=443421),
-    [bug 1930444](http://sourceforge.net/tracker/index.php?func=detail&aid=1930444&group_id=45607&atid=443421),
-    [bug 1931468](http://sourceforge.net/tracker/index.php?func=detail&aid=1931468&group_id=45607&atid=443421),
-    [bug 1932961](http://sourceforge.net/tracker/index.php?func=detail&aid=1932961&group_id=45607&atid=443421),
-    [bug 1933569](http://sourceforge.net/tracker/index.php?func=detail&aid=1933569&group_id=45607&atid=443421),
-    [bug 1934635](http://sourceforge.net/tracker/index.php?func=detail&aid=1934635&group_id=45607&atid=443421);
+    [bug 1927822](https://sourceforge.net/tracker/index.php?func=detail&aid=1927822&group_id=45607&atid=443421),
+    [bug 1928370](https://sourceforge.net/tracker/index.php?func=detail&aid=1928370&group_id=45607&atid=443421),
+    [bug 1930444](https://sourceforge.net/tracker/index.php?func=detail&aid=1930444&group_id=45607&atid=443421),
+    [bug 1931468](https://sourceforge.net/tracker/index.php?func=detail&aid=1931468&group_id=45607&atid=443421),
+    [bug 1932961](https://sourceforge.net/tracker/index.php?func=detail&aid=1932961&group_id=45607&atid=443421),
+    [bug 1933569](https://sourceforge.net/tracker/index.php?func=detail&aid=1933569&group_id=45607&atid=443421),
+    [bug 1934635](https://sourceforge.net/tracker/index.php?func=detail&aid=1934635&group_id=45607&atid=443421);
     thanks to Ronald Nippold for being persistent in supplying the
     build logs
   - encapsulated xerces-attributes; makes value retrieval so much
@@ -41,7 +41,7 @@
     (**--exclude-empty-edges**/**--exclude-empty-lanes**) allow to
     dump only information about edges/lanes which were occupied by
     vehicles.
-  - debugged [bug 1964433 different simulation results for different starting times](http://sourceforge.net/tracker/index.php?func=detail&aid=1964433&group_id=45607&atid=443421);
+  - debugged [bug 1964433 different simulation results for different starting times](https://sourceforge.net/tracker/index.php?func=detail&aid=1964433&group_id=45607&atid=443421);
     The issue was a false computation of WAUT switching and TLS
     offset times when choosing a different simulation begin time
     than 0
@@ -49,11 +49,11 @@
     MSVehicle::isOnRoad
   - removed MSEdge::isSource; was used only once and can be easily
     replaced by comparing the result of MSEdge::getPurpose()
-  - debugged [bug 1932105 second stop on the same edge confuses vehicles](http://sourceforge.net/tracker/index.php?func=detail&aid=1932105&group_id=45607&atid=443421)
-  - debugged [bug 1941846 repeatable crash with sumo r5378](http://sourceforge.net/tracker/index.php?func=detail&aid=1941846&group_id=45607&atid=443421)
-  - debugged [bug 1912547 linux 64 bit compile error for sumo svn 5143](http://sourceforge.net/tracker/index.php?func=detail&aid=1912547&group_id=45607&atid=443421)
-  - debugged [bug 1913655 command line sumo throws unknown exception](http://sourceforge.net/tracker/index.php?func=detail&aid=1913655&group_id=45607&atid=443421)
-  - debugged [bug 1924989 sumo r5186 crashs by pure virtual function call](http://sourceforge.net/tracker/index.php?func=detail&aid=1924989&group_id=45607&atid=443421)
+  - debugged [bug 1932105 second stop on the same edge confuses vehicles](https://sourceforge.net/tracker/index.php?func=detail&aid=1932105&group_id=45607&atid=443421)
+  - debugged [bug 1941846 repeatable crash with sumo r5378](https://sourceforge.net/tracker/index.php?func=detail&aid=1941846&group_id=45607&atid=443421)
+  - debugged [bug 1912547 linux 64 bit compile error for sumo svn 5143](https://sourceforge.net/tracker/index.php?func=detail&aid=1912547&group_id=45607&atid=443421)
+  - debugged [bug 1913655 command line sumo throws unknown exception](https://sourceforge.net/tracker/index.php?func=detail&aid=1913655&group_id=45607&atid=443421)
+  - debugged [bug 1924989 sumo r5186 crashs by pure virtual function call](https://sourceforge.net/tracker/index.php?func=detail&aid=1924989&group_id=45607&atid=443421)
   - begun work on [Specification](../Specification/index.md)
     - all vehicles are emitted at position=0, with speed=0
   - removed usage of NLLoadFilter
@@ -76,21 +76,21 @@
   - Removed opening an additional command line window from the
     release version
   - Title is now set properly
-  - debugged [bug 2021454 Discarding View settings resets them](http://sourceforge.net/tracker/index.php?func=detail&aid=2021454&group_id=45607&atid=443421);
+  - debugged [bug 2021454 Discarding View settings resets them](https://sourceforge.net/tracker/index.php?func=detail&aid=2021454&group_id=45607&atid=443421);
     The editor now uses the settings that were used when it was
     opened as the one to apply when "cancel" is pressed
-  - debugged [bug 2021464 view settings are not saved](http://sourceforge.net/tracker/index.php?func=detail&aid=2021464&group_id=45607&atid=443421);
+  - debugged [bug 2021464 view settings are not saved](https://sourceforge.net/tracker/index.php?func=detail&aid=2021464&group_id=45607&atid=443421);
     The button is now removed, all the interaction will be done via
     the top buttons
-  - debugged [bug 2015792 Save List of selected Items](http://sourceforge.net/tracker/index.php?func=detail&aid=2015792&group_id=45607&atid=443421);
+  - debugged [bug 2015792 Save List of selected Items](https://sourceforge.net/tracker/index.php?func=detail&aid=2015792&group_id=45607&atid=443421);
     The proper extension (mostly ".txt") is now appended if no
     extension is given. Affects saving breakpoints, additional
     weights, tracked parameter, and selections.
-  - [bug 1919509 guisim crashed](http://sourceforge.net/tracker/index.php?func=detail&aid=1919509&group_id=45607&atid=443421)
+  - [bug 1919509 guisim crashed](https://sourceforge.net/tracker/index.php?func=detail&aid=1919509&group_id=45607&atid=443421)
       is invalid, the issue was a buggy opengl driver
 
 - netconvert
-  - debugged [bug 1993928 --keep-edges.input-file does not remove empty nodes](http://sourceforge.net/tracker/index.php?func=detail&aid=1993928&group_id=45607&atid=443421);
+  - debugged [bug 1993928 --keep-edges.input-file does not remove empty nodes](https://sourceforge.net/tracker/index.php?func=detail&aid=1993928&group_id=45607&atid=443421);
     as soon as one edge-removal(keeping) option occures, nodes are
     rechecked whether they contain any further edge. If not, the
     node is removed.
@@ -106,7 +106,7 @@
   - removed "name" attribute from NBEdge; was not written anyway
   - work on SUMO-networks reimport
     (unfinished)
-  - documentation: debugged [bug 1909685 option "omit-corrupt-edges" not recognized](http://sourceforge.net/tracker/index.php?func=detail&aid=1909685&group_id=45607&atid=443421)
+  - documentation: debugged [bug 1909685 option "omit-corrupt-edges" not recognized](https://sourceforge.net/tracker/index.php?func=detail&aid=1909685&group_id=45607&atid=443421)
     (use **--dismiss-loading-errors** instead of
     **--omit-corrupt-edges**)
   - removed usage of NLLoadFilter
@@ -118,7 +118,7 @@
     may start on edges which are shorter than they are, now.
 
 - duarouter
-  - debugged [bug 1981921 duarouter truncates routes](http://sourceforge.net/tracker/index.php?func=detail&aid=1981921&group_id=45607&atid=443421);
+  - debugged [bug 1981921 duarouter truncates routes](https://sourceforge.net/tracker/index.php?func=detail&aid=1981921&group_id=45607&atid=443421);
     Now, **--remove-loops** only prunes the route if the vehicle
     would have to take a turnaround at the begin or end.
   - reworked handling of broken routes; longer routes are not
diff -Nru sumo-1.17.0/docs/web/docs/Z/Changes_from_version_0.9.9_to_version_0.9.10.md sumo-1.18.0/docs/web/docs/Z/Changes_from_version_0.9.9_to_version_0.9.10.md
--- sumo-1.17.0/docs/web/docs/Z/Changes_from_version_0.9.9_to_version_0.9.10.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Z/Changes_from_version_0.9.9_to_version_0.9.10.md	2023-06-28 20:02:17.000000000 +0000
@@ -5,7 +5,7 @@
 **Release date: 16.09.2008**
 
 - Building
-  - debugged [bug 2042630 --enable-traci disables traci?](http://sourceforge.net/tracker/index.php?func=detail&aid=2050900&group_id=45607&atid=443421)
+  - debugged [bug 2042630 --enable-traci disables traci?](https://sourceforge.net/tracker/index.php?func=detail&aid=2050900&group_id=45607&atid=443421)
 
 - All
   - solved [feature request 1725623 comma separated option lists](https://sourceforge.net/tracker/index.php?func=detail&aid=1725623&group_id=45607&atid=443424)
@@ -33,4 +33,4 @@
 
 - duarouter
   - patched behavior on missing files
-  - debugged [bug 2042630 remove-loops breaks application](http://sourceforge.net/tracker/index.php?func=detail&aid=2042630&group_id=45607&atid=443421)
\ No newline at end of file
+  - debugged [bug 2042630 remove-loops breaks application](https://sourceforge.net/tracker/index.php?func=detail&aid=2042630&group_id=45607&atid=443421)
\ No newline at end of file
diff -Nru sumo-1.17.0/docs/web/docs/Z/Changes_in_2015_releases.md sumo-1.18.0/docs/web/docs/Z/Changes_in_2015_releases.md
--- sumo-1.17.0/docs/web/docs/Z/Changes_in_2015_releases.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Z/Changes_in_2015_releases.md	2023-06-28 20:02:17.000000000 +0000
@@ -224,7 +224,7 @@
   - [Right-turn-on-red](https://en.wikipedia.org/wiki/Right_turn_on_red)
     is now supported via the new [node type *traffic_light_right_on_red*](../Networks/PlainXML.md#node_types). #1287
   - Importing *.inpx* [VISSIM networks](../Networks/Import/Vissim.md) is now supported.
-    Thanks to the [AIT](http://www.ait.ac.at/) for their
+    Thanks to the [AIT](https://www.ait.ac.at/) for their
     contribution.
   - The positioning and presence of [internal junctions](../Networks/SUMO_Road_Networks.md#internal_junctions)
     can now be [customized with the new connection attribute `contPos`](../Networks/PlainXML.md#explicitly_setting_which_edge_lane_is_connected_to_which). #2016
@@ -300,8 +300,8 @@
 
 - Documentation
   - Online documentation of
-    [TraCI4J](http://github.com/egueli/TraCI4J) can now be found at
-    [traci4j-javadoc](http://sumo.dlr.de/daily/javadoc/traci4j/)
+    [TraCI4J](https://github.com/egueli/TraCI4J) can now be found at
+    [traci4j-javadoc](https://sumo.dlr.de/daily/javadoc/traci4j/)
   - The section on [Additional netconvert outputs was completely rewritten](../Networks/Further_Outputs.md#further_outputs).
   - Added a [new page on XML Validation](../XMLValidation.md)
   - Added [documentation for the C++ TraCI API client](../TraCI/C++TraCIAPI.md)
@@ -588,7 +588,7 @@
 
 - Scenarios
   - An updated version of the [TAPASCologne scenario](../Data/Scenarios/TAPASCologne.md) can be found
-    on [the sourceforge download page](http://sourceforge.net/projects/sumo/files/traffic_data/scenarios/TAPASCologne).
+    on [the sourceforge download page](https://sourceforge.net/projects/sumo/files/traffic_data/scenarios/TAPASCologne).
     This updates the network to the latest OSM data and
     [netconvert](../netconvert.md) version.
   - An updated version of the [Bologna scenarios](../Data/Scenarios.md#bologna) can be found on
@@ -843,7 +843,7 @@
     delay along with the current visualisation settings. #1625
 
 - netconvert
-  - read heightmaps from GeoTIFFs for instance [SRTM data](http://opendem.info/download_srtm.html) #1495
+  - read heightmaps from GeoTIFFs for instance [SRTM data](https://opendem.info/download_srtm.html) #1495
   - when adding sidewalks via
     [typemap](../SUMO_edge_type_file.md) or **--sidewalks.guess**, permissions on
     all other lanes are now automatically set to disallow
diff -Nru sumo-1.17.0/docs/web/docs/Z/Changes_in_2016_releases.md sumo-1.18.0/docs/web/docs/Z/Changes_in_2016_releases.md
--- sumo-1.17.0/docs/web/docs/Z/Changes_in_2016_releases.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/docs/Z/Changes_in_2016_releases.md	2023-06-28 20:02:17.000000000 +0000
@@ -491,7 +491,7 @@
 
 - Documentation
   - Test coverage analysis can now be found at
-    [\[1\]](http://sumo.dlr.de/daily/lcov/html/).
+    [\[1\]](https://sumo.dlr.de/daily/lcov/html/).
   - Documented [Wireless device detection
     model](../Simulation/Bluetooth.md) which has been available
     since version 0.18.0
diff -Nru sumo-1.17.0/docs/web/.link_check_config.json sumo-1.18.0/docs/web/.link_check_config.json
--- sumo-1.17.0/docs/web/.link_check_config.json	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/.link_check_config.json	2023-06-28 20:02:17.000000000 +0000
@@ -19,7 +19,7 @@
       "pattern": "https://github.com/eclipse/sumo/blob/main/"
     },
     {
-      "pattern": "https://elib.dlr.de/94006/1/Proceeding_SUMO2014_15%2B16May2014_Berlin-Adlershof.pdf"
+      "pattern": "^https://elib.dlr.de/"
     },
     {
       "pattern": "https://doi.org/10.3141/2623-01"
diff -Nru sumo-1.17.0/docs/web/mkdocs.yml sumo-1.18.0/docs/web/mkdocs.yml
--- sumo-1.17.0/docs/web/mkdocs.yml	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/mkdocs.yml	2023-06-28 20:02:17.000000000 +0000
@@ -17,7 +17,7 @@
   - Publications: Publications.md
   - Developer: Developer/index.md
   - ChangeLog: ChangeLog.md
-  - Contact: https://eclipse.org/sumo/contact/
+  - Contact: https://eclipse.dev/sumo/contact/
 
 theme:
   name: mkdocs
@@ -60,8 +60,8 @@
   - codehilite
 
 extra:
-    Version: 1.17.0
-    ReleaseDate: 25.04.2023
+    Version: 1.18.0
+    ReleaseDate: 29.06.2023
 
     AdditionalFile: '[*additional-file*](/docs/sumo.html#format_of_additional_files)'
     AdditionalFiles: '[*additional-files*](/docs/sumo.html#format_of_additional_files)'
@@ -82,4 +82,4 @@
     Outdated: 'This information is outdated.'
     Source: 'https://github.com/eclipse/sumo/blob/main/'
     SUMO: '***<SUMO_HOME>***'
-    SUMOUSERConference: '[SUMO User Conference](https://eclipse.org/sumo/conference)'
+    SUMOUSERConference: '[SUMO User Conference](https://eclipse.dev/sumo/conference)'
diff -Nru sumo-1.17.0/docs/web/README.md sumo-1.18.0/docs/web/README.md
--- sumo-1.17.0/docs/web/README.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/README.md	2023-06-28 20:02:17.000000000 +0000
@@ -25,7 +25,7 @@
 
 On Linux, install **plantuml** via `sudo apt-get install plantuml`.
 
-To run the built-in development server, use:
+On Windows, make sure that `mkdocs` is recognized in the command line by adding its location to the `Path` environment variable (typically something like `C:\Users\[username]\AppData\Roaming\Python\Python39\Scripts`). To run the built-in development server, use:
 ```
 mkdocs serve
 ```
diff -Nru sumo-1.17.0/docs/web/theme/toc.html sumo-1.18.0/docs/web/theme/toc.html
--- sumo-1.17.0/docs/web/theme/toc.html	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/docs/web/theme/toc.html	2023-06-28 20:02:17.000000000 +0000
@@ -25,7 +25,7 @@
     
 
     
-        visit eclipse.org/sumo
+        visit eclipse.dev/sumo
     
 
 
diff -Nru sumo-1.17.0/include/version.h sumo-1.18.0/include/version.h
--- sumo-1.17.0/include/version.h	2023-04-24 22:09:15.000000000 +0000
+++ sumo-1.18.0/include/version.h	2023-06-28 22:09:33.000000000 +0000
@@ -1 +1 @@
-#define VERSION_STRING "v1_17_0+0000-737931d58da"
+#define VERSION_STRING "v1_18_0+0000-03ecfdea036"
diff -Nru sumo-1.17.0/NOTICE.md sumo-1.18.0/NOTICE.md
--- sumo-1.17.0/NOTICE.md	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/NOTICE.md	2023-06-28 20:02:17.000000000 +0000
@@ -2,7 +2,7 @@
 
 This content is produced and maintained by the Eclipse Sumo project.
 
-* Project home: https://eclipse.org/sumo
+* Project home: https://eclipse.dev/sumo
 
 ## Trademarks
 
diff -Nru sumo-1.17.0/src/activitygen/activities/AGActivities.cpp sumo-1.18.0/src/activitygen/activities/AGActivities.cpp
--- sumo-1.17.0/src/activitygen/activities/AGActivities.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/activitygen/activities/AGActivities.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2010-2023 German Aerospace Center (DLR) and others.
 // activitygen module
 // Copyright 2010 TUM (Technische Universitaet Muenchen, http://www.tum.de/)
diff -Nru sumo-1.17.0/src/activitygen/activities/AGActivities.h sumo-1.18.0/src/activitygen/activities/AGActivities.h
--- sumo-1.17.0/src/activitygen/activities/AGActivities.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/activitygen/activities/AGActivities.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // activitygen module
 // Copyright 2010 TUM (Technische Universitaet Muenchen, http://www.tum.de/)
diff -Nru sumo-1.17.0/src/activitygen/activities/AGActivity.cpp sumo-1.18.0/src/activitygen/activities/AGActivity.cpp
--- sumo-1.17.0/src/activitygen/activities/AGActivity.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/activitygen/activities/AGActivity.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // activitygen module
 // Copyright 2010 TUM (Technische Universitaet Muenchen, http://www.tum.de/)
diff -Nru sumo-1.17.0/src/activitygen/activities/AGActivity.h sumo-1.18.0/src/activitygen/activities/AGActivity.h
--- sumo-1.17.0/src/activitygen/activities/AGActivity.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/activitygen/activities/AGActivity.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2010-2023 German Aerospace Center (DLR) and others.
 // activitygen module
 // Copyright 2010 TUM (Technische Universitaet Muenchen, http://www.tum.de/)
diff -Nru sumo-1.17.0/src/activitygen/activities/AGFreeTime.cpp sumo-1.18.0/src/activitygen/activities/AGFreeTime.cpp
--- sumo-1.17.0/src/activitygen/activities/AGFreeTime.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/activitygen/activities/AGFreeTime.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2010-2023 German Aerospace Center (DLR) and others.
 // activitygen module
 // Copyright 2010 TUM (Technische Universitaet Muenchen, http://www.tum.de/)
diff -Nru sumo-1.17.0/src/activitygen/activities/AGFreeTime.h sumo-1.18.0/src/activitygen/activities/AGFreeTime.h
--- sumo-1.17.0/src/activitygen/activities/AGFreeTime.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/activitygen/activities/AGFreeTime.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2010-2023 German Aerospace Center (DLR) and others.
 // activitygen module
 // Copyright 2010 TUM (Technische Universitaet Muenchen, http://www.tum.de/)
diff -Nru sumo-1.17.0/src/activitygen/activities/AGTrip.cpp sumo-1.18.0/src/activitygen/activities/AGTrip.cpp
--- sumo-1.17.0/src/activitygen/activities/AGTrip.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/activitygen/activities/AGTrip.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2010-2023 German Aerospace Center (DLR) and others.
 // activitygen module
 // Copyright 2010 TUM (Technische Universitaet Muenchen, http://www.tum.de/)
diff -Nru sumo-1.17.0/src/activitygen/activities/AGTrip.h sumo-1.18.0/src/activitygen/activities/AGTrip.h
--- sumo-1.17.0/src/activitygen/activities/AGTrip.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/activitygen/activities/AGTrip.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2010-2023 German Aerospace Center (DLR) and others.
 // activitygen module
 // Copyright 2010 TUM (Technische Universitaet Muenchen, http://www.tum.de/)
diff -Nru sumo-1.17.0/src/activitygen/activities/AGWorkAndSchool.cpp sumo-1.18.0/src/activitygen/activities/AGWorkAndSchool.cpp
--- sumo-1.17.0/src/activitygen/activities/AGWorkAndSchool.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/activitygen/activities/AGWorkAndSchool.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // activitygen module
 // Copyright 2010 TUM (Technische Universitaet Muenchen, http://www.tum.de/)
diff -Nru sumo-1.17.0/src/activitygen/activities/AGWorkAndSchool.h sumo-1.18.0/src/activitygen/activities/AGWorkAndSchool.h
--- sumo-1.17.0/src/activitygen/activities/AGWorkAndSchool.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/activitygen/activities/AGWorkAndSchool.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // activitygen module
 // Copyright 2010 TUM (Technische Universitaet Muenchen, http://www.tum.de/)
diff -Nru sumo-1.17.0/src/activitygen/activitygen_main.cpp sumo-1.18.0/src/activitygen/activitygen_main.cpp
--- sumo-1.17.0/src/activitygen/activitygen_main.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/activitygen/activitygen_main.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // activitygen module
 // Copyright 2010 TUM (Technische Universitaet Muenchen, http://www.tum.de/)
@@ -104,7 +104,7 @@
         XMLSubSys::setValidation(oc.getString("xml-validation"), oc.getString("xml-validation.net"), "never");
         MsgHandler::initOutputOptions();
         RandHelper::initRandGlobal();
-        SystemFrame::checkOptions();
+        SystemFrame::checkOptions(oc);
 
         // Load network
         net = new RONet();
diff -Nru sumo-1.17.0/src/activitygen/AGActivityGen.cpp sumo-1.18.0/src/activitygen/AGActivityGen.cpp
--- sumo-1.17.0/src/activitygen/AGActivityGen.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/activitygen/AGActivityGen.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2010-2023 German Aerospace Center (DLR) and others.
 // activitygen module
 // Copyright 2010 TUM (Technische Universitaet Muenchen, http://www.tum.de/)
diff -Nru sumo-1.17.0/src/activitygen/AGActivityGen.h sumo-1.18.0/src/activitygen/AGActivityGen.h
--- sumo-1.17.0/src/activitygen/AGActivityGen.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/activitygen/AGActivityGen.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2010-2023 German Aerospace Center (DLR) and others.
 // activitygen module
 // Copyright 2010 TUM (Technische Universitaet Muenchen, http://www.tum.de/)
diff -Nru sumo-1.17.0/src/activitygen/AGActivityGenHandler.cpp sumo-1.18.0/src/activitygen/AGActivityGenHandler.cpp
--- sumo-1.17.0/src/activitygen/AGActivityGenHandler.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/activitygen/AGActivityGenHandler.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // activitygen module
 // Copyright 2010 TUM (Technische Universitaet Muenchen, http://www.tum.de/)
@@ -166,13 +166,21 @@
         double pop = 0;
         double work = 0;
 
+        std::string eid = attrs.getString(SUMO_ATTR_EDGE);
         if (attrs.hasAttribute(AGEN_ATTR_POPULATION)) {
             pop = attrs.getFloat(AGEN_ATTR_POPULATION);
+            if (std::isnan(pop)) {
+                pop = 0;
+                WRITE_WARNINGF(TL("Invalid % value of edge % is treated as zero."), SUMOXMLDefinitions::Attrs.getString(AGEN_ATTR_POPULATION), eid);
+            }
         }
         if (attrs.hasAttribute(AGEN_ATTR_OUT_WORKPOSITION)) {
             work = attrs.getFloat(AGEN_ATTR_OUT_WORKPOSITION);
+            if (std::isnan(work)) {
+                work = 0;
+                WRITE_WARNINGF(TL("Invalid % value of edge % is treated as zero."), SUMOXMLDefinitions::Attrs.getString(AGEN_ATTR_OUT_WORKPOSITION), eid);
+            }
         }
-        std::string eid = attrs.getString(SUMO_ATTR_EDGE);
         AGStreet* street = dynamic_cast(net->getEdge(eid));
         if (street == nullptr) {
             WRITE_ERRORF(TL("Edge '%' is not known."), eid);
diff -Nru sumo-1.17.0/src/activitygen/AGActivityGenHandler.h sumo-1.18.0/src/activitygen/AGActivityGenHandler.h
--- sumo-1.17.0/src/activitygen/AGActivityGenHandler.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/activitygen/AGActivityGenHandler.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // activitygen module
 // Copyright 2010 TUM (Technische Universitaet Muenchen, http://www.tum.de/)
diff -Nru sumo-1.17.0/src/activitygen/AGActivityTripWriter.cpp sumo-1.18.0/src/activitygen/AGActivityTripWriter.cpp
--- sumo-1.17.0/src/activitygen/AGActivityTripWriter.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/activitygen/AGActivityTripWriter.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // activitygen module
 // Copyright 2010 TUM (Technische Universitaet Muenchen, http://www.tum.de/)
diff -Nru sumo-1.17.0/src/activitygen/AGActivityTripWriter.h sumo-1.18.0/src/activitygen/AGActivityTripWriter.h
--- sumo-1.17.0/src/activitygen/AGActivityTripWriter.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/activitygen/AGActivityTripWriter.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2010-2023 German Aerospace Center (DLR) and others.
 // activitygen module
 // Copyright 2010 TUM (Technische Universitaet Muenchen, http://www.tum.de/)
diff -Nru sumo-1.17.0/src/activitygen/AGFrame.cpp sumo-1.18.0/src/activitygen/AGFrame.cpp
--- sumo-1.17.0/src/activitygen/AGFrame.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/activitygen/AGFrame.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // activitygen module
 // Copyright 2010 TUM (Technische Universitaet Muenchen, http://www.tum.de/)
@@ -65,7 +65,7 @@
 
     // need to do this here to be able to check for network and route input options
     SystemFrame::addReportOptions(oc);
-    RandHelper::insertRandOptions();
+    RandHelper::insertRandOptions(oc);
 
     oc.doRegister("output-file", 'o', new Option_FileName());
     oc.addSynonyme("output-file", "output", true);
diff -Nru sumo-1.17.0/src/activitygen/AGFrame.h sumo-1.18.0/src/activitygen/AGFrame.h
--- sumo-1.17.0/src/activitygen/AGFrame.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/activitygen/AGFrame.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // activitygen module
 // Copyright 2010 TUM (Technische Universitaet Muenchen, http://www.tum.de/)
diff -Nru sumo-1.17.0/src/activitygen/city/AGAdult.cpp sumo-1.18.0/src/activitygen/city/AGAdult.cpp
--- sumo-1.17.0/src/activitygen/city/AGAdult.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/activitygen/city/AGAdult.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2010-2023 German Aerospace Center (DLR) and others.
 // activitygen module
 // Copyright 2010 TUM (Technische Universitaet Muenchen, http://www.tum.de/)
@@ -70,7 +70,9 @@
             work->let();
         }
         work = newWork;
-        work->take(this);
+        if (work != nullptr) {
+            work->take(this);
+        }
     } else {
         if (work != nullptr) {
             // Also sets work = 0 with the call back lostWorkPosition
diff -Nru sumo-1.17.0/src/activitygen/city/AGAdult.h sumo-1.18.0/src/activitygen/city/AGAdult.h
--- sumo-1.17.0/src/activitygen/city/AGAdult.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/activitygen/city/AGAdult.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2010-2023 German Aerospace Center (DLR) and others.
 // activitygen module
 // Copyright 2010 TUM (Technische Universitaet Muenchen, http://www.tum.de/)
diff -Nru sumo-1.17.0/src/activitygen/city/AGBus.cpp sumo-1.18.0/src/activitygen/city/AGBus.cpp
--- sumo-1.17.0/src/activitygen/city/AGBus.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/activitygen/city/AGBus.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // activitygen module
 // Copyright 2010 TUM (Technische Universitaet Muenchen, http://www.tum.de/)
diff -Nru sumo-1.17.0/src/activitygen/city/AGBus.h sumo-1.18.0/src/activitygen/city/AGBus.h
--- sumo-1.17.0/src/activitygen/city/AGBus.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/activitygen/city/AGBus.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // activitygen module
 // Copyright 2010 TUM (Technische Universitaet Muenchen, http://www.tum.de/)
diff -Nru sumo-1.17.0/src/activitygen/city/AGBusLine.cpp sumo-1.18.0/src/activitygen/city/AGBusLine.cpp
--- sumo-1.17.0/src/activitygen/city/AGBusLine.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/activitygen/city/AGBusLine.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // activitygen module
 // Copyright 2010 TUM (Technische Universitaet Muenchen, http://www.tum.de/)
diff -Nru sumo-1.17.0/src/activitygen/city/AGBusLine.h sumo-1.18.0/src/activitygen/city/AGBusLine.h
--- sumo-1.17.0/src/activitygen/city/AGBusLine.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/activitygen/city/AGBusLine.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // activitygen module
 // Copyright 2010 TUM (Technische Universitaet Muenchen, http://www.tum.de/)
diff -Nru sumo-1.17.0/src/activitygen/city/AGCar.cpp sumo-1.18.0/src/activitygen/city/AGCar.cpp
--- sumo-1.17.0/src/activitygen/city/AGCar.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/activitygen/city/AGCar.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2010-2023 German Aerospace Center (DLR) and others.
 // activitygen module
 // Copyright 2010 TUM (Technische Universitaet Muenchen, http://www.tum.de/)
diff -Nru sumo-1.17.0/src/activitygen/city/AGCar.h sumo-1.18.0/src/activitygen/city/AGCar.h
--- sumo-1.17.0/src/activitygen/city/AGCar.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/activitygen/city/AGCar.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2010-2023 German Aerospace Center (DLR) and others.
 // activitygen module
 // Copyright 2010 TUM (Technische Universitaet Muenchen, http://www.tum.de/)
diff -Nru sumo-1.17.0/src/activitygen/city/AGChild.cpp sumo-1.18.0/src/activitygen/city/AGChild.cpp
--- sumo-1.17.0/src/activitygen/city/AGChild.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/activitygen/city/AGChild.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2010-2023 German Aerospace Center (DLR) and others.
 // activitygen module
 // Copyright 2010 TUM (Technische Universitaet Muenchen, http://www.tum.de/)
diff -Nru sumo-1.17.0/src/activitygen/city/AGChild.h sumo-1.18.0/src/activitygen/city/AGChild.h
--- sumo-1.17.0/src/activitygen/city/AGChild.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/activitygen/city/AGChild.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2010-2023 German Aerospace Center (DLR) and others.
 // activitygen module
 // Copyright 2010 TUM (Technische Universitaet Muenchen, http://www.tum.de/)
diff -Nru sumo-1.17.0/src/activitygen/city/AGCity.cpp sumo-1.18.0/src/activitygen/city/AGCity.cpp
--- sumo-1.17.0/src/activitygen/city/AGCity.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/activitygen/city/AGCity.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2010-2023 German Aerospace Center (DLR) and others.
 // activitygen module
 // Copyright 2010 TUM (Technische Universitaet Muenchen, http://www.tum.de/)
@@ -78,7 +78,6 @@
     for (it = streets.begin(); it != streets.end(); ++it) {
         (*it)->setPopulation((*it)->getPopulation() * statData.factorInhabitants);
         (*it)->setWorkplaceNumber((*it)->getWorkplaceNumber() * statData.factorWorkPositions);
-        //it->print();
     }
 
     //completing streets from edges of the network not handled/present in STAT file (no population no work position)
@@ -103,10 +102,8 @@
 AGCity::generateWorkPositions() {
     std::vector::iterator it;
     int workPositionCounter = 0;
-
     try {
         for (it = streets.begin(); it != streets.end(); ++it) {
-            //std::cout << "number of work positions in street: " << it->getWorkplaceNumber() << std::endl;
             for (int i = 0; i < (*it)->getWorkplaceNumber(); ++i) {
                 workPositions.push_back(AGWorkPosition(&statData, **it));
                 ++workPositionCounter;
@@ -140,6 +137,7 @@
     int nbrOutWorkPositions = (int)((double)workPositions.size() * (double)statData.outgoingTraffic / (nbrWorkers - (double)statData.outgoingTraffic));
 
     if (cityGates.empty()) {
+        statData.workPositions = static_cast(workPositions.size());
         return;
     }
 
diff -Nru sumo-1.17.0/src/activitygen/city/AGCity.h sumo-1.18.0/src/activitygen/city/AGCity.h
--- sumo-1.17.0/src/activitygen/city/AGCity.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/activitygen/city/AGCity.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2010-2023 German Aerospace Center (DLR) and others.
 // activitygen module
 // Copyright 2010 TUM (Technische Universitaet Muenchen, http://www.tum.de/)
diff -Nru sumo-1.17.0/src/activitygen/city/AGDataAndStatistics.cpp sumo-1.18.0/src/activitygen/city/AGDataAndStatistics.cpp
--- sumo-1.17.0/src/activitygen/city/AGDataAndStatistics.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/activitygen/city/AGDataAndStatistics.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // activitygen module
 // Copyright 2010 TUM (Technische Universitaet Muenchen, http://www.tum.de/)
diff -Nru sumo-1.17.0/src/activitygen/city/AGDataAndStatistics.h sumo-1.18.0/src/activitygen/city/AGDataAndStatistics.h
--- sumo-1.17.0/src/activitygen/city/AGDataAndStatistics.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/activitygen/city/AGDataAndStatistics.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // activitygen module
 // Copyright 2010 TUM (Technische Universitaet Muenchen, http://www.tum.de/)
diff -Nru sumo-1.17.0/src/activitygen/city/AGHousehold.cpp sumo-1.18.0/src/activitygen/city/AGHousehold.cpp
--- sumo-1.17.0/src/activitygen/city/AGHousehold.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/activitygen/city/AGHousehold.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // activitygen module
 // Copyright 2010 TUM (Technische Universitaet Muenchen, http://www.tum.de/)
diff -Nru sumo-1.17.0/src/activitygen/city/AGHousehold.h sumo-1.18.0/src/activitygen/city/AGHousehold.h
--- sumo-1.17.0/src/activitygen/city/AGHousehold.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/activitygen/city/AGHousehold.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2010-2023 German Aerospace Center (DLR) and others.
 // activitygen module
 // Copyright 2010 TUM (Technische Universitaet Muenchen, http://www.tum.de/)
diff -Nru sumo-1.17.0/src/activitygen/city/AGPerson.cpp sumo-1.18.0/src/activitygen/city/AGPerson.cpp
--- sumo-1.17.0/src/activitygen/city/AGPerson.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/activitygen/city/AGPerson.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2010-2023 German Aerospace Center (DLR) and others.
 // activitygen module
 // Copyright 2010 TUM (Technische Universitaet Muenchen, http://www.tum.de/)
diff -Nru sumo-1.17.0/src/activitygen/city/AGPerson.h sumo-1.18.0/src/activitygen/city/AGPerson.h
--- sumo-1.17.0/src/activitygen/city/AGPerson.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/activitygen/city/AGPerson.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // activitygen module
 // Copyright 2010 TUM (Technische Universitaet Muenchen, http://www.tum.de/)
diff -Nru sumo-1.17.0/src/activitygen/city/AGPosition.cpp sumo-1.18.0/src/activitygen/city/AGPosition.cpp
--- sumo-1.17.0/src/activitygen/city/AGPosition.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/activitygen/city/AGPosition.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // activitygen module
 // Copyright 2010 TUM (Technische Universitaet Muenchen, http://www.tum.de/)
diff -Nru sumo-1.17.0/src/activitygen/city/AGPosition.h sumo-1.18.0/src/activitygen/city/AGPosition.h
--- sumo-1.17.0/src/activitygen/city/AGPosition.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/activitygen/city/AGPosition.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // activitygen module
 // Copyright 2010 TUM (Technische Universitaet Muenchen, http://www.tum.de/)
diff -Nru sumo-1.17.0/src/activitygen/city/AGSchool.cpp sumo-1.18.0/src/activitygen/city/AGSchool.cpp
--- sumo-1.17.0/src/activitygen/city/AGSchool.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/activitygen/city/AGSchool.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // activitygen module
 // Copyright 2010 TUM (Technische Universitaet Muenchen, http://www.tum.de/)
diff -Nru sumo-1.17.0/src/activitygen/city/AGSchool.h sumo-1.18.0/src/activitygen/city/AGSchool.h
--- sumo-1.17.0/src/activitygen/city/AGSchool.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/activitygen/city/AGSchool.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // activitygen module
 // Copyright 2010 TUM (Technische Universitaet Muenchen, http://www.tum.de/)
diff -Nru sumo-1.17.0/src/activitygen/city/AGStreet.cpp sumo-1.18.0/src/activitygen/city/AGStreet.cpp
--- sumo-1.17.0/src/activitygen/city/AGStreet.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/activitygen/city/AGStreet.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2010-2023 German Aerospace Center (DLR) and others.
 // activitygen module
 // Copyright 2010 TUM (Technische Universitaet Muenchen, http://www.tum.de/)
diff -Nru sumo-1.17.0/src/activitygen/city/AGStreet.h sumo-1.18.0/src/activitygen/city/AGStreet.h
--- sumo-1.17.0/src/activitygen/city/AGStreet.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/activitygen/city/AGStreet.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2010-2023 German Aerospace Center (DLR) and others.
 // activitygen module
 // Copyright 2010 TUM (Technische Universitaet Muenchen, http://www.tum.de/)
diff -Nru sumo-1.17.0/src/activitygen/city/AGTime.cpp sumo-1.18.0/src/activitygen/city/AGTime.cpp
--- sumo-1.17.0/src/activitygen/city/AGTime.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/activitygen/city/AGTime.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // activitygen module
 // Copyright 2010 TUM (Technische Universitaet Muenchen, http://www.tum.de/)
diff -Nru sumo-1.17.0/src/activitygen/city/AGTime.h sumo-1.18.0/src/activitygen/city/AGTime.h
--- sumo-1.17.0/src/activitygen/city/AGTime.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/activitygen/city/AGTime.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // activitygen module
 // Copyright 2010 TUM (Technische Universitaet Muenchen, http://www.tum.de/)
diff -Nru sumo-1.17.0/src/activitygen/city/AGWorkPosition.cpp sumo-1.18.0/src/activitygen/city/AGWorkPosition.cpp
--- sumo-1.17.0/src/activitygen/city/AGWorkPosition.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/activitygen/city/AGWorkPosition.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // activitygen module
 // Copyright 2010 TUM (Technische Universitaet Muenchen, http://www.tum.de/)
diff -Nru sumo-1.17.0/src/activitygen/city/AGWorkPosition.h sumo-1.18.0/src/activitygen/city/AGWorkPosition.h
--- sumo-1.17.0/src/activitygen/city/AGWorkPosition.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/activitygen/city/AGWorkPosition.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2010-2023 German Aerospace Center (DLR) and others.
 // activitygen module
 // Copyright 2010 TUM (Technische Universitaet Muenchen, http://www.tum.de/)
diff -Nru sumo-1.17.0/src/config.h.cmake sumo-1.18.0/src/config.h.cmake
--- sumo-1.17.0/src/config.h.cmake	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/config.h.cmake	2023-06-28 20:02:17.000000000 +0000
@@ -204,7 +204,7 @@
 //#define HAVE_VERSION_H
 #ifndef HAVE_VERSION_H
     /* Define if auto-generated version.h is unavailable. */
-    #define VERSION_STRING "1.17.0"
+    #define VERSION_STRING "1.18.0"
 #endif
 
 /* defines the epsilon to use on general floating point comparison */
diff -Nru sumo-1.17.0/src/dfrouter/dfrouter_main.cpp sumo-1.18.0/src/dfrouter/dfrouter_main.cpp
--- sumo-1.17.0/src/dfrouter/dfrouter_main.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/dfrouter/dfrouter_main.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -264,7 +264,7 @@
             SystemFrame::close();
             return 0;
         }
-        SystemFrame::checkOptions();
+        SystemFrame::checkOptions(oc);
         XMLSubSys::setValidation(oc.getString("xml-validation"), oc.getString("xml-validation.net"), "never");
         MsgHandler::initOutputOptions();
         if (!RODFFrame::checkOptions()) {
diff -Nru sumo-1.17.0/src/dfrouter/RODFDetector.cpp sumo-1.18.0/src/dfrouter/RODFDetector.cpp
--- sumo-1.17.0/src/dfrouter/RODFDetector.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/dfrouter/RODFDetector.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2006-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/dfrouter/RODFDetectorFlow.cpp sumo-1.18.0/src/dfrouter/RODFDetectorFlow.cpp
--- sumo-1.17.0/src/dfrouter/RODFDetectorFlow.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/dfrouter/RODFDetectorFlow.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2006-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/dfrouter/RODFDetectorFlow.h sumo-1.18.0/src/dfrouter/RODFDetectorFlow.h
--- sumo-1.17.0/src/dfrouter/RODFDetectorFlow.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/dfrouter/RODFDetectorFlow.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/dfrouter/RODFDetector.h sumo-1.18.0/src/dfrouter/RODFDetector.h
--- sumo-1.17.0/src/dfrouter/RODFDetector.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/dfrouter/RODFDetector.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/dfrouter/RODFDetectorHandler.cpp sumo-1.18.0/src/dfrouter/RODFDetectorHandler.cpp
--- sumo-1.17.0/src/dfrouter/RODFDetectorHandler.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/dfrouter/RODFDetectorHandler.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/dfrouter/RODFDetectorHandler.h sumo-1.18.0/src/dfrouter/RODFDetectorHandler.h
--- sumo-1.17.0/src/dfrouter/RODFDetectorHandler.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/dfrouter/RODFDetectorHandler.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/dfrouter/RODFDetFlowLoader.cpp sumo-1.18.0/src/dfrouter/RODFDetFlowLoader.cpp
--- sumo-1.17.0/src/dfrouter/RODFDetFlowLoader.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/dfrouter/RODFDetFlowLoader.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/dfrouter/RODFDetFlowLoader.h sumo-1.18.0/src/dfrouter/RODFDetFlowLoader.h
--- sumo-1.17.0/src/dfrouter/RODFDetFlowLoader.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/dfrouter/RODFDetFlowLoader.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/dfrouter/RODFEdgeBuilder.cpp sumo-1.18.0/src/dfrouter/RODFEdgeBuilder.cpp
--- sumo-1.17.0/src/dfrouter/RODFEdgeBuilder.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/dfrouter/RODFEdgeBuilder.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2006-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/dfrouter/RODFEdgeBuilder.h sumo-1.18.0/src/dfrouter/RODFEdgeBuilder.h
--- sumo-1.17.0/src/dfrouter/RODFEdgeBuilder.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/dfrouter/RODFEdgeBuilder.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2006-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/dfrouter/RODFEdge.cpp sumo-1.18.0/src/dfrouter/RODFEdge.cpp
--- sumo-1.17.0/src/dfrouter/RODFEdge.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/dfrouter/RODFEdge.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2006-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/dfrouter/RODFEdge.h sumo-1.18.0/src/dfrouter/RODFEdge.h
--- sumo-1.17.0/src/dfrouter/RODFEdge.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/dfrouter/RODFEdge.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2006-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/dfrouter/RODFFrame.cpp sumo-1.18.0/src/dfrouter/RODFFrame.cpp
--- sumo-1.17.0/src/dfrouter/RODFFrame.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/dfrouter/RODFFrame.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2006-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -245,7 +245,7 @@
     oc.doRegister("no-step-log", new Option_Bool(false));
     oc.addDescription("no-step-log", "Report", TL("Disable console output of route parsing step"));
 
-    RandHelper::insertRandOptions();
+    RandHelper::insertRandOptions(oc);
 }
 
 
diff -Nru sumo-1.17.0/src/dfrouter/RODFFrame.h sumo-1.18.0/src/dfrouter/RODFFrame.h
--- sumo-1.17.0/src/dfrouter/RODFFrame.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/dfrouter/RODFFrame.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/dfrouter/RODFNet.cpp sumo-1.18.0/src/dfrouter/RODFNet.cpp
--- sumo-1.17.0/src/dfrouter/RODFNet.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/dfrouter/RODFNet.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/dfrouter/RODFNet.h sumo-1.18.0/src/dfrouter/RODFNet.h
--- sumo-1.17.0/src/dfrouter/RODFNet.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/dfrouter/RODFNet.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/dfrouter/RODFRouteCont.cpp sumo-1.18.0/src/dfrouter/RODFRouteCont.cpp
--- sumo-1.17.0/src/dfrouter/RODFRouteCont.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/dfrouter/RODFRouteCont.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/dfrouter/RODFRouteCont.h sumo-1.18.0/src/dfrouter/RODFRouteCont.h
--- sumo-1.17.0/src/dfrouter/RODFRouteCont.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/dfrouter/RODFRouteCont.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/dfrouter/RODFRouteDesc.h sumo-1.18.0/src/dfrouter/RODFRouteDesc.h
--- sumo-1.17.0/src/dfrouter/RODFRouteDesc.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/dfrouter/RODFRouteDesc.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/duarouter/duarouter_main.cpp sumo-1.18.0/src/duarouter/duarouter_main.cpp
--- sumo-1.17.0/src/duarouter/duarouter_main.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/duarouter/duarouter_main.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -248,7 +248,7 @@
             SystemFrame::close();
             return 0;
         }
-        SystemFrame::checkOptions();
+        SystemFrame::checkOptions(oc);
         XMLSubSys::setValidation(oc.getString("xml-validation"), oc.getString("xml-validation.net"), oc.getString("xml-validation.routes"));
 #ifdef HAVE_FOX
         if (oc.getInt("routing-threads") > 1) {
diff -Nru sumo-1.17.0/src/duarouter/RODUAEdgeBuilder.cpp sumo-1.18.0/src/duarouter/RODUAEdgeBuilder.cpp
--- sumo-1.17.0/src/duarouter/RODUAEdgeBuilder.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/duarouter/RODUAEdgeBuilder.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2004-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/duarouter/RODUAEdgeBuilder.h sumo-1.18.0/src/duarouter/RODUAEdgeBuilder.h
--- sumo-1.17.0/src/duarouter/RODUAEdgeBuilder.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/duarouter/RODUAEdgeBuilder.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2004-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/duarouter/RODUAFrame.cpp sumo-1.18.0/src/duarouter/RODUAFrame.cpp
--- sumo-1.17.0/src/duarouter/RODUAFrame.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/duarouter/RODUAFrame.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -57,7 +57,7 @@
     addImportOptions();
     addDUAOptions();
     // add rand options
-    RandHelper::insertRandOptions();
+    RandHelper::insertRandOptions(oc);
 }
 
 
diff -Nru sumo-1.17.0/src/duarouter/RODUAFrame.h sumo-1.18.0/src/duarouter/RODUAFrame.h
--- sumo-1.17.0/src/duarouter/RODUAFrame.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/duarouter/RODUAFrame.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/fmi/fmi2Functions.c sumo-1.18.0/src/fmi/fmi2Functions.c
--- sumo-1.17.0/src/fmi/fmi2Functions.c	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/fmi/fmi2Functions.c	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2020-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/fmi/libsumocpp2c.cpp sumo-1.18.0/src/fmi/libsumocpp2c.cpp
--- sumo-1.17.0/src/fmi/libsumocpp2c.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/fmi/libsumocpp2c.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2020-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/fmi/libsumocpp2c.h sumo-1.18.0/src/fmi/libsumocpp2c.h
--- sumo-1.17.0/src/fmi/libsumocpp2c.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/fmi/libsumocpp2c.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2020-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/fmi/sumo2fmi_bridge.c sumo-1.18.0/src/fmi/sumo2fmi_bridge.c
--- sumo-1.17.0/src/fmi/sumo2fmi_bridge.c	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/fmi/sumo2fmi_bridge.c	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2020-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/fmi/sumo2fmi_bridge.h sumo-1.18.0/src/fmi/sumo2fmi_bridge.h
--- sumo-1.17.0/src/fmi/sumo2fmi_bridge.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/fmi/sumo2fmi_bridge.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2020-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/foreign/PHEMlight/cpp/CEP.cpp sumo-1.18.0/src/foreign/PHEMlight/cpp/CEP.cpp
--- sumo-1.17.0/src/foreign/PHEMlight/cpp/CEP.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/foreign/PHEMlight/cpp/CEP.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 // PHEMlight module
 // Copyright (C) 2016-2017 Technische Universitaet Graz, https://www.tugraz.at/
diff -Nru sumo-1.17.0/src/foreign/PHEMlight/cpp/CEP.h sumo-1.18.0/src/foreign/PHEMlight/cpp/CEP.h
--- sumo-1.17.0/src/foreign/PHEMlight/cpp/CEP.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/foreign/PHEMlight/cpp/CEP.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 // PHEMlight module
 // Copyright (C) 2016-2017 Technische Universitaet Graz, https://www.tugraz.at/
diff -Nru sumo-1.17.0/src/foreign/PHEMlight/cpp/CEPHandler.cpp sumo-1.18.0/src/foreign/PHEMlight/cpp/CEPHandler.cpp
--- sumo-1.17.0/src/foreign/PHEMlight/cpp/CEPHandler.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/foreign/PHEMlight/cpp/CEPHandler.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 // PHEMlight module
 // Copyright 2016 Technische Universitaet Graz, https://www.tugraz.at/
diff -Nru sumo-1.17.0/src/foreign/PHEMlight/cpp/CEPHandler.h sumo-1.18.0/src/foreign/PHEMlight/cpp/CEPHandler.h
--- sumo-1.17.0/src/foreign/PHEMlight/cpp/CEPHandler.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/foreign/PHEMlight/cpp/CEPHandler.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 // PHEMlight module
 // Copyright 2016 Technische Universitaet Graz, https://www.tugraz.at/
diff -Nru sumo-1.17.0/src/foreign/PHEMlight/cpp/Constants.cpp sumo-1.18.0/src/foreign/PHEMlight/cpp/Constants.cpp
--- sumo-1.17.0/src/foreign/PHEMlight/cpp/Constants.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/foreign/PHEMlight/cpp/Constants.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 // PHEMlight module
 // Copyright (C) 2016-2017 Technische Universitaet Graz, https://www.tugraz.at/
diff -Nru sumo-1.17.0/src/foreign/PHEMlight/cpp/Constants.h sumo-1.18.0/src/foreign/PHEMlight/cpp/Constants.h
--- sumo-1.17.0/src/foreign/PHEMlight/cpp/Constants.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/foreign/PHEMlight/cpp/Constants.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 // PHEMlight module
 // Copyright (C) 2016-2017 Technische Universitaet Graz, https://www.tugraz.at/
diff -Nru sumo-1.17.0/src/foreign/PHEMlight/cpp/Helpers.cpp sumo-1.18.0/src/foreign/PHEMlight/cpp/Helpers.cpp
--- sumo-1.17.0/src/foreign/PHEMlight/cpp/Helpers.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/foreign/PHEMlight/cpp/Helpers.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 // PHEMlight module
 // Copyright 2016 Technische Universitaet Graz, https://www.tugraz.at/
diff -Nru sumo-1.17.0/src/foreign/PHEMlight/cpp/Helpers.h sumo-1.18.0/src/foreign/PHEMlight/cpp/Helpers.h
--- sumo-1.17.0/src/foreign/PHEMlight/cpp/Helpers.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/foreign/PHEMlight/cpp/Helpers.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 // PHEMlight module
 // Copyright 2016 Technische Universitaet Graz, https://www.tugraz.at/
diff -Nru sumo-1.17.0/src/foreign/PHEMlight/V5/cpp/CEP.cpp sumo-1.18.0/src/foreign/PHEMlight/V5/cpp/CEP.cpp
--- sumo-1.17.0/src/foreign/PHEMlight/V5/cpp/CEP.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/foreign/PHEMlight/V5/cpp/CEP.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 // PHEMlight module
 // Copyright (C) 2016-2023 Technische Universitaet Graz, https://www.tugraz.at/
diff -Nru sumo-1.17.0/src/foreign/PHEMlight/V5/cpp/CEP.h sumo-1.18.0/src/foreign/PHEMlight/V5/cpp/CEP.h
--- sumo-1.17.0/src/foreign/PHEMlight/V5/cpp/CEP.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/foreign/PHEMlight/V5/cpp/CEP.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 // PHEMlight module
 // Copyright (C) 2016-2023 Technische Universitaet Graz, https://www.tugraz.at/
diff -Nru sumo-1.17.0/src/foreign/PHEMlight/V5/cpp/CEPHandler.cpp sumo-1.18.0/src/foreign/PHEMlight/V5/cpp/CEPHandler.cpp
--- sumo-1.17.0/src/foreign/PHEMlight/V5/cpp/CEPHandler.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/foreign/PHEMlight/V5/cpp/CEPHandler.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 // PHEMlight module
 // Copyright (C) 2016-2023 Technische Universitaet Graz, https://www.tugraz.at/
diff -Nru sumo-1.17.0/src/foreign/PHEMlight/V5/cpp/CEPHandler.h sumo-1.18.0/src/foreign/PHEMlight/V5/cpp/CEPHandler.h
--- sumo-1.17.0/src/foreign/PHEMlight/V5/cpp/CEPHandler.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/foreign/PHEMlight/V5/cpp/CEPHandler.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 // PHEMlight module
 // Copyright (C) 2016-2023 Technische Universitaet Graz, https://www.tugraz.at/
diff -Nru sumo-1.17.0/src/foreign/PHEMlight/V5/cpp/Constants.cpp sumo-1.18.0/src/foreign/PHEMlight/V5/cpp/Constants.cpp
--- sumo-1.17.0/src/foreign/PHEMlight/V5/cpp/Constants.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/foreign/PHEMlight/V5/cpp/Constants.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 // PHEMlight module
 // Copyright (C) 2016-2023 Technische Universitaet Graz, https://www.tugraz.at/
diff -Nru sumo-1.17.0/src/foreign/PHEMlight/V5/cpp/Constants.h sumo-1.18.0/src/foreign/PHEMlight/V5/cpp/Constants.h
--- sumo-1.17.0/src/foreign/PHEMlight/V5/cpp/Constants.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/foreign/PHEMlight/V5/cpp/Constants.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 // PHEMlight module
 // Copyright (C) 2016-2023 Technische Universitaet Graz, https://www.tugraz.at/
diff -Nru sumo-1.17.0/src/foreign/PHEMlight/V5/cpp/Correction.cpp sumo-1.18.0/src/foreign/PHEMlight/V5/cpp/Correction.cpp
--- sumo-1.17.0/src/foreign/PHEMlight/V5/cpp/Correction.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/foreign/PHEMlight/V5/cpp/Correction.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 // PHEMlight module
 // Copyright (C) 2016-2023 Technische Universitaet Graz, https://www.tugraz.at/
diff -Nru sumo-1.17.0/src/foreign/PHEMlight/V5/cpp/Correction.h sumo-1.18.0/src/foreign/PHEMlight/V5/cpp/Correction.h
--- sumo-1.17.0/src/foreign/PHEMlight/V5/cpp/Correction.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/foreign/PHEMlight/V5/cpp/Correction.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 // PHEMlight module
 // Copyright (C) 2016-2023 Technische Universitaet Graz, https://www.tugraz.at/
diff -Nru sumo-1.17.0/src/foreign/PHEMlight/V5/cpp/Helpers.cpp sumo-1.18.0/src/foreign/PHEMlight/V5/cpp/Helpers.cpp
--- sumo-1.17.0/src/foreign/PHEMlight/V5/cpp/Helpers.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/foreign/PHEMlight/V5/cpp/Helpers.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 // PHEMlight module
 // Copyright (C) 2016-2023 Technische Universitaet Graz, https://www.tugraz.at/
diff -Nru sumo-1.17.0/src/foreign/PHEMlight/V5/cpp/Helpers.h sumo-1.18.0/src/foreign/PHEMlight/V5/cpp/Helpers.h
--- sumo-1.17.0/src/foreign/PHEMlight/V5/cpp/Helpers.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/foreign/PHEMlight/V5/cpp/Helpers.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 // PHEMlight module
 // Copyright (C) 2016-2023 Technische Universitaet Graz, https://www.tugraz.at/
diff -Nru sumo-1.17.0/src/foreign/rtree/LayeredRTree.h sumo-1.18.0/src/foreign/rtree/LayeredRTree.h
--- sumo-1.17.0/src/foreign/rtree/LayeredRTree.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/foreign/rtree/LayeredRTree.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/foreign/rtree/SUMORTree.h sumo-1.18.0/src/foreign/rtree/SUMORTree.h
--- sumo-1.17.0/src/foreign/rtree/SUMORTree.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/foreign/rtree/SUMORTree.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/gui/dialogs/GUIDialog_AboutSUMO.cpp sumo-1.18.0/src/gui/dialogs/GUIDialog_AboutSUMO.cpp
--- sumo-1.17.0/src/gui/dialogs/GUIDialog_AboutSUMO.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/gui/dialogs/GUIDialog_AboutSUMO.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -61,7 +61,7 @@
     (new MFXLinkLabel(this, "SPDX-License-Identifier: EPL-2.0", nullptr, GUIDesignLabelAboutInfo))->setTipText("https://www.eclipse.org/legal/epl-v20.html");
 
     // link to homepage
-    (new MFXLinkLabel(this, "https://www.eclipse.org/sumo", nullptr, GUIDesignLabel(JUSTIFY_NORMAL)))->setTipText("https://www.eclipse.org/sumo");
+    (new MFXLinkLabel(this, "https://www.eclipse.dev/sumo", nullptr, GUIDesignLabel(JUSTIFY_NORMAL)))->setTipText("https://www.eclipse.dev/sumo");
 
     // centered ok-button
     FXHorizontalFrame* buttonFrame = new FXHorizontalFrame(this, GUIDesignHorizontalFrame);
diff -Nru sumo-1.17.0/src/gui/dialogs/GUIDialog_AboutSUMO.h sumo-1.18.0/src/gui/dialogs/GUIDialog_AboutSUMO.h
--- sumo-1.17.0/src/gui/dialogs/GUIDialog_AboutSUMO.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/gui/dialogs/GUIDialog_AboutSUMO.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/gui/dialogs/GUIDialog_AppSettings.cpp sumo-1.18.0/src/gui/dialogs/GUIDialog_AppSettings.cpp
--- sumo-1.17.0/src/gui/dialogs/GUIDialog_AppSettings.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/gui/dialogs/GUIDialog_AppSettings.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/gui/dialogs/GUIDialog_AppSettings.h sumo-1.18.0/src/gui/dialogs/GUIDialog_AppSettings.h
--- sumo-1.17.0/src/gui/dialogs/GUIDialog_AppSettings.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/gui/dialogs/GUIDialog_AppSettings.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/gui/dialogs/GUIDialog_Breakpoints.cpp sumo-1.18.0/src/gui/dialogs/GUIDialog_Breakpoints.cpp
--- sumo-1.17.0/src/gui/dialogs/GUIDialog_Breakpoints.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/gui/dialogs/GUIDialog_Breakpoints.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -65,10 +65,10 @@
 // method definitions
 // ===========================================================================
 
-GUIDialog_Breakpoints::GUIDialog_Breakpoints(GUIApplicationWindow* parent, std::vector& breakpoints, FXMutex& breakpointLock) :
+GUIDialog_Breakpoints::GUIDialog_Breakpoints(GUIApplicationWindow* parent, std::vector& breakpoints, FXMutex& breakpointLock, SUMOTime simBegin) :
     FXMainWindow(parent->getApp(), TL("Breakpoints Editor"), GUIIconSubSys::getIcon(GUIIcon::APP_BREAKPOINTS), nullptr, GUIDesignChooserDialog),
     GUIPersistentWindowPos(this, "DIALOG_BREAKPOINTS", true, 20, 40, 300, 350),
-    myParent(parent), myBreakpoints(&breakpoints), myBreakpointLock(&breakpointLock) {
+    myParent(parent), myBreakpoints(&breakpoints), myBreakpointLock(&breakpointLock), mySimBegin(simBegin) {
     // build main Frame
     FXHorizontalFrame* hbox = new FXHorizontalFrame(this, GUIDesignAuxiliarFrame);
     // build the table
@@ -223,7 +223,7 @@
         if (!empty) {
             t = string2time(value);
             // round down to nearest reachable time step
-            t -= t % DELTA_T;
+            t -= (t - mySimBegin) % DELTA_T;
         }
         if (i->row == (int)myBreakpoints->size()) {
             if (!empty) {
diff -Nru sumo-1.17.0/src/gui/dialogs/GUIDialog_Breakpoints.h sumo-1.18.0/src/gui/dialogs/GUIDialog_Breakpoints.h
--- sumo-1.17.0/src/gui/dialogs/GUIDialog_Breakpoints.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/gui/dialogs/GUIDialog_Breakpoints.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -46,7 +46,7 @@
     /** @brief Constructor
      * @param[in] parent The parent window
      */
-    GUIDialog_Breakpoints(GUIApplicationWindow* parent, std::vector& breakpoints, FXMutex& breakpointLock);
+    GUIDialog_Breakpoints(GUIApplicationWindow* parent, std::vector& breakpoints, FXMutex& breakpointLock, SUMOTime simBegin);
 
     /// @brief Destructor
     ~GUIDialog_Breakpoints();
@@ -102,4 +102,6 @@
 
     /// @brief Lock for modifying the list of breakpoints
     FXMutex* myBreakpointLock;
+
+    SUMOTime mySimBegin;
 };
diff -Nru sumo-1.17.0/src/gui/dialogs/GUIDialog_Feedback.cpp sumo-1.18.0/src/gui/dialogs/GUIDialog_Feedback.cpp
--- sumo-1.17.0/src/gui/dialogs/GUIDialog_Feedback.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/gui/dialogs/GUIDialog_Feedback.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/gui/dialogs/GUIDialog_Feedback.h sumo-1.18.0/src/gui/dialogs/GUIDialog_Feedback.h
--- sumo-1.17.0/src/gui/dialogs/GUIDialog_Feedback.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/gui/dialogs/GUIDialog_Feedback.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/gui/dialogs/GUIDialog_GLObjChooser.cpp sumo-1.18.0/src/gui/dialogs/GUIDialog_GLObjChooser.cpp
--- sumo-1.17.0/src/gui/dialogs/GUIDialog_GLObjChooser.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/gui/dialogs/GUIDialog_GLObjChooser.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/gui/dialogs/GUIDialog_GLObjChooser.h sumo-1.18.0/src/gui/dialogs/GUIDialog_GLObjChooser.h
--- sumo-1.17.0/src/gui/dialogs/GUIDialog_GLObjChooser.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/gui/dialogs/GUIDialog_GLObjChooser.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/gui/dialogs/GUIDialog_HallOfFame.cpp sumo-1.18.0/src/gui/dialogs/GUIDialog_HallOfFame.cpp
--- sumo-1.17.0/src/gui/dialogs/GUIDialog_HallOfFame.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/gui/dialogs/GUIDialog_HallOfFame.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -43,13 +43,13 @@
     // main text
     FXVerticalFrame* descriptionFrame = new FXVerticalFrame(mainInfoFrame, GUIDesignLabelAboutInfo);
     myHeadlineFont = new FXFont(getApp(), "Arial", 12, FXFont::Bold);
-    (new FXLabel(descriptionFrame, "SUMO User Conference 2022 - Hall of Fame", nullptr, GUIDesignLabelAboutInfo))->setFont(myHeadlineFont);
+    (new FXLabel(descriptionFrame, "SUMO User Conference 2023 - Hall of Fame", nullptr, GUIDesignLabelAboutInfo))->setFont(myHeadlineFont);
     new FXLabel(descriptionFrame, "", GUIIconSubSys::getIcon(GUIIcon::HALL_OF_FAME), GUIDesignLabelIcon);
-    new FXLabel(descriptionFrame, "SUMO guru of the year: Dennis Harmann", nullptr, GUIDesignLabelAboutInfo);
-    new FXLabel(descriptionFrame, "Voted best presentation: Vijay Jaisankar (Simulation of traffic scenarios using SUMO)", nullptr, GUIDesignLabelAboutInfo);
+    new FXLabel(descriptionFrame, "Voted best presentation:\nComparing Measured Driver Behavior Distributions to Results from Car-Following Models using SUMO and Real-World Vehicle Trajectories from Radar\n(Maxwell Schrader, Mahdi Al Abdraboh and Joshua Bittle)\n", nullptr, GUIDesignLabelAboutInfo);
+    new FXLabel(descriptionFrame, "Voted best poster:\nOpen-Source Framework for Modeling Emission Concentrations in Urban Areas\n(Mario Ilic, Seyed M. Saghaeiannejad, Sasan Amini and Klaus Bogenberger)\n", nullptr, GUIDesignLabelAboutInfo);
 
     // link to conference website
-    (new MFXLinkLabel(this, "Visit conference website", nullptr, GUIDesignLabel(JUSTIFY_NORMAL)))->setTipText("https://www.eclipse.org/sumo/conference");
+    (new MFXLinkLabel(this, "Visit conference website", nullptr, GUIDesignLabel(JUSTIFY_NORMAL)))->setTipText("https://www.eclipse.dev/sumo/conference");
 
     // centered ok-button
     FXHorizontalFrame* buttonFrame = new FXHorizontalFrame(this, GUIDesignHorizontalFrame);
diff -Nru sumo-1.17.0/src/gui/dialogs/GUIDialog_HallOfFame.h sumo-1.18.0/src/gui/dialogs/GUIDialog_HallOfFame.h
--- sumo-1.17.0/src/gui/dialogs/GUIDialog_HallOfFame.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/gui/dialogs/GUIDialog_HallOfFame.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/gui/GUIApplicationWindow.cpp sumo-1.18.0/src/gui/GUIApplicationWindow.cpp
--- sumo-1.17.0/src/gui/GUIApplicationWindow.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/gui/GUIApplicationWindow.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -898,7 +898,7 @@
 long
 GUIApplicationWindow::onCmdEditBreakpoints(FXObject*, FXSelector, void*) {
     if (myBreakpointDialog == nullptr) {
-        myBreakpointDialog = new GUIDialog_Breakpoints(this, myRunThread->getBreakpoints(), myRunThread->getBreakpointLock());
+        myBreakpointDialog = new GUIDialog_Breakpoints(this, myRunThread->getBreakpoints(), myRunThread->getBreakpointLock(), myRunThread->getSimBegin());
     } else {
         myBreakpointDialog->restore();
         myBreakpointDialog->setFocus();
@@ -1162,15 +1162,19 @@
 
 
 long
-GUIApplicationWindow::onCmdReload(FXObject*, FXSelector, void*) {
-    if (!myAmLoading && TraCIServer::getInstance() == nullptr) {
+GUIApplicationWindow::onCmdReload(FXObject* sender, FXSelector sel, void*) {
+    if (!myAmLoading && (sender == nullptr || TraCIServer::getInstance() == nullptr)) {
         storeWindowSizeAndPos();
         getApp()->beginWaitCursor();
         myAmLoading = true;
-        myIsReload = true;
+        myIsReload = sender != nullptr || sel == 1;
         closeAllWindows();
         myLoadThread->start();
-        setStatusBarText(TL("Reloading."));
+        if (sender == nullptr) {
+            setStatusBarText(sel == 1 ? TL("Auto-Reloading.") : TL("TraCI-Loading."));
+        } else {
+            setStatusBarText(TL("Reloading."));
+        }
         update();
     }
     return 1;
@@ -2018,8 +2022,14 @@
         closeAllWindows();
         getApp()->exit(ec->getReason() == MSNet::SIMSTATE_ERROR_IN_SIM);
     } else if (GUIGlobals::gDemoAutoReload) {
-        onCmdReload(nullptr, 0, nullptr);
+        onCmdReload(nullptr, 1, nullptr);
     } else if (!myHaveNotifiedAboutSimEnd) {
+        // GUIRunThread::deleteSim() triggers the final message to the log file
+        // (this will never reach the GUI but we cannot use WRITE_MESSAGE here
+        // to avoid a duplicate log entry)
+        myMessageWindow->appendMsg(GUIEventType::MESSAGE_OCCURRED,
+                                   TLF("Simulation ended at time: %. (%)",
+                                       time2string(ec->getTimeStep()), MSNet::getStateMessage(ec->getReason())));
         // build the text
         const std::string text = "Simulation ended at time: " + time2string(ec->getTimeStep()) +
                                  ".\nReason: " + MSNet::getStateMessage(ec->getReason()) +
@@ -2086,9 +2096,9 @@
         }
 
     }
-    myWaitingTimeLabel->setText(time2string(myWaitingTime).c_str());
-    myTimeLossLabel->setText(time2string(myTimeLoss).c_str());
-    myEmergencyVehicleLabel->setText(time2string(myEmergencyVehicleCount).c_str());
+    myWaitingTimeLabel->setText(time2string(myWaitingTime, myShowTimeAsHMS).c_str());
+    myTimeLossLabel->setText(time2string(myTimeLoss, myShowTimeAsHMS).c_str());
+    myEmergencyVehicleLabel->setText(time2string(myEmergencyVehicleCount, myShowTimeAsHMS).c_str());
 }
 
 
@@ -2269,8 +2279,18 @@
 GUIApplicationWindow::updateTimeLCDTooltip() {
     if (myShowTimeAsHMS) {
         myLCDLabel->setToolTipText("HH:MM:SS");
+        if (myAmGaming) {
+            myWaitingTimeLabel->setToolTipText("HH:MM:SS");
+            myTimeLossLabel->setToolTipText("HH:MM:SS");
+            myEmergencyVehicleLabel->setToolTipText("HH:MM:SS");
+        }
     } else {
-        myLCDLabel->setToolTipText("seconds");
+        myLCDLabel->setToolTipText(TL("seconds"));
+        if (myAmGaming) {
+            myWaitingTimeLabel->setToolTipText(TL("seconds"));
+            myTimeLossLabel->setToolTipText(TL("seconds"));
+            myEmergencyVehicleLabel->setToolTipText(TL("seconds"));
+        }
     }
 }
 
diff -Nru sumo-1.17.0/src/gui/GUIApplicationWindow.h sumo-1.18.0/src/gui/GUIApplicationWindow.h
--- sumo-1.17.0/src/gui/GUIApplicationWindow.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/gui/GUIApplicationWindow.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/gui/GUIEvent_SimulationEnded.h sumo-1.18.0/src/gui/GUIEvent_SimulationEnded.h
--- sumo-1.17.0/src/gui/GUIEvent_SimulationEnded.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/gui/GUIEvent_SimulationEnded.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/gui/GUIEvent_SimulationLoaded.h sumo-1.18.0/src/gui/GUIEvent_SimulationLoaded.h
--- sumo-1.17.0/src/gui/GUIEvent_SimulationLoaded.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/gui/GUIEvent_SimulationLoaded.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2002-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/gui/GUIGlobals.cpp sumo-1.18.0/src/gui/GUIGlobals.cpp
--- sumo-1.17.0/src/gui/GUIGlobals.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/gui/GUIGlobals.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/gui/GUIGlobals.h sumo-1.18.0/src/gui/GUIGlobals.h
--- sumo-1.17.0/src/gui/GUIGlobals.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/gui/GUIGlobals.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/gui/GUILoadThread.cpp sumo-1.18.0/src/gui/GUILoadThread.cpp
--- sumo-1.17.0/src/gui/GUILoadThread.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/gui/GUILoadThread.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/gui/GUILoadThread.h sumo-1.18.0/src/gui/GUILoadThread.h
--- sumo-1.17.0/src/gui/GUILoadThread.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/gui/GUILoadThread.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2002-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/gui/GUIManipulator.cpp sumo-1.18.0/src/gui/GUIManipulator.cpp
--- sumo-1.17.0/src/gui/GUIManipulator.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/gui/GUIManipulator.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/gui/GUIManipulator.h sumo-1.18.0/src/gui/GUIManipulator.h
--- sumo-1.17.0/src/gui/GUIManipulator.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/gui/GUIManipulator.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/gui/GUIRunThread.cpp sumo-1.18.0/src/gui/GUIRunThread.cpp
--- sumo-1.17.0/src/gui/GUIRunThread.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/gui/GUIRunThread.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/gui/GUIRunThread.h sumo-1.18.0/src/gui/GUIRunThread.h
--- sumo-1.17.0/src/gui/GUIRunThread.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/gui/GUIRunThread.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -112,6 +112,10 @@
         return myBreakpointLock;
     }
 
+    SUMOTime& getSimBegin() {
+        return mySimStartTime;
+    }
+
     void enableLibsumo() {
         myAmLibsumo = true;
     }
diff -Nru sumo-1.17.0/src/gui/GUISUMOViewParent.cpp sumo-1.18.0/src/gui/GUISUMOViewParent.cpp
--- sumo-1.17.0/src/gui/GUISUMOViewParent.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/gui/GUISUMOViewParent.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/gui/GUISUMOViewParent.h sumo-1.18.0/src/gui/GUISUMOViewParent.h
--- sumo-1.17.0/src/gui/GUISUMOViewParent.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/gui/GUISUMOViewParent.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/gui/GUITLLogicPhasesTrackerWindow.cpp sumo-1.18.0/src/gui/GUITLLogicPhasesTrackerWindow.cpp
--- sumo-1.17.0/src/gui/GUITLLogicPhasesTrackerWindow.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/gui/GUITLLogicPhasesTrackerWindow.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/gui/GUITLLogicPhasesTrackerWindow.h sumo-1.18.0/src/gui/GUITLLogicPhasesTrackerWindow.h
--- sumo-1.17.0/src/gui/GUITLLogicPhasesTrackerWindow.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/gui/GUITLLogicPhasesTrackerWindow.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/gui/GUIViewTraffic.cpp sumo-1.18.0/src/gui/GUIViewTraffic.cpp
--- sumo-1.17.0/src/gui/GUIViewTraffic.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/gui/GUIViewTraffic.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -459,9 +459,15 @@
             }
             const int ci = minTll->getCurrentPhaseIndex();
             const int n = minTll->getPhaseNumber();
+            int greenCount = 0;
+            for (auto& phase : minTll->getPhases()) {
+                if (phase->isGreenPhase()) {
+                    greenCount++;
+                }
+            }
             int nextPhase = (ci + 1) % n;
             SUMOTime nextDuration = 0;
-            if (minTll->getCurrentPhaseDef().isGreenPhase()) {
+            if (minTll->getCurrentPhaseDef().isGreenPhase() || (greenCount == 1 && minTll->getCurrentPhaseDef().isAllRedPhase())) {
                 nextDuration = minTll->getPhase(nextPhase).duration;
             } else {
                 // we are in transition to a green phase
diff -Nru sumo-1.17.0/src/gui/GUIViewTraffic.h sumo-1.18.0/src/gui/GUIViewTraffic.h
--- sumo-1.17.0/src/gui/GUIViewTraffic.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/gui/GUIViewTraffic.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/gui/TraCIServerAPI_GUI.cpp sumo-1.18.0/src/gui/TraCIServerAPI_GUI.cpp
--- sumo-1.17.0/src/gui/TraCIServerAPI_GUI.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/gui/TraCIServerAPI_GUI.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/gui/TraCIServerAPI_GUI.h sumo-1.18.0/src/gui/TraCIServerAPI_GUI.h
--- sumo-1.17.0/src/gui/TraCIServerAPI_GUI.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/gui/TraCIServerAPI_GUI.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/guinetload/GUIDetectorBuilder.cpp sumo-1.18.0/src/guinetload/GUIDetectorBuilder.cpp
--- sumo-1.17.0/src/guinetload/GUIDetectorBuilder.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/guinetload/GUIDetectorBuilder.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -96,8 +96,8 @@
                                      SUMOTime haltingTimeThreshold,
                                      const std::string name, const std::string& vTypes,
                                      const std::string& nextEdges,
-                                     int detectPersons, bool openEntry) {
-    return new GUIE3Collector(id, entries, exits, haltingSpeedThreshold, haltingTimeThreshold, name, vTypes, nextEdges, detectPersons,  openEntry);
+                                     int detectPersons, bool openEntry, bool expectArrival) {
+    return new GUIE3Collector(id, entries, exits, haltingSpeedThreshold, haltingTimeThreshold, name, vTypes, nextEdges, detectPersons, openEntry, expectArrival);
 }
 
 
diff -Nru sumo-1.17.0/src/guinetload/GUIDetectorBuilder.h sumo-1.18.0/src/guinetload/GUIDetectorBuilder.h
--- sumo-1.17.0/src/guinetload/GUIDetectorBuilder.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/guinetload/GUIDetectorBuilder.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -131,7 +131,7 @@
             SUMOTime haltingTimeThreshold,
             const std::string name, const std::string& vTypes,
             const std::string& nextEdges,
-            int detectPersons, bool openEntry) override;
+            int detectPersons, bool openEntry, bool expectArrival) override;
     /// @}
 
 
diff -Nru sumo-1.17.0/src/guinetload/GUIEdgeControlBuilder.cpp sumo-1.18.0/src/guinetload/GUIEdgeControlBuilder.cpp
--- sumo-1.17.0/src/guinetload/GUIEdgeControlBuilder.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/guinetload/GUIEdgeControlBuilder.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/guinetload/GUIEdgeControlBuilder.h sumo-1.18.0/src/guinetload/GUIEdgeControlBuilder.h
--- sumo-1.17.0/src/guinetload/GUIEdgeControlBuilder.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/guinetload/GUIEdgeControlBuilder.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/guinetload/GUITriggerBuilder.cpp sumo-1.18.0/src/guinetload/GUITriggerBuilder.cpp
--- sumo-1.17.0/src/guinetload/GUITriggerBuilder.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/guinetload/GUITriggerBuilder.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -87,9 +87,10 @@
                                     unsigned int capacity,
                                     double width, double length, double angle, const std::string& name,
                                     bool onRoad,
-                                    const std::string& departPos) {
+                                    const std::string& departPos,
+                                    bool lefthand) {
     assert(myParkingArea == 0);
-    GUIParkingArea* stop = new GUIParkingArea(id, lines, *lane, frompos, topos, capacity, width, length, angle, name, onRoad, departPos);
+    GUIParkingArea* stop = new GUIParkingArea(id, lines, *lane, frompos, topos, capacity, width, length, angle, name, onRoad, departPos, lefthand);
     if (!net.addStoppingPlace(SUMO_TAG_PARKING_AREA, stop)) {
         delete stop;
         throw InvalidArgument("Could not build parking area '" + id + "'; probably declared twice.");
diff -Nru sumo-1.17.0/src/guinetload/GUITriggerBuilder.h sumo-1.18.0/src/guinetload/GUITriggerBuilder.h
--- sumo-1.17.0/src/guinetload/GUITriggerBuilder.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/guinetload/GUITriggerBuilder.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2004-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -134,7 +134,8 @@
                                   unsigned int capacity,
                                   double width, double length, double angle, const std::string& name,
                                   bool onRoad,
-                                  const std::string& departPos) override;
+                                  const std::string& departPos,
+                                  bool lefthand) override;
 
 
     /** @brief Builds a charging station
diff -Nru sumo-1.17.0/src/guisim/Command_Hotkey_InductionLoop.cpp sumo-1.18.0/src/guisim/Command_Hotkey_InductionLoop.cpp
--- sumo-1.17.0/src/guisim/Command_Hotkey_InductionLoop.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/guisim/Command_Hotkey_InductionLoop.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/guisim/Command_Hotkey_InductionLoop.h sumo-1.18.0/src/guisim/Command_Hotkey_InductionLoop.h
--- sumo-1.17.0/src/guisim/Command_Hotkey_InductionLoop.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/guisim/Command_Hotkey_InductionLoop.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/guisim/Command_Hotkey_TrafficLight.cpp sumo-1.18.0/src/guisim/Command_Hotkey_TrafficLight.cpp
--- sumo-1.17.0/src/guisim/Command_Hotkey_TrafficLight.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/guisim/Command_Hotkey_TrafficLight.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/guisim/Command_Hotkey_TrafficLight.h sumo-1.18.0/src/guisim/Command_Hotkey_TrafficLight.h
--- sumo-1.17.0/src/guisim/Command_Hotkey_TrafficLight.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/guisim/Command_Hotkey_TrafficLight.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/guisim/GUIBaseVehicle.cpp sumo-1.18.0/src/guisim/GUIBaseVehicle.cpp
--- sumo-1.17.0/src/guisim/GUIBaseVehicle.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/guisim/GUIBaseVehicle.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/guisim/GUIBaseVehicle.h sumo-1.18.0/src/guisim/GUIBaseVehicle.h
--- sumo-1.17.0/src/guisim/GUIBaseVehicle.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/guisim/GUIBaseVehicle.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/guisim/GUIBusStop.cpp sumo-1.18.0/src/guisim/GUIBusStop.cpp
--- sumo-1.17.0/src/guisim/GUIBusStop.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/guisim/GUIBusStop.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/guisim/GUIBusStop.h sumo-1.18.0/src/guisim/GUIBusStop.h
--- sumo-1.17.0/src/guisim/GUIBusStop.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/guisim/GUIBusStop.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/guisim/GUICalibrator.cpp sumo-1.18.0/src/guisim/GUICalibrator.cpp
--- sumo-1.17.0/src/guisim/GUICalibrator.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/guisim/GUICalibrator.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/guisim/GUICalibrator.h sumo-1.18.0/src/guisim/GUICalibrator.h
--- sumo-1.17.0/src/guisim/GUICalibrator.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/guisim/GUICalibrator.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/guisim/GUIChargingStation.cpp sumo-1.18.0/src/guisim/GUIChargingStation.cpp
--- sumo-1.17.0/src/guisim/GUIChargingStation.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/guisim/GUIChargingStation.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/guisim/GUIChargingStation.h sumo-1.18.0/src/guisim/GUIChargingStation.h
--- sumo-1.17.0/src/guisim/GUIChargingStation.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/guisim/GUIChargingStation.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/guisim/GUIContainer.cpp sumo-1.18.0/src/guisim/GUIContainer.cpp
--- sumo-1.17.0/src/guisim/GUIContainer.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/guisim/GUIContainer.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -180,18 +180,14 @@
 
 
 GUIParameterTableWindow*
-GUIContainer::getTypeParameterWindow(GUIMainWindow& app,
-                                     GUISUMOAbstractView&) {
-    GUIParameterTableWindow* ret = new GUIParameterTableWindow(app, *this);
-    // add items
-    ret->mkItem("Type Information:", false, "");
-    ret->mkItem("type [id]", false, myVType->getID());
+GUIContainer::getTypeParameterWindow(GUIMainWindow& app, GUISUMOAbstractView&) {
+    GUIParameterTableWindow* ret = new GUIParameterTableWindow(app, *this, "vType:" + myVType->getID());
     ret->mkItem("length", false, myVType->getLength());
     ret->mkItem("width", false, myVType->getWidth());
     ret->mkItem("height", false, myVType->getHeight());
     ret->mkItem("minGap", false, myVType->getMinGap());
+    ret->mkItem("mass [kg]", false, myVType->getMass());
     ret->mkItem("maximum speed [m/s]", false, myVType->getMaxSpeed());
-    // close building
     ret->closeBuilding(&(myVType->getParameter()));
     return ret;
 }
diff -Nru sumo-1.17.0/src/guisim/GUIContainer.h sumo-1.18.0/src/guisim/GUIContainer.h
--- sumo-1.17.0/src/guisim/GUIContainer.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/guisim/GUIContainer.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/guisim/GUIDetectorWrapper.cpp sumo-1.18.0/src/guisim/GUIDetectorWrapper.cpp
--- sumo-1.17.0/src/guisim/GUIDetectorWrapper.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/guisim/GUIDetectorWrapper.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/guisim/GUIDetectorWrapper.h sumo-1.18.0/src/guisim/GUIDetectorWrapper.h
--- sumo-1.17.0/src/guisim/GUIDetectorWrapper.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/guisim/GUIDetectorWrapper.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/guisim/GUIE2Collector.cpp sumo-1.18.0/src/guisim/GUIE2Collector.cpp
--- sumo-1.17.0/src/guisim/GUIE2Collector.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/guisim/GUIE2Collector.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -129,6 +129,9 @@
     ret->mkItem("length [m]", false, myDetector.getLength());
     ret->mkItem("position [m]", false, myDetector.getStartPos());
     ret->mkItem("lane", false, myDetector.getLane()->getID());
+    if (myDetector.isTyped()) {
+        ret->mkItem("vTypes", false, toString(myDetector.getVehicleTypes()));
+    }
     // values
     ret->mkItem("vehicles [#]", true,
                 new FunctionBinding(&myDetector, &MSE2Collector::getCurrentVehicleNumber));
diff -Nru sumo-1.17.0/src/guisim/GUIE2Collector.h sumo-1.18.0/src/guisim/GUIE2Collector.h
--- sumo-1.17.0/src/guisim/GUIE2Collector.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/guisim/GUIE2Collector.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/guisim/GUIE3Collector.cpp sumo-1.18.0/src/guisim/GUIE3Collector.cpp
--- sumo-1.17.0/src/guisim/GUIE3Collector.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/guisim/GUIE3Collector.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -77,6 +77,9 @@
     // add items
     // values
     ret->mkItem("name", false, myDetector.myName);
+    if (myDetector.isTyped()) {
+        ret->mkItem("vTypes", false, toString(myDetector.getVehicleTypes()));
+    }
     ret->mkItem("vehicles within [#]", true,
                 new FunctionBinding(&myDetector, &MSE3Collector::getVehiclesWithin));
     ret->mkItem("mean speed [m/s]", true,
@@ -179,8 +182,8 @@
                                const std::string name, const std::string& vTypes,
                                const std::string& nextEdges,
                                int detectPersons,
-                               bool openEntry):
-    MSE3Collector(id, entries,  exits, haltingSpeedThreshold, haltingTimeThreshold, name, vTypes, nextEdges, detectPersons, openEntry)
+                               bool openEntry, bool expectArrival):
+    MSE3Collector(id, entries,  exits, haltingSpeedThreshold, haltingTimeThreshold, name, vTypes, nextEdges, detectPersons, openEntry, expectArrival)
 {}
 
 
diff -Nru sumo-1.17.0/src/guisim/GUIE3Collector.h sumo-1.18.0/src/guisim/GUIE3Collector.h
--- sumo-1.17.0/src/guisim/GUIE3Collector.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/guisim/GUIE3Collector.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -49,7 +49,7 @@
                    SUMOTime haltingTimeThreshold,
                    const std::string name, const std::string& vTypes,
                    const std::string& nextEdges,
-                   int detectPersons, bool openEntry);
+                   int detectPersons, bool openEntry, bool expectArrival);
 
     /// @brief Destructor
     ~GUIE3Collector();
diff -Nru sumo-1.17.0/src/guisim/GUIEdge.cpp sumo-1.18.0/src/guisim/GUIEdge.cpp
--- sumo-1.17.0/src/guisim/GUIEdge.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/guisim/GUIEdge.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/guisim/GUIEdge.h sumo-1.18.0/src/guisim/GUIEdge.h
--- sumo-1.17.0/src/guisim/GUIEdge.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/guisim/GUIEdge.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/guisim/GUIEventControl.cpp sumo-1.18.0/src/guisim/GUIEventControl.cpp
--- sumo-1.17.0/src/guisim/GUIEventControl.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/guisim/GUIEventControl.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/guisim/GUIEventControl.h sumo-1.18.0/src/guisim/GUIEventControl.h
--- sumo-1.17.0/src/guisim/GUIEventControl.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/guisim/GUIEventControl.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/guisim/GUIInductLoop.cpp sumo-1.18.0/src/guisim/GUIInductLoop.cpp
--- sumo-1.17.0/src/guisim/GUIInductLoop.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/guisim/GUIInductLoop.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -142,6 +142,9 @@
         ret->mkItem("end position [m]", false, myDetector.getEndPosition());
     }
     ret->mkItem("lane", false, myDetector.getLane()->getID());
+    if (myDetector.isTyped()) {
+        ret->mkItem("vTypes", false, toString(myDetector.getVehicleTypes()));
+    }
     // values
     ret->mkItem("entered vehicles [#]", true,
                 new FuncBinding_IntParam(&myDetector, &GUIInductLoop::getEnteredNumber, 0));
diff -Nru sumo-1.17.0/src/guisim/GUIInductLoop.h sumo-1.18.0/src/guisim/GUIInductLoop.h
--- sumo-1.17.0/src/guisim/GUIInductLoop.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/guisim/GUIInductLoop.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/guisim/GUIInstantInductLoop.cpp sumo-1.18.0/src/guisim/GUIInstantInductLoop.cpp
--- sumo-1.17.0/src/guisim/GUIInstantInductLoop.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/guisim/GUIInstantInductLoop.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2003-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -95,6 +95,9 @@
     ret->mkItem("name", false, myDetector.myName);
     ret->mkItem("position [m]", false, myPosition);
     ret->mkItem("lane", false, myDetector.getLane()->getID());
+    if (myDetector.isTyped()) {
+        ret->mkItem("vTypes", false, toString(myDetector.getVehicleTypes()));
+    }
     // values
     // close building
     ret->closeBuilding(&myDetector);
diff -Nru sumo-1.17.0/src/guisim/GUIInstantInductLoop.h sumo-1.18.0/src/guisim/GUIInstantInductLoop.h
--- sumo-1.17.0/src/guisim/GUIInstantInductLoop.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/guisim/GUIInstantInductLoop.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/guisim/GUIJunctionWrapper.cpp sumo-1.18.0/src/guisim/GUIJunctionWrapper.cpp
--- sumo-1.17.0/src/guisim/GUIJunctionWrapper.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/guisim/GUIJunctionWrapper.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/guisim/GUIJunctionWrapper.h sumo-1.18.0/src/guisim/GUIJunctionWrapper.h
--- sumo-1.17.0/src/guisim/GUIJunctionWrapper.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/guisim/GUIJunctionWrapper.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/guisim/GUILane.cpp sumo-1.18.0/src/guisim/GUILane.cpp
--- sumo-1.17.0/src/guisim/GUILane.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/guisim/GUILane.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -86,6 +86,7 @@
     myGeom(0),
 #endif
     myAmClosed(false),
+    myLengthGeometryFactor2(myLengthGeometryFactor),
     myLock(true) {
     if (MSGlobals::gUseMesoSim) {
         myShape = splitAtSegments(shape);
@@ -587,7 +588,7 @@
             GLHelper::popMatrix();
         } else {
             GUINet* net = (GUINet*) MSNet::getInstance();
-            const bool spreadSuperposed = s.spreadSuperposed && myEdge->getBidiEdge() != nullptr;
+            const bool spreadSuperposed = s.spreadSuperposed && myBidiLane != nullptr;
             if (hiddenBidi && !spreadSuperposed) {
                 // do not draw shape
                 mustDrawMarkings = !isInternal && myPermissions != 0 && myPermissions != SVC_PEDESTRIAN && exaggeration == 1.0 && !isWaterway(myPermissions) && neighLaneNotBidi();
@@ -1057,25 +1058,25 @@
 
 const PositionVector&
 GUILane::getShape(bool secondary) const {
-    return secondary ? myShape2 : myShape;
+    return secondary && myShape2.size() > 0 ? myShape2 : myShape;
 }
 
 
 const std::vector&
 GUILane::getShapeRotations(bool secondary) const {
-    return secondary ? myShapeRotations2 : myShapeRotations;
+    return secondary && myShapeRotations2.size() > 0 ? myShapeRotations2 : myShapeRotations;
 }
 
 
 const std::vector&
 GUILane::getShapeLengths(bool secondary) const {
-    return secondary ? myShapeLengths2 : myShapeLengths;
+    return secondary && myShapeLengths2.size() > 0 ? myShapeLengths2 : myShapeLengths;
 }
 
 
 std::vector&
 GUILane::getShapeColors(bool secondary) const {
-    return secondary ? myShapeColors2 : myShapeColors;
+    return secondary && myShapeColors2.size() > 0 ? myShapeColors2 : myShapeColors;
 }
 
 
diff -Nru sumo-1.17.0/src/guisim/GUILane.h sumo-1.18.0/src/guisim/GUILane.h
--- sumo-1.17.0/src/guisim/GUILane.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/guisim/GUILane.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -95,10 +95,6 @@
 
     void addSecondaryShape(const PositionVector& shape) override;
 
-    const PositionVector& getSecondaryShape() {
-        return myShape2;
-    }
-
     double getLengthGeometryFactor(bool secondaryShape) const override {
         return secondaryShape ? myLengthGeometryFactor2 :  myLengthGeometryFactor;
     }
diff -Nru sumo-1.17.0/src/guisim/GUILaneSpeedTrigger.cpp sumo-1.18.0/src/guisim/GUILaneSpeedTrigger.cpp
--- sumo-1.17.0/src/guisim/GUILaneSpeedTrigger.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/guisim/GUILaneSpeedTrigger.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/guisim/GUILaneSpeedTrigger.h sumo-1.18.0/src/guisim/GUILaneSpeedTrigger.h
--- sumo-1.17.0/src/guisim/GUILaneSpeedTrigger.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/guisim/GUILaneSpeedTrigger.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/guisim/GUINet.cpp sumo-1.18.0/src/guisim/GUINet.cpp
--- sumo-1.17.0/src/guisim/GUINet.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/guisim/GUINet.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -342,7 +342,7 @@
         for (GUIEdge* edge : myEdgeWrapper) {
             Boundary b;
             for (MSLane* lane : edge->getLanes()) {
-                b.add(static_cast(lane)->getSecondaryShape().getBoxBoundary());
+                b.add(static_cast(lane)->getShape(true).getBoxBoundary());
             }
             // make sure persons are always drawn and selectable since they depend on their edge being drawn
             b.grow(MSPModel::SIDEWALK_OFFSET + 1);
@@ -783,6 +783,7 @@
 
 void
 GUINet::flushOutputsAtEnd() {
+    mySkipFinalReset = true;
     myDetectorControl->close(SIMSTEP);
     OutputDevice::flushAll();
     // update tracker windows
diff -Nru sumo-1.17.0/src/guisim/GUINet.h sumo-1.18.0/src/guisim/GUINet.h
--- sumo-1.17.0/src/guisim/GUINet.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/guisim/GUINet.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -360,6 +360,10 @@
     /// @brief flush outputs once the simulation has reached its end
     void flushOutputsAtEnd();
 
+    virtual bool skipFinalReset() const override {
+        return mySkipFinalReset;
+    }
+
 private:
     /// @brief Initialises the tl-logic map and wrappers
     void initTLMap();
@@ -409,6 +413,8 @@
     /// @brief loaded edge data for visualization
     std::map myLoadedEdgeData;
 
+    bool mySkipFinalReset = false;
+
     /// @brief class for discovering edge attributes
     class DiscoverAttributes : public SUMOSAXHandler {
     public:
diff -Nru sumo-1.17.0/src/guisim/GUIOverheadWire.cpp sumo-1.18.0/src/guisim/GUIOverheadWire.cpp
--- sumo-1.17.0/src/guisim/GUIOverheadWire.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/guisim/GUIOverheadWire.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/guisim/GUIOverheadWire.h sumo-1.18.0/src/guisim/GUIOverheadWire.h
--- sumo-1.17.0/src/guisim/GUIOverheadWire.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/guisim/GUIOverheadWire.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/guisim/GUIParkingArea.cpp sumo-1.18.0/src/guisim/GUIParkingArea.cpp
--- sumo-1.17.0/src/guisim/GUIParkingArea.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/guisim/GUIParkingArea.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -55,8 +55,9 @@
                                double frompos, double topos, unsigned int capacity,
                                double width, double length, double angle, const std::string& name,
                                bool onRoad,
-                               const std::string& departPos) :
-    MSParkingArea(id, lines, lane, frompos, topos, capacity, width, length, angle, name, onRoad, departPos),
+                               const std::string& departPos,
+                               bool lefthand) :
+    MSParkingArea(id, lines, lane, frompos, topos, capacity, width, length, angle, name, onRoad, departPos, lefthand),
     GUIGlObject_AbstractAdd(GLO_PARKING_AREA, id, GUIIconSubSys::getIcon(GUIIcon::PARKINGAREA)) {
     const double offsetSign = MSGlobals::gLefthand ? -1 : 1;
     myShapeRotations.reserve(myShape.size() - 1);
diff -Nru sumo-1.17.0/src/guisim/GUIParkingArea.h sumo-1.18.0/src/guisim/GUIParkingArea.h
--- sumo-1.17.0/src/guisim/GUIParkingArea.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/guisim/GUIParkingArea.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -75,7 +75,8 @@
                    double frompos, double topos, unsigned int capacity,
                    double width, double length, double angle, const std::string& name,
                    bool onRoad,
-                   const std::string& departPos);
+                   const std::string& departPos,
+                   bool lefthand);
 
 
     /// @brief Destructor
diff -Nru sumo-1.17.0/src/guisim/GUIPerson.cpp sumo-1.18.0/src/guisim/GUIPerson.cpp
--- sumo-1.17.0/src/guisim/GUIPerson.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/guisim/GUIPerson.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -247,19 +247,15 @@
 
 
 GUIParameterTableWindow*
-GUIPerson::getTypeParameterWindow(GUIMainWindow& app,
-                                  GUISUMOAbstractView&) {
-    GUIParameterTableWindow* ret = new GUIParameterTableWindow(app, *this);
-    // add items
-    ret->mkItem("Type Information:", false, "");
-    ret->mkItem("type [id]", false, myVType->getID());
+GUIPerson::getTypeParameterWindow(GUIMainWindow& app, GUISUMOAbstractView&) {
+    GUIParameterTableWindow* ret = new GUIParameterTableWindow(app, *this, "vType:" + myVType->getID());
     ret->mkItem("length", false, myVType->getLength());
     ret->mkItem("width", false, myVType->getWidth());
     ret->mkItem("height", false, myVType->getHeight());
     ret->mkItem("minGap", false, myVType->getMinGap());
+    ret->mkItem("mass [kg]", false, myVType->getMass());
     ret->mkItem("desired max speed [m/s]", false, myVType->getDesiredMaxSpeed());
     ret->mkItem("maximum speed [m/s]", false, myVType->getMaxSpeed());
-    // close building
     ret->closeBuilding(&(myVType->getParameter()));
     return ret;
 }
diff -Nru sumo-1.17.0/src/guisim/GUIPerson.h sumo-1.18.0/src/guisim/GUIPerson.h
--- sumo-1.17.0/src/guisim/GUIPerson.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/guisim/GUIPerson.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/guisim/GUITrafficLightLogicWrapper.cpp sumo-1.18.0/src/guisim/GUITrafficLightLogicWrapper.cpp
--- sumo-1.17.0/src/guisim/GUITrafficLightLogicWrapper.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/guisim/GUITrafficLightLogicWrapper.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/guisim/GUITrafficLightLogicWrapper.h sumo-1.18.0/src/guisim/GUITrafficLightLogicWrapper.h
--- sumo-1.17.0/src/guisim/GUITrafficLightLogicWrapper.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/guisim/GUITrafficLightLogicWrapper.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/guisim/GUITransportableControl.cpp sumo-1.18.0/src/guisim/GUITransportableControl.cpp
--- sumo-1.17.0/src/guisim/GUITransportableControl.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/guisim/GUITransportableControl.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/guisim/GUITransportableControl.h sumo-1.18.0/src/guisim/GUITransportableControl.h
--- sumo-1.17.0/src/guisim/GUITransportableControl.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/guisim/GUITransportableControl.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/guisim/GUITriggeredRerouter.cpp sumo-1.18.0/src/guisim/GUITriggeredRerouter.cpp
--- sumo-1.17.0/src/guisim/GUITriggeredRerouter.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/guisim/GUITriggeredRerouter.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/guisim/GUITriggeredRerouter.h sumo-1.18.0/src/guisim/GUITriggeredRerouter.h
--- sumo-1.17.0/src/guisim/GUITriggeredRerouter.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/guisim/GUITriggeredRerouter.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/guisim/GUIVehicleControl.cpp sumo-1.18.0/src/guisim/GUIVehicleControl.cpp
--- sumo-1.17.0/src/guisim/GUIVehicleControl.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/guisim/GUIVehicleControl.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/guisim/GUIVehicleControl.h sumo-1.18.0/src/guisim/GUIVehicleControl.h
--- sumo-1.17.0/src/guisim/GUIVehicleControl.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/guisim/GUIVehicleControl.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2003-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/guisim/GUIVehicle.cpp sumo-1.18.0/src/guisim/GUIVehicle.cpp
--- sumo-1.17.0/src/guisim/GUIVehicle.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/guisim/GUIVehicle.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -205,20 +205,17 @@
 
 
 GUIParameterTableWindow*
-GUIVehicle::getTypeParameterWindow(GUIMainWindow& app,
-                                   GUISUMOAbstractView&) {
-    GUIParameterTableWindow* ret = new GUIParameterTableWindow(app, *this);
-    // add items
-    ret->mkItem("Type Information:", false, "");
-    ret->mkItem("type [id]", false, myType->getID());
-    ret->mkItem("length", false, myType->getLength());
-    ret->mkItem("width", false, myType->getWidth());
-    ret->mkItem("height", false, myType->getHeight());
-    ret->mkItem("minGap", false, myType->getMinGap());
+GUIVehicle::getTypeParameterWindow(GUIMainWindow& app, GUISUMOAbstractView&) {
+    GUIParameterTableWindow* ret = new GUIParameterTableWindow(app, *this, "vType:" + myType->getID());
+    ret->mkItem("length [m]", false, myType->getLength());
+    ret->mkItem("width [m]", false, myType->getWidth());
+    ret->mkItem("height [m]", false, myType->getHeight());
+    ret->mkItem("minGap [m]", false, myType->getMinGap());
     ret->mkItem("vehicle class", false, SumoVehicleClassStrings.getString(myType->getVehicleClass()));
     ret->mkItem("emission class", false, PollutantsInterface::getName(myType->getEmissionClass()));
+    ret->mkItem("mass [kg]", false, myType->getMass());
     ret->mkItem("carFollowModel", false, SUMOXMLDefinitions::CarFollowModels.getString((SumoXMLTag)getCarFollowModel().getModelID()));
-    ret->mkItem("LaneChangeModel", false, SUMOXMLDefinitions::LaneChangeModels.getString(getLaneChangeModel().getModelID()));
+    ret->mkItem("laneChangeModel", false, SUMOXMLDefinitions::LaneChangeModels.getString(getLaneChangeModel().getModelID()));
     ret->mkItem("guiShape", false, getVehicleShapeName(myType->getGuiShape()));
     ret->mkItem("maximum speed [m/s]", false, getVehicleType().getMaxSpeed());
     ret->mkItem("desired maximum speed [m/s]", false, getVehicleType().getDesiredMaxSpeed());
@@ -227,21 +224,21 @@
     ret->mkItem("emergency deceleration [m/s^2]", false, getCarFollowModel().getEmergencyDecel());
     ret->mkItem("apparent deceleration [m/s^2]", false, getCarFollowModel().getApparentDecel());
     ret->mkItem("imperfection (sigma)", false, getCarFollowModel().getImperfection());
-    ret->mkItem("desired headway (tau)", false, getCarFollowModel().getHeadwayTime());
+    ret->mkItem("desired headway (tau) [s]", false, getCarFollowModel().getHeadwayTime());
     ret->mkItem("speedFactor", false, myType->getParameter().speedFactor.toStr(gPrecision));
     if (myType->getParameter().wasSet(VTYPEPARS_ACTIONSTEPLENGTH_SET)) {
         ret->mkItem("action step length [s]", false, myType->getActionStepLengthSecs());
     }
     ret->mkItem("person capacity", false, myType->getPersonCapacity());
-    ret->mkItem("boarding time", false, STEPS2TIME(myType->getLoadingDuration(true)));
+    ret->mkItem("boarding time [s]", false, STEPS2TIME(myType->getLoadingDuration(true)));
     ret->mkItem("container capacity", false, myType->getContainerCapacity());
-    ret->mkItem("loading time", false, STEPS2TIME(myType->getLoadingDuration(false)));
+    ret->mkItem("loading time [s]", false, STEPS2TIME(myType->getLoadingDuration(false)));
     if (MSGlobals::gLateralResolution > 0) {
-        ret->mkItem("minGapLat", false, myType->getMinGapLat());
-        ret->mkItem("maxSpeedLat", false, myType->getMaxSpeedLat());
+        ret->mkItem("minGapLat [m]", false, myType->getMinGapLat());
+        ret->mkItem("maxSpeedLat [m/s]", false, myType->getMaxSpeedLat());
         ret->mkItem("latAlignment", true, new FunctionBindingString(this, &GUIVehicle::getDynamicAlignment));
     } else if (MSGlobals::gLaneChangeDuration > 0) {
-        ret->mkItem("maxSpeedLat", false, myType->getMaxSpeedLat());
+        ret->mkItem("maxSpeedLat [m/s]", false, myType->getMaxSpeedLat());
     }
     for (auto item : myType->getParameter().lcParameter) {
         ret->mkItem(toString(item.first).c_str(), false, toString(item.second));
@@ -252,8 +249,6 @@
     if (MSGlobals::gModelParkingManoeuver) {
         ret->mkItem("manoeuver Angle vs Times", false, myType->getParameter().getManoeuverAngleTimesS());
     }
-
-    // close building
     ret->closeBuilding(&(myType->getParameter()));
     return ret;
 }
@@ -928,7 +923,7 @@
             // the vehicle to enter the junction first has priority
             const GUIVehicle* leader = dynamic_cast(it->vehAndGap.first);
             if (leader != nullptr) {
-                if (isLeader(dpi.myLink, leader, it->vehAndGap.second)) {
+                if (isLeader(dpi.myLink, leader, it->vehAndGap.second) || it->inTheWay()) {
                     gSelected.select(leader->getGlID());
 #ifdef DEBUG_FOES
                     std::cout << "      linkLeader=" << leader->getID() << "\n";
diff -Nru sumo-1.17.0/src/guisim/GUIVehicle.h sumo-1.18.0/src/guisim/GUIVehicle.h
--- sumo-1.17.0/src/guisim/GUIVehicle.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/guisim/GUIVehicle.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/guisim_main.cpp sumo-1.18.0/src/guisim_main.cpp
--- sumo-1.17.0/src/guisim_main.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/guisim_main.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/jtrrouter/jtrrouter_main.cpp sumo-1.18.0/src/jtrrouter/jtrrouter_main.cpp
--- sumo-1.17.0/src/jtrrouter/jtrrouter_main.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/jtrrouter/jtrrouter_main.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -193,7 +193,7 @@
             SystemFrame::close();
             return 0;
         }
-        SystemFrame::checkOptions();
+        SystemFrame::checkOptions(oc);
         XMLSubSys::setValidation(oc.getString("xml-validation"), oc.getString("xml-validation.net"), oc.getString("xml-validation.routes"));
         MsgHandler::initOutputOptions();
         if (!ROJTRFrame::checkOptions()) {
diff -Nru sumo-1.17.0/src/jtrrouter/ROJTREdgeBuilder.cpp sumo-1.18.0/src/jtrrouter/ROJTREdgeBuilder.cpp
--- sumo-1.17.0/src/jtrrouter/ROJTREdgeBuilder.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/jtrrouter/ROJTREdgeBuilder.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2004-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/jtrrouter/ROJTREdgeBuilder.h sumo-1.18.0/src/jtrrouter/ROJTREdgeBuilder.h
--- sumo-1.17.0/src/jtrrouter/ROJTREdgeBuilder.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/jtrrouter/ROJTREdgeBuilder.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2004-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/jtrrouter/ROJTREdge.cpp sumo-1.18.0/src/jtrrouter/ROJTREdge.cpp
--- sumo-1.17.0/src/jtrrouter/ROJTREdge.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/jtrrouter/ROJTREdge.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2004-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/jtrrouter/ROJTREdge.h sumo-1.18.0/src/jtrrouter/ROJTREdge.h
--- sumo-1.17.0/src/jtrrouter/ROJTREdge.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/jtrrouter/ROJTREdge.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2004-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/jtrrouter/ROJTRFrame.cpp sumo-1.18.0/src/jtrrouter/ROJTRFrame.cpp
--- sumo-1.17.0/src/jtrrouter/ROJTRFrame.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/jtrrouter/ROJTRFrame.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -88,7 +88,7 @@
     oc.addDescription("discount-sources", "Processing", TL("Subtract upstream flow when inserting a new flow. When option --sources-are-sinks is set, the upstream flow is limited to the value of the source flow and the remaining part terminates."));
 
     // add rand options
-    RandHelper::insertRandOptions();
+    RandHelper::insertRandOptions(oc);
 }
 
 
diff -Nru sumo-1.17.0/src/jtrrouter/ROJTRFrame.h sumo-1.18.0/src/jtrrouter/ROJTRFrame.h
--- sumo-1.17.0/src/jtrrouter/ROJTRFrame.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/jtrrouter/ROJTRFrame.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/jtrrouter/ROJTRRouter.cpp sumo-1.18.0/src/jtrrouter/ROJTRRouter.cpp
--- sumo-1.17.0/src/jtrrouter/ROJTRRouter.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/jtrrouter/ROJTRRouter.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/jtrrouter/ROJTRRouter.h sumo-1.18.0/src/jtrrouter/ROJTRRouter.h
--- sumo-1.17.0/src/jtrrouter/ROJTRRouter.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/jtrrouter/ROJTRRouter.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -77,15 +77,6 @@
      */
     bool compute(const ROEdge* from, const ROEdge* to, const ROVehicle* const vehicle,
                  SUMOTime time, ConstROEdgeVector& into, bool silent = false);
-
-
-    /** @brief Recomputes the costs of a route
-     * @param[in] edges The route
-     * @param[in] v The vehicle that belongs to the route
-     * @param[in] msTime The departure time of the vehicle
-     * @return The route costs
-     */
-    double recomputeCosts(const ConstROEdgeVector& edges, const ROVehicle* const v, SUMOTime msTime) const;
     /// @}
 
 private:
diff -Nru sumo-1.17.0/src/jtrrouter/ROJTRTurnDefLoader.cpp sumo-1.18.0/src/jtrrouter/ROJTRTurnDefLoader.cpp
--- sumo-1.17.0/src/jtrrouter/ROJTRTurnDefLoader.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/jtrrouter/ROJTRTurnDefLoader.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/jtrrouter/ROJTRTurnDefLoader.h sumo-1.18.0/src/jtrrouter/ROJTRTurnDefLoader.h
--- sumo-1.17.0/src/jtrrouter/ROJTRTurnDefLoader.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/jtrrouter/ROJTRTurnDefLoader.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/libsumo/BusStop.cpp sumo-1.18.0/src/libsumo/BusStop.cpp
--- sumo-1.17.0/src/libsumo/BusStop.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/libsumo/BusStop.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/libsumo/BusStop.h sumo-1.18.0/src/libsumo/BusStop.h
--- sumo-1.17.0/src/libsumo/BusStop.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/libsumo/BusStop.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/libsumo/Calibrator.cpp sumo-1.18.0/src/libsumo/Calibrator.cpp
--- sumo-1.17.0/src/libsumo/Calibrator.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/libsumo/Calibrator.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/libsumo/Calibrator.h sumo-1.18.0/src/libsumo/Calibrator.h
--- sumo-1.17.0/src/libsumo/Calibrator.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/libsumo/Calibrator.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/libsumo/ChargingStation.cpp sumo-1.18.0/src/libsumo/ChargingStation.cpp
--- sumo-1.17.0/src/libsumo/ChargingStation.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/libsumo/ChargingStation.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/libsumo/ChargingStation.h sumo-1.18.0/src/libsumo/ChargingStation.h
--- sumo-1.17.0/src/libsumo/ChargingStation.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/libsumo/ChargingStation.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/libsumo/CMakeLists.txt sumo-1.18.0/src/libsumo/CMakeLists.txt
--- sumo-1.17.0/src/libsumo/CMakeLists.txt	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/libsumo/CMakeLists.txt	2023-06-28 20:02:17.000000000 +0000
@@ -106,10 +106,6 @@
 endif()
 target_link_libraries(libsumocpp PRIVATE ${sumo_link_libraries})
 
-set(ENABLE_PYTHON_BINDINGS ON CACHE BOOL "Build Python Bindings")
-set(ENABLE_JAVA_BINDINGS ON CACHE BOOL "Build Java Bindings")
-set(ENABLE_CS_BINDINGS OFF CACHE BOOL "Build C# Bindings")
-
 if(SWIG_FOUND)
     include(${SWIG_USE_FILE})
     set_source_files_properties(libsumo.i PROPERTIES CPLUSPLUS ON)
@@ -179,75 +175,51 @@
         install(TARGETS libsumocs DESTINATION bin LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
     endif()
 
-    if(ENABLE_PYTHON_BINDINGS)
-        if (MSVC)
-            # recheck that the platform of the generator and python matches
-            execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "import sys; print(sys.maxsize > 2**32)"
-                            OUTPUT_VARIABLE IS_PYTHON64 OUTPUT_STRIP_TRAILING_WHITESPACE)
-            if (${CMAKE_MODULE_LINKER_FLAGS} STREQUAL "/machine:x64")
-                if (${IS_PYTHON64} STREQUAL "False")
-                    message(STATUS "Did not find Python 64 bit. Please set PYTHON_EXECUTABLE, PYTHON_INCLUDE_DIR and PYTHON_LIBRARY manually.")
-                    set(PYTHONLIBS_FOUND OFF)
-                endif()
-            else()
-                if (${IS_PYTHON64} STREQUAL "True")
-                    message(STATUS "Did not find Python 32 bit. Please set PYTHON_EXECUTABLE, PYTHON_INCLUDE_DIR and PYTHON_LIBRARY manually.")
-                    set(PYTHONLIBS_FOUND OFF)
-                endif()
-            endif()
-            if (NOT PYTHON_DEBUG_LIBRARY AND "${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
-                message(STATUS "Did not find Python debug library. Please reinstall your python and enable the python debug libraries in the installer.")
-                set(PYTHONLIBS_FOUND OFF)
-            endif()
+    if (ENABLE_PYTHON_BINDINGS AND PYTHON_INCLUDE_DIRS)
+        include_directories(${PYTHON_INCLUDE_DIRS})
+        set(CMAKE_SWIG_FLAGS -keyword) # is necessary for using keyword args
+        if (FOX_FOUND)
+            set(CMAKE_SWIG_FLAGS ${CMAKE_SWIG_FLAGS} -DHAVE_LIBSUMOGUI)
         endif()
-        if(PYTHONLIBS_FOUND)
-            include_directories(${PYTHON_INCLUDE_DIRS})
-            set(CMAKE_SWIG_FLAGS -keyword) # is necessary for using keyword args
-            if (FOX_FOUND)
-                set(CMAKE_SWIG_FLAGS ${CMAKE_SWIG_FLAGS} -DHAVE_LIBSUMOGUI)
-            endif()
-            # other options which should be evaluated: -builtin, -modern, -extranative
-            set(SWIG_OUTFILE_DIR ${CMAKE_CURRENT_BINARY_DIR})
-            set(CMAKE_SWIG_OUTDIR ${CMAKE_SOURCE_DIR}/tools/libsumo)
-            set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/tools/libsumo)
+        # other options which should be evaluated: -builtin, -modern, -extranative
+        set(SWIG_OUTFILE_DIR ${CMAKE_CURRENT_BINARY_DIR})
+        set(CMAKE_SWIG_OUTDIR ${CMAKE_SOURCE_DIR}/tools/libsumo)
+        set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/tools/libsumo)
 #            set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_DEBUG ${CMAKE_SOURCE_DIR}/tools/libsumo)
-            set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELEASE ${CMAKE_SOURCE_DIR}/tools/libsumo)
-            set(SWIG_MODULE_libsumo_EXTRA_DEPS ${LIBSUMO_HEADERS} libsumo_typemap.i)
-            if (${CMAKE_VERSION} VERSION_GREATER 3.8.0)
-                if (CLANG_COMPILER)
-                    set_property(SOURCE libsumo.i PROPERTY GENERATED_COMPILE_OPTIONS "-Wno-deprecated-declarations")
-                endif()
-                SWIG_ADD_LIBRARY(libsumo LANGUAGE python SOURCES libsumo.i)
-            else()
-                SWIG_ADD_MODULE(libsumo python libsumo.i)
-            endif()
-            add_dependencies(${SWIG_MODULE_libsumo_REAL_NAME} generate-version-h install_dll)
-            if ((GNU_COMPILER OR CLANG_COMPILER) AND NOT APPLE)
-                swig_link_libraries(libsumo -Wl,--whole-archive ${libsumo_link_library} ${sumolibs} -Wl,--no-whole-archive)
-            else()
-                set_target_properties(${SWIG_MODULE_libsumo_REAL_NAME} PROPERTIES FOLDER "libsumo")
-                if (SKBUILD OR ${CMAKE_VERSION} VERSION_LESS 3.14.0)
-                    swig_link_libraries(libsumo ${libsumo_link_library} ${sumolibs} ${PYTHON_LIBRARIES})
-                else()
-                    # using target fixes segfault in macos, swig_link_libraries is also deprecated
-                    target_link_libraries(libsumo ${libsumo_link_library} ${sumolibs} Python::Module)
-                endif()
-            endif()
-            if (WIN32)
-                swig_link_libraries(libsumo ${PYTHON_LIBRARIES})
-            endif()
-            swig_link_libraries(libsumo ${sumo_link_libraries})
-            if (NOT ${PYTHON_SETUPTOOLS_MISSING})
-                if (${PYTHON_BUILD_MISSING})
-                    install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} ${TOOLS_DIR}/build/setup-libsumo.py clean --all install --root=\$ENV{DESTDIR}/ --prefix=${CMAKE_INSTALL_PREFIX} --optimize=1)"
-                            COMPONENT pylibsumo)
-                else ()
-                    install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} ./build/version.py ./build/setup-libsumo.py ./setup.py COMMAND ${PYTHON_EXECUTABLE} -m pip install --root=\$ENV{DESTDIR}/ --prefix=${CMAKE_INSTALL_PREFIX} . WORKING_DIRECTORY ${TOOLS_DIR})"
-                            COMPONENT pylibsumo)
-                endif()
+        set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELEASE ${CMAKE_SOURCE_DIR}/tools/libsumo)
+        set(SWIG_MODULE_libsumo_EXTRA_DEPS ${LIBSUMO_HEADERS} libsumo_typemap.i)
+        if (${CMAKE_VERSION} VERSION_GREATER 3.8.0)
+            if (CLANG_COMPILER)
+                set_property(SOURCE libsumo.i PROPERTY GENERATED_COMPILE_OPTIONS "-Wno-deprecated-declarations")
             endif()
+            SWIG_ADD_LIBRARY(libsumo LANGUAGE python SOURCES libsumo.i)
         else()
-            message(WARNING "ENABLE_PYTHON_BINDINGS is set but Python libraries were not found.")
+            SWIG_ADD_MODULE(libsumo python libsumo.i)
+        endif()
+        add_dependencies(${SWIG_MODULE_libsumo_REAL_NAME} generate-version-h install_dll)
+        if ((GNU_COMPILER OR CLANG_COMPILER) AND NOT APPLE)
+            swig_link_libraries(libsumo -Wl,--whole-archive ${libsumo_link_library} ${sumolibs} -Wl,--no-whole-archive)
+        else()
+            set_target_properties(${SWIG_MODULE_libsumo_REAL_NAME} PROPERTIES FOLDER "libsumo")
+            if (SKBUILD OR ${CMAKE_VERSION} VERSION_LESS 3.14.0)
+                swig_link_libraries(libsumo ${libsumo_link_library} ${sumolibs} ${PYTHON_LIBRARIES})
+            else()
+                # using target fixes segfault in macos, swig_link_libraries is also deprecated
+                target_link_libraries(libsumo ${libsumo_link_library} ${sumolibs} Python::Module)
+            endif()
+        endif()
+        if (WIN32)
+            swig_link_libraries(libsumo ${PYTHON_LIBRARIES})
+        endif()
+        swig_link_libraries(libsumo ${sumo_link_libraries})
+        if (NOT ${PYTHON_SETUPTOOLS_MISSING})
+            if (${PYTHON_BUILD_MISSING})
+                install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} ${TOOLS_DIR}/build/setup-libsumo.py clean --all install --root=\$ENV{DESTDIR}/ --prefix=${CMAKE_INSTALL_PREFIX} --optimize=1)"
+                        COMPONENT pylibsumo)
+            else ()
+                install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} ./build/version.py ./build/setup-libsumo.py ./setup.py COMMAND ${PYTHON_EXECUTABLE} -m pip install --root=\$ENV{DESTDIR}/ --prefix=${CMAKE_INSTALL_PREFIX} . WORKING_DIRECTORY ${TOOLS_DIR})"
+                        COMPONENT pylibsumo)
+            endif()
         endif()
     endif()
 
diff -Nru sumo-1.17.0/src/libsumo/Edge.cpp sumo-1.18.0/src/libsumo/Edge.cpp
--- sumo-1.17.0/src/libsumo/Edge.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/libsumo/Edge.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -29,6 +29,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include "Edge.h"
 
@@ -281,6 +282,14 @@
     return vehIDs;
 }
 
+
+double
+Edge::getAngle(const std::string& edgeID, double relativePosition) {
+    const std::vector& lanes = getEdge(edgeID)->getLanes();
+    return lanes.empty() ? libsumo::INVALID_DOUBLE_VALUE : Lane::getAngle(lanes.front()->getID(), relativePosition);
+}
+
+
 std::string
 Edge::getParameter(const std::string& edgeID, const std::string& param) {
     return getEdge(edgeID)->getParameter(param, "");
@@ -425,6 +434,9 @@
             return wrapper->wrapString(objID, variable, getStreetName(objID));
         case VAR_PENDING_VEHICLES:
             return wrapper->wrapStringList(objID, variable, getPendingVehicles(objID));
+        case VAR_ANGLE:
+            paramData->readUnsignedByte();
+            return wrapper->wrapDouble(objID, variable, getAngle(objID, paramData->readDouble()));
         case libsumo::VAR_PARAMETER:
             paramData->readUnsignedByte();
             return wrapper->wrapString(objID, variable, getParameter(objID, paramData->readString()));
diff -Nru sumo-1.17.0/src/libsumo/Edge.h sumo-1.18.0/src/libsumo/Edge.h
--- sumo-1.17.0/src/libsumo/Edge.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/libsumo/Edge.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -68,6 +68,7 @@
     static int getLaneNumber(const std::string& edgeID);
     static std::string getStreetName(const std::string& edgeID);
     static const std::vector getPendingVehicles(const std::string& edgeID);
+    static double getAngle(const std::string& edgeID, double relativePosition = libsumo::INVALID_DOUBLE_VALUE);
 
     LIBSUMO_ID_PARAMETER_API
     LIBSUMO_SUBSCRIPTION_API
diff -Nru sumo-1.17.0/src/libsumo/GUI.cpp sumo-1.18.0/src/libsumo/GUI.cpp
--- sumo-1.17.0/src/libsumo/GUI.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/libsumo/GUI.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -60,19 +60,21 @@
 // ===========================================================================
 std::vector
 GUI::getIDList() {
-    if (GUIMainWindow::getInstance() == nullptr) {
+    try {
+        return GUIMainWindow::getInstance()->getViewIDs();
+    } catch (const ProcessError&) {
         throw TraCIException("GUI is not running, command not implemented in command line sumo");
     }
-    return GUIMainWindow::getInstance()->getViewIDs();
 }
 
 
 int
 GUI::getIDCount() {
-    if (GUIMainWindow::getInstance() == nullptr) {
+    try {
+        return (int)GUIMainWindow::getInstance()->getViewIDs().size();
+    } catch (const ProcessError&) {
         throw TraCIException("GUI is not running, command not implemented in command line sumo");
     }
-    return (int)GUIMainWindow::getInstance()->getViewIDs().size();
 }
 
 
@@ -157,24 +159,24 @@
 
 void
 GUI::addView(const std::string& viewID, const std::string& schemeName, bool in3D) {
-    GUIMainWindow* const mw = GUIMainWindow::getInstance();
-    if (mw == nullptr) {
+    try {
+        // calling openNewView directly doesn't work from the traci/simulation thread
+        GUIMainWindow::getInstance()->sendBlockingEvent(new GUIEvent_AddView(viewID, schemeName, in3D));
+    } catch (const ProcessError&) {
         throw TraCIException("GUI is not running, command not implemented in command line sumo");
     }
-    // calling openNewView directly doesn't work from the traci/simulation thread
-    mw->sendBlockingEvent(new GUIEvent_AddView(viewID, schemeName, in3D));
     // sonar thinks here is a memory leak but the GUIApplicationWindow does the clean up
 }  // NOSONAR
 
 
 void
 GUI::removeView(const std::string& viewID) {
-    GUIMainWindow* const mw = GUIMainWindow::getInstance();
-    if (mw == nullptr) {
+    try {
+        // calling removeViewByID directly doesn't work from the traci/simulation thread
+        GUIMainWindow::getInstance()->sendBlockingEvent(new GUIEvent_CloseView(viewID));
+    } catch (const ProcessError&) {
         throw TraCIException("GUI is not running, command not implemented in command line sumo");
     }
-    // calling removeViewByID directly doesn't work from the traci/simulation thread
-    mw->sendBlockingEvent(new GUIEvent_CloseView(viewID));
     // sonar thinks here is a memory leak but the GUIApplicationWindow does the clean up
 }  // NOSONAR
 
@@ -223,11 +225,11 @@
 
 bool
 GUI::hasView(const std::string& viewID) {
-    GUIMainWindow* const mw = GUIMainWindow::getInstance();
-    if (mw == nullptr) {
+    try {
+        return GUIMainWindow::getInstance()->getViewByID(viewID) != nullptr;
+    } catch (const ProcessError&) {
         throw TraCIException("GUI is not running, command not implemented in command line sumo");
     }
-    return mw->getViewByID(viewID) != nullptr;
 }
 
 
@@ -338,7 +340,7 @@
         myWindow->getRunner()->enableLibsumo();
         // Load configuration given on command line
         myWindow->loadOnStartup(true);
-    } catch (ProcessError& e) {
+    } catch (const ProcessError& e) {
         throw TraCIException(e.what());
     }
     return true;
@@ -394,15 +396,15 @@
 GUISUMOAbstractView*
 GUI::getView(const std::string& id) {
     // we cannot use myWindow here, this is not set for the traci server
-    GUIMainWindow* const mw = GUIMainWindow::getInstance();
-    if (mw == nullptr) {
+    try {
+        GUIGlChildWindow* const c = GUIMainWindow::getInstance()->getViewByID(id);
+        if (c == nullptr) {
+            throw TraCIException("View '" + id + "' is not known");
+        }
+        return c->getView();
+    } catch (const ProcessError&) {
         throw TraCIException("GUI is not running, command not implemented in command line sumo");
     }
-    GUIGlChildWindow* const c = mw->getViewByID(id);
-    if (c == nullptr) {
-        throw TraCIException("View '" + id + "' is not known");
-    }
-    return c->getView();
 }
 
 
diff -Nru sumo-1.17.0/src/libsumo/GUI.h sumo-1.18.0/src/libsumo/GUI.h
--- sumo-1.17.0/src/libsumo/GUI.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/libsumo/GUI.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/libsumo/Helper.cpp sumo-1.18.0/src/libsumo/Helper.cpp
--- sumo-1.17.0/src/libsumo/Helper.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/libsumo/Helper.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/libsumo/Helper.h sumo-1.18.0/src/libsumo/Helper.h
--- sumo-1.17.0/src/libsumo/Helper.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/libsumo/Helper.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/libsumo/InductionLoop.cpp sumo-1.18.0/src/libsumo/InductionLoop.cpp
--- sumo-1.17.0/src/libsumo/InductionLoop.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/libsumo/InductionLoop.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/libsumo/InductionLoop.h sumo-1.18.0/src/libsumo/InductionLoop.h
--- sumo-1.17.0/src/libsumo/InductionLoop.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/libsumo/InductionLoop.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/libsumo/Junction.cpp sumo-1.18.0/src/libsumo/Junction.cpp
--- sumo-1.17.0/src/libsumo/Junction.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/libsumo/Junction.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/libsumo/Junction.h sumo-1.18.0/src/libsumo/Junction.h
--- sumo-1.17.0/src/libsumo/Junction.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/libsumo/Junction.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/libsumo/LaneArea.cpp sumo-1.18.0/src/libsumo/LaneArea.cpp
--- sumo-1.17.0/src/libsumo/LaneArea.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/libsumo/LaneArea.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/libsumo/LaneArea.h sumo-1.18.0/src/libsumo/LaneArea.h
--- sumo-1.17.0/src/libsumo/LaneArea.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/libsumo/LaneArea.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -28,6 +28,8 @@
 // ===========================================================================
 #ifndef LIBTRACI
 class MSE2Collector;
+class NamedRTree;
+class PositionVector;
 #endif
 
 
diff -Nru sumo-1.17.0/src/libsumo/Lane.cpp sumo-1.18.0/src/libsumo/Lane.cpp
--- sumo-1.17.0/src/libsumo/Lane.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/libsumo/Lane.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -30,6 +30,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include "Lane.h"
@@ -332,6 +333,22 @@
 }
 
 
+double
+Lane::getAngle(const std::string& laneID, double relativePosition) {
+    double angle;
+    MSLane* lane = getLane(laneID);
+    if (relativePosition == libsumo::INVALID_DOUBLE_VALUE) {
+        Position start = lane->getShape().front();
+        Position end = lane->getShape().back();
+        angle = start.angleTo2D(end);
+    } else {
+        angle = lane->getShape().rotationAtOffset(lane->interpolateLanePosToGeometryPos(relativePosition));
+    }
+
+    return GeomHelper::naviDegree(angle);
+}
+
+
 void
 Lane::setAllowed(const std::string& laneID, std::string allowedClass) {
     setAllowed(laneID, std::vector({allowedClass}));
@@ -493,6 +510,9 @@
             return wrapper->wrapPositionVector(objID, variable, getShape(objID));
         case VAR_PENDING_VEHICLES:
             return wrapper->wrapStringList(objID, variable, getPendingVehicles(objID));
+        case VAR_ANGLE:
+            paramData->readUnsignedByte();
+            return wrapper->wrapDouble(objID, variable, getAngle(objID, paramData->readDouble()));
         case libsumo::VAR_PARAMETER:
             paramData->readUnsignedByte();
             return wrapper->wrapString(objID, variable, getParameter(objID, paramData->readString()));
diff -Nru sumo-1.17.0/src/libsumo/Lane.h sumo-1.18.0/src/libsumo/Lane.h
--- sumo-1.17.0/src/libsumo/Lane.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/libsumo/Lane.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -75,6 +75,7 @@
     static std::vector getFoes(const std::string& laneID, const std::string& toLaneID);
     static std::vector getInternalFoes(const std::string& laneID);
     static const std::vector getPendingVehicles(const std::string& laneID);
+    static double getAngle(const std::string& laneID, double relativePosition = libsumo::INVALID_DOUBLE_VALUE);
 
     LIBSUMO_ID_PARAMETER_API
     LIBSUMO_SUBSCRIPTION_API
diff -Nru sumo-1.17.0/src/libsumo/libsumo.h sumo-1.18.0/src/libsumo/libsumo.h
--- sumo-1.17.0/src/libsumo/libsumo.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/libsumo/libsumo.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/libsumo/libsumo.i sumo-1.18.0/src/libsumo/libsumo.i
--- sumo-1.17.0/src/libsumo/libsumo.i	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/libsumo/libsumo.i	2023-06-28 20:02:17.000000000 +0000
@@ -38,10 +38,10 @@
 %template(TraCIReservationVector) std::vector;
 %template(TraCISignalConstraintVector) std::vector;
 %template(TraCICollisionVector) std::vector;
-%template(TraCIJunctionFoeVector) std::vector;
 #ifndef SWIGPYTHON
 %template(TraCIBestLanesVector) std::vector;
 %template(TraCIConnectionVector) std::vector;
+%template(TraCIJunctionFoeVector) std::vector;
 %template(TraCILinkVector) std::vector;
 %template(TraCILinkVectorVector) std::vector< std::vector >;
 %template(TraCINextTLSVector) std::vector;
diff -Nru sumo-1.17.0/src/libsumo/libsumo_typemap.i sumo-1.18.0/src/libsumo/libsumo_typemap.i
--- sumo-1.17.0/src/libsumo/libsumo_typemap.i	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/libsumo/libsumo_typemap.i	2023-06-28 20:02:17.000000000 +0000
@@ -308,6 +308,23 @@
     }
 };
 
+%typemap(out) std::vector {
+    $result = PyTuple_New($1.size());
+    int index = 0;
+    for (auto iter = $1.begin(); iter != $1.end(); ++iter) {
+        PyTuple_SetItem($result, index++, Py_BuildValue("(sddddssNN)",
+                                                        iter->foeId.c_str(),
+                                                        iter->egoDist,
+                                                        iter->foeDist,
+                                                        iter->egoExitDist,
+                                                        iter->foeExitDist,
+                                                        iter->egoLane.c_str(),
+                                                        iter->foeLane.c_str(),
+                                                        PyBool_FromLong(iter->egoResponse),
+                                                        PyBool_FromLong(iter->foeResponse)));
+    }
+};
+
 %typemap(out) std::vector > {
     $result = PyTuple_New($1.size());
     int index = 0;
diff -Nru sumo-1.17.0/src/libsumo/libtraci.h sumo-1.18.0/src/libsumo/libtraci.h
--- sumo-1.17.0/src/libsumo/libtraci.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/libsumo/libtraci.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/libsumo/MeanData.cpp sumo-1.18.0/src/libsumo/MeanData.cpp
--- sumo-1.17.0/src/libsumo/MeanData.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/libsumo/MeanData.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/libsumo/MeanData.h sumo-1.18.0/src/libsumo/MeanData.h
--- sumo-1.17.0/src/libsumo/MeanData.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/libsumo/MeanData.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/libsumo/MultiEntryExit.cpp sumo-1.18.0/src/libsumo/MultiEntryExit.cpp
--- sumo-1.17.0/src/libsumo/MultiEntryExit.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/libsumo/MultiEntryExit.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/libsumo/MultiEntryExit.h sumo-1.18.0/src/libsumo/MultiEntryExit.h
--- sumo-1.17.0/src/libsumo/MultiEntryExit.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/libsumo/MultiEntryExit.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/libsumo/OverheadWire.cpp sumo-1.18.0/src/libsumo/OverheadWire.cpp
--- sumo-1.17.0/src/libsumo/OverheadWire.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/libsumo/OverheadWire.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/libsumo/OverheadWire.h sumo-1.18.0/src/libsumo/OverheadWire.h
--- sumo-1.17.0/src/libsumo/OverheadWire.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/libsumo/OverheadWire.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/libsumo/ParkingArea.cpp sumo-1.18.0/src/libsumo/ParkingArea.cpp
--- sumo-1.17.0/src/libsumo/ParkingArea.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/libsumo/ParkingArea.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/libsumo/ParkingArea.h sumo-1.18.0/src/libsumo/ParkingArea.h
--- sumo-1.17.0/src/libsumo/ParkingArea.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/libsumo/ParkingArea.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/libsumo/Person.cpp sumo-1.18.0/src/libsumo/Person.cpp
--- sumo-1.17.0/src/libsumo/Person.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/libsumo/Person.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -470,10 +470,15 @@
 
 double
 Person::getBoardingDuration(const std::string& personID) {
-    return STEPS2TIME(getPerson(personID)->getVehicleType().getLoadingDuration(true));
+    return STEPS2TIME(getPerson(personID)->getVehicleType().getBoardingDuration(true));
 }
 
 
+double
+Person::getImpatience(const std::string& personID) {
+    return getPerson(personID)->getImpatience();
+}
+
 
 void
 Person::setSpeed(const std::string& personID, double speed) {
@@ -926,7 +931,7 @@
                 try {
                     tmp.move2side(-lanePosLat); // moved to left
                 } catch (ProcessError&) {
-                    WRITE_WARNINGF(TL("Could not determine position on lane '% at lateral position %."), lane->getID(), toString(-lanePosLat));
+                    WRITE_WARNINGF(TL("Could not determine position on lane '%' at lateral position %."), lane->getID(), toString(-lanePosLat));
                 }
                 //std::cout << " lane=" << lane->getID() << " posLat=" << lanePosLat << " shape=" << lane->getShape() << " tmp=" << tmp << " tmpDist=" << tmp.distance2D(pos) << "\n";
                 if (tmp.distance2D(pos) > perpDist) {
@@ -1088,6 +1093,19 @@
 
 
 void
+Person::setBoardingDuration(const std::string& personID, double boardingDuration)  {
+    Helper::getPerson(personID)->getSingularType().setBoardingDuration(TIME2STEPS(boardingDuration));
+}
+
+
+void
+Person::setImpatience(const std::string& personID, double impatience)  {
+    Helper::getVehicle(personID)->getSingularType().setImpatience(impatience);
+}
+
+
+
+void
 Person::setTau(const std::string& personID, double tau) {
     getPerson(personID)->getSingularType().setTau(tau);
 }
@@ -1195,6 +1213,8 @@
             return wrapper->wrapColor(objID, variable, getColor(objID));
         case VAR_WAITING_TIME:
             return wrapper->wrapDouble(objID, variable, getWaitingTime(objID));
+        case VAR_IMPATIENCE:
+            return wrapper->wrapDouble(objID, variable, getImpatience(objID));
         case VAR_TYPE:
             return wrapper->wrapString(objID, variable, getTypeID(objID));
         case VAR_SPEED_FACTOR:
diff -Nru sumo-1.17.0/src/libsumo/Person.h sumo-1.18.0/src/libsumo/Person.h
--- sumo-1.17.0/src/libsumo/Person.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/libsumo/Person.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/libsumo/POI.cpp sumo-1.18.0/src/libsumo/POI.cpp
--- sumo-1.17.0/src/libsumo/POI.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/libsumo/POI.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/libsumo/POI.h sumo-1.18.0/src/libsumo/POI.h
--- sumo-1.17.0/src/libsumo/POI.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/libsumo/POI.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/libsumo/Polygon.cpp sumo-1.18.0/src/libsumo/Polygon.cpp
--- sumo-1.17.0/src/libsumo/Polygon.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/libsumo/Polygon.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/libsumo/Polygon.h sumo-1.18.0/src/libsumo/Polygon.h
--- sumo-1.17.0/src/libsumo/Polygon.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/libsumo/Polygon.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -29,6 +29,7 @@
 // ===========================================================================
 #ifndef LIBTRACI
 class NamedRTree;
+class PositionVector;
 class SUMOPolygon;
 class SUMOTrafficObject;
 #endif
diff -Nru sumo-1.17.0/src/libsumo/Rerouter.cpp sumo-1.18.0/src/libsumo/Rerouter.cpp
--- sumo-1.17.0/src/libsumo/Rerouter.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/libsumo/Rerouter.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/libsumo/Rerouter.h sumo-1.18.0/src/libsumo/Rerouter.h
--- sumo-1.17.0/src/libsumo/Rerouter.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/libsumo/Rerouter.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/libsumo/Route.cpp sumo-1.18.0/src/libsumo/Route.cpp
--- sumo-1.17.0/src/libsumo/Route.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/libsumo/Route.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/libsumo/Route.h sumo-1.18.0/src/libsumo/Route.h
--- sumo-1.17.0/src/libsumo/Route.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/libsumo/Route.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/libsumo/RouteProbe.cpp sumo-1.18.0/src/libsumo/RouteProbe.cpp
--- sumo-1.17.0/src/libsumo/RouteProbe.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/libsumo/RouteProbe.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/libsumo/RouteProbe.h sumo-1.18.0/src/libsumo/RouteProbe.h
--- sumo-1.17.0/src/libsumo/RouteProbe.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/libsumo/RouteProbe.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/libsumo/Simulation.cpp sumo-1.18.0/src/libsumo/Simulation.cpp
--- sumo-1.17.0/src/libsumo/Simulation.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/libsumo/Simulation.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/libsumo/Simulation.h sumo-1.18.0/src/libsumo/Simulation.h
--- sumo-1.17.0/src/libsumo/Simulation.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/libsumo/Simulation.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/libsumo/StorageHelper.h sumo-1.18.0/src/libsumo/StorageHelper.h
--- sumo-1.17.0/src/libsumo/StorageHelper.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/libsumo/StorageHelper.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -93,6 +93,13 @@
         return size;
     }
 
+    static bool readBool(tcpip::Storage& ret, const std::string& error = "") {
+        if (ret.readUnsignedByte() != libsumo::TYPE_UBYTE && error != "") {
+            throw TraCIException(error);
+        }
+        return ret.readUnsignedByte() != 0;
+    }
+
     static void readStage(tcpip::Storage& inputStorage, libsumo::TraCIStage& stage, const std::string& error = "") {
         stage.type = readTypedInt(inputStorage, error);
         stage.vType = readTypedString(inputStorage, error);
diff -Nru sumo-1.17.0/src/libsumo/Subscription.h sumo-1.18.0/src/libsumo/Subscription.h
--- sumo-1.17.0/src/libsumo/Subscription.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/libsumo/Subscription.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/libsumo/TraCIConstants.h sumo-1.18.0/src/libsumo/TraCIConstants.h
--- sumo-1.17.0/src/libsumo/TraCIConstants.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/libsumo/TraCIConstants.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2007-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -908,7 +908,7 @@
 // list of allowed vehicle classes for lane changes (get&set: lanes)
 TRACI_CONST int LANE_CHANGES = 0x3c;
 
-// list of foe lanes (get: lanes)
+// list of foe lanes (get: lane, vehicle)
 TRACI_CONST int VAR_FOES = 0x37;
 
 // slope (get: edge, lane, vehicle, person)
@@ -938,7 +938,7 @@
 // position (3D) (get: vehicle, poi, set: poi)
 TRACI_CONST int VAR_POSITION3D = 0x39;
 
-// angle (get: vehicle, poi, gui; set: poi, gui)
+// angle (get: vehicle, edge, lane, poi, gui; set: poi, gui)
 TRACI_CONST int VAR_ANGLE = 0x43;
 
 // length (get: vehicle types, lanes, lane area detector, set: lanes)
@@ -1143,6 +1143,9 @@
 // boarding time (get: vehicle type, vehicle, person)
 TRACI_CONST int VAR_BOARDING_DURATION = 0x2f;
 
+// impatience (get,set: vehicle type, vehicle, person)
+TRACI_CONST int VAR_IMPATIENCE = 0x26;
+
 TRACI_CONST int VAR_BUS_STOP_ID_LIST = 0x9f;
 
 // number of persons waiting at a defined bus stop (get: simulation)
@@ -1328,7 +1331,6 @@
 // retrieves abstract parameter and returns (key, value) tuple
 TRACI_CONST int VAR_PARAMETER_WITH_KEY = 0x3e;
 
-
 // add an instance (poi, polygon, vehicle, person, route, gui)
 TRACI_CONST int ADD = 0x80;
 
diff -Nru sumo-1.17.0/src/libsumo/TraCIDefs.h sumo-1.18.0/src/libsumo/TraCIDefs.h
--- sumo-1.17.0/src/libsumo/TraCIDefs.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/libsumo/TraCIDefs.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/libsumo/TrafficLight.cpp sumo-1.18.0/src/libsumo/TrafficLight.cpp
--- sumo-1.17.0/src/libsumo/TrafficLight.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/libsumo/TrafficLight.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/libsumo/TrafficLight.h sumo-1.18.0/src/libsumo/TrafficLight.h
--- sumo-1.17.0/src/libsumo/TrafficLight.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/libsumo/TrafficLight.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/libsumo/VariableSpeedSign.cpp sumo-1.18.0/src/libsumo/VariableSpeedSign.cpp
--- sumo-1.17.0/src/libsumo/VariableSpeedSign.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/libsumo/VariableSpeedSign.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/libsumo/VariableSpeedSign.h sumo-1.18.0/src/libsumo/VariableSpeedSign.h
--- sumo-1.17.0/src/libsumo/VariableSpeedSign.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/libsumo/VariableSpeedSign.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/libsumo/Vehicle.cpp sumo-1.18.0/src/libsumo/Vehicle.cpp
--- sumo-1.17.0/src/libsumo/Vehicle.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/libsumo/Vehicle.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -355,7 +355,7 @@
         }
         const std::vector internalLanes;
         // distance to the end of the lane
-        double curDist = veh->getPositionOnLane();
+        double curDist = -veh->getPositionOnLane();
         for (const MSLane* lane : veh->getUpcomingLanesUntil(dist)) {
             curDist += lane->getLength();
             if (lane->isInternal()) {
@@ -365,18 +365,24 @@
                 const MSJunctionLogic* logic = exitLink->getJunction()->getLogic();
                 for (const MSLane* foeLane : exitLink->getFoeLanes()) {
                     const MSLink::ConflictInfo& ci = conflicts[foeIndex];
-                    const double distBehindCrossing = ci.getLengthBehindCrossing(exitLink);
-                    if (distBehindCrossing == -MSLink::NO_INTERSECTION) {
+                    if (ci.flag == MSLink::CONFLICT_NO_INTERSECTION) {
                         continue;
                     }
+                    const double distBehindCrossing = ci.lengthBehindCrossing;
                     const MSLink* foeExitLink = foeLane->getLinkCont().front();
                     const double distToCrossing = curDist - distBehindCrossing;
                     const double foeDistBehindCrossing = ci.getFoeLengthBehindCrossing(foeExitLink);
                     for (auto item : foeExitLink->getApproaching()) {
+                        const SUMOVehicle* foe = item.first;
                         TraCIJunctionFoe jf;
-                        jf.foeId = item.first->getID();
+                        jf.foeId = foe->getID();
                         jf.egoDist = distToCrossing;
-                        jf.foeDist = item.second.dist - foeDistBehindCrossing;
+                        // approach information is from the start of the previous step
+                        // but the foe vehicle then moved within that steop
+                        const double prevFoeDist = SPEED2DIST(MSGlobals::gSemiImplicitEulerUpdate
+                                                              ? foe->getSpeed()
+                                                              : (foe->getSpeed() + foe->getPreviousSpeed()) / 2);
+                        jf.foeDist = item.second.dist - foeDistBehindCrossing - prevFoeDist;
                         jf.egoExitDist = jf.egoDist + ci.conflictSize;
                         jf.foeExitDist = jf.foeDist + ci.getFoeConflictSize(foeExitLink);
                         jf.egoLane = lane->getID();
@@ -897,6 +903,13 @@
     return Helper::getVehicle(vehID)->getStopDelay();
 }
 
+
+double
+Vehicle::getImpatience(const std::string& vehID) {
+    return Helper::getVehicle(vehID)->getImpatience();
+}
+
+
 double
 Vehicle::getStopArrivalDelay(const std::string& vehID) {
     double result = Helper::getVehicle(vehID)->getStopArrivalDelay();
@@ -1156,7 +1169,7 @@
 
 
 std::string
-Vehicle::getStopParameter(const std::string& vehID, int nextStopIndex, const std::string& param) {
+Vehicle::getStopParameter(const std::string& vehID, int nextStopIndex, const std::string& param, bool customParam) {
     MSBaseVehicle* vehicle = Helper::getVehicle(vehID);
     try {
         if (nextStopIndex >= (int)vehicle->getStops().size() || (nextStopIndex < 0 && -nextStopIndex > (int)vehicle->getPastStops().size())) {
@@ -1167,6 +1180,10 @@
         const SUMOVehicleParameter::Stop& pars = (nextStopIndex >= 0
                 ? vehicle->getStop(nextStopIndex).pars
                 : vehicle->getPastStops()[vehicle->getPastStops().size() + nextStopIndex]);
+        if (customParam) {
+            // custom user parameter
+            return pars.getParameter(param, "");
+        }
 
         if (param == toString(SUMO_ATTR_EDGE)) {
             return pars.edge;
@@ -1237,11 +1254,16 @@
 
 void
 Vehicle::setStopParameter(const std::string& vehID, int nextStopIndex,
-                          const std::string& param, const std::string& value) {
+                          const std::string& param, const std::string& value,
+                          bool customParam) {
     MSBaseVehicle* vehicle = Helper::getVehicle(vehID);
     try {
         MSStop& stop = vehicle->getStop(nextStopIndex);
         SUMOVehicleParameter::Stop& pars = const_cast(stop.pars);
+        if (customParam) {
+            pars.setParameter(param, value);
+            return;
+        }
         std::string error;
         if (param == toString(SUMO_ATTR_EDGE)
                 || param == toString(SUMO_ATTR_BUS_STOP)
@@ -1504,6 +1526,10 @@
     if (!vehicleType) {
         throw TraCIException("Invalid type '" + typeID + "' for vehicle '" + vehID + "'.");
     }
+    if (typeID != "DEFAULT_VEHTYPE") {
+        vehicleParams.vtypeid = typeID;
+        vehicleParams.parametersSet |= VEHPARS_VTYPE_SET;
+    }
     ConstMSRoutePtr route = MSRoute::dictionary(routeID);
     if (!route) {
         if (routeID == "") {
@@ -1726,7 +1752,7 @@
             pos = lane->geometryPositionAtOffset(lanePos, -lanePosLat);
         }
         assert((found && lane != 0) || (!found && lane == 0));
-        assert(!ISNAN(lanePos));
+        assert(!std::isnan(lanePos));
         if (angle == INVALID_DOUBLE_VALUE) {
             if (lane != nullptr) {
                 angle = GeomHelper::naviDegree(lane->getShape().rotationAtOffset(lanePos));
@@ -2177,6 +2203,20 @@
 
 
 void
+Vehicle::setBoardingDuration(const std::string& vehID, double boardingDuration)  {
+    Helper::getVehicle(vehID)->getSingularType().setBoardingDuration(TIME2STEPS(boardingDuration));
+}
+
+
+void
+Vehicle::setImpatience(const std::string& vehID, double impatience)  {
+    MSBaseVehicle* vehicle = Helper::getVehicle(vehID);
+    const double normalImpatience = vehicle->getImpatience();
+    vehicle->getBaseInfluencer().setExtraImpatience(impatience - normalImpatience);
+}
+
+
+void
 Vehicle::remove(const std::string& vehID, char reason) {
     MSBaseVehicle* veh = Helper::getVehicle(vehID);
     MSMoveReminder::Notification n = MSMoveReminder::NOTIFICATION_ARRIVED;
@@ -2400,9 +2440,8 @@
         if (microVeh == nullptr) {
             throw TraCIException("Meso Vehicle '" + vehID + "' does not support carFollowModel parameters.");
         }
-        const std::string attrName = key.substr(15);
         try {
-            microVeh->getCarFollowModel().setParameter(microVeh, attrName, value);
+            veh->setCarFollowModelParameter(key, value);
         } catch (InvalidArgument& e) {
             throw TraCIException("Vehicle '" + vehID + "' does not support carFollowModel parameter '" + key + "' (" + e.what() + ").");
         }
@@ -2783,6 +2822,8 @@
             return wrapper->wrapDouble(objID, variable, getLastActionTime(objID));
         case VAR_STOP_DELAY:
             return wrapper->wrapDouble(objID, variable, getStopDelay(objID));
+        case VAR_IMPATIENCE:
+            return wrapper->wrapDouble(objID, variable, getImpatience(objID));
         case VAR_STOP_ARRIVALDELAY:
             return wrapper->wrapDouble(objID, variable, getStopArrivalDelay(objID));
         case VAR_TIMELOSS:
diff -Nru sumo-1.17.0/src/libsumo/Vehicle.h sumo-1.18.0/src/libsumo/Vehicle.h
--- sumo-1.17.0/src/libsumo/Vehicle.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/libsumo/Vehicle.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -91,7 +91,7 @@
     static std::vector getNextLinks(const std::string& vehID);
     static std::vector getStops(const std::string& vehID, int limit = 0);
     static int getStopState(const std::string& vehID);
-    static std::string getStopParameter(const std::string& vehID, int nextStopIndex, const std::string& param);
+    static std::string getStopParameter(const std::string& vehID, int nextStopIndex, const std::string& param, bool customParam = false);
 
     static double getDistance(const std::string& vehID);
     static double getDrivingDistance(const std::string& vehID, const std::string& edgeID, double position, int laneIndex = 0);
@@ -155,7 +155,8 @@
                            int teleport = 0);
 
     static void setStopParameter(const std::string& vehID, int nextStopIndex,
-                                 const std::string& param, const std::string& value);
+                                 const std::string& param, const std::string& value,
+                                 bool customParam = false);
 
     static void rerouteParkingArea(const std::string& vehID,
                                    const std::string& parkingAreaID);
diff -Nru sumo-1.17.0/src/libsumo/VehicleType.cpp sumo-1.18.0/src/libsumo/VehicleType.cpp
--- sumo-1.17.0/src/libsumo/VehicleType.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/libsumo/VehicleType.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -186,7 +186,23 @@
 
 std::string
 VehicleType::getParameter(const std::string& typeID, const std::string& key) {
-    return getVType(typeID)->getParameter().getParameter(key, "");
+    if (StringUtils::startsWith(key, "junctionModel.")) {
+        const std::string attrName = key.substr(14);
+        if (!SUMOXMLDefinitions::Attrs.hasString(attrName)) {
+            throw TraCIException("Invalid junctionModel parameter '" + key + "' for type '" + typeID + "'");
+        }
+        SumoXMLAttr attr = (SumoXMLAttr)SUMOXMLDefinitions::Attrs.get(attrName);
+        if (SUMOVTypeParameter::AllowedJMAttrs.count(attr) == 0) {
+            throw TraCIException("Invalid junctionModel parameter '" + key + "' for type '" + typeID + "'");
+        }
+        if (getVType(typeID)->getParameter().jmParameter.count(attr) != 0) {
+            return getVType(typeID)->getParameter().jmParameter.find(attr)->second;
+        } else {
+            return "";
+        }
+    } else {
+        return getVType(typeID)->getParameter().getParameter(key, "");
+    }
 }
 
 LIBSUMO_GET_PARAMETER_WITH_KEY_IMPLEMENTATION(VehicleType)
@@ -206,6 +222,11 @@
     return STEPS2TIME(getVType(typeID)->getBoardingDuration(true));
 }
 
+double
+VehicleType::getImpatience(const std::string& typeID) {
+    return getVType(typeID)->getImpatience();
+}
+
 void
 VehicleType::setLength(const std::string& typeID, double length)  {
     getVType(typeID)->setLength(length);
@@ -225,6 +246,18 @@
 
 
 void
+VehicleType::setBoardingDuration(const std::string& typeID, double boardingDuration)  {
+    getVType(typeID)->setBoardingDuration(TIME2STEPS(boardingDuration), true);
+}
+
+
+void
+VehicleType::setImpatience(const std::string& typeID, double impatience)  {
+    getVType(typeID)->setImpatience(impatience);
+}
+
+
+void
 VehicleType::setVehicleClass(const std::string& typeID, const std::string& clazz)  {
     getVType(typeID)->setVClass(getVehicleClassID(clazz));
 }
@@ -363,7 +396,24 @@
 
 void
 VehicleType::setParameter(const std::string& typeID, const std::string& name, const std::string& value) {
-    ((SUMOVTypeParameter&)getVType(typeID)->getParameter()).setParameter(name, value);
+    if (StringUtils::startsWith(name, "junctionModel.")) {
+        const std::string attrName = name.substr(14);
+        if (!SUMOXMLDefinitions::Attrs.hasString(attrName)) {
+            throw TraCIException("Invalid junctionModel parameter '" + name + "' for type '" + typeID + "'");
+        }
+        SumoXMLAttr attr = (SumoXMLAttr)SUMOXMLDefinitions::Attrs.get(attrName);
+        if (SUMOVTypeParameter::AllowedJMAttrs.count(attr) == 0) {
+            throw TraCIException("Invalid junctionModel parameter '" + name + "' for type '" + typeID + "'");
+        }
+        try {
+            StringUtils::toDouble(value); // check number format
+            ((SUMOVTypeParameter&)getVType(typeID)->getParameter()).jmParameter[attr] = value;
+        } catch (NumberFormatException&) {
+            throw TraCIException("Invalid junctionModel parameter value '" + value + "' for type '" + typeID + " (should be numeric)'");
+        }
+    } else {
+        ((SUMOVTypeParameter&)getVType(typeID)->getParameter()).setParameter(name, value);
+    }
 }
 
 
@@ -445,6 +495,8 @@
             return wrapper->wrapInt(objID, variable, getPersonCapacity(typeID));
         case VAR_BOARDING_DURATION:
             return wrapper->wrapDouble(objID, variable, getBoardingDuration(typeID));
+        case VAR_IMPATIENCE:
+            return wrapper->wrapDouble(objID, variable, getImpatience(typeID));
         case VAR_SCALE:
             return wrapper->wrapDouble(objID, variable, getScale(typeID));
         case libsumo::VAR_PARAMETER:
diff -Nru sumo-1.17.0/src/libsumo/VehicleType.h sumo-1.18.0/src/libsumo/VehicleType.h
--- sumo-1.17.0/src/libsumo/VehicleType.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/libsumo/VehicleType.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -49,6 +49,7 @@
 \
 static double getSpeedDeviation(const std::string& typeID); \
 static double getBoardingDuration(const std::string& typeID); \
+static double getImpatience(const std::string& typeID); \
 
 
 #define LIBSUMO_VEHICLE_TYPE_SETTER \
@@ -72,6 +73,8 @@
 static void setMaxSpeedLat(const std::string& typeID, double speed); \
 static void setLateralAlignment(const std::string& typeID, const std::string& latAlignment); \
 static void setActionStepLength(const std::string& typeID, double actionStepLength, bool resetActionOffset=true); \
+static void setBoardingDuration(const std::string& typeID, double boardingDuration); \
+static void setImpatience(const std::string& typeID, double impatience); \
 
 // ===========================================================================
 // class declarations
diff -Nru sumo-1.17.0/src/libtraci/BusStop.cpp sumo-1.18.0/src/libtraci/BusStop.cpp
--- sumo-1.17.0/src/libtraci/BusStop.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/libtraci/BusStop.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/libtraci/Calibrator.cpp sumo-1.18.0/src/libtraci/Calibrator.cpp
--- sumo-1.17.0/src/libtraci/Calibrator.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/libtraci/Calibrator.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/libtraci/ChargingStation.cpp sumo-1.18.0/src/libtraci/ChargingStation.cpp
--- sumo-1.17.0/src/libtraci/ChargingStation.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/libtraci/ChargingStation.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/libtraci/CMakeLists.txt sumo-1.18.0/src/libtraci/CMakeLists.txt
--- sumo-1.17.0/src/libtraci/CMakeLists.txt	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/libtraci/CMakeLists.txt	2023-06-28 20:02:17.000000000 +0000
@@ -130,71 +130,47 @@
         install(TARGETS libtracics DESTINATION bin LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
     endif()
 
-    if(ENABLE_PYTHON_BINDINGS)
-        if (MSVC)
-            # recheck that the platform of the generator and python matches
-            execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "import sys; print(sys.maxsize > 2**32)"
-                            OUTPUT_VARIABLE IS_PYTHON64 OUTPUT_STRIP_TRAILING_WHITESPACE)
-            if (${CMAKE_MODULE_LINKER_FLAGS} STREQUAL "/machine:x64")
-                if (${IS_PYTHON64} STREQUAL "False")
-                    message(STATUS "Did not find Python 64 bit. Please set PYTHON_EXECUTABLE, PYTHON_INCLUDE_DIR and PYTHON_LIBRARY manually.")
-                    set(PYTHONLIBS_FOUND OFF)
-                endif()
-            else()
-                if (${IS_PYTHON64} STREQUAL "True")
-                    message(STATUS "Did not find Python 32 bit. Please set PYTHON_EXECUTABLE, PYTHON_INCLUDE_DIR and PYTHON_LIBRARY manually.")
-                    set(PYTHONLIBS_FOUND OFF)
-                endif()
-            endif()
-            if (NOT PYTHON_DEBUG_LIBRARY AND "${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
-                message(STATUS "Did not find Python debug library. Please reinstall your python and enable the python debug libraries in the installer.")
-                set(PYTHONLIBS_FOUND OFF)
-            endif()
-        endif()
-        if(PYTHONLIBS_FOUND)
-            include_directories(${PYTHON_INCLUDE_DIRS})
+    if (ENABLE_PYTHON_BINDINGS AND PYTHON_INCLUDE_DIRS)
+        include_directories(${PYTHON_INCLUDE_DIRS})
 #                set(CMAKE_SWIG_FLAGS "")
-            set(CMAKE_SWIG_FLAGS "-keyword") # is necessary for using keyword args
+        set(CMAKE_SWIG_FLAGS "-keyword") # is necessary for using keyword args
 # other options which should be evaluated: -builtin, -modern, -extranative
-            set(SWIG_OUTFILE_DIR ${CMAKE_CURRENT_BINARY_DIR})
-            set(CMAKE_SWIG_OUTDIR ${CMAKE_SOURCE_DIR}/tools/libtraci)
-            set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/tools/libtraci)
+        set(SWIG_OUTFILE_DIR ${CMAKE_CURRENT_BINARY_DIR})
+        set(CMAKE_SWIG_OUTDIR ${CMAKE_SOURCE_DIR}/tools/libtraci)
+        set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/tools/libtraci)
 #            set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_DEBUG ${CMAKE_SOURCE_DIR}/tools/libtraci)
-            set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELEASE ${CMAKE_SOURCE_DIR}/tools/libtraci)
-            set(SWIG_MODULE_libtraci_EXTRA_DEPS ${libtraci_HEADERS} ../libsumo/libsumo_typemap.i)
-            if (${CMAKE_VERSION} VERSION_GREATER 3.8.0)
-                if (CLANG_COMPILER)
-                    set_property(SOURCE libtraci.i PROPERTY GENERATED_COMPILE_OPTIONS "-Wno-deprecated-declarations")
-                endif()
-                SWIG_ADD_LIBRARY(libtraci LANGUAGE python SOURCES libtraci.i)
-            else()
-                SWIG_ADD_MODULE(libtraci python libtraci.i)
+        set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELEASE ${CMAKE_SOURCE_DIR}/tools/libtraci)
+        set(SWIG_MODULE_libtraci_EXTRA_DEPS ${libtraci_HEADERS} ../libsumo/libsumo_typemap.i)
+        if (${CMAKE_VERSION} VERSION_GREATER 3.8.0)
+            if (CLANG_COMPILER)
+                set_property(SOURCE libtraci.i PROPERTY GENERATED_COMPILE_OPTIONS "-Wno-deprecated-declarations")
             endif()
-            if ((GNU_COMPILER OR CLANG_COMPILER) AND NOT APPLE)
-                swig_link_libraries(libtraci -Wl,--whole-archive libtracistatic ${libtcpip} -Wl,--no-whole-archive)
+            SWIG_ADD_LIBRARY(libtraci LANGUAGE python SOURCES libtraci.i)
+        else()
+            SWIG_ADD_MODULE(libtraci python libtraci.i)
+        endif()
+        if ((GNU_COMPILER OR CLANG_COMPILER) AND NOT APPLE)
+            swig_link_libraries(libtraci -Wl,--whole-archive libtracistatic ${libtcpip} -Wl,--no-whole-archive)
+        else()
+            set_target_properties(${SWIG_MODULE_libtraci_REAL_NAME} PROPERTIES FOLDER "libtraci")
+            if (SKBUILD OR ${CMAKE_VERSION} VERSION_LESS 3.14.0)
+                swig_link_libraries(libtraci libtracistatic ${libtcpip} ${PYTHON_LIBRARIES})
             else()
-                set_target_properties(${SWIG_MODULE_libtraci_REAL_NAME} PROPERTIES FOLDER "libtraci")
-                if (SKBUILD OR ${CMAKE_VERSION} VERSION_LESS 3.14.0)
-                    swig_link_libraries(libtraci libtracistatic ${libtcpip} ${PYTHON_LIBRARIES})
-                else()
-                    # using target fixes segfault in macos, swig_link_libraries is also deprecated
-                    target_link_libraries(libtraci libtracistatic ${libtcpip} Python::Module)
-                endif()
-            endif()
-            if (WIN32)
-                swig_link_libraries(libtraci ${PYTHON_LIBRARIES})
+                # using target fixes segfault in macos, swig_link_libraries is also deprecated
+                target_link_libraries(libtraci libtracistatic ${libtcpip} Python::Module)
             endif()
-            if (NOT ${PYTHON_SETUPTOOLS_MISSING})
-                if (${PYTHON_BUILD_MISSING})
-                    install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} ${TOOLS_DIR}/build/setup-libtraci.py clean --all install --root=\$ENV{DESTDIR}/ --prefix=${CMAKE_INSTALL_PREFIX} --optimize=1)"
-                            COMPONENT pylibtraci)
-                else ()
-                    install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} ./build/version.py ./build/setup-libtraci.py ./setup.py COMMAND ${PYTHON_EXECUTABLE} -m pip install --root=\$ENV{DESTDIR}/ --prefix=${CMAKE_INSTALL_PREFIX} . WORKING_DIRECTORY ${TOOLS_DIR})"
-                            COMPONENT pylibtraci)
-                endif()
+        endif()
+        if (WIN32)
+            swig_link_libraries(libtraci ${PYTHON_LIBRARIES})
+        endif()
+        if (NOT ${PYTHON_SETUPTOOLS_MISSING})
+            if (${PYTHON_BUILD_MISSING})
+                install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} ${TOOLS_DIR}/build/setup-libtraci.py clean --all install --root=\$ENV{DESTDIR}/ --prefix=${CMAKE_INSTALL_PREFIX} --optimize=1)"
+                        COMPONENT pylibtraci)
+            else ()
+                install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} ./build/version.py ./build/setup-libtraci.py ./setup.py COMMAND ${PYTHON_EXECUTABLE} -m pip install --root=\$ENV{DESTDIR}/ --prefix=${CMAKE_INSTALL_PREFIX} . WORKING_DIRECTORY ${TOOLS_DIR})"
+                        COMPONENT pylibtraci)
             endif()
-        else()
-            message(WARNING "ENABLE_PYTHON_BINDINGS is set but Python libraries were not found.")
         endif()
     endif()
 
diff -Nru sumo-1.17.0/src/libtraci/Connection.cpp sumo-1.18.0/src/libtraci/Connection.cpp
--- sumo-1.17.0/src/libtraci/Connection.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/libtraci/Connection.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -51,9 +51,10 @@
             mySocket.connect();
             break;
         } catch (tcpip::SocketException& e) {
+            mySocket.close();
             if (i == numRetries) {
                 close();
-                throw;
+                throw libsumo::FatalTraCIError("Could not connect in " + toString(numRetries + 1) + " tries");
             }
             std::cout << "Could not connect to TraCI server at " << host << ":" << port << " " << e.what() << std::endl;
             std::cout << " Retrying in 1 second" << std::endl;
@@ -165,7 +166,7 @@
 void
 Connection::createCommand(int cmdID, int varID, const std::string* const objID, tcpip::Storage* add) const {
     if (!mySocket.has_client_connection()) {
-        throw libsumo::FatalTraCIError("Not connected.");
+        throw libsumo::FatalTraCIError("Connection already closed.");
     }
     myOutput.reset();
     // command length
@@ -452,7 +453,8 @@
     // see also https://github.com/eclipse/sumo/issues/7288
     libsumo::SubscriptionResults& results = myContextSubscriptionResults[responseID][contextID];
     while (numObjects-- > 0) {
-        std::string objectID = inMsg.readString();
+        const std::string& objectID = inMsg.readString();
+        results[objectID]; // instantiate empty map for id lists
         readVariables(inMsg, objectID, variableCount, results);
     }
 }
diff -Nru sumo-1.17.0/src/libtraci/Connection.h sumo-1.18.0/src/libtraci/Connection.h
--- sumo-1.17.0/src/libtraci/Connection.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/libtraci/Connection.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -55,6 +55,9 @@
     }
 
     static Connection& getActive() {
+        if (myActive == nullptr) {
+            throw libsumo::FatalTraCIError("Not connected.");
+        }
         return *myActive;
     }
 
@@ -77,7 +80,7 @@
     /// @brief ends the simulation and closes the connection
     void close();
 
-    libsumo::SubscriptionResults getAllSubscriptionResults(const int domain) {
+    libsumo::SubscriptionResults& getAllSubscriptionResults(const int domain) {
         return mySubscriptionResults[domain];
     }
 
diff -Nru sumo-1.17.0/src/libtraci/Domain.h sumo-1.18.0/src/libtraci/Domain.h
--- sumo-1.17.0/src/libtraci/Domain.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/libtraci/Domain.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/libtraci/Edge.cpp sumo-1.18.0/src/libtraci/Edge.cpp
--- sumo-1.17.0/src/libtraci/Edge.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/libtraci/Edge.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -147,11 +147,13 @@
     return Dom::getDouble(libsumo::LAST_STEP_MEAN_SPEED, edgeID);
 }
 
+
 double
 Edge::getMeanFriction(const std::string& edgeID) {
     return Dom::getDouble(libsumo::VAR_FRICTION, edgeID);
 }
 
+
 double
 Edge::getLastStepOccupancy(const std::string& edgeID) {
     return Dom::getDouble(libsumo::LAST_STEP_OCCUPANCY, edgeID);
@@ -181,11 +183,22 @@
     return Dom::getString(libsumo::VAR_NAME, edgeID);
 }
 
+
 const std::vector
 Edge::getPendingVehicles(const std::string& edgeID) {
     return Dom::getStringVector(libsumo::VAR_PENDING_VEHICLES, edgeID);
 }
 
+
+double
+Edge::getAngle(const std::string& edgeID, double relativePosition) {
+    tcpip::Storage content;
+    content.writeUnsignedByte(libsumo::TYPE_DOUBLE);
+    content.writeDouble(relativePosition);
+    return Dom::getDouble(libsumo::VAR_ANGLE, edgeID, &content);
+}
+
+
 LIBTRACI_SUBSCRIPTION_IMPLEMENTATION(Edge, EDGE)
 LIBTRACI_PARAMETER_IMPLEMENTATION(Edge, EDGE)
 
@@ -257,6 +270,7 @@
     Dom::setDouble(libsumo::VAR_MAXSPEED, edgeID, speed);
 }
 
+
 void
 Edge::setFriction(const std::string& edgeID, double friction) {
     Dom::setDouble(libsumo::VAR_MAXSPEED, edgeID, friction);
diff -Nru sumo-1.17.0/src/libtraci/GUI.cpp sumo-1.18.0/src/libtraci/GUI.cpp
--- sumo-1.17.0/src/libtraci/GUI.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/libtraci/GUI.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/libtraci/InductionLoop.cpp sumo-1.18.0/src/libtraci/InductionLoop.cpp
--- sumo-1.17.0/src/libtraci/InductionLoop.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/libtraci/InductionLoop.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/libtraci/Junction.cpp sumo-1.18.0/src/libtraci/Junction.cpp
--- sumo-1.17.0/src/libtraci/Junction.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/libtraci/Junction.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/libtraci/LaneArea.cpp sumo-1.18.0/src/libtraci/LaneArea.cpp
--- sumo-1.17.0/src/libtraci/LaneArea.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/libtraci/LaneArea.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/libtraci/Lane.cpp sumo-1.18.0/src/libtraci/Lane.cpp
--- sumo-1.17.0/src/libtraci/Lane.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/libtraci/Lane.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -69,6 +69,7 @@
     return Dom::getDouble(libsumo::VAR_MAXSPEED, laneID);
 }
 
+
 double
 Lane::getFriction(const std::string& laneID) {
     return Dom::getDouble(libsumo::VAR_FRICTION, laneID);
@@ -191,6 +192,7 @@
     return Dom::getDouble(libsumo::VAR_NOXEMISSION, laneID);
 }
 
+
 double
 Lane::getFuelConsumption(const std::string& laneID) {
     return Dom::getDouble(libsumo::VAR_FUELCONSUMPTION, laneID);
@@ -244,6 +246,7 @@
     return Dom::getInt(libsumo::LAST_STEP_VEHICLE_NUMBER, laneID);
 }
 
+
 int
 Lane::getLastStepHaltingNumber(const std::string& laneID) {
     return Dom::getInt(libsumo::LAST_STEP_VEHICLE_HALTING_NUMBER, laneID);
@@ -264,6 +267,7 @@
     return Dom::getStringVector(libsumo::VAR_FOES, laneID, &content);
 }
 
+
 // XXX: there seems to be no "Dom::getFoes"
 std::vector
 Lane::getInternalFoes(const std::string& laneID) {
@@ -282,6 +286,15 @@
 }
 
 
+double
+Lane::getAngle(const std::string& laneID, double relativePosition) {
+    tcpip::Storage content;
+    content.writeUnsignedByte(libsumo::TYPE_DOUBLE);
+    content.writeDouble(relativePosition);
+    return Dom::getDouble(libsumo::VAR_ANGLE, laneID, &content);
+}
+
+
 void
 Lane::setAllowed(const std::string& laneID, std::string allowedClass) {
     setAllowed(laneID, std::vector({allowedClass}));
@@ -321,6 +334,7 @@
     Dom::setDouble(libsumo::VAR_MAXSPEED, laneID, speed);
 }
 
+
 void
 Lane::setFriction(const std::string& laneID, double friction) {
     Dom::setDouble(libsumo::VAR_FRICTION, laneID, friction);
diff -Nru sumo-1.17.0/src/libtraci/libtraci.i sumo-1.18.0/src/libtraci/libtraci.i
--- sumo-1.17.0/src/libtraci/libtraci.i	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/libtraci/libtraci.i	2023-06-28 20:02:17.000000000 +0000
@@ -46,10 +46,10 @@
 %template(TraCIReservationVector) std::vector;
 %template(TraCISignalConstraintVector) std::vector;
 %template(TraCICollisionVector) std::vector;
-%template(TraCIJunctionFoeVector) std::vector;
 #ifndef SWIGPYTHON
 %template(TraCIBestLanesVector) std::vector;
 %template(TraCIConnectionVector) std::vector;
+%template(TraCIJunctionFoeVector) std::vector;
 %template(TraCILinkVector) std::vector;
 %template(TraCILinkVectorVector) std::vector< std::vector >;
 %template(TraCINextTLSVector) std::vector;
diff -Nru sumo-1.17.0/src/libtraci/MeanData.cpp sumo-1.18.0/src/libtraci/MeanData.cpp
--- sumo-1.17.0/src/libtraci/MeanData.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/libtraci/MeanData.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/libtraci/MultiEntryExit.cpp sumo-1.18.0/src/libtraci/MultiEntryExit.cpp
--- sumo-1.17.0/src/libtraci/MultiEntryExit.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/libtraci/MultiEntryExit.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/libtraci/OverheadWire.cpp sumo-1.18.0/src/libtraci/OverheadWire.cpp
--- sumo-1.17.0/src/libtraci/OverheadWire.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/libtraci/OverheadWire.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/libtraci/ParkingArea.cpp sumo-1.18.0/src/libtraci/ParkingArea.cpp
--- sumo-1.17.0/src/libtraci/ParkingArea.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/libtraci/ParkingArea.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/libtraci/Person.cpp sumo-1.18.0/src/libtraci/Person.cpp
--- sumo-1.17.0/src/libtraci/Person.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/libtraci/Person.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -308,6 +308,12 @@
     return Dom::getDouble(libsumo::VAR_BOARDING_DURATION, personID);
 }
 
+double
+Person::getImpatience(const std::string& personID) {
+    return Dom::getDouble(libsumo::VAR_IMPATIENCE, personID);
+}
+
+
 
 LIBTRACI_PARAMETER_IMPLEMENTATION(Person, PERSON)
 
@@ -325,6 +331,16 @@
 
 
 void
+Person::setImpatience(const std::string& personID, double impatience) {
+    Dom::setDouble(libsumo::VAR_IMPATIENCE, personID, impatience);
+}
+
+void
+Person::setBoardingDuration(const std::string& personID, double boardingDuration) {
+    Dom::setDouble(libsumo::VAR_BOARDING_DURATION, personID, boardingDuration);
+}
+
+void
 Person::add(const std::string& personID, const std::string& edgeID, double pos, double departInSecs, const std::string typeID) {
     tcpip::Storage content;
     content.writeUnsignedByte(libsumo::TYPE_COMPOUND);
diff -Nru sumo-1.17.0/src/libtraci/POI.cpp sumo-1.18.0/src/libtraci/POI.cpp
--- sumo-1.17.0/src/libtraci/POI.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/libtraci/POI.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/libtraci/Polygon.cpp sumo-1.18.0/src/libtraci/Polygon.cpp
--- sumo-1.17.0/src/libtraci/Polygon.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/libtraci/Polygon.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/libtraci/Rerouter.cpp sumo-1.18.0/src/libtraci/Rerouter.cpp
--- sumo-1.17.0/src/libtraci/Rerouter.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/libtraci/Rerouter.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/libtraci/Route.cpp sumo-1.18.0/src/libtraci/Route.cpp
--- sumo-1.17.0/src/libtraci/Route.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/libtraci/Route.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/libtraci/RouteProbe.cpp sumo-1.18.0/src/libtraci/RouteProbe.cpp
--- sumo-1.17.0/src/libtraci/RouteProbe.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/libtraci/RouteProbe.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/libtraci/Simulation.cpp sumo-1.18.0/src/libtraci/Simulation.cpp
--- sumo-1.17.0/src/libtraci/Simulation.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/libtraci/Simulation.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/libtraci/TrafficLight.cpp sumo-1.18.0/src/libtraci/TrafficLight.cpp
--- sumo-1.17.0/src/libtraci/TrafficLight.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/libtraci/TrafficLight.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/libtraci/VariableSpeedSign.cpp sumo-1.18.0/src/libtraci/VariableSpeedSign.cpp
--- sumo-1.17.0/src/libtraci/VariableSpeedSign.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/libtraci/VariableSpeedSign.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/libtraci/Vehicle.cpp sumo-1.18.0/src/libtraci/Vehicle.cpp
--- sumo-1.17.0/src/libtraci/Vehicle.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/libtraci/Vehicle.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -216,6 +216,12 @@
 }
 
 
+double
+Vehicle::getImpatience(const std::string& vehID) {
+    return Dom::getDouble(libsumo::VAR_IMPATIENCE, vehID);
+}
+
+
 std::vector
 Vehicle::getPersonIDList(const std::string& vehID) {
     return Dom::getStringVector(libsumo::LAST_STEP_PERSON_ID_LIST, vehID);
@@ -243,11 +249,8 @@
     std::unique_lock lock{ libtraci::Connection::getActive().getMutex() };
     tcpip::Storage& ret = Dom::get(libsumo::VAR_FOLLOWER, vehID, &content);
     ret.readInt(); // components
-    ret.readUnsignedByte();
-    const std::string leaderID = ret.readString();
-    ret.readUnsignedByte();
-    const double gap = ret.readDouble();
-    return std::make_pair(leaderID, gap);
+    const std::string leaderID = StoHelp::readTypedString(ret);
+    return std::make_pair(leaderID, StoHelp::readTypedDouble(ret));
 }
 
 
@@ -258,11 +261,20 @@
     StoHelp::writeTypedDouble(content, dist);
     std::unique_lock lock{ libtraci::Connection::getActive().getMutex() };
     tcpip::Storage& ret = Dom::get(libsumo::VAR_FOES, vehID, &content);
-    const int n = ret.readInt(); // number of foe informations
+    ret.readInt(); // compound size
+    const int n = StoHelp::readTypedInt(ret); // number of foe informations
     for (int i = 0; i < n; ++i) {
         libsumo::TraCIJunctionFoe info;
-        // TODO implement server side and result retrieval
-        result.push_back(info);
+        info.foeId = StoHelp::readTypedString(ret);
+        info.egoDist = StoHelp::readTypedDouble(ret);
+        info.foeDist = StoHelp::readTypedDouble(ret);
+        info.egoExitDist = StoHelp::readTypedDouble(ret);
+        info.foeExitDist = StoHelp::readTypedDouble(ret);
+        info.egoLane = StoHelp::readTypedString(ret);
+        info.foeLane = StoHelp::readTypedString(ret);
+        info.egoResponse = StoHelp::readBool(ret);
+        info.foeResponse = StoHelp::readBool(ret);
+        result.emplace_back(info);
     }
     return result;
 }
@@ -398,41 +410,18 @@
     ret.readUnsignedByte();
     ret.readInt();
 
-    int linkNo = ret.readInt();
+    const int linkNo = ret.readInt();
     for (int i = 0; i < linkNo; ++i) {
-
-        ret.readUnsignedByte();
-        std::string approachedLane = ret.readString();
-
-        ret.readUnsignedByte();
-        std::string approachedLaneInternal = ret.readString();
-
-        ret.readUnsignedByte();
-        bool hasPrio = ret.readUnsignedByte() != 0;
-
-        ret.readUnsignedByte();
-        bool isOpen = ret.readUnsignedByte() != 0;
-
-        ret.readUnsignedByte();
-        bool hasFoe = ret.readUnsignedByte() != 0;
-
-        ret.readUnsignedByte();
-        std::string state = ret.readString();
-
-        ret.readUnsignedByte();
-        std::string direction = ret.readString();
-
-        ret.readUnsignedByte();
-        double length = ret.readDouble();
-
-        result.push_back(libsumo::TraCIConnection(approachedLane,
-                         hasPrio,
-                         isOpen,
-                         hasFoe,
-                         approachedLaneInternal,
-                         state,
-                         direction,
-                         length));
+        libsumo::TraCIConnection con;
+        con.approachedLane = StoHelp::readTypedString(ret);
+        con.approachedInternal = StoHelp::readTypedString(ret);
+        con.hasPrio = StoHelp::readBool(ret);
+        con.isOpen = StoHelp::readBool(ret);
+        con.hasFoe = StoHelp::readBool(ret);
+        con.state = StoHelp::readTypedString(ret);
+        con.direction = StoHelp::readTypedString(ret);
+        con.length = StoHelp::readTypedDouble(ret);
+        result.emplace_back(con);
     }
     return result;
 }
@@ -471,11 +460,12 @@
 }
 
 std::string
-Vehicle::getStopParameter(const std::string& vehID, int nextStopIndex, const std::string& param) {
+Vehicle::getStopParameter(const std::string& vehID, int nextStopIndex, const std::string& param, bool customParam) {
     tcpip::Storage content;
-    StoHelp::writeCompound(content, 2);
+    StoHelp::writeCompound(content, 3);
     StoHelp::writeTypedInt(content, nextStopIndex);
     StoHelp::writeTypedString(content, param);
+    StoHelp::writeTypedByte(content, customParam);
     return Dom::getString(libsumo::VAR_STOP_PARAMETER, vehID, &content);
 }
 
@@ -848,12 +838,14 @@
 
 void
 Vehicle::setStopParameter(const std::string& vehID, int nextStopIndex,
-                          const std::string& param, const std::string& value) {
+                          const std::string& param, const std::string& value,
+                          bool customParam) {
     tcpip::Storage content;
-    StoHelp::writeCompound(content, 3);
+    StoHelp::writeCompound(content, 4);
     StoHelp::writeTypedInt(content, nextStopIndex);
     StoHelp::writeTypedString(content, param);
     StoHelp::writeTypedString(content, value);
+    StoHelp::writeTypedByte(content, customParam);
     Dom::set(libsumo::VAR_STOP_PARAMETER, vehID, &content);
 }
 
@@ -1299,6 +1291,17 @@
 }
 
 
+void
+Vehicle::setImpatience(const std::string& vehID, double impatience) {
+    Dom::setDouble(libsumo::VAR_IMPATIENCE, vehID, impatience);
+}
+
+void
+Vehicle::setBoardingDuration(const std::string& vehID, double boardingDuration) {
+    Dom::setDouble(libsumo::VAR_BOARDING_DURATION, vehID, boardingDuration);
+}
+
+
 void
 Vehicle::highlight(const std::string& vehID, const libsumo::TraCIColor& col, double size, const int alphaMax, const double duration, const int type) {
     tcpip::Storage content;
diff -Nru sumo-1.17.0/src/libtraci/VehicleType.cpp sumo-1.18.0/src/libtraci/VehicleType.cpp
--- sumo-1.17.0/src/libtraci/VehicleType.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/libtraci/VehicleType.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -195,6 +195,22 @@
 }
 
 
+double
+VehicleType::getImpatience(const std::string& typeID) {
+    return Dom::getDouble(libsumo::VAR_IMPATIENCE, typeID);
+}
+
+
+void
+VehicleType::setImpatience(const std::string& typeID, double impatience) {
+    Dom::setDouble(libsumo::VAR_IMPATIENCE, typeID, impatience);
+}
+
+void
+VehicleType::setBoardingDuration(const std::string& typeID, double boardingDuration) {
+    Dom::setDouble(libsumo::VAR_BOARDING_DURATION, typeID, boardingDuration);
+}
+
 void
 VehicleType::setActionStepLength(const std::string& typeID, double actionStepLength, bool resetActionOffset) {
     //if (actionStepLength < 0) {
diff -Nru sumo-1.17.0/src/marouter/marouter_main.cpp sumo-1.18.0/src/marouter/marouter_main.cpp
--- sumo-1.17.0/src/marouter/marouter_main.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/marouter/marouter_main.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -350,7 +350,7 @@
             SystemFrame::close();
             return 0;
         }
-        SystemFrame::checkOptions();
+        SystemFrame::checkOptions(oc);
         XMLSubSys::setValidation(oc.getString("xml-validation"), oc.getString("xml-validation.net"), oc.getString("xml-validation.routes"));
         MsgHandler::initOutputOptions();
         if (!ROMAFrame::checkOptions()) {
diff -Nru sumo-1.17.0/src/marouter/ROMAAssignments.cpp sumo-1.18.0/src/marouter/ROMAAssignments.cpp
--- sumo-1.17.0/src/marouter/ROMAAssignments.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/marouter/ROMAAssignments.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/marouter/ROMAAssignments.h sumo-1.18.0/src/marouter/ROMAAssignments.h
--- sumo-1.17.0/src/marouter/ROMAAssignments.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/marouter/ROMAAssignments.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/marouter/ROMAEdgeBuilder.cpp sumo-1.18.0/src/marouter/ROMAEdgeBuilder.cpp
--- sumo-1.17.0/src/marouter/ROMAEdgeBuilder.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/marouter/ROMAEdgeBuilder.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/marouter/ROMAEdgeBuilder.h sumo-1.18.0/src/marouter/ROMAEdgeBuilder.h
--- sumo-1.17.0/src/marouter/ROMAEdgeBuilder.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/marouter/ROMAEdgeBuilder.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/marouter/ROMAEdge.cpp sumo-1.18.0/src/marouter/ROMAEdge.cpp
--- sumo-1.17.0/src/marouter/ROMAEdge.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/marouter/ROMAEdge.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/marouter/ROMAEdge.h sumo-1.18.0/src/marouter/ROMAEdge.h
--- sumo-1.17.0/src/marouter/ROMAEdge.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/marouter/ROMAEdge.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/marouter/ROMAFrame.cpp sumo-1.18.0/src/marouter/ROMAFrame.cpp
--- sumo-1.17.0/src/marouter/ROMAFrame.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/marouter/ROMAFrame.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -58,7 +58,7 @@
     addImportOptions();
     addAssignmentOptions();
     // add rand options
-    RandHelper::insertRandOptions();
+    RandHelper::insertRandOptions(oc);
 }
 
 
diff -Nru sumo-1.17.0/src/marouter/ROMAFrame.h sumo-1.18.0/src/marouter/ROMAFrame.h
--- sumo-1.17.0/src/marouter/ROMAFrame.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/marouter/ROMAFrame.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/marouter/ROMARouteHandler.cpp sumo-1.18.0/src/marouter/ROMARouteHandler.cpp
--- sumo-1.17.0/src/marouter/ROMARouteHandler.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/marouter/ROMARouteHandler.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/marouter/ROMARouteHandler.h sumo-1.18.0/src/marouter/ROMARouteHandler.h
--- sumo-1.17.0/src/marouter/ROMARouteHandler.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/marouter/ROMARouteHandler.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/mesogui/GUIMEInductLoop.cpp sumo-1.18.0/src/mesogui/GUIMEInductLoop.cpp
--- sumo-1.17.0/src/mesogui/GUIMEInductLoop.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/mesogui/GUIMEInductLoop.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/mesogui/GUIMEInductLoop.h sumo-1.18.0/src/mesogui/GUIMEInductLoop.h
--- sumo-1.17.0/src/mesogui/GUIMEInductLoop.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/mesogui/GUIMEInductLoop.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/mesogui/GUIMEVehicleControl.cpp sumo-1.18.0/src/mesogui/GUIMEVehicleControl.cpp
--- sumo-1.17.0/src/mesogui/GUIMEVehicleControl.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/mesogui/GUIMEVehicleControl.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/mesogui/GUIMEVehicleControl.h sumo-1.18.0/src/mesogui/GUIMEVehicleControl.h
--- sumo-1.17.0/src/mesogui/GUIMEVehicleControl.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/mesogui/GUIMEVehicleControl.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/mesogui/GUIMEVehicle.cpp sumo-1.18.0/src/mesogui/GUIMEVehicle.cpp
--- sumo-1.17.0/src/mesogui/GUIMEVehicle.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/mesogui/GUIMEVehicle.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -119,24 +119,20 @@
 
 
 GUIParameterTableWindow*
-GUIMEVehicle::getTypeParameterWindow(GUIMainWindow& app,
-                                     GUISUMOAbstractView&) {
-    GUIParameterTableWindow* ret = new GUIParameterTableWindow(app, *this);
-    // add items
-    ret->mkItem("Type Information:", false, "");
-    ret->mkItem("type [id]", false, myType->getID());
-    ret->mkItem("length", false, myType->getLength());
-    ret->mkItem("minGap", false, myType->getMinGap());
+GUIMEVehicle::getTypeParameterWindow(GUIMainWindow& app, GUISUMOAbstractView&) {
+    GUIParameterTableWindow* ret = new GUIParameterTableWindow(app, *this, "vType:" + myType->getID());
+    ret->mkItem("length [m]", false, myType->getLength());
+    ret->mkItem("width [m]", false, myType->getWidth());
+    ret->mkItem("height [m]", false, myType->getHeight());
+    ret->mkItem("minGap [m]", false, myType->getMinGap());
     ret->mkItem("vehicle class", false, SumoVehicleClassStrings.getString(myType->getVehicleClass()));
     ret->mkItem("emission class", false, PollutantsInterface::getName(myType->getEmissionClass()));
+    ret->mkItem("mass [kg]", false, myType->getMass());
+    ret->mkItem("guiShape", false, getVehicleShapeName(myType->getGuiShape()));
     ret->mkItem("maximum speed [m/s]", false, getMaxSpeed());
-    //ret->mkItem("maximum acceleration [m/s^2]", false, getCarFollowModel().getMaxAccel());
-    //ret->mkItem("maximum deceleration [m/s^2]", false, getCarFollowModel().getMaxDecel());
-    //ret->mkItem("imperfection (sigma)", false, getCarFollowModel().getImperfection());
-    //ret->mkItem("desired headway (tau)", false, getCarFollowModel().getHeadwayTime());
+    ret->mkItem("speedFactor", false, myType->getParameter().speedFactor.toStr(gPrecision));
     ret->mkItem("person capacity", false, myType->getPersonCapacity());
     ret->mkItem("container capacity", false, myType->getContainerCapacity());
-    // close building
     ret->closeBuilding(&(myType->getParameter()));
     return ret;
 }
diff -Nru sumo-1.17.0/src/mesogui/GUIMEVehicle.h sumo-1.18.0/src/mesogui/GUIMEVehicle.h
--- sumo-1.17.0/src/mesogui/GUIMEVehicle.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/mesogui/GUIMEVehicle.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/mesosim/MEInductLoop.cpp sumo-1.18.0/src/mesosim/MEInductLoop.cpp
--- sumo-1.17.0/src/mesosim/MEInductLoop.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/mesosim/MEInductLoop.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/mesosim/MEInductLoop.h sumo-1.18.0/src/mesosim/MEInductLoop.h
--- sumo-1.17.0/src/mesosim/MEInductLoop.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/mesosim/MEInductLoop.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/mesosim/MELoop.cpp sumo-1.18.0/src/mesosim/MELoop.cpp
--- sumo-1.17.0/src/mesosim/MELoop.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/mesosim/MELoop.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/mesosim/MELoop.h sumo-1.18.0/src/mesosim/MELoop.h
--- sumo-1.17.0/src/mesosim/MELoop.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/mesosim/MELoop.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/mesosim/MESegment.cpp sumo-1.18.0/src/mesosim/MESegment.cpp
--- sumo-1.17.0/src/mesosim/MESegment.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/mesosim/MESegment.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/mesosim/MESegment.h sumo-1.18.0/src/mesosim/MESegment.h
--- sumo-1.17.0/src/mesosim/MESegment.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/mesosim/MESegment.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/mesosim/METriggeredCalibrator.cpp sumo-1.18.0/src/mesosim/METriggeredCalibrator.cpp
--- sumo-1.17.0/src/mesosim/METriggeredCalibrator.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/mesosim/METriggeredCalibrator.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/mesosim/METriggeredCalibrator.h sumo-1.18.0/src/mesosim/METriggeredCalibrator.h
--- sumo-1.17.0/src/mesosim/METriggeredCalibrator.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/mesosim/METriggeredCalibrator.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/mesosim/MEVehicleControl.cpp sumo-1.18.0/src/mesosim/MEVehicleControl.cpp
--- sumo-1.17.0/src/mesosim/MEVehicleControl.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/mesosim/MEVehicleControl.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/mesosim/MEVehicleControl.h sumo-1.18.0/src/mesosim/MEVehicleControl.h
--- sumo-1.17.0/src/mesosim/MEVehicleControl.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/mesosim/MEVehicleControl.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/mesosim/MEVehicle.cpp sumo-1.18.0/src/mesosim/MEVehicle.cpp
--- sumo-1.17.0/src/mesosim/MEVehicle.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/mesosim/MEVehicle.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/mesosim/MEVehicle.h sumo-1.18.0/src/mesosim/MEVehicle.h
--- sumo-1.17.0/src/mesosim/MEVehicle.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/mesosim/MEVehicle.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -182,18 +182,6 @@
         return 0;
     }
 
-    /** @brief replace the current parking area stop with a new stop with merge duration
-     */
-    bool replaceParkingArea(MSParkingArea* /* parkingArea = 0 */, std::string& /*errorMsg*/) {
-        throw ProcessError(TL("parkingZoneReroute not implemented for meso"));
-    }
-
-    /** @brief get the current parking area stop
-     */
-    MSParkingArea* getNextParkingArea() {
-        throw ProcessError(TL("parkingZoneReroute not implemented for meso"));
-    }
-
     /** @brief Sets the (planned) time at which the vehicle leaves its current segment
      * @param[in] t The leaving time
      */
diff -Nru sumo-1.17.0/src/microsim/actions/Command_SaveTLCoupledDet.cpp sumo-1.18.0/src/microsim/actions/Command_SaveTLCoupledDet.cpp
--- sumo-1.17.0/src/microsim/actions/Command_SaveTLCoupledDet.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/actions/Command_SaveTLCoupledDet.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/actions/Command_SaveTLCoupledDet.h sumo-1.18.0/src/microsim/actions/Command_SaveTLCoupledDet.h
--- sumo-1.17.0/src/microsim/actions/Command_SaveTLCoupledDet.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/actions/Command_SaveTLCoupledDet.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/actions/Command_SaveTLCoupledLaneDet.cpp sumo-1.18.0/src/microsim/actions/Command_SaveTLCoupledLaneDet.cpp
--- sumo-1.17.0/src/microsim/actions/Command_SaveTLCoupledLaneDet.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/actions/Command_SaveTLCoupledLaneDet.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/actions/Command_SaveTLCoupledLaneDet.h sumo-1.18.0/src/microsim/actions/Command_SaveTLCoupledLaneDet.h
--- sumo-1.17.0/src/microsim/actions/Command_SaveTLCoupledLaneDet.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/actions/Command_SaveTLCoupledLaneDet.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/actions/Command_SaveTLSProgram.cpp sumo-1.18.0/src/microsim/actions/Command_SaveTLSProgram.cpp
--- sumo-1.17.0/src/microsim/actions/Command_SaveTLSProgram.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/actions/Command_SaveTLSProgram.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/actions/Command_SaveTLSProgram.h sumo-1.18.0/src/microsim/actions/Command_SaveTLSProgram.h
--- sumo-1.17.0/src/microsim/actions/Command_SaveTLSProgram.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/actions/Command_SaveTLSProgram.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/actions/Command_SaveTLSState.cpp sumo-1.18.0/src/microsim/actions/Command_SaveTLSState.cpp
--- sumo-1.17.0/src/microsim/actions/Command_SaveTLSState.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/actions/Command_SaveTLSState.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/actions/Command_SaveTLSState.h sumo-1.18.0/src/microsim/actions/Command_SaveTLSState.h
--- sumo-1.17.0/src/microsim/actions/Command_SaveTLSState.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/actions/Command_SaveTLSState.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/actions/Command_SaveTLSSwitches.cpp sumo-1.18.0/src/microsim/actions/Command_SaveTLSSwitches.cpp
--- sumo-1.17.0/src/microsim/actions/Command_SaveTLSSwitches.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/actions/Command_SaveTLSSwitches.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/actions/Command_SaveTLSSwitches.h sumo-1.18.0/src/microsim/actions/Command_SaveTLSSwitches.h
--- sumo-1.17.0/src/microsim/actions/Command_SaveTLSSwitches.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/actions/Command_SaveTLSSwitches.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/actions/Command_SaveTLSSwitchStates.cpp sumo-1.18.0/src/microsim/actions/Command_SaveTLSSwitchStates.cpp
--- sumo-1.17.0/src/microsim/actions/Command_SaveTLSSwitchStates.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/actions/Command_SaveTLSSwitchStates.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/actions/Command_SaveTLSSwitchStates.h sumo-1.18.0/src/microsim/actions/Command_SaveTLSSwitchStates.h
--- sumo-1.17.0/src/microsim/actions/Command_SaveTLSSwitchStates.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/actions/Command_SaveTLSSwitchStates.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/cfmodels/CC_Const.h sumo-1.18.0/src/microsim/cfmodels/CC_Const.h
--- sumo-1.17.0/src/microsim/cfmodels/CC_Const.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/cfmodels/CC_Const.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/cfmodels/CC_VehicleVariables.cpp sumo-1.18.0/src/microsim/cfmodels/CC_VehicleVariables.cpp
--- sumo-1.17.0/src/microsim/cfmodels/CC_VehicleVariables.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/cfmodels/CC_VehicleVariables.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/cfmodels/CC_VehicleVariables.h sumo-1.18.0/src/microsim/cfmodels/CC_VehicleVariables.h
--- sumo-1.17.0/src/microsim/cfmodels/CC_VehicleVariables.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/cfmodels/CC_VehicleVariables.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/cfmodels/MSCFModel_ACC.cpp sumo-1.18.0/src/microsim/cfmodels/MSCFModel_ACC.cpp
--- sumo-1.17.0/src/microsim/cfmodels/MSCFModel_ACC.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/cfmodels/MSCFModel_ACC.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/cfmodels/MSCFModel_ACC.h sumo-1.18.0/src/microsim/cfmodels/MSCFModel_ACC.h
--- sumo-1.17.0/src/microsim/cfmodels/MSCFModel_ACC.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/cfmodels/MSCFModel_ACC.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/cfmodels/MSCFModel_CACC.cpp sumo-1.18.0/src/microsim/cfmodels/MSCFModel_CACC.cpp
--- sumo-1.17.0/src/microsim/cfmodels/MSCFModel_CACC.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/cfmodels/MSCFModel_CACC.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/cfmodels/MSCFModel_CACC.h sumo-1.18.0/src/microsim/cfmodels/MSCFModel_CACC.h
--- sumo-1.17.0/src/microsim/cfmodels/MSCFModel_CACC.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/cfmodels/MSCFModel_CACC.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/cfmodels/MSCFModel_CC.cpp sumo-1.18.0/src/microsim/cfmodels/MSCFModel_CC.cpp
--- sumo-1.17.0/src/microsim/cfmodels/MSCFModel_CC.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/cfmodels/MSCFModel_CC.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/cfmodels/MSCFModel_CC.h sumo-1.18.0/src/microsim/cfmodels/MSCFModel_CC.h
--- sumo-1.17.0/src/microsim/cfmodels/MSCFModel_CC.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/cfmodels/MSCFModel_CC.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/cfmodels/MSCFModel.cpp sumo-1.18.0/src/microsim/cfmodels/MSCFModel.cpp
--- sumo-1.17.0/src/microsim/cfmodels/MSCFModel.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/cfmodels/MSCFModel.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -344,7 +344,7 @@
     if (MSGlobals::gSemiImplicitEulerUpdate) {
         return stopSpeed(veh, speed, gap, CalcReason::FUTURE);
     } else {
-        return MIN2(maximumSafeStopSpeed(gap, myDecel, 0., true, 0.), myType->getMaxSpeed());
+        return MIN2(maximumSafeStopSpeed(gap, myDecel, 0., true, 0., false), myType->getMaxSpeed());
     }
 }
 
@@ -771,7 +771,7 @@
 
 
 double
-MSCFModel::maximumSafeStopSpeed(double gap, double decel, double currentSpeed, bool onInsertion, double headway) const {
+MSCFModel::maximumSafeStopSpeed(double gap, double decel, double currentSpeed, bool onInsertion, double headway, bool relaxEmergency) const {
     double vsafe;
     if (MSGlobals::gSemiImplicitEulerUpdate) {
         vsafe = maximumSafeStopSpeedEuler(gap, decel, onInsertion, headway);
@@ -779,42 +779,45 @@
         vsafe = maximumSafeStopSpeedBallistic(gap, decel, currentSpeed, onInsertion, headway);
     }
 
-//    if (myDecel != myEmergencyDecel) {
-//#ifdef DEBUG_EMERGENCYDECEL
-//        if (true) {
-//            std::cout << SIMTIME << " maximumSafeStopSpeed()"
-//                    << " g=" << g
-//                    << " v=" << v
-//                    << " initial vsafe=" << vsafe << "(decel=" << SPEED2ACCEL(v-vsafe) << ")" << std::endl;
-//        }
-//#endif
-//
-//        if (vsafe < v - ACCEL2SPEED(myDecel + NUMERICAL_EPS)) {
-//            // emergency deceleration required
-//
-//#ifdef DEBUG_EMERGENCYDECEL
-//            if (true) {
-//                std::cout << SIMTIME << " maximumSafeStopSpeed() results in emergency deceleration "
-//                        << "initial vsafe=" << vsafe  << " egoSpeed=" << v << "(decel=" << SPEED2ACCEL(v-vsafe) << ")" << std::endl;
-//            }
-//#endif
-//
-//            const double safeDecel = calculateEmergencyDeceleration(g, v, 0., 1);
-//            assert(myDecel <= safeDecel);
-//            vsafe = v - ACCEL2SPEED(myDecel + EMERGENCY_DECEL_AMPLIFIER * (safeDecel - myDecel));
-//
-//            if(MSGlobals::gSemiImplicitEulerUpdate) {
-//                vsafe = MAX2(vsafe,0.);
-//            }
-//
-//#ifdef DEBUG_EMERGENCYDECEL
-//            if (true) {
-//                std::cout << "     -> corrected emergency deceleration: " << SPEED2ACCEL(v-vsafe) << std::endl;
-//            }
-//#endif
-//
-//        }
-//    }
+    if (relaxEmergency && myDecel != myEmergencyDecel) {
+#ifdef DEBUG_EMERGENCYDECEL
+        if (true) {
+            std::cout << SIMTIME << " maximumSafeStopSpeed()"
+                      << " g=" << gap
+                      << " v=" << currentSpeed
+                      << " initial vsafe=" << vsafe << "(decel=" << SPEED2ACCEL(v - vsafe) << ")" << std::endl;
+        }
+#endif
+
+        double origSafeDecel = SPEED2ACCEL(currentSpeed - vsafe);
+        if (origSafeDecel > myDecel + NUMERICAL_EPS) {
+            // emergency deceleration required
+
+#ifdef DEBUG_EMERGENCYDECEL
+            if (true) {
+                std::cout << SIMTIME << " maximumSafeStopSpeed() results in emergency deceleration "
+                          << "initial vsafe=" << vsafe  << " egoSpeed=" << v << "(decel=" << SPEED2ACCEL(v - vsafe) << ")" << std::endl;
+            }
+#endif
+
+            double safeDecel = EMERGENCY_DECEL_AMPLIFIER * calculateEmergencyDeceleration(gap, currentSpeed, 0., 1);
+            // Don't be riskier than the usual method (myDecel <= safeDecel may occur, because a headway>0 is used above)
+            safeDecel = MAX2(safeDecel, myDecel);
+            // don't brake harder than originally planned (possible due to euler/ballistic mismatch)
+            safeDecel = MIN2(safeDecel, origSafeDecel);
+            vsafe = currentSpeed - ACCEL2SPEED(safeDecel);
+            if (MSGlobals::gSemiImplicitEulerUpdate) {
+                vsafe = MAX2(vsafe, 0.);
+            }
+
+#ifdef DEBUG_EMERGENCYDECEL
+            if (true) {
+                std::cout << "     -> corrected emergency deceleration: " << SPEED2ACCEL(v - vsafe) << std::endl;
+            }
+#endif
+
+        }
+    }
 
     return vsafe;
 }
@@ -946,7 +949,7 @@
     const double headway = myHeadwayTime;
     double x;
     if (gap >= 0 || MSGlobals::gComputeLC) {
-        x = maximumSafeStopSpeed(gap + brakeGap(predSpeed, MAX2(myDecel, predMaxDecel), 0), myDecel, egoSpeed, onInsertion, headway);
+        x = maximumSafeStopSpeed(gap + brakeGap(predSpeed, MAX2(myDecel, predMaxDecel), 0), myDecel, egoSpeed, onInsertion, headway, false);
     } else {
         x = egoSpeed - ACCEL2SPEED(myEmergencyDecel);
         if (MSGlobals::gSemiImplicitEulerUpdate) {
@@ -990,7 +993,7 @@
         }
     }
     assert(x >= 0 || !MSGlobals::gSemiImplicitEulerUpdate);
-    assert(!ISNAN(x));
+    assert(!std::isnan(x));
     return x;
 }
 
diff -Nru sumo-1.17.0/src/microsim/cfmodels/MSCFModel_Daniel1.cpp sumo-1.18.0/src/microsim/cfmodels/MSCFModel_Daniel1.cpp
--- sumo-1.17.0/src/microsim/cfmodels/MSCFModel_Daniel1.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/cfmodels/MSCFModel_Daniel1.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/cfmodels/MSCFModel_Daniel1.h sumo-1.18.0/src/microsim/cfmodels/MSCFModel_Daniel1.h
--- sumo-1.17.0/src/microsim/cfmodels/MSCFModel_Daniel1.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/cfmodels/MSCFModel_Daniel1.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/cfmodels/MSCFModel_EIDM.cpp sumo-1.18.0/src/microsim/cfmodels/MSCFModel_EIDM.cpp
--- sumo-1.17.0/src/microsim/cfmodels/MSCFModel_EIDM.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/cfmodels/MSCFModel_EIDM.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -160,7 +160,7 @@
         }
     }
     assert(x >= 0 || !MSGlobals::gSemiImplicitEulerUpdate);
-    assert(!ISNAN(x));
+    assert(!std::isnan(x));
     return x;
 }
 
diff -Nru sumo-1.17.0/src/microsim/cfmodels/MSCFModel_EIDM.h sumo-1.18.0/src/microsim/cfmodels/MSCFModel_EIDM.h
--- sumo-1.17.0/src/microsim/cfmodels/MSCFModel_EIDM.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/cfmodels/MSCFModel_EIDM.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/cfmodels/MSCFModel.h sumo-1.18.0/src/microsim/cfmodels/MSCFModel.h
--- sumo-1.17.0/src/microsim/cfmodels/MSCFModel.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/cfmodels/MSCFModel.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -601,8 +601,9 @@
      * @param[in] currentSpeed The current speed of the ego vehicle
      * @param[in] onInsertion Indicator whether the call is triggered during vehicle insertion
      * @param[in] headway The desired time headway to be included in the calculations (default argument -1 induces the use of myHeadway)
+     * @param[in] relaxEmergency Whether emergency deceleration should be reduced (at the cost of staying in a dangerous situation for longer)
      */
-    double maximumSafeStopSpeed(double gap, double decel, double currentSpeed, bool onInsertion = false, double headway = -1) const;
+    double maximumSafeStopSpeed(double gap, double decel, double currentSpeed, bool onInsertion = false, double headway = -1, bool relaxEmergency = true) const;
 
 
     /** @brief Returns the maximum next velocity for stopping within gap
@@ -653,6 +654,7 @@
         UNUSED_PARAMETER(veh);
         UNUSED_PARAMETER(key);
         UNUSED_PARAMETER(value);
+        throw InvalidArgument("Setting parameter '" + key + "' is not supported by carFollowModel");
     }
 
 protected:
diff -Nru sumo-1.17.0/src/microsim/cfmodels/MSCFModel_IDM.cpp sumo-1.18.0/src/microsim/cfmodels/MSCFModel_IDM.cpp
--- sumo-1.17.0/src/microsim/cfmodels/MSCFModel_IDM.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/cfmodels/MSCFModel_IDM.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -147,9 +147,14 @@
         //std::cout << " switching to krauss: " << veh->getID() << " gap=" << gap << " speed=" << speed << " res1=" << result << " res2=" << maximumSafeStopSpeed(gap, speed, false, veh->getActionStepLengthSecs())<< "\n";
         result = maximumSafeStopSpeed(gap, decel, speed, false, veh->getActionStepLengthSecs());
     }
-    //if (result * TS > gap) {
-    //    std::cout << "Maximum stop speed exceeded for gap=" << gap << " result=" << result << " veh=" << veh->getID() << " speed=" << speed << " t=" << SIMTIME << "\n";
-    //}
+    // avoid overshooting the stop location
+    if (gap >= 0) {
+        result = MIN2(result, DIST2SPEED(gap));
+        //if (result * TS > gap) {
+        //    std::cout << "Maximum stop speed exceeded for gap=" << gap << " result=" << result << " veh=" << veh->getID() << " speed=" << speed << " t=" << SIMTIME << "\n";
+        //}
+    }
+
     return result;
 }
 
diff -Nru sumo-1.17.0/src/microsim/cfmodels/MSCFModel_IDM.h sumo-1.18.0/src/microsim/cfmodels/MSCFModel_IDM.h
--- sumo-1.17.0/src/microsim/cfmodels/MSCFModel_IDM.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/cfmodels/MSCFModel_IDM.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/cfmodels/MSCFModel_Kerner.cpp sumo-1.18.0/src/microsim/cfmodels/MSCFModel_Kerner.cpp
--- sumo-1.17.0/src/microsim/cfmodels/MSCFModel_Kerner.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/cfmodels/MSCFModel_Kerner.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/cfmodels/MSCFModel_Kerner.h sumo-1.18.0/src/microsim/cfmodels/MSCFModel_Kerner.h
--- sumo-1.17.0/src/microsim/cfmodels/MSCFModel_Kerner.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/cfmodels/MSCFModel_Kerner.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/cfmodels/MSCFModel_Krauss.cpp sumo-1.18.0/src/microsim/cfmodels/MSCFModel_Krauss.cpp
--- sumo-1.17.0/src/microsim/cfmodels/MSCFModel_Krauss.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/cfmodels/MSCFModel_Krauss.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -98,12 +98,13 @@
 
 
 double
-MSCFModel_Krauss::stopSpeed(const MSVehicle* const veh, const double speed, double gap, double decel, const CalcReason /*usage*/) const {
+MSCFModel_Krauss::stopSpeed(const MSVehicle* const veh, const double speed, double gap, double decel, const CalcReason usage) const {
     // NOTE: This allows return of smaller values than minNextSpeed().
     // Only relevant for the ballistic update: We give the argument headway=veh->getActionStepLengthSecs(), to assure that
     // the stopping position is approached with a uniform deceleration also for tau!=veh->getActionStepLengthSecs().
     applyHeadwayPerceptionError(veh, speed, gap);
-    return MIN2(maximumSafeStopSpeed(gap, decel, speed, false, veh->getActionStepLengthSecs()), maxNextSpeed(speed, veh));
+    const bool relaxEmergency = usage != FUTURE; // do not relax insertionStopSpeed
+    return MIN2(maximumSafeStopSpeed(gap, decel, speed, false, veh->getActionStepLengthSecs(), relaxEmergency), maxNextSpeed(speed, veh));
 }
 
 
diff -Nru sumo-1.17.0/src/microsim/cfmodels/MSCFModel_Krauss.h sumo-1.18.0/src/microsim/cfmodels/MSCFModel_Krauss.h
--- sumo-1.17.0/src/microsim/cfmodels/MSCFModel_Krauss.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/cfmodels/MSCFModel_Krauss.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/cfmodels/MSCFModel_KraussOrig1.cpp sumo-1.18.0/src/microsim/cfmodels/MSCFModel_KraussOrig1.cpp
--- sumo-1.17.0/src/microsim/cfmodels/MSCFModel_KraussOrig1.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/cfmodels/MSCFModel_KraussOrig1.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/cfmodels/MSCFModel_KraussOrig1.h sumo-1.18.0/src/microsim/cfmodels/MSCFModel_KraussOrig1.h
--- sumo-1.17.0/src/microsim/cfmodels/MSCFModel_KraussOrig1.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/cfmodels/MSCFModel_KraussOrig1.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/cfmodels/MSCFModel_KraussPS.cpp sumo-1.18.0/src/microsim/cfmodels/MSCFModel_KraussPS.cpp
--- sumo-1.17.0/src/microsim/cfmodels/MSCFModel_KraussPS.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/cfmodels/MSCFModel_KraussPS.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/cfmodels/MSCFModel_KraussPS.h sumo-1.18.0/src/microsim/cfmodels/MSCFModel_KraussPS.h
--- sumo-1.17.0/src/microsim/cfmodels/MSCFModel_KraussPS.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/cfmodels/MSCFModel_KraussPS.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/cfmodels/MSCFModel_KraussX.cpp sumo-1.18.0/src/microsim/cfmodels/MSCFModel_KraussX.cpp
--- sumo-1.17.0/src/microsim/cfmodels/MSCFModel_KraussX.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/cfmodels/MSCFModel_KraussX.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/cfmodels/MSCFModel_KraussX.h sumo-1.18.0/src/microsim/cfmodels/MSCFModel_KraussX.h
--- sumo-1.17.0/src/microsim/cfmodels/MSCFModel_KraussX.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/cfmodels/MSCFModel_KraussX.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/cfmodels/MSCFModel_PWag2009.cpp sumo-1.18.0/src/microsim/cfmodels/MSCFModel_PWag2009.cpp
--- sumo-1.17.0/src/microsim/cfmodels/MSCFModel_PWag2009.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/cfmodels/MSCFModel_PWag2009.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2010-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/cfmodels/MSCFModel_PWag2009.h sumo-1.18.0/src/microsim/cfmodels/MSCFModel_PWag2009.h
--- sumo-1.17.0/src/microsim/cfmodels/MSCFModel_PWag2009.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/cfmodels/MSCFModel_PWag2009.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2010-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/cfmodels/MSCFModel_Rail.cpp sumo-1.18.0/src/microsim/cfmodels/MSCFModel_Rail.cpp
--- sumo-1.17.0/src/microsim/cfmodels/MSCFModel_Rail.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/cfmodels/MSCFModel_Rail.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -81,7 +81,7 @@
         gap = MAX2(0.0, gap + veh->getVehicleType().getMinGap() - 50);
     }
 
-    const double vsafe = maximumSafeStopSpeed(gap, myDecel, speed, false, TS); // absolute breaking distance
+    const double vsafe = maximumSafeStopSpeed(gap, myDecel, speed, false, TS, false); // absolute breaking distance
     const double vmin = minNextSpeed(speed, veh);
     const double vmax = maxNextSpeed(speed, veh);
 
@@ -255,5 +255,5 @@
 }
 
 double MSCFModel_Rail::stopSpeed(const MSVehicle* const veh, const double speed, double gap, double decel, const CalcReason /*usage*/) const {
-    return MIN2(maximumSafeStopSpeed(gap, decel, speed, false, TS), maxNextSpeed(speed, veh));
+    return MIN2(maximumSafeStopSpeed(gap, decel, speed, false, TS, false), maxNextSpeed(speed, veh));
 }
diff -Nru sumo-1.17.0/src/microsim/cfmodels/MSCFModel_Rail.h sumo-1.18.0/src/microsim/cfmodels/MSCFModel_Rail.h
--- sumo-1.17.0/src/microsim/cfmodels/MSCFModel_Rail.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/cfmodels/MSCFModel_Rail.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/cfmodels/MSCFModel_SmartSK.cpp sumo-1.18.0/src/microsim/cfmodels/MSCFModel_SmartSK.cpp
--- sumo-1.17.0/src/microsim/cfmodels/MSCFModel_SmartSK.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/cfmodels/MSCFModel_SmartSK.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/cfmodels/MSCFModel_SmartSK.h sumo-1.18.0/src/microsim/cfmodels/MSCFModel_SmartSK.h
--- sumo-1.17.0/src/microsim/cfmodels/MSCFModel_SmartSK.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/cfmodels/MSCFModel_SmartSK.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/cfmodels/MSCFModel_W99.cpp sumo-1.18.0/src/microsim/cfmodels/MSCFModel_W99.cpp
--- sumo-1.17.0/src/microsim/cfmodels/MSCFModel_W99.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/cfmodels/MSCFModel_W99.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2011-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/cfmodels/MSCFModel_W99.h sumo-1.18.0/src/microsim/cfmodels/MSCFModel_W99.h
--- sumo-1.17.0/src/microsim/cfmodels/MSCFModel_W99.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/cfmodels/MSCFModel_W99.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/cfmodels/MSCFModel_Wiedemann.cpp sumo-1.18.0/src/microsim/cfmodels/MSCFModel_Wiedemann.cpp
--- sumo-1.17.0/src/microsim/cfmodels/MSCFModel_Wiedemann.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/cfmodels/MSCFModel_Wiedemann.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2011-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/cfmodels/MSCFModel_Wiedemann.h sumo-1.18.0/src/microsim/cfmodels/MSCFModel_Wiedemann.h
--- sumo-1.17.0/src/microsim/cfmodels/MSCFModel_Wiedemann.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/cfmodels/MSCFModel_Wiedemann.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/cfmodels/ParBuffer.h sumo-1.18.0/src/microsim/cfmodels/ParBuffer.h
--- sumo-1.17.0/src/microsim/cfmodels/ParBuffer.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/cfmodels/ParBuffer.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/Command_RouteReplacement.cpp sumo-1.18.0/src/microsim/Command_RouteReplacement.cpp
--- sumo-1.17.0/src/microsim/Command_RouteReplacement.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/Command_RouteReplacement.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/Command_RouteReplacement.h sumo-1.18.0/src/microsim/Command_RouteReplacement.h
--- sumo-1.17.0/src/microsim/Command_RouteReplacement.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/Command_RouteReplacement.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/devices/CMakeLists.txt sumo-1.18.0/src/microsim/devices/CMakeLists.txt
--- sumo-1.17.0/src/microsim/devices/CMakeLists.txt	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/devices/CMakeLists.txt	2023-06-28 20:02:17.000000000 +0000
@@ -37,6 +37,8 @@
    MSDevice_Taxi.h
    MSDevice_GLOSA.cpp
    MSDevice_GLOSA.h
+   MSDevice_StationFinder.cpp
+   MSDevice_StationFinder.h
    MSTransportableDevice.h
    MSTransportableDevice_Routing.cpp
    MSTransportableDevice_Routing.h
diff -Nru sumo-1.17.0/src/microsim/devices/MSDevice_Battery.cpp sumo-1.18.0/src/microsim/devices/MSDevice_Battery.cpp
--- sumo-1.17.0/src/microsim/devices/MSDevice_Battery.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/devices/MSDevice_Battery.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2013-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -30,7 +30,7 @@
 #include 
 #include 
 #include 
-#include "MSDevice_Tripinfo.h"
+#include "MSDevice_StationFinder.h"
 #include "MSDevice_Emissions.h"
 #include "MSDevice_Battery.h"
 
@@ -54,9 +54,9 @@
 
 
 void
-MSDevice_Battery::buildVehicleDevices(SUMOVehicle& v, std::vector& into) {
+MSDevice_Battery::buildVehicleDevices(SUMOVehicle& v, std::vector& into, MSDevice_StationFinder* sf) {
     // Check if vehicle should get a battery
-    if (equippedByDefaultAssignmentOptions(OptionsCont::getOptions(), "battery", v, false)) {
+    if (sf != nullptr || equippedByDefaultAssignmentOptions(OptionsCont::getOptions(), "battery", v, false)) {
         const SUMOVTypeParameter& typeParams = v.getVehicleType().getParameter();
         // obtain maximumBatteryCapacity
         const double maximumBatteryCapacity = typeParams.getDouble(toString(SUMO_ATTR_MAXIMUMBATTERYCAPACITY), DEFAULT_MAX_CAPACITY);
@@ -79,6 +79,10 @@
 
         // Add device to vehicle
         into.push_back(device);
+
+        if (sf != nullptr) {
+            sf->setBattery(device);
+        }
     }
 }
 
diff -Nru sumo-1.17.0/src/microsim/devices/MSDevice_Battery.h sumo-1.18.0/src/microsim/devices/MSDevice_Battery.h
--- sumo-1.17.0/src/microsim/devices/MSDevice_Battery.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/devices/MSDevice_Battery.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2013-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -32,6 +32,7 @@
 // ===========================================================================
 class SUMOVehicle;
 class MSDevice_Emissions;
+class MSDevice_StationFinder;
 
 
 // ===========================================================================
@@ -58,7 +59,7 @@
     * @param[in] v The vehicle for which a device may be built
     * @param[filled] into The vector to store the built device in
     */
-    static void buildVehicleDevices(SUMOVehicle& v, std::vector& into);
+    static void buildVehicleDevices(SUMOVehicle& v, std::vector& into, MSDevice_StationFinder* sf);
 
 public:
     /// @brief Destructor.
diff -Nru sumo-1.17.0/src/microsim/devices/MSDevice_Bluelight.cpp sumo-1.18.0/src/microsim/devices/MSDevice_Bluelight.cpp
--- sumo-1.17.0/src/microsim/devices/MSDevice_Bluelight.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/devices/MSDevice_Bluelight.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2013-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/devices/MSDevice_Bluelight.h sumo-1.18.0/src/microsim/devices/MSDevice_Bluelight.h
--- sumo-1.17.0/src/microsim/devices/MSDevice_Bluelight.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/devices/MSDevice_Bluelight.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2013-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/devices/MSDevice_BTreceiver.cpp sumo-1.18.0/src/microsim/devices/MSDevice_BTreceiver.cpp
--- sumo-1.17.0/src/microsim/devices/MSDevice_BTreceiver.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/devices/MSDevice_BTreceiver.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2013-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/devices/MSDevice_BTreceiver.h sumo-1.18.0/src/microsim/devices/MSDevice_BTreceiver.h
--- sumo-1.17.0/src/microsim/devices/MSDevice_BTreceiver.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/devices/MSDevice_BTreceiver.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2013-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/devices/MSDevice_BTsender.cpp sumo-1.18.0/src/microsim/devices/MSDevice_BTsender.cpp
--- sumo-1.17.0/src/microsim/devices/MSDevice_BTsender.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/devices/MSDevice_BTsender.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2013-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/devices/MSDevice_BTsender.h sumo-1.18.0/src/microsim/devices/MSDevice_BTsender.h
--- sumo-1.17.0/src/microsim/devices/MSDevice_BTsender.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/devices/MSDevice_BTsender.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2013-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/devices/MSDevice.cpp sumo-1.18.0/src/microsim/devices/MSDevice.cpp
--- sumo-1.17.0/src/microsim/devices/MSDevice.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/devices/MSDevice.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2013-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -33,6 +33,7 @@
 #include "MSDevice_BTreceiver.h"
 #include "MSDevice_BTsender.h"
 #include "MSDevice_Example.h"
+#include "MSDevice_StationFinder.h"
 #include "MSDevice_Battery.h"
 #include "MSDevice_SSM.h"
 #include "MSDevice_ToC.h"
@@ -73,6 +74,7 @@
     MSVehicleDevice_BTreceiver::insertOptions(oc);
     MSVehicleDevice_BTsender::insertOptions(oc);
     MSDevice_Example::insertOptions(oc);
+    MSDevice_StationFinder::insertOptions(oc);
     MSDevice_Battery::insertOptions(oc);
     MSDevice_SSM::insertOptions(oc);
     MSDevice_ToC::insertOptions(oc);
@@ -110,7 +112,9 @@
     MSVehicleDevice_BTreceiver::buildVehicleDevices(v, into);
     MSVehicleDevice_BTsender::buildVehicleDevices(v, into);
     MSDevice_Example::buildVehicleDevices(v, into);
-    MSDevice_Battery::buildVehicleDevices(v, into);
+    const size_t numBefore = into.size();
+    MSDevice_StationFinder::buildVehicleDevices(v, into);
+    MSDevice_Battery::buildVehicleDevices(v, into, into.size() == numBefore ? nullptr : static_cast(into.back()));
     MSDevice_SSM::buildVehicleDevices(v, into);
     MSDevice_ToC::buildVehicleDevices(v, into);
     MSDevice_DriverState::buildVehicleDevices(v, into);
diff -Nru sumo-1.17.0/src/microsim/devices/MSDevice_DriverState.cpp sumo-1.18.0/src/microsim/devices/MSDevice_DriverState.cpp
--- sumo-1.17.0/src/microsim/devices/MSDevice_DriverState.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/devices/MSDevice_DriverState.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2013-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/devices/MSDevice_DriverState.h sumo-1.18.0/src/microsim/devices/MSDevice_DriverState.h
--- sumo-1.17.0/src/microsim/devices/MSDevice_DriverState.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/devices/MSDevice_DriverState.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2013-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/devices/MSDevice_ElecHybrid.cpp sumo-1.18.0/src/microsim/devices/MSDevice_ElecHybrid.cpp
--- sumo-1.17.0/src/microsim/devices/MSDevice_ElecHybrid.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/devices/MSDevice_ElecHybrid.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2002-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -213,7 +213,7 @@
     //
     // myParam[SUMO_ATTR_ANGLE] = myLastAngle == std::numeric_limits::infinity() ? 0. : GeomHelper::angleDiff(myLastAngle, veh.getAngle());
     // myConsum = PollutantsInterface::getEnergyHelper().compute(0, PollutantsInterface::ELEC, veh.getSpeed(), veh.getAcceleration(), veh.getSlope(), &myParam);
-    assert(!ISNAN(myConsum));
+    assert(!std::isnan(myConsum));
 
     // is battery pack discharged (from previous timestep)
     if (myActualBatteryCapacity < mySOCMin * myMaximumBatteryCapacity) {
@@ -401,7 +401,7 @@
                 // 10 and 1500 Volts that are used below are chosen fairly arbitrarily to keep the initial values within
                 // reasonable limits.
                 double voltage = myCircuitVoltage;
-                if (voltage < 10.0 || voltage > 1500.0 || ISNAN(voltage)) {
+                if (voltage < 10.0 || voltage > 1500.0 || std::isnan(voltage)) {
                     // RICE_TODO : It seems to output warning whenever a vehicle is appearing under the overhead wire for the first time?
                     // WRITE_WARNINGF(TL("The initial voltage is was % V, replacing it with substation voltage % V."), toString(voltage), toString(actualSubstation->getSubstationVoltage()));
                     voltage = actualSubstation->getSubstationVoltage();
@@ -552,10 +552,10 @@
 
     // Update the statistical values
     // RICE_TODO: update these statistical values also after solving circuit by electric circuit
-    if (ISNAN(myMaxBatteryCharge) || myMaxBatteryCharge < myActualBatteryCapacity) {
+    if (std::isnan(myMaxBatteryCharge) || myMaxBatteryCharge < myActualBatteryCapacity) {
         myMaxBatteryCharge = myActualBatteryCapacity;
     }
-    if (ISNAN(myMinBatteryCharge) || myMinBatteryCharge > myActualBatteryCapacity) {
+    if (std::isnan(myMinBatteryCharge) || myMinBatteryCharge > myActualBatteryCapacity) {
         myMinBatteryCharge = myActualBatteryCapacity;
     }
 
@@ -951,13 +951,13 @@
 
 double
 MSDevice_ElecHybrid::acceleration(SUMOVehicle& veh, double power, double oldSpeed) {
-    myHolder.getEmissionParameters()->setDouble(SUMO_ATTR_ANGLE, ISNAN(myLastAngle) ? 0. : GeomHelper::angleDiff(myLastAngle, veh.getAngle()));
+    myHolder.getEmissionParameters()->setDouble(SUMO_ATTR_ANGLE, std::isnan(myLastAngle) ? 0. : GeomHelper::angleDiff(myLastAngle, veh.getAngle()));
     return PollutantsInterface::getEnergyHelper().acceleration(0, PollutantsInterface::ELEC, oldSpeed, power, veh.getSlope(), myHolder.getEmissionParameters());
 }
 
 double
 MSDevice_ElecHybrid::consumption(SUMOVehicle& veh, double a, double newSpeed) {
-    myHolder.getEmissionParameters()->setDouble(SUMO_ATTR_ANGLE, ISNAN(myLastAngle) ? 0. : GeomHelper::angleDiff(myLastAngle, veh.getAngle()));
+    myHolder.getEmissionParameters()->setDouble(SUMO_ATTR_ANGLE, std::isnan(myLastAngle) ? 0. : GeomHelper::angleDiff(myLastAngle, veh.getAngle()));
     return PollutantsInterface::getEnergyHelper().compute(0, PollutantsInterface::ELEC, newSpeed, a, veh.getSlope(), myHolder.getEmissionParameters()) * TS;
 }
 
diff -Nru sumo-1.17.0/src/microsim/devices/MSDevice_ElecHybrid.h sumo-1.18.0/src/microsim/devices/MSDevice_ElecHybrid.h
--- sumo-1.17.0/src/microsim/devices/MSDevice_ElecHybrid.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/devices/MSDevice_ElecHybrid.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2002-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/devices/MSDevice_Emissions.cpp sumo-1.18.0/src/microsim/devices/MSDevice_Emissions.cpp
--- sumo-1.17.0/src/microsim/devices/MSDevice_Emissions.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/devices/MSDevice_Emissions.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/devices/MSDevice_Emissions.h sumo-1.18.0/src/microsim/devices/MSDevice_Emissions.h
--- sumo-1.17.0/src/microsim/devices/MSDevice_Emissions.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/devices/MSDevice_Emissions.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/devices/MSDevice_Example.cpp sumo-1.18.0/src/microsim/devices/MSDevice_Example.cpp
--- sumo-1.17.0/src/microsim/devices/MSDevice_Example.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/devices/MSDevice_Example.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2013-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/devices/MSDevice_Example.h sumo-1.18.0/src/microsim/devices/MSDevice_Example.h
--- sumo-1.17.0/src/microsim/devices/MSDevice_Example.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/devices/MSDevice_Example.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2013-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/devices/MSDevice_FCD.cpp sumo-1.18.0/src/microsim/devices/MSDevice_FCD.cpp
--- sumo-1.17.0/src/microsim/devices/MSDevice_FCD.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/devices/MSDevice_FCD.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2013-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/devices/MSDevice_FCD.h sumo-1.18.0/src/microsim/devices/MSDevice_FCD.h
--- sumo-1.17.0/src/microsim/devices/MSDevice_FCD.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/devices/MSDevice_FCD.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2013-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/devices/MSDevice_Friction.cpp sumo-1.18.0/src/microsim/devices/MSDevice_Friction.cpp
--- sumo-1.17.0/src/microsim/devices/MSDevice_Friction.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/devices/MSDevice_Friction.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2013-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/devices/MSDevice_Friction.h sumo-1.18.0/src/microsim/devices/MSDevice_Friction.h
--- sumo-1.17.0/src/microsim/devices/MSDevice_Friction.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/devices/MSDevice_Friction.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2013-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/devices/MSDevice_GLOSA.cpp sumo-1.18.0/src/microsim/devices/MSDevice_GLOSA.cpp
--- sumo-1.17.0/src/microsim/devices/MSDevice_GLOSA.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/devices/MSDevice_GLOSA.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2013-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/devices/MSDevice_GLOSA.h sumo-1.18.0/src/microsim/devices/MSDevice_GLOSA.h
--- sumo-1.17.0/src/microsim/devices/MSDevice_GLOSA.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/devices/MSDevice_GLOSA.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2013-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/devices/MSDevice.h sumo-1.18.0/src/microsim/devices/MSDevice.h
--- sumo-1.17.0/src/microsim/devices/MSDevice.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/devices/MSDevice.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2007-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -174,10 +174,10 @@
 
     /// @name Helper methods for parsing parameters
     /// @{
-    static std::string getStringParam(const SUMOVehicle& v, const OptionsCont& oc, std::string paramName, std::string deflt, bool required);
-    static double getFloatParam(const SUMOVehicle& v, const OptionsCont& oc, std::string paramName, double deflt, bool required);
-    static bool getBoolParam(const SUMOVehicle& v, const OptionsCont& oc, std::string paramName, bool deflt, bool required);
-    static SUMOTime getTimeParam(const SUMOVehicle& v, const OptionsCont& oc, std::string paramName, SUMOTime deflt, bool required);
+    static std::string getStringParam(const SUMOVehicle& v, const OptionsCont& oc, std::string paramName, std::string deflt, bool required = false);
+    static double getFloatParam(const SUMOVehicle& v, const OptionsCont& oc, std::string paramName, double deflt, bool required = false);
+    static bool getBoolParam(const SUMOVehicle& v, const OptionsCont& oc, std::string paramName, bool deflt, bool required = false);
+    static SUMOTime getTimeParam(const SUMOVehicle& v, const OptionsCont& oc, std::string paramName, SUMOTime deflt, bool required = false);
     /// @}
 
 private:
diff -Nru sumo-1.17.0/src/microsim/devices/MSDevice_Routing.cpp sumo-1.18.0/src/microsim/devices/MSDevice_Routing.cpp
--- sumo-1.17.0/src/microsim/devices/MSDevice_Routing.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/devices/MSDevice_Routing.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2007-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/devices/MSDevice_Routing.h sumo-1.18.0/src/microsim/devices/MSDevice_Routing.h
--- sumo-1.17.0/src/microsim/devices/MSDevice_Routing.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/devices/MSDevice_Routing.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2007-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/devices/MSDevice_SSM.cpp sumo-1.18.0/src/microsim/devices/MSDevice_SSM.cpp
--- sumo-1.17.0/src/microsim/devices/MSDevice_SSM.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/devices/MSDevice_SSM.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2013-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -76,11 +76,13 @@
 //                                 and a default threshold must be defined. A corresponding
 //                                 case should be added to the switch in buildVehicleDevices,
 //                                 and in computeSSMs(), the SSM-value should be computed.)
-#define AVAILABLE_SSMS "TTC DRAC PET BR SGAP TGAP"
-
+#define AVAILABLE_SSMS "TTC DRAC PET BR SGAP TGAP PPET MDRAC"
 #define DEFAULT_THRESHOLD_TTC 3. // in [s.], events get logged if time to collision is below threshold (1.5s. is an appropriate criticality threshold according to Van der Horst, A. R. A. (1991). Time-to-collision as a Cue for Decision-making in Braking [also see Guido et al. 2011])
 #define DEFAULT_THRESHOLD_DRAC 3. // in [m/s^2], events get logged if "deceleration to avoid a crash" is above threshold (3.4s. is an appropriate criticality threshold according to American Association of State Highway and Transportation Officials (2004). A Policy on Geometric Design of Highways and Streets [also see Guido et al. 2011])
+#define DEFAULT_THRESHOLD_MDRAC 3.4 //in [m/s^2], events get logged if "deceleration to avoid a crash" is above threshold (MDRAC considers reaction time of follower)
+
 #define DEFAULT_THRESHOLD_PET 2. // in seconds, events get logged if post encroachment time is below threshold
+#define DEFAULT_THRESHOLD_PPET 2. // in seconds, events get logged if predicted post encroachment time is below threshold
 
 #define DEFAULT_THRESHOLD_BR 0.0 // in [m/s^2], events get logged if brake rate is above threshold
 #define DEFAULT_THRESHOLD_SGAP 0.2 // in [m.], events get logged if the space headway is below threshold.
@@ -187,6 +189,18 @@
 
 int MSDevice_SSM::myIssuedParameterWarnFlags = 0;
 
+const std::set MSDevice_SSM::FOE_ENCOUNTERTYPES({
+    ENCOUNTER_TYPE_FOLLOWING_LEADER, ENCOUNTER_TYPE_MERGING_FOLLOWER,
+    ENCOUNTER_TYPE_CROSSING_FOLLOWER, ENCOUNTER_TYPE_FOE_ENTERED_CONFLICT_AREA,
+    ENCOUNTER_TYPE_FOE_LEFT_CONFLICT_AREA
+});
+const std::set MSDevice_SSM::EGO_ENCOUNTERTYPES({
+    ENCOUNTER_TYPE_FOLLOWING_FOLLOWER, ENCOUNTER_TYPE_MERGING_LEADER,
+    ENCOUNTER_TYPE_CROSSING_LEADER, ENCOUNTER_TYPE_EGO_ENTERED_CONFLICT_AREA,
+    ENCOUNTER_TYPE_EGO_LEFT_CONFLICT_AREA
+});
+
+
 const std::set&
 MSDevice_SSM::getInstances() {
     return *myInstances;
@@ -217,7 +231,7 @@
 
     // custom options
     oc.doRegister("device.ssm.measures", new Option_String(""));
-    oc.addDescription("device.ssm.measures", "SSM Device", TL("Specifies which measures will be logged (as a space or comma-separated sequence of IDs in ('TTC', 'DRAC', 'PET'))"));
+    oc.addDescription("device.ssm.measures", "SSM Device", TL("Specifies which measures will be logged (as a space or comma-separated sequence of IDs in ('TTC', 'DRAC', 'PET', 'PPET','MDRAC'))"));
     oc.doRegister("device.ssm.thresholds", new Option_String(""));
     oc.addDescription("device.ssm.thresholds", "SSM Device", TL("Specifies space or comma-separated thresholds corresponding to the specified measures (see documentation and watch the order!). Only events exceeding the thresholds will be logged."));
     oc.doRegister("device.ssm.trajectories",  new Option_Bool(false));
@@ -226,6 +240,8 @@
     oc.addDescription("device.ssm.range", "SSM Device", TL("Specifies the detection range in meters. For vehicles below this distance from the equipped vehicle, SSM values are traced."));
     oc.doRegister("device.ssm.extratime", new Option_Float(DEFAULT_EXTRA_TIME));
     oc.addDescription("device.ssm.extratime", "SSM Device", TL("Specifies the time in seconds to be logged after a conflict is over. Required >0 if PET is to be calculated for crossing conflicts."));
+    oc.doRegister("device.ssm.mdrac.prt", new Option_Float(1.));
+    oc.addDescription("device.ssm.mdrac.prt", "SSM Device", TL("Specifies the perception reaction time for MDRAC computation."));
     oc.doRegister("device.ssm.file", new Option_String(""));
     oc.addDescription("device.ssm.file", "SSM Device", TL("Give a global default filename for the SSM output"));
     oc.doRegister("device.ssm.geo", new Option_Bool(false));
@@ -234,6 +250,8 @@
     oc.addDescription("device.ssm.write-positions", "SSM Device", TL("Whether to write positions (coordinates) for each timestep"));
     oc.doRegister("device.ssm.write-lane-positions", new Option_Bool(false));
     oc.addDescription("device.ssm.write-lane-positions", "SSM Device", TL("Whether to write lanes and their positions for each timestep"));
+    oc.doRegister("device.ssm.exclude-conflict-types", new Option_String(""));
+    oc.addDescription("device.ssm.exclude-conflict-types", "SSM Device", TL("Which conflicts will be excluded from the log according to the conflict type they have been classified (combination of values in 'ego', 'foe' , '', any numerical valid conflict type code). An empty value will log all and 'ego'/'foe' refer to a certain conflict type subset."));
 }
 
 
@@ -316,8 +334,14 @@
 
         const bool writeLanesPos = writeLanesPositions(v);
 
+        std::vector conflictTypeFilter;
+        success = filterByConflictType(v, deviceID, conflictTypeFilter);
+        if (!success) {
+            return;
+        }
+
         // Build the device (XXX: who deletes it?)
-        MSDevice_SSM* device = new MSDevice_SSM(v, deviceID, file, thresholds, trajectories, range, extraTime, useGeo, writePos, writeLanesPos);
+        MSDevice_SSM* device = new MSDevice_SSM(v, deviceID, file, thresholds, trajectories, range, extraTime, useGeo, writePos, writeLanesPos, conflictTypeFilter);
         into.push_back(device);
 
         // Init spatial filter (once)
@@ -341,9 +365,11 @@
     egoConflictExitTime(INVALID_DOUBLE),
     foeConflictEntryTime(INVALID_DOUBLE),
     foeConflictExitTime(INVALID_DOUBLE),
-    minTTC(INVALID_DOUBLE, Position::INVALID, ENCOUNTER_TYPE_NOCONFLICT_AHEAD, INVALID_DOUBLE),
-    maxDRAC(INVALID_DOUBLE, Position::INVALID, ENCOUNTER_TYPE_NOCONFLICT_AHEAD, INVALID_DOUBLE),
-    PET(INVALID_DOUBLE, Position::INVALID, ENCOUNTER_TYPE_NOCONFLICT_AHEAD, INVALID_DOUBLE),
+    minTTC(INVALID_DOUBLE, Position::INVALID, ENCOUNTER_TYPE_NOCONFLICT_AHEAD, INVALID_DOUBLE, INVALID_DOUBLE),
+    maxDRAC(INVALID_DOUBLE, Position::INVALID, ENCOUNTER_TYPE_NOCONFLICT_AHEAD, INVALID_DOUBLE, INVALID_DOUBLE),
+    maxMDRAC(INVALID_DOUBLE, Position::INVALID, ENCOUNTER_TYPE_NOCONFLICT_AHEAD, INVALID_DOUBLE, INVALID_DOUBLE),
+    PET(INVALID_DOUBLE, Position::INVALID, ENCOUNTER_TYPE_NOCONFLICT_AHEAD, INVALID_DOUBLE, INVALID_DOUBLE),
+    minPPET(INVALID_DOUBLE, Position::INVALID, ENCOUNTER_TYPE_NOCONFLICT_AHEAD, INVALID_DOUBLE, INVALID_DOUBLE),
     closingRequested(false) {
 #ifdef DEBUG_ENCOUNTER
     if (DEBUG_COND_ENCOUNTER(this)) {
@@ -364,7 +390,7 @@
 void
 MSDevice_SSM::Encounter::add(double time, const EncounterType type, Position egoX, std::string egoLane, double egoLanePos, Position egoV,
                              Position foeX, std::string foeLane, double foeLanePos, Position foeV,
-                             Position conflictPoint, double egoDistToConflict, double foeDistToConflict, double ttc, double drac, std::pair pet) {
+                             Position conflictPoint, double egoDistToConflict, double foeDistToConflict, double ttc, double drac, std::pair pet, double ppet, double mdrac) {
 #ifdef DEBUG_ENCOUNTER
     if (DEBUG_COND_ENCOUNTER(this))
         std::cout << time << " Adding data point for encounter of '" << egoID << "' and '" << foeID << "':\n"
@@ -397,6 +423,7 @@
         minTTC.time = time;
         minTTC.pos = conflictPoint;
         minTTC.type = ttc <= 0 ? ENCOUNTER_TYPE_COLLISION :  type;
+        minTTC.speed = egoV.distanceTo(Position(0, 0));
     }
 
     DRACspan.push_back(drac);
@@ -405,6 +432,7 @@
         maxDRAC.time = time;
         maxDRAC.pos = conflictPoint;
         maxDRAC.type = type;
+        maxDRAC.speed = egoV.distanceTo(Position(0, 0));
     }
 
     if (pet.first != INVALID_DOUBLE && (PET.value >= pet.second || PET.value == INVALID_DOUBLE)) {
@@ -412,6 +440,23 @@
         PET.time = pet.first;
         PET.pos = conflictPoint;
         PET.type = PET.value <= 0 ? ENCOUNTER_TYPE_COLLISION : type;
+        PET.speed = egoV.distanceTo(Position(0, 0));
+    }
+    PPETspan.push_back(ppet);
+    if (ppet != INVALID_DOUBLE && (ppet < minPPET.value || minPPET.value == INVALID_DOUBLE)) {
+        minPPET.value = ppet;
+        minPPET.time = time;
+        minPPET.pos = conflictPoint;
+        minPPET.type = ppet <= 0 ? ENCOUNTER_TYPE_COLLISION :  type;
+        minPPET.speed = egoV.distanceTo(Position(0, 0));
+    }
+    MDRACspan.push_back(mdrac);
+    if (mdrac != INVALID_DOUBLE && (mdrac > maxMDRAC.value || maxMDRAC.value == INVALID_DOUBLE)) {
+        maxMDRAC.value = mdrac;
+        maxMDRAC.time = time;
+        maxMDRAC.pos = conflictPoint;
+        maxMDRAC.type = type;
+        maxMDRAC.speed = egoV.distanceTo(Position(0, 0));
     }
 }
 
@@ -448,11 +493,11 @@
     foeEstimatedConflictExitTime(INVALID_DOUBLE),
     egoConflictAreaLength(INVALID_DOUBLE),
     foeConflictAreaLength(INVALID_DOUBLE),
-    egoLeftConflict(false),
-    foeLeftConflict(false),
     ttc(INVALID_DOUBLE),
     drac(INVALID_DOUBLE),
-    pet(std::make_pair(INVALID_DOUBLE, INVALID_DOUBLE)) {
+    mdrac(INVALID_DOUBLE),
+    pet(std::make_pair(INVALID_DOUBLE, INVALID_DOUBLE)),
+    ppet(INVALID_DOUBLE) {
 }
 
 
@@ -732,6 +777,12 @@
     if (myComputeDRAC && e->maxDRAC.value != INVALID_DOUBLE && e->maxDRAC.value >= myThresholds["DRAC"]) {
         return true;
     }
+    if (myComputePPET && e->minPPET.value != INVALID_DOUBLE && e->minPPET.value <= myThresholds["PPET"]) {
+        return true;
+    }
+    if (myComputeMDRAC && e->maxMDRAC.value != INVALID_DOUBLE && e->maxMDRAC.value >= myThresholds["MDRAC"]) {
+        return true;
+    }
     return false;
 }
 
@@ -878,7 +929,7 @@
         // Add current states to trajectories and update type
         e->add(SIMTIME, eInfo.type, e->ego->getPosition(), e->ego->getLane()->getID(), e->ego->getPositionOnLane(), e->ego->getVelocityVector(),
                e->foe->getPosition(), e->foe->getLane()->getID(), e->foe->getPositionOnLane(), e->foe->getVelocityVector(),
-               eInfo.conflictPoint, eInfo.egoConflictEntryDist, eInfo.foeConflictEntryDist, eInfo.ttc, eInfo.drac, eInfo.pet);
+               eInfo.conflictPoint, eInfo.egoConflictEntryDist, eInfo.foeConflictEntryDist, eInfo.ttc, eInfo.drac, eInfo.pet, eInfo.ppet, eInfo.mdrac);
     }
     // Keep encounter
     return true;
@@ -949,8 +1000,10 @@
     if (DEBUG_COND(e->ego))
         std::cout << SIMTIME << " estimateConflictTimes() for ego '" << e->egoID << "' and foe '" << e->foeID << "'\n"
                   << "    encounter type: " << eInfo.type << "\n"
-                  << "    egoConflictEntryDist=" << (eInfo.egoConflictEntryDist == INVALID_DOUBLE ? "NA" : ::toString(eInfo.egoConflictEntryDist))
-                  << ", foeConflictEntryDist=" << (eInfo.foeConflictEntryDist == INVALID_DOUBLE ? "NA" : ::toString(eInfo.foeConflictEntryDist))
+                  << "    egoConflictEntryDist=" << writeNA(eInfo.egoConflictEntryDist)
+                  << " foeConflictEntryDist=" << writeNA(eInfo.foeConflictEntryDist)
+                  << " egoConflictExitDist=" << writeNA(eInfo.egoConflictExitDist)
+                  << " foeConflictExitDist=" << writeNA(eInfo.foeConflictExitDist)
                   << "\n    ego speed=" << e->ego->getSpeed()
                   << ", foe speed=" << e->foe->getSpeed()
                   << std::endl;
@@ -1026,13 +1079,22 @@
 #endif
 
     // Estimate exit times from conflict area for leader / follower.
+    // assume vehicles start to accelerate after entring the intersection
     if (eInfo.egoConflictExitDist >= 0.) {
         eInfo.egoEstimatedConflictExitTime = e->ego->getCarFollowModel().estimateArrivalTime(eInfo.egoConflictExitDist, e->ego->getSpeed(), e->ego->getMaxSpeedOnLane(), MIN2(0., e->ego->getAcceleration()));
+        //eInfo.egoEstimatedConflictExitTime = eInfo.egoEstimatedConflictEntryTime + e->ego->getCarFollowModel().estimateArrivalTime(
+        //        eInfo.egoConflictExitDist - MAX2(0.0, eInfo.egoConflictEntryDist),
+        //        e->ego->getSpeed(), e->ego->getMaxSpeedOnLane(),
+        //        e->ego->getCarFollowModel().getMaxAccel());
     } else {
         eInfo.egoEstimatedConflictExitTime = 0.;
     }
     if (eInfo.foeConflictExitDist >= 0.) {
         eInfo.foeEstimatedConflictExitTime = e->foe->getCarFollowModel().estimateArrivalTime(eInfo.foeConflictExitDist, e->foe->getSpeed(), e->foe->getMaxSpeedOnLane(), MIN2(0., e->foe->getAcceleration()));
+        //eInfo.foeEstimatedConflictExitTime = eInfo.foeEstimatedConflictEntryTime + e->foe->getCarFollowModel().estimateArrivalTime(
+        //        eInfo.foeConflictExitDist - MAX2(0.0, eInfo.foeConflictEntryDist),
+        //        e->foe->getSpeed(), e->foe->getMaxSpeedOnLane(),
+        //        e->foe->getCarFollowModel().getMaxAccel());
     } else {
         eInfo.foeEstimatedConflictExitTime = 0.;
     }
@@ -1097,8 +1159,8 @@
             || type == ENCOUNTER_TYPE_MERGING_FOLLOWER || type == ENCOUNTER_TYPE_MERGING_LEADER
             || type == ENCOUNTER_TYPE_FOLLOWING_FOLLOWER || type == ENCOUNTER_TYPE_FOLLOWING_LEADER
             || type == ENCOUNTER_TYPE_ONCOMING) {
-        if (myComputeTTC || myComputeDRAC) {
-            determineTTCandDRAC(eInfo);
+        if (myComputeTTC || myComputeDRAC || myComputePPET || myComputeMDRAC) {
+            determineTTCandDRACandPPETandMDRAC(eInfo);
         }
         determinePET(eInfo);
     } else if (type == ENCOUNTER_TYPE_BOTH_LEFT_CONFLICT_AREA) {
@@ -1234,11 +1296,13 @@
 
 
 void
-MSDevice_SSM::determineTTCandDRAC(EncounterApproachInfo& eInfo) const {
+MSDevice_SSM::determineTTCandDRACandPPETandMDRAC(EncounterApproachInfo& eInfo) const {
     Encounter* e = eInfo.encounter;
     const EncounterType& type = eInfo.type;
     double& ttc = eInfo.ttc;
     double& drac = eInfo.drac;
+    double& ppet = eInfo.ppet;
+    double& mdrac = eInfo.mdrac;
 
 #ifdef DEBUG_SSM
     if (DEBUG_COND(myHolderMS))
@@ -1256,6 +1320,9 @@
         if (myComputeDRAC) {
             drac = computeDRAC(gap, e->ego->getSpeed(), e->foe->getSpeed());
         }
+        if (myComputeMDRAC) {
+            mdrac = computeMDRAC(gap, e->ego->getSpeed(), e->foe->getSpeed(), myMDRACPRT);
+        }
     } else if (type == ENCOUNTER_TYPE_FOLLOWING_LEADER) {
         double gap = eInfo.foeConflictEntryDist;
         if (myComputeTTC) {
@@ -1264,6 +1331,9 @@
         if (myComputeDRAC) {
             drac = computeDRAC(gap, e->foe->getSpeed(), e->ego->getSpeed());
         }
+        if (myComputeMDRAC) {
+            mdrac = computeMDRAC(gap, e->foe->getSpeed(), e->ego->getSpeed(), myMDRACPRT);
+        }
     } else if (type == ENCOUNTER_TYPE_ONCOMING) {
         if (myComputeTTC) {
             const double dv = e->ego->getSpeed() + e->foe->getSpeed();
@@ -1298,6 +1368,7 @@
             // at least one vehicle is stopped
             ttc = INVALID_DOUBLE;
             drac = INVALID_DOUBLE;
+            mdrac = INVALID_DOUBLE;
 #ifdef DEBUG_SSM
             if (DEBUG_COND(myHolderMS)) {
                 std::cout << "    No TTC and DRAC computed as one vehicle is stopped." << std::endl;
@@ -1314,6 +1385,10 @@
         double leaderConflictDist = leaderEntryTime == egoEntryTime ? eInfo.egoConflictEntryDist : eInfo.foeConflictEntryDist;
         double followerConflictDist = leaderEntryTime == egoEntryTime ? eInfo.foeConflictEntryDist : eInfo.egoConflictEntryDist;
         double leaderLength = leaderEntryTime == egoEntryTime ? e->ego->getLength() : e->foe->getLength();
+        if (myComputePPET && followerEntryTime != INVALID_DOUBLE && leaderEntryTime != INVALID_DOUBLE) {
+            ppet = followerEntryTime - leaderExitTime;
+            //std::cout << " debug1 ppet=" << ppet << "\n";
+        }
         if (leaderExitTime >= followerEntryTime) {
             // collision would occur at merge area
             if (myComputeTTC) {
@@ -1324,7 +1399,9 @@
             if (myComputeDRAC) {
                 drac = computeDRAC(followerConflictDist, followerSpeed, 0.);
             }
-//            if (myComputeDRAC) drac = computeDRAC(eInfo);
+            if (myComputeMDRAC) {
+                mdrac = computeMDRAC(followerConflictDist, followerSpeed, 0., myMDRACPRT);
+            }
 
 #ifdef DEBUG_SSM
             if (DEBUG_COND(myHolderMS))
@@ -1356,6 +1433,19 @@
                     drac = computeDRAC(g0, followerSpeed, leaderSpeed);
                 }
             }
+            if (myComputeMDRAC) {
+                // Intitial gap. (May be negative only if the leader speed is higher than the follower speed, i.e., dv < 0)
+                double g0 = followerConflictDist - leaderConflictDist - leaderLength;
+                if (g0 < 0) {
+                    // Speed difference must be positive if g0<0.
+                    assert(leaderSpeed - followerSpeed > 0);
+                    // no deceleration needed for dv>0 and gap after merge >= 0
+                    mdrac = INVALID_DOUBLE;
+                } else {
+                    // compute drac as for a following situation
+                    mdrac = computeMDRAC(g0, followerSpeed, leaderSpeed, myMDRACPRT);
+                }
+            }
 #ifdef DEBUG_SSM
             if (DEBUG_COND(myHolderMS)) {
                 if (ttc == INVALID_DOUBLE) {
@@ -1377,30 +1467,61 @@
         if (myComputeDRAC) {
             drac = computeDRAC(eInfo);
         }
-        if (eInfo.egoEstimatedConflictEntryTime <= eInfo.foeEstimatedConflictExitTime) {
+        if (eInfo.egoEstimatedConflictEntryTime <= eInfo.foeEstimatedConflictExitTime && eInfo.egoEstimatedConflictEntryTime != INVALID_DOUBLE) {
             // follower's predicted arrival at the crossing area is earlier than the leader's predicted exit -> collision predicted
             double gap = eInfo.egoConflictEntryDist;
             if (myComputeTTC) {
                 ttc = computeTTC(gap, e->ego->getSpeed(), 0.);
             }
+            if (myComputeMDRAC) {
+                mdrac = computeMDRAC(gap, e->ego->getSpeed(), 0., myMDRACPRT);
+            }
         } else {
             // encounter is expected to happen without collision
             ttc = INVALID_DOUBLE;
+            mdrac = INVALID_DOUBLE;
+        }
+        if (myComputePPET) {
+            const double entryTime = eInfo.egoEstimatedConflictEntryTime;
+            const double exitTime = (e->foeConflictExitTime == INVALID_DOUBLE
+                                     ? eInfo.foeEstimatedConflictExitTime : e->foeConflictExitTime);
+            if (entryTime != INVALID_DOUBLE && exitTime != INVALID_DOUBLE) {
+                ppet = entryTime - exitTime;
+            }
+            //std::cout << " debug2 ppet=" << ppet << "\n";
         }
+
     } else if (type == ENCOUNTER_TYPE_CROSSING_LEADER
                || type == ENCOUNTER_TYPE_EGO_ENTERED_CONFLICT_AREA) {
         if (myComputeDRAC) {
             drac = computeDRAC(eInfo);
         }
-        if (eInfo.foeEstimatedConflictEntryTime <= eInfo.egoEstimatedConflictExitTime) {
+        if (eInfo.foeEstimatedConflictEntryTime <= eInfo.egoEstimatedConflictExitTime && eInfo.foeEstimatedConflictEntryTime != INVALID_DOUBLE) {
             // follower's predicted arrival at the crossing area is earlier than the leader's predicted exit -> collision predicted
             double gap = eInfo.foeConflictEntryDist;
             if (myComputeTTC) {
                 ttc = computeTTC(gap, e->foe->getSpeed(), 0.);
             }
+            if (myComputeMDRAC) {
+                mdrac = computeMDRAC(gap, e->foe->getSpeed(), 0., myMDRACPRT);
+            }
         } else {
             // encounter is expected to happen without collision
             ttc = INVALID_DOUBLE;
+            mdrac = INVALID_DOUBLE;
+        }
+        if (myComputePPET) {
+            const double entryTime = eInfo.foeEstimatedConflictEntryTime;
+            const double exitTime = (e->egoConflictExitTime == INVALID_DOUBLE
+                                     ? eInfo.egoEstimatedConflictExitTime : e->egoConflictExitTime);
+            if (entryTime != INVALID_DOUBLE && exitTime != INVALID_DOUBLE) {
+                ppet = entryTime - exitTime;
+            }
+            //std::cout << SIMTIME << " debug3 ppet=" << writeNA(ppet)
+            //    << " fecet=" << writeNA(eInfo.foeEstimatedConflictEntryTime)
+            //    << " ecet=" << writeNA(e->egoConflictExitTime)
+            //    << " eecec=" << writeNA(eInfo.egoEstimatedConflictExitTime)
+            //    << "\n";
         }
     } else {
 #ifdef DEBUG_SSM
@@ -1461,6 +1582,28 @@
 }
 
 double
+MSDevice_SSM::computeMDRAC(double gap, double followerSpeed, double leaderSpeed, double prt) {
+//#ifdef DEBUG_SSM_DRAC
+//    if (DEBUG_COND)
+//    std::cout << "computeMDRAC() with gap=" << gap << ", followerSpeed=" << followerSpeed << ", leaderSpeed=" << leaderSpeed
+//              << std::endl;
+//#endif
+    if (gap <= 0.) {
+        return INVALID_DOUBLE;    // collision!
+    }
+    double dv = followerSpeed - leaderSpeed;
+    if (dv <= 0.) {
+        return 0.0;    // no need to brake
+    }
+    if (gap / dv == prt) {
+        return INVALID_DOUBLE;
+    }
+    assert(followerSpeed > 0.);
+    return 0.5 * dv / (gap / dv - prt);
+}
+
+
+double
 MSDevice_SSM::computeDRAC(const EncounterApproachInfo& eInfo) {
     // Introduce concise variable names
     double dEntry1 = eInfo.egoConflictEntryDist;
@@ -1834,11 +1977,10 @@
 #endif
 
         // Determine actual encounter type
-        bool egoEnteredConflict =  eInfo.egoConflictEntryDist < 0.;
-        bool foeEnteredConflict =  eInfo.foeConflictEntryDist < 0.;
-        bool egoLeftConflict =  eInfo.egoConflictExitDist < 0.;
-        bool foeLeftConflict =  eInfo.foeConflictExitDist < 0.;
-
+        bool egoEnteredConflict = eInfo.egoConflictEntryDist < 0.;
+        bool foeEnteredConflict = eInfo.foeConflictEntryDist < 0.;
+        bool egoLeftConflict = eInfo.egoConflictExitDist < 0.;
+        bool foeLeftConflict = eInfo.foeConflictExitDist < 0.;
         if ((!egoEnteredConflict) && !foeEnteredConflict) {
             // XXX: do we need to recompute the follow/lead order, here?
             assert(lastPotentialConflictType == ENCOUNTER_TYPE_CROSSING_FOLLOWER
@@ -2638,7 +2780,19 @@
     while (!myPastConflicts.empty()) {
         Encounter* top = myPastConflicts.top();
         if (flushAll || top->begin <= myOldestActiveEncounterBegin) {
-            writeOutConflict(top);
+            bool write = true;
+            if (myFilterConflictTypes) {
+                std::vector foundTypes;
+                std::set encounterTypes(top->typeSpan.begin(), top->typeSpan.end());
+                std::set_intersection(
+                    myDroppedConflictTypes.begin(), myDroppedConflictTypes.end(),
+                    encounterTypes.begin(), encounterTypes.end(),
+                    std::back_inserter(foundTypes));
+                write = foundTypes.size() == 0;
+            }
+            if (write) {
+                writeOutConflict(top);
+            }
             myPastConflicts.pop();
             delete top;
         } else {
@@ -2767,16 +2921,17 @@
             myOutputFile->openTag("TTCSpan").writeAttr("values", makeStringWithNAs(e->TTCspan, INVALID_DOUBLE)).closeTag();
         }
         if (e->minTTC.time == INVALID_DOUBLE) {
-            myOutputFile->openTag("minTTC").writeAttr("time", "NA").writeAttr("position", "NA").writeAttr("type", "NA").writeAttr("value", "NA").closeTag();
+            myOutputFile->openTag("minTTC").writeAttr("time", "NA").writeAttr("position", "NA").writeAttr("type", "NA").writeAttr("value", "NA").writeAttr("speed", "NA").closeTag();
         } else {
             std::string time = ::toString(e->minTTC.time);
             std::string type = ::toString(int(e->minTTC.type));
             std::string value = ::toString(e->minTTC.value);
+            std::string speed = ::toString(e->minTTC.speed);
             if (myUseGeoCoords) {
                 toGeo(e->minTTC.pos);
             }
             std::string position = makeStringWithNAs(e->minTTC.pos);
-            myOutputFile->openTag("minTTC").writeAttr("time", time).writeAttr("position", position).writeAttr("type", type).writeAttr("value", value).closeTag();
+            myOutputFile->openTag("minTTC").writeAttr("time", time).writeAttr("position", position).writeAttr("type", type).writeAttr("value", value).writeAttr("speed", speed).closeTag();
         }
     }
     if (myComputeDRAC) {
@@ -2784,30 +2939,68 @@
             myOutputFile->openTag("DRACSpan").writeAttr("values", makeStringWithNAs(e->DRACspan, {0.0, INVALID_DOUBLE})).closeTag();
         }
         if (e->maxDRAC.time == INVALID_DOUBLE) {
-            myOutputFile->openTag("maxDRAC").writeAttr("time", "NA").writeAttr("position", "NA").writeAttr("type", "NA").writeAttr("value", "NA").closeTag();
+            myOutputFile->openTag("maxDRAC").writeAttr("time", "NA").writeAttr("position", "NA").writeAttr("type", "NA").writeAttr("value", "NA").writeAttr("speed", "NA").closeTag();
         } else {
             std::string time = ::toString(e->maxDRAC.time);
             std::string type = ::toString(int(e->maxDRAC.type));
             std::string value = ::toString(e->maxDRAC.value);
+            std::string speed = ::toString(e->maxDRAC.speed);
             if (myUseGeoCoords) {
                 toGeo(e->maxDRAC.pos);
             }
             std::string position = makeStringWithNAs(e->maxDRAC.pos);
-            myOutputFile->openTag("maxDRAC").writeAttr("time", time).writeAttr("position", position).writeAttr("type", type).writeAttr("value", value).closeTag();
+            myOutputFile->openTag("maxDRAC").writeAttr("time", time).writeAttr("position", position).writeAttr("type", type).writeAttr("value", value).writeAttr("speed", speed).closeTag();
         }
     }
     if (myComputePET) {
         if (e->PET.time == INVALID_DOUBLE) {
-            myOutputFile->openTag("PET").writeAttr("time", "NA").writeAttr("position", "NA").writeAttr("type", "NA").writeAttr("value", "NA").closeTag();
+            myOutputFile->openTag("PET").writeAttr("time", "NA").writeAttr("position", "NA").writeAttr("type", "NA").writeAttr("value", "NA").writeAttr("speed", "NA").closeTag();
         } else {
             std::string time = ::toString(e->PET.time);
             std::string type = ::toString(int(e->PET.type));
             std::string value = ::toString(e->PET.value);
+            std::string speed = ::toString(e->PET.speed);
             if (myUseGeoCoords) {
                 toGeo(e->PET.pos);
             }
             std::string position = ::toString(e->PET.pos, myUseGeoCoords ? gPrecisionGeo : gPrecision);
-            myOutputFile->openTag("PET").writeAttr("time", time).writeAttr("position", position).writeAttr("type", type).writeAttr("value", value).closeTag();
+            myOutputFile->openTag("PET").writeAttr("time", time).writeAttr("position", position).writeAttr("type", type).writeAttr("value", value).writeAttr("speed", speed).closeTag();
+        }
+    }
+    if (myComputePPET) {
+        if (mySaveTrajectories) {
+            myOutputFile->openTag("PPETSpan").writeAttr("values", makeStringWithNAs(e->PPETspan, INVALID_DOUBLE)).closeTag();
+        }
+        if (e->minPPET.time == INVALID_DOUBLE) {
+            myOutputFile->openTag("minPPET").writeAttr("time", "NA").writeAttr("position", "NA").writeAttr("type", "NA").writeAttr("value", "NA").writeAttr("speed", "NA").closeTag();
+        } else {
+            std::string time = ::toString(e->minPPET.time);
+            std::string type = ::toString(int(e->minPPET.type));
+            std::string value = ::toString(e->minPPET.value);
+            std::string speed = ::toString(e->minPPET.speed);
+            if (myUseGeoCoords) {
+                toGeo(e->minPPET.pos);
+            }
+            std::string position = makeStringWithNAs(e->minPPET.pos);
+            myOutputFile->openTag("minPPET").writeAttr("time", time).writeAttr("position", position).writeAttr("type", type).writeAttr("value", value).writeAttr("speed", speed).closeTag();
+        }
+    }
+    if (myComputeMDRAC) {
+        if (mySaveTrajectories) {
+            myOutputFile->openTag("MDRACSpan").writeAttr("values", makeStringWithNAs(e->MDRACspan, {0.0, INVALID_DOUBLE})).closeTag();
+        }
+        if (e->maxMDRAC.time == INVALID_DOUBLE) {
+            myOutputFile->openTag("maxMDRAC").writeAttr("time", "NA").writeAttr("position", "NA").writeAttr("type", "NA").writeAttr("value", "NA").writeAttr("speed", "NA").closeTag();
+        } else {
+            std::string time = ::toString(e->maxMDRAC.time);
+            std::string type = ::toString(int(e->maxMDRAC.type));
+            std::string value = ::toString(e->maxMDRAC.value);
+            std::string speed = ::toString(e->maxMDRAC.speed);
+            if (myUseGeoCoords) {
+                toGeo(e->maxMDRAC.pos);
+            }
+            std::string position = makeStringWithNAs(e->maxMDRAC.pos);
+            myOutputFile->openTag("maxMDRAC").writeAttr("time", time).writeAttr("position", position).writeAttr("type", type).writeAttr("value", value).writeAttr("speed", speed).closeTag();
         }
     }
     myOutputFile->closeTag();
@@ -2848,15 +3041,22 @@
 }
 
 
+std::string
+MSDevice_SSM::writeNA(double v, double NA) {
+    return v == NA ? "NA" : toString(v);
+}
+
 // ---------------------------------------------------------------------------
 // MSDevice_SSM-methods
 // ---------------------------------------------------------------------------
 MSDevice_SSM::MSDevice_SSM(SUMOVehicle& holder, const std::string& id, std::string outputFilename, std::map thresholds,
-                           bool trajectories, double range, double extraTime, bool useGeoCoords, bool writePositions, bool writeLanesPositions) :
+                           bool trajectories, double range, double extraTime, bool useGeoCoords, bool writePositions, bool writeLanesPositions,
+                           std::vector conflictTypeFilter) :
     MSVehicleDevice(holder, id),
     myThresholds(thresholds),
     mySaveTrajectories(trajectories),
     myRange(range),
+    myMDRACPRT(getMDRAC_PRT(holder)),
     myExtraTime(extraTime),
     myUseGeoCoords(useGeoCoords),
     myWritePositions(writePositions),
@@ -2870,12 +3070,17 @@
 
     myComputeTTC = myThresholds.find("TTC") != myThresholds.end();
     myComputeDRAC = myThresholds.find("DRAC") != myThresholds.end();
+    myComputeMDRAC = myThresholds.find("MDRAC") != myThresholds.end();
     myComputePET = myThresholds.find("PET") != myThresholds.end();
+    myComputePPET = myThresholds.find("PPET") != myThresholds.end();
 
     myComputeBR = myThresholds.find("BR") != myThresholds.end();
     myComputeSGAP = myThresholds.find("SGAP") != myThresholds.end();
     myComputeTGAP = myThresholds.find("TGAP") != myThresholds.end();
 
+    myDroppedConflictTypes = conflictTypeFilter;
+    myFilterConflictTypes = myDroppedConflictTypes.size() > 0;
+
     myActiveEncounters = EncounterVector();
     myPastConflicts = EncounterQueue();
 
@@ -3601,6 +3806,52 @@
 }
 
 
+bool
+MSDevice_SSM::filterByConflictType(const SUMOVehicle& v, std::string deviceID, std::vector& conflictTypes) {
+    OptionsCont& oc = OptionsCont::getOptions();
+    std::string typeString = "";
+    if (v.getParameter().knowsParameter("device.ssm.exclude-conflict-types")) {
+        try {
+            typeString = v.getParameter().getParameter("device.ssm.exclude-conflict-types", "");
+        } catch (...) {
+            WRITE_WARNINGF(TL("Invalid value '%' for vehicle parameter 'ssm.conflict-order'."), v.getParameter().getParameter("device.ssm.exclude-conflict-types", ""));
+        }
+    } else if (v.getVehicleType().getParameter().knowsParameter("device.ssm.exclude-conflict-types")) {
+        try {
+            typeString = v.getVehicleType().getParameter().getParameter("device.ssm.exclude-conflict-types", "");
+        } catch (...) {
+            WRITE_WARNINGF(TL("Invalid value '%' for vType parameter 'ssm.conflict-order'."), v.getVehicleType().getParameter().getParameter("device.ssm.exclude-conflict-types", ""));
+        }
+    } else {
+        typeString = oc.getString("device.ssm.exclude-conflict-types");
+        if (oc.isDefault("device.ssm.exclude-conflict-types") && (myIssuedParameterWarnFlags & SSM_WARN_CONFLICTFILTER) == 0) {
+            WRITE_MESSAGEF(TL("Vehicle '%' does not supply vehicle parameter 'device.ssm.exclude-conflict-types'. Using default of '%'."), v.getID(), typeString);
+            myIssuedParameterWarnFlags |= SSM_WARN_CONFLICTFILTER;
+        }
+    }
+    // Check retrieved conflict keys
+    StringTokenizer st = StringTokenizer("");
+    st = (typeString.find(",") != std::string::npos) ? StringTokenizer(typeString, ",") : StringTokenizer(typeString);
+    std::vector found = st.getVector();
+    std::set confirmed;
+    for (std::vector::const_iterator i = found.begin(); i != found.end(); ++i) {
+        if (*i == "foe") {
+            confirmed.insert(FOE_ENCOUNTERTYPES.begin(), FOE_ENCOUNTERTYPES.end());
+        } else if (*i == "ego") {
+            confirmed.insert(EGO_ENCOUNTERTYPES.begin(), EGO_ENCOUNTERTYPES.end());
+        } else if (encounterToString(static_cast(std::stoi(*i))) != "UNKNOWN") {
+            confirmed.insert(std::stoi(*i));
+        } else {
+            // Given identifier is unknown
+            WRITE_ERRORF(TL("SSM order filter '%' is not supported. Aborting construction of SSM device '%'."), *i, deviceID);
+            return false;
+        }
+    }
+    conflictTypes.insert(conflictTypes.end(), confirmed.begin(), confirmed.end());
+    return true;
+}
+
+
 double
 MSDevice_SSM::getDetectionRange(const SUMOVehicle& v) {
     OptionsCont& oc = OptionsCont::getOptions();
@@ -3629,6 +3880,35 @@
 
 
 double
+MSDevice_SSM::getMDRAC_PRT(const SUMOVehicle& v) {
+    OptionsCont& oc = OptionsCont::getOptions();
+    double prt = 1;
+    if (v.getParameter().knowsParameter("device.ssm.mdrac.prt")) {
+        try {
+            prt = StringUtils::toDouble(v.getParameter().getParameter("device.ssm.mdrac.prt", ""));
+        } catch (...) {
+            WRITE_WARNINGF(TL("Invalid value '%'for vehicle parameter 'ssm.mdrac.prt'."), v.getParameter().getParameter("device.ssm.mdrac.prt", ""));
+        }
+    } else if (v.getVehicleType().getParameter().knowsParameter("device.ssm.mdrac.prt")) {
+        try {
+            prt = StringUtils::toDouble(v.getVehicleType().getParameter().getParameter("device.ssm.mdrac.prt", ""));
+        } catch (...) {
+            WRITE_WARNINGF(TL("Invalid value '%'for vType parameter 'ssm.mdrac.prt'."), v.getVehicleType().getParameter().getParameter("device.ssm.mdrac.prt", ""));
+        }
+    } else {
+        prt = oc.getFloat("device.ssm.mdrac.prt");
+        if (oc.isDefault("device.ssm.mdrac.prt") && (myIssuedParameterWarnFlags & SSM_WARN_MDRAC_PRT) == 0) {
+            WRITE_MESSAGEF(TL("Vehicle '%' does not supply vehicle parameter 'device.ssm.mdrac.prt'. Using default of '%'."), v.getID(), toString(prt));
+            myIssuedParameterWarnFlags |= SSM_WARN_MDRAC_PRT;
+        }
+    }
+    return prt;
+}
+
+
+
+
+double
 MSDevice_SSM::getExtraTime(const SUMOVehicle& v) {
     OptionsCont& oc = OptionsCont::getOptions();
     double extraTime = INVALID_DOUBLE;
@@ -3771,8 +4051,12 @@
                 thresholds.insert(std::make_pair(*i, DEFAULT_THRESHOLD_TTC));
             } else if (*i == "DRAC") {
                 thresholds.insert(std::make_pair(*i, DEFAULT_THRESHOLD_DRAC));
+            } else if (*i == "MDRAC") {
+                thresholds.insert(std::make_pair(*i, DEFAULT_THRESHOLD_MDRAC));
             } else if (*i == "PET") {
                 thresholds.insert(std::make_pair(*i, DEFAULT_THRESHOLD_PET));
+            } else if (*i == "PPET") {
+                thresholds.insert(std::make_pair(*i, DEFAULT_THRESHOLD_PPET));
             } else if (*i == "BR") {
                 thresholds.insert(std::make_pair(*i, DEFAULT_THRESHOLD_BR));
             } else if (*i == "SGAP") {
@@ -3797,27 +4081,43 @@
     if (key == "maxDRAC" && !myComputeDRAC) {
         throw InvalidArgument("Measure DRAC is not tracked by ssm device");
     }
+    if (key == "maxMDRAC" && !myComputeMDRAC) {
+        throw InvalidArgument("Measure MDRAC is not tracked by ssm device");
+    }
     if (key == "minPET" && !myComputePET) {
         throw InvalidArgument("Measure PET is not tracked by ssm device");
     }
+    if (key == "minPPET" && !myComputePPET) {
+        throw InvalidArgument("Measure PPET is not tracked by ssm device");
+    }
     if (key == "minTTC" ||
             key == "maxDRAC" ||
-            key == "minPET") {
+            key == "maxMDRAC" ||
+            key == "minPET" ||
+            key == "minPPET") {
         double value = INVALID_DOUBLE;
         double minTTC = INVALID_DOUBLE;
         double minPET = INVALID_DOUBLE;
         double maxDRAC = -INVALID_DOUBLE;
+        double maxMDRAC = -INVALID_DOUBLE;
+        double minPPET = INVALID_DOUBLE;
         for (Encounter* e : myActiveEncounters) {
             minTTC = MIN2(minTTC, e->minTTC.value);
             minPET = MIN2(minPET, e->PET.value);
             maxDRAC = MAX2(maxDRAC, e->maxDRAC.value);
+            maxMDRAC = MAX2(maxMDRAC, e->maxMDRAC.value);
+            minPPET = MIN2(minPPET, e->minPPET.value);
         }
         if (key == "minTTC") {
             value = minTTC;
         } else if (key == "maxDRAC") {
             value = maxDRAC;
+        } else if (key == "maxMDRAC") {
+            value = maxMDRAC;
         } else if (key == "minPET") {
             value = minPET;
+        } else if (key == "minPPET") {
+            value = minPPET;
         }
         if (fabs(value) == INVALID_DOUBLE) {
             return "";
diff -Nru sumo-1.17.0/src/microsim/devices/MSDevice_SSM.h sumo-1.18.0/src/microsim/devices/MSDevice_SSM.h
--- sumo-1.17.0/src/microsim/devices/MSDevice_SSM.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/devices/MSDevice_SSM.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2013-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -196,9 +196,11 @@
             EncounterType type;
             /// @brief value of the corresponding SSM
             double value;
+            /// @brief speed of the reporting vehicle at the given time/position
+            double speed;
 
-            ConflictPointInfo(double time, Position x, EncounterType type, double ssmValue) :
-                time(time), pos(x), type(type), value(ssmValue) {};
+            ConflictPointInfo(double time, Position x, EncounterType type, double ssmValue, double speed) :
+                time(time), pos(x), type(type), value(ssmValue), speed(speed) {};
         };
 
     public:
@@ -210,7 +212,7 @@
         /// @brief add a new data point and update encounter type
         void add(double time, EncounterType type, Position egoX, std::string egoLane, double egoLanePos,
                  Position egoV, Position foeX, std::string foeLane, double foeLanePos, Position foeV,
-                 Position conflictPoint, double egoDistToConflict, double foeDistToConflict, double ttc, double drac, std::pair pet);
+                 Position conflictPoint, double egoDistToConflict, double foeDistToConflict, double ttc, double drac, std::pair pet, double ppet, double mdrac);
 
         /// @brief Returns the number of trajectory points stored
         std::size_t size() const {
@@ -276,6 +278,10 @@
         std::vector TTCspan;
         /// @brief All values for DRAC
         std::vector DRACspan;
+        /// @brief All values for MDRAC
+        std::vector MDRACspan;
+        /// @brief All values for PPET
+        std::vector PPETspan;
 
 //        /// @brief Cross sections at which a PET shall be calculated for the corresponding vehicle
 //        std::vector, double> > egoPETCrossSections;
@@ -285,7 +291,9 @@
         /// @{
         ConflictPointInfo minTTC;
         ConflictPointInfo maxDRAC;
+        ConflictPointInfo maxMDRAC;
         ConflictPointInfo PET;
+        ConflictPointInfo minPPET;
         /// @}
 
         /// @brief this flag is set by updateEncounter() or directly in processEncounters(), where encounters are closed if it is true.
@@ -316,11 +324,11 @@
         double foeEstimatedConflictExitTime;
         double egoConflictAreaLength;
         double foeConflictAreaLength;
-        bool egoLeftConflict;
-        bool foeLeftConflict;
         double ttc;
         double drac;
-        std::pair pet;
+        double mdrac;
+        std::pair pet;  // (egoConflictEntryTime, PET);
+        double ppet;
         std::pair egoConflictEntryCrossSection;
         std::pair foeConflictEntryCrossSection;
     };
@@ -511,9 +519,11 @@
      * @param useGeoCoords Whether coordinates should be written out in the original coordinate reference system or as sumo's x,y values
      * @param writePositions Whether positions (coordinates) should be written for each timestep
      * @param writeLanesPositions Whether lanes and their positions should be written for each timestep and each conflict
+     * @param conflictOrder Vector of order keywords ego/foe to be considered
      */
     MSDevice_SSM(SUMOVehicle& holder, const std::string& id, std::string outputFilename, std::map thresholds,
-                 bool trajectories, double range, double extraTime, bool useGeoCoords, bool writePositions, bool writeLanesPositions);
+                 bool trajectories, double range, double extraTime, bool useGeoCoords, bool writePositions, bool writeLanesPositions,
+                 std::vector conflictOrder);
 
     /** @brief Finds encounters for which the foe vehicle has disappeared from range.
      *         remainingExtraTime is decreased until it reaches zero, which triggers closing the encounter.
@@ -652,7 +662,7 @@
     /** @brief Discriminates between different encounter types and correspondingly determines TTC and DRAC for those cases
      *         and writes the result to eInfo.ttc and eInfo.drac
      */
-    void determineTTCandDRAC(EncounterApproachInfo& eInfo) const;
+    void determineTTCandDRACandPPETandMDRAC(EncounterApproachInfo& eInfo) const;
 
 
     /** @brief Computes the time to collision (in seconds) for two vehicles with a given initial gap under the assumption
@@ -660,7 +670,6 @@
      */
     double computeTTC(double gap, double followerSpeed, double leaderSpeed) const;
 
-
     /** @brief Computes the DRAC (deceleration to avoid a collision) for a lead/follow situation as defined,
      *         e.g., in Guido et al. (2011, Safety performance measures:  a comparison between microsimulation and observational data)
      *         for two vehicles with a given gap.
@@ -668,6 +677,13 @@
      */
     static double computeDRAC(double gap, double followerSpeed, double leaderSpeed);
 
+    /** @brief Computes the MDRAC (deceleration to avoid a collision) for a lead/follow situation as defined considering a reaction time of follower,
+     *         e.g., in Fazekas et al. (2017, A Novel Surrogate Indicator Based on Constant Initial Acceleration and Reaction Time Assumption)
+     *         for two vehicles with a given gap.
+     *         Returns 0.0 if no deceleration is required by the follower to avoid a crash, INVALID if collision is detected.
+     */
+    static double computeMDRAC(double gap, double followerSpeed, double leaderSpeed, double prt);
+
     /** @brief Computes the DRAC a crossing situation, determining the minimal constant deceleration needed
      *         for one of the vehicles to reach the conflict area after the other has left.
      *         for estimated leaving times, current deceleration is extrapolated, and acceleration is neglected.
@@ -692,15 +708,18 @@
     static std::string makeStringWithNAs(const std::vector& v, const std::vector& NAs);
     std::string makeStringWithNAs(const PositionVector& v);
     std::string makeStringWithNAs(const Position& p);
+    static std::string writeNA(double v, double NA = INVALID_DOUBLE);
 
     /// @name parameter load helpers (introduced for readability of buildVehicleDevices())
     /// @{
     static std::string getOutputFilename(const SUMOVehicle& v, std::string deviceID);
     static double getDetectionRange(const SUMOVehicle& v);
+    static double getMDRAC_PRT(const SUMOVehicle& v);
     static double getExtraTime(const SUMOVehicle& v);
     static bool useGeoCoords(const SUMOVehicle& v);
     static bool writePositions(const SUMOVehicle& v);
     static bool writeLanesPositions(const SUMOVehicle& v);
+    static bool filterByConflictType(const SUMOVehicle& v, std::string deviceID, std::vector& conflictTypes);
     static bool requestsTrajectories(const SUMOVehicle& v);
     static bool getMeasuresAndThresholds(const SUMOVehicle& v, std::string deviceID,
                                          std::map& thresholds);
@@ -721,6 +740,8 @@
     bool mySaveTrajectories;
     /// Detection range. For vehicles closer than this distance from the ego vehicle, SSMs are traced
     double myRange;
+    /// @brief perception reaction time for MDRAC
+    double myMDRACPRT;
     /// Extra time in seconds to be logged after a conflict is over
     double myExtraTime;
     /// Whether to use the original coordinate system for output
@@ -729,8 +750,13 @@
     bool myWritePositions;
     /// Wether to print the lanes and positions for all timesteps and conflicts
     bool myWriteLanesPositions;
+    /// Whether to exclude certain conflicts containing certain conflict types from the output
+    bool myFilterConflictTypes;
+    /// Which conflict types to exclude from the output
+    std::vector myDroppedConflictTypes;
+
     /// Flags for switching on / off comutation of different SSMs, derived from myMeasures
-    bool myComputeTTC, myComputeDRAC, myComputePET, myComputeBR, myComputeSGAP, myComputeTGAP;
+    bool myComputeTTC, myComputeDRAC, myComputePET, myComputeBR, myComputeSGAP, myComputeTGAP, myComputePPET, myComputeMDRAC;
     MSVehicle* myHolderMS;
     /// @}
 
@@ -789,14 +815,17 @@
         SSM_WARN_THRESHOLDS = 1 << 1,
         SSM_WARN_TRAJECTORIES = 1 << 2,
         SSM_WARN_RANGE = 1 << 3,
+        SSM_WARN_MDRAC_PRT = 1 << 3,
         SSM_WARN_EXTRATIME = 1 << 4,
         SSM_WARN_FILE = 1 << 5,
         SSM_WARN_GEO = 1 << 6,
         SSM_WARN_POS = 1 << 7,
-        SSM_WARN_LANEPOS = 1 << 8
+        SSM_WARN_LANEPOS = 1 << 8,
+        SSM_WARN_CONFLICTFILTER = 1 << 9
     };
 
-
+    static const std::set FOE_ENCOUNTERTYPES;
+    static const std::set EGO_ENCOUNTERTYPES;
 
 private:
     /// @brief Invalidated copy constructor.
diff -Nru sumo-1.17.0/src/microsim/devices/MSDevice_StationFinder.cpp sumo-1.18.0/src/microsim/devices/MSDevice_StationFinder.cpp
--- sumo-1.17.0/src/microsim/devices/MSDevice_StationFinder.cpp	1970-01-01 00:00:00.000000000 +0000
+++ sumo-1.18.0/src/microsim/devices/MSDevice_StationFinder.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -0,0 +1,175 @@
+/****************************************************************************/
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
+// Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License 2.0 which is available at
+// https://www.eclipse.org/legal/epl-2.0/
+// This Source Code 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
+/****************************************************************************/
+/// @file    MSDevice_StationFinder.cpp
+/// @author  Michael Behrisch
+/// @date    2023-05-24
+///
+// A device which triggers rerouting to nearby charging stations
+/****************************************************************************/
+#include 
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include "MSRoutingEngine.h"
+#include "MSDevice_Battery.h"
+#include "MSDevice_StationFinder.h"
+
+
+// ===========================================================================
+// method definitions
+// ===========================================================================
+// ---------------------------------------------------------------------------
+// static initialisation methods
+// ---------------------------------------------------------------------------
+void
+MSDevice_StationFinder::insertOptions(OptionsCont& oc) {
+    insertDefaultAssignmentOptions("stationfinder", "Battery", oc);
+    oc.doRegister("device.stationfinder.rescueTime", new Option_String("1800", "TIME"));
+    oc.addDescription("device.stationfinder.rescueTime", "Battery", TL("Time to wait for a rescue vehicle on the road side when the battery is empty"));
+    oc.doRegister("device.stationfinder.reserveFactor", new Option_Float(1.1));
+    oc.addDescription("device.stationfinder.reserveFactor", "Battery", TL("Additional battery buffer for unexpected traffic situation when estimating the battery need"));
+    oc.doRegister("device.stationfinder.emptyThreshold", new Option_Float(5));
+    oc.addDescription("device.stationfinder.emptyThreshold", "Battery", TL("Battery percentage to go into rescue mode"));
+    oc.doRegister("device.stationfinder.radius", new Option_String("180", "TIME"));
+    oc.addDescription("device.stationfinder.radius", "Battery", TL("Search radius in travel time seconds"));
+    oc.doRegister("device.stationfinder.repeat", new Option_String("60", "TIME"));
+    oc.addDescription("device.stationfinder.repeat", "Battery", TL("When to trigger a new search if no station has been found"));
+    oc.doRegister("device.stationfinder.maxChargePower", new Option_Float(1000.));
+    oc.addDescription("device.stationfinder.maxChargePower", "Battery", TL("The maximum charging speed of the vehicle battery"));
+    oc.doRegister("device.stationfinder.chargeType", new Option_String("charging"));
+    oc.addDescription("device.stationfinder.chargeType", "Battery", TL("Type of energy transfer"));
+    oc.doRegister("device.stationfinder.waitForCharge", new Option_String("600", "TIME"));
+    oc.addDescription("device.stationfinder.waitForCharge", "Battery", TL("After this waiting time vehicle searches for a new station when the initial one is blocked"));
+}
+
+
+void
+MSDevice_StationFinder::buildVehicleDevices(SUMOVehicle& v, std::vector& into) {
+    OptionsCont& oc = OptionsCont::getOptions();
+    if (equippedByDefaultAssignmentOptions(oc, "stationfinder", v, false)) {
+        into.push_back(new MSDevice_StationFinder(v));
+    }
+}
+
+
+// ---------------------------------------------------------------------------
+// MSDevice_StationFinder-methods
+// ---------------------------------------------------------------------------
+MSDevice_StationFinder::MSDevice_StationFinder(SUMOVehicle& holder)
+    : MSVehicleDevice(holder, "stationfinder_" + holder.getID()),
+      myBattery(nullptr), myChargingStation(nullptr) {
+    OptionsCont& oc = OptionsCont::getOptions();
+    myReserveFactor = getFloatParam(holder, oc, "stationfinder.reserveFactor", 1.1);
+}
+
+
+MSDevice_StationFinder::~MSDevice_StationFinder() {
+}
+
+
+bool
+MSDevice_StationFinder::notifyMove(SUMOTrafficObject& /*veh*/, double /*oldPos*/, double /*newPos*/, double /*newSpeed*/) {
+    if (myChargingStation == nullptr) {
+        const SUMOTime now = SIMSTEP;
+        SUMOAbstractRouter& router = MSRoutingEngine::getRouterTT(myHolder.getRNGIndex(), myHolder.getVClass());
+        const ConstMSEdgeVector& route = myHolder.getRoute().getEdges();
+        const ConstMSEdgeVector remainingRoute(route.begin() + myHolder.getRoutePosition(), route.end());
+        const double remainingTime = router.recomputeCosts(remainingRoute, &myHolder, now);
+        if (now > myHolder.getDeparture()) {
+            double expectedConsumption = myBattery->getTotalConsumption() / STEPS2TIME(now - myHolder.getDeparture()) * remainingTime;
+            if (expectedConsumption > myBattery->getActualBatteryCapacity() * myReserveFactor) {
+                const MSEdge* const start = myHolder.getEdge();
+                double minTime = std::numeric_limits::max();
+                MSChargingStation* minStation = nullptr;
+                ConstMSEdgeVector minRoute;
+                // TODO do some form of bulk routing here
+                for (const auto& stop : MSNet::getInstance()->getStoppingPlaces(SUMO_TAG_CHARGING_STATION)) {
+                    ConstMSEdgeVector routeTo;
+                    const MSEdge* const csEdge = &stop.second->getLane().getEdge();
+                    if (router.compute(start, myHolder.getPositionOnLane(), csEdge, stop.second->getBeginLanePosition(), &myHolder, now, routeTo)) {
+                        ConstMSEdgeVector routeFrom;
+                        if (csEdge == route.back() || router.compute(start, &stop.second->getLane().getEdge(), &myHolder, now, routeFrom)) {
+                            if (csEdge != route.back()) {
+                                routeTo.insert(routeTo.end(), routeFrom.begin() + 1, routeFrom.end());
+                            }
+                            const double time = router.recomputeCosts(routeTo, &myHolder, now);
+                            if (time < minTime) {
+                                minTime = time;
+                                minStation = static_cast(stop.second);
+                                minRoute = routeTo;
+                            }
+                        }
+                    }
+                }
+                if (minStation != nullptr) {
+                    if (myHolder.hasStops()) {
+                        WRITE_WARNINGF(TL("Rerouting using station finder removes all upcoming stops for vehicle '%'."), myHolder.getID());
+                    }
+                    myHolder.replaceRouteEdges(minRoute, minTime, 0., getID());
+                    myChargingStation = minStation;
+                    SUMOVehicleParameter::Stop stopPar;
+                    stopPar.chargingStation = minStation->getID();
+                    stopPar.lane = minStation->getLane().getID();
+                    stopPar.endPos = minStation->getEndLanePosition();
+                    stopPar.duration = TIME2STEPS(expectedConsumption / minStation->getChargingPower(false) * myReserveFactor);
+                    std::string errorMsg;
+                    if (!myHolder.addStop(stopPar, errorMsg)) {
+                        WRITE_ERROR(errorMsg);
+                    } else if (errorMsg != "") {
+                        WRITE_WARNING(errorMsg);
+                    }
+                }
+            }
+        }
+    }
+    return true;
+}
+
+
+bool
+MSDevice_StationFinder::notifyIdle(SUMOTrafficObject& /*veh*/) {
+    return true;
+}
+
+
+void
+MSDevice_StationFinder::notifyMoveInternal(const SUMOTrafficObject& /*veh*/,
+        const double /* frontOnLane */,
+        const double /* timeOnLane */,
+        const double /* meanSpeedFrontOnLane */,
+        const double /* meanSpeedVehicleOnLane */,
+        const double /* travelledDistanceFrontOnLane */,
+        const double /* travelledDistanceVehicleOnLane */,
+        const double /* meanLengthOnLane */) {
+
+    // called by meso (see MSMeanData_Emissions::MSLaneMeanDataValues::notifyMoveInternal)
+}
+
+
+
+void
+MSDevice_StationFinder::generateOutput(OutputDevice* tripinfoOut) const {
+    if (tripinfoOut != nullptr) {
+    }
+}
+
+
+/****************************************************************************/
diff -Nru sumo-1.17.0/src/microsim/devices/MSDevice_StationFinder.h sumo-1.18.0/src/microsim/devices/MSDevice_StationFinder.h
--- sumo-1.17.0/src/microsim/devices/MSDevice_StationFinder.h	1970-01-01 00:00:00.000000000 +0000
+++ sumo-1.18.0/src/microsim/devices/MSDevice_StationFinder.h	2023-06-28 20:02:17.000000000 +0000
@@ -0,0 +1,157 @@
+/****************************************************************************/
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
+// Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License 2.0 which is available at
+// https://www.eclipse.org/legal/epl-2.0/
+// This Source Code 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
+/****************************************************************************/
+/// @file    MSDevice_StationFinder.h
+/// @author  Michael Behrisch
+/// @date    2023-05-24
+///
+// A device which triggers rerouting to nearby charging stations
+/****************************************************************************/
+#pragma once
+#include 
+
+#include "MSVehicleDevice.h"
+
+
+// ===========================================================================
+// class declarations
+// ===========================================================================
+class MSDevice_Battery;
+class MSStoppingPlace;
+
+
+// ===========================================================================
+// class definitions
+// ===========================================================================
+/**
+ * @class MSDevice_StationFinder
+ * @brief A device which triggers rerouting to nearby charging stations
+ *
+ * Each device checks the battery status by being
+ *  called each time step and initiaiting the search for a compatible
+ *  charging station if the battery level is too low.
+ *
+ * @see MSDevice
+ */
+class MSDevice_StationFinder : public MSVehicleDevice {
+public:
+    /** @brief Inserts MSDevice_StationFinder-options
+     */
+    static void insertOptions(OptionsCont& oc);
+
+
+    /** @brief Build devices for the given vehicle, if needed
+     *
+     * The options are read and evaluated whether stationFinder-devices shall be built
+     *  for the given vehicle.
+     *
+     * For each seen vehicle, the global vehicle index is increased.
+     *
+     * The built device is stored in the given vector.
+     *
+     * @param[in] v The vehicle for which a device may be built
+     * @param[in, filled] into The vector to store the built device in
+     */
+    static void buildVehicleDevices(SUMOVehicle& v, std::vector& into);
+
+
+public:
+    /** @brief Constructor
+     *
+     * @param[in] holder The vehicle that holds this device
+     */
+    MSDevice_StationFinder(SUMOVehicle& holder);
+
+    /// @brief Destructor.
+    ~MSDevice_StationFinder();
+
+    /// @name Methods called on vehicle movement / state change, overwriting MSDevice
+    /// @{
+
+    /** @brief Computes current emission values and adds them to their sums
+        *
+        * The vehicle's current emission values
+        *  are computed using the current velocity and acceleration.
+        *
+        * @param[in] veh The regarded vehicle
+        * @param[in] oldPos Position before the move-micro-timestep.
+        * @param[in] newPos Position after the move-micro-timestep.
+        * @param[in] newSpeed The vehicle's current speed
+        * @return false, if the vehicle is beyond the lane, true otherwise
+        * @see MSMoveReminder
+        * @see MSMoveReminder::notifyMove
+        * @see PollutantsInterface
+        */
+    bool notifyMove(SUMOTrafficObject& veh, double oldPos, double newPos, double newSpeed);
+
+    /** @brief Computes idling emission values and adds them to the emission sums
+        *
+        * Idling implied by zero velocity, acceleration and slope
+        *
+        * @param[in] veh The vehicle
+        *
+        * @see MSMoveReminder::notifyMove
+        * @see PollutantsInterface
+        */
+    bool notifyIdle(SUMOTrafficObject& veh);
+
+    /// @}
+
+    /// @brief return the name for this type of device
+    const std::string deviceName() const {
+        return "stationfinder";
+    }
+
+    /** @brief Called on writing tripinfo output
+     *
+     * @param[in] os The stream to write the information into
+     * @exception IOError not yet implemented
+     * @see MSDevice::tripInfoOutput
+     */
+    void generateOutput(OutputDevice* tripinfoOut) const;
+
+    void setBattery(MSDevice_Battery* battery) {
+        myBattery = battery;
+    }
+
+protected:
+    /** @brief Internal notification about the vehicle moves, see MSMoveReminder::notifyMoveInternal()
+     *
+     */
+    void notifyMoveInternal(const SUMOTrafficObject& veh,
+                            const double frontOnLane,
+                            const double timeOnLane,
+                            const double meanSpeedFrontOnLane,
+                            const double meanSpeedVehicleOnLane,
+                            const double travelledDistanceFrontOnLane,
+                            const double travelledDistanceVehicleOnLane,
+                            const double meanLengthOnLane);
+
+private:
+    /// @brief The corresponding battery device
+    MSDevice_Battery* myBattery;
+
+    /// @brief The safety buffer when calculating expected consumption
+    double myReserveFactor;
+
+    /// @brief To which station we are currently travelling
+    MSStoppingPlace* myChargingStation;
+
+private:
+    /// @brief Invalidated copy constructor.
+    MSDevice_StationFinder(const MSDevice_StationFinder&);
+
+    /// @brief Invalidated assignment operator.
+    MSDevice_StationFinder& operator=(const MSDevice_StationFinder&);
+
+};
diff -Nru sumo-1.17.0/src/microsim/devices/MSDevice_Taxi.cpp sumo-1.18.0/src/microsim/devices/MSDevice_Taxi.cpp
--- sumo-1.17.0/src/microsim/devices/MSDevice_Taxi.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/devices/MSDevice_Taxi.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2013-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -21,6 +21,7 @@
 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -33,6 +34,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include "MSDispatch.h"
 #include "MSDispatch_Greedy.h"
@@ -242,6 +244,16 @@
                                          myHolder.getParameter().departProcedure == DepartDefinition::GIVEN
                                          ? myHolder.getParameter().depart
                                          : MSNet::getInstance()->getCurrentTimeStep()) + (3600 * 8));
+    } else if (algo == "taxistand") {
+        const std::string rerouterID = getStringParam(holder, OptionsCont::getOptions(), "taxi.stands-rerouter", "", false);
+        if (rerouterID.empty()) {
+            throw ProcessError("Idle algorithm '" + algo + "' requires a rerouter id to be defined using device param 'stands-rerouter' for vehicle '" + myHolder.getID() + "'");
+        }
+        if (MSTriggeredRerouter::getInstances().count(rerouterID) == 0) {
+            throw ProcessError("Unknown rerouter '" + rerouterID + "' when loading taxi stands for vehicle '" + myHolder.getID() + "'");
+        }
+        MSTriggeredRerouter* rerouter = MSTriggeredRerouter::getInstances().find(rerouterID)->second;
+        myIdleAlgorithm = new MSIdling_TaxiStand(rerouter);
     } else {
         throw ProcessError("Idle algorithm '" + algo + "' is not known for vehicle '" + myHolder.getID() + "'");
     }
@@ -295,7 +307,10 @@
     const MSEdge* rerouteOrigin = *myHolder.getRerouteOrigin();
     if (isEmpty()) {
         // start fresh from the current edge
-        myHolder.abortNextStop();
+        while (myHolder.hasStops()) {
+            // in meso there might be more than 1 stop at this point
+            myHolder.abortNextStop();
+        }
         assert(!myHolder.hasStops());
         tmpEdges.push_back(myHolder.getEdge());
         if (myHolder.getEdge() != rerouteOrigin) {
diff -Nru sumo-1.17.0/src/microsim/devices/MSDevice_Taxi.h sumo-1.18.0/src/microsim/devices/MSDevice_Taxi.h
--- sumo-1.17.0/src/microsim/devices/MSDevice_Taxi.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/devices/MSDevice_Taxi.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2013-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/devices/MSDevice_ToC.cpp sumo-1.18.0/src/microsim/devices/MSDevice_ToC.cpp
--- sumo-1.17.0/src/microsim/devices/MSDevice_ToC.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/devices/MSDevice_ToC.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2013-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/devices/MSDevice_ToC.h sumo-1.18.0/src/microsim/devices/MSDevice_ToC.h
--- sumo-1.17.0/src/microsim/devices/MSDevice_ToC.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/devices/MSDevice_ToC.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2013-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/devices/MSDevice_Transportable.cpp sumo-1.18.0/src/microsim/devices/MSDevice_Transportable.cpp
--- sumo-1.17.0/src/microsim/devices/MSDevice_Transportable.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/devices/MSDevice_Transportable.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/devices/MSDevice_Transportable.h sumo-1.18.0/src/microsim/devices/MSDevice_Transportable.h
--- sumo-1.17.0/src/microsim/devices/MSDevice_Transportable.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/devices/MSDevice_Transportable.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/devices/MSDevice_Tripinfo.cpp sumo-1.18.0/src/microsim/devices/MSDevice_Tripinfo.cpp
--- sumo-1.17.0/src/microsim/devices/MSDevice_Tripinfo.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/devices/MSDevice_Tripinfo.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2009-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/devices/MSDevice_Tripinfo.h sumo-1.18.0/src/microsim/devices/MSDevice_Tripinfo.h
--- sumo-1.17.0/src/microsim/devices/MSDevice_Tripinfo.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/devices/MSDevice_Tripinfo.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2009-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/devices/MSDevice_Vehroutes.cpp sumo-1.18.0/src/microsim/devices/MSDevice_Vehroutes.cpp
--- sumo-1.17.0/src/microsim/devices/MSDevice_Vehroutes.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/devices/MSDevice_Vehroutes.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2009-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -402,7 +402,11 @@
             writeXMLRoute(od);
         }
     } else {
-        const int routesToSkip = myHolder.getParameter().wasSet(VEHPARS_FORCE_REROUTE) && !myIncludeIncomplete ? 1 : 0;
+        std::string dummyMsg;
+        const int routesToSkip = (myHolder.getParameter().wasSet(VEHPARS_FORCE_REROUTE)
+                                  && !myIncludeIncomplete
+                                  && myReplacedRoutes.size() > 0
+                                  && !myHolder.hasValidRoute(dummyMsg, myReplacedRoutes[0].route) ? 1 : 0);
         if ((int)myReplacedRoutes.size() > routesToSkip) {
             od.openTag(SUMO_TAG_ROUTE_DISTRIBUTION);
             for (int i = routesToSkip; i < (int)myReplacedRoutes.size(); ++i) {
diff -Nru sumo-1.17.0/src/microsim/devices/MSDevice_Vehroutes.h sumo-1.18.0/src/microsim/devices/MSDevice_Vehroutes.h
--- sumo-1.17.0/src/microsim/devices/MSDevice_Vehroutes.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/devices/MSDevice_Vehroutes.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2009-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/devices/MSDispatch.cpp sumo-1.18.0/src/microsim/devices/MSDispatch.cpp
--- sumo-1.17.0/src/microsim/devices/MSDispatch.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/devices/MSDispatch.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2007-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -238,13 +238,13 @@
     ConstMSEdgeVector edges;
     if (timeDirect < 0) {
         router.compute(from, fromPos, to, toPos, &taxi->getHolder(), t, edges, true);
-        timeDirect = router.recomputeCosts(edges, &taxi->getHolder(), fromPos, toPos, t);
+        timeDirect = router.recomputeCostsPos(edges, &taxi->getHolder(), fromPos, toPos, t);
         edges.clear();
     }
 
     router.compute(from, fromPos, via, viaPos, &taxi->getHolder(), t, edges, true);
     const double start = STEPS2TIME(t);
-    const double leg1 = router.recomputeCosts(edges, &taxi->getHolder(), fromPos, viaPos, t);
+    const double leg1 = router.recomputeCostsPos(edges, &taxi->getHolder(), fromPos, viaPos, t);
 #ifdef DEBUG_DETOUR
     std::cout << "        leg1=" << toString(edges) << " startPos=" << fromPos << " toPos=" << viaPos << " time=" << leg1 << "\n";
 #endif
@@ -252,7 +252,7 @@
     edges.clear();
     const SUMOTime timeContinue = TIME2STEPS(start + leg1 + wait);
     router.compute(via, viaPos, to, toPos, &taxi->getHolder(), timeContinue, edges, true);
-    const double leg2 = router.recomputeCosts(edges, &taxi->getHolder(), viaPos, toPos, timeContinue);
+    const double leg2 = router.recomputeCostsPos(edges, &taxi->getHolder(), viaPos, toPos, timeContinue);
     const double timeDetour = leg1 + wait + leg2;
 #ifdef DEBUG_DETOUR
     std::cout << "        leg2=" << toString(edges) << " startPos=" << viaPos << " toPos=" << toPos << " time=" << leg2 << "\n";
diff -Nru sumo-1.17.0/src/microsim/devices/MSDispatch_Greedy.cpp sumo-1.18.0/src/microsim/devices/MSDispatch_Greedy.cpp
--- sumo-1.17.0/src/microsim/devices/MSDispatch_Greedy.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/devices/MSDispatch_Greedy.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2007-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/devices/MSDispatch_Greedy.h sumo-1.18.0/src/microsim/devices/MSDispatch_Greedy.h
--- sumo-1.17.0/src/microsim/devices/MSDispatch_Greedy.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/devices/MSDispatch_Greedy.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2007-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/devices/MSDispatch_GreedyShared.cpp sumo-1.18.0/src/microsim/devices/MSDispatch_GreedyShared.cpp
--- sumo-1.17.0/src/microsim/devices/MSDispatch_GreedyShared.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/devices/MSDispatch_GreedyShared.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2007-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/devices/MSDispatch_GreedyShared.h sumo-1.18.0/src/microsim/devices/MSDispatch_GreedyShared.h
--- sumo-1.17.0/src/microsim/devices/MSDispatch_GreedyShared.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/devices/MSDispatch_GreedyShared.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2007-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/devices/MSDispatch.h sumo-1.18.0/src/microsim/devices/MSDispatch.h
--- sumo-1.17.0/src/microsim/devices/MSDispatch.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/devices/MSDispatch.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2007-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/devices/MSDispatch_RouteExtension.cpp sumo-1.18.0/src/microsim/devices/MSDispatch_RouteExtension.cpp
--- sumo-1.17.0/src/microsim/devices/MSDispatch_RouteExtension.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/devices/MSDispatch_RouteExtension.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2007-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/devices/MSDispatch_RouteExtension.h sumo-1.18.0/src/microsim/devices/MSDispatch_RouteExtension.h
--- sumo-1.17.0/src/microsim/devices/MSDispatch_RouteExtension.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/devices/MSDispatch_RouteExtension.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2007-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/devices/MSDispatch_TraCI.cpp sumo-1.18.0/src/microsim/devices/MSDispatch_TraCI.cpp
--- sumo-1.17.0/src/microsim/devices/MSDispatch_TraCI.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/devices/MSDispatch_TraCI.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2007-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/devices/MSDispatch_TraCI.h sumo-1.18.0/src/microsim/devices/MSDispatch_TraCI.h
--- sumo-1.17.0/src/microsim/devices/MSDispatch_TraCI.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/devices/MSDispatch_TraCI.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2007-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/devices/MSIdling.cpp sumo-1.18.0/src/microsim/devices/MSIdling.cpp
--- sumo-1.17.0/src/microsim/devices/MSIdling.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/devices/MSIdling.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2007-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -24,7 +24,9 @@
 #include 
 #include 
 #include 
+#include 
 #include 
+#include 
 #include 
 #include "MSRoutingEngine.h"
 #include "MSIdling.h"
@@ -167,5 +169,53 @@
     }
 }
 
+// ===========================================================================
+// MSIdling_TaxiStand methods
+// ===========================================================================
+
+void
+MSIdling_TaxiStand::idle(MSDevice_Taxi* taxi) {
+    MSBaseVehicle& veh = dynamic_cast(taxi->getHolder());
+
+    const MSTriggeredRerouter::RerouteInterval* rerouteDef = myRerouter->getCurrentReroute(SIMSTEP);
+    if (rerouteDef == nullptr || rerouteDef->parkProbs.getVals().size() == 0) {
+        if (!myHaveWarned) {
+            WRITE_WARNINGF(TL("Could not determine taxi stand for vehicle '%' at time=%"), veh.getID(), time2string(SIMSTEP));
+            myHaveWarned = true;
+        }
+        return;
+    }
+    MSStop* lastStop = nullptr;
+    if (veh.hasStops()) {
+        lastStop = &veh.getStop((int)veh.getStops().size() - 1);
+    }
+    if (lastStop == nullptr || lastStop->parkingarea == nullptr) {
+        const MSParkingArea* pa = rerouteDef->parkProbs.getVals().front().first;
+        SUMOVehicleParameter::Stop stop;
+        stop.lane = pa->getLane().getID();
+        stop.startPos = pa->getBeginLanePosition();
+        stop.endPos = pa->getEndLanePosition();
+
+        if (taxi->getHolder().getVehicleType().getContainerCapacity() > 0) {
+            stop.containerTriggered = true;
+        } else {
+            stop.triggered = true;
+        }
+        stop.actType = "idling";
+        stop.parkingarea = pa->getID();
+        stop.parking = ParkingType::OFFROAD;
+        const int nextStopIndex = (int)veh.getStops().size();
+        std::string error;
+        if (!veh.insertStop(nextStopIndex, stop, "taxi:taxistand", false, error)) {
+            WRITE_WARNING("Stop insertion failed for idling taxi '" + veh.getID() + "' (" + error + ").");
+        }
+        //std::cout << SIMTIME << " taxistandsVeh=" << veh.getID() << "  driving to parkingArea " << pa->getID() << "\n";
+        veh.activateReminders(MSMoveReminder::NOTIFICATION_PARKING_REROUTE, &pa->getLane());
+    } else {
+        //std::cout << SIMTIME << " taxistandsVeh=" << veh.getID() << "  already driving to parkingArea\n";
+    }
+}
+
+
 
 /****************************************************************************/
diff -Nru sumo-1.17.0/src/microsim/devices/MSIdling.h sumo-1.18.0/src/microsim/devices/MSIdling.h
--- sumo-1.17.0/src/microsim/devices/MSIdling.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/devices/MSIdling.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2007-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -30,6 +30,7 @@
 // ===========================================================================
 // class declarations
 // ===========================================================================
+class MSTriggeredRerouter;
 
 // ===========================================================================
 // class definitions
@@ -60,3 +61,14 @@
 class MSIdling_RandomCircling : public MSIdling {
     void idle(MSDevice_Taxi* taxi);
 };
+
+class MSIdling_TaxiStand : public MSIdling {
+public :
+    MSIdling_TaxiStand(MSTriggeredRerouter* rerouter) : myRerouter(rerouter) {}
+    void idle(MSDevice_Taxi* taxi);
+
+protected:
+    MSTriggeredRerouter* myRerouter;
+    bool myHaveWarned = false;
+
+};
diff -Nru sumo-1.17.0/src/microsim/devices/MSRoutingEngine.cpp sumo-1.18.0/src/microsim/devices/MSRoutingEngine.cpp
--- sumo-1.17.0/src/microsim/devices/MSRoutingEngine.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/devices/MSRoutingEngine.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2007-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/devices/MSRoutingEngine.h sumo-1.18.0/src/microsim/devices/MSRoutingEngine.h
--- sumo-1.17.0/src/microsim/devices/MSRoutingEngine.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/devices/MSRoutingEngine.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2007-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/devices/MSTransportableDevice_FCD.cpp sumo-1.18.0/src/microsim/devices/MSTransportableDevice_FCD.cpp
--- sumo-1.17.0/src/microsim/devices/MSTransportableDevice_FCD.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/devices/MSTransportableDevice_FCD.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2013-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/devices/MSTransportableDevice_FCD.h sumo-1.18.0/src/microsim/devices/MSTransportableDevice_FCD.h
--- sumo-1.17.0/src/microsim/devices/MSTransportableDevice_FCD.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/devices/MSTransportableDevice_FCD.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2013-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/devices/MSTransportableDevice.h sumo-1.18.0/src/microsim/devices/MSTransportableDevice.h
--- sumo-1.17.0/src/microsim/devices/MSTransportableDevice.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/devices/MSTransportableDevice.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2007-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/devices/MSTransportableDevice_Routing.cpp sumo-1.18.0/src/microsim/devices/MSTransportableDevice_Routing.cpp
--- sumo-1.17.0/src/microsim/devices/MSTransportableDevice_Routing.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/devices/MSTransportableDevice_Routing.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2007-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/devices/MSTransportableDevice_Routing.h sumo-1.18.0/src/microsim/devices/MSTransportableDevice_Routing.h
--- sumo-1.17.0/src/microsim/devices/MSTransportableDevice_Routing.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/devices/MSTransportableDevice_Routing.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2007-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/devices/MSVehicleDevice.h sumo-1.18.0/src/microsim/devices/MSVehicleDevice.h
--- sumo-1.17.0/src/microsim/devices/MSVehicleDevice.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/devices/MSVehicleDevice.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2007-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/engine/EngineParameters.cpp sumo-1.18.0/src/microsim/engine/EngineParameters.cpp
--- sumo-1.17.0/src/microsim/engine/EngineParameters.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/engine/EngineParameters.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/engine/EngineParameters.h sumo-1.18.0/src/microsim/engine/EngineParameters.h
--- sumo-1.17.0/src/microsim/engine/EngineParameters.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/engine/EngineParameters.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/engine/FirstOrderLagModel.cpp sumo-1.18.0/src/microsim/engine/FirstOrderLagModel.cpp
--- sumo-1.17.0/src/microsim/engine/FirstOrderLagModel.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/engine/FirstOrderLagModel.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/engine/FirstOrderLagModel.h sumo-1.18.0/src/microsim/engine/FirstOrderLagModel.h
--- sumo-1.17.0/src/microsim/engine/FirstOrderLagModel.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/engine/FirstOrderLagModel.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/engine/GenericEngineModel.cpp sumo-1.18.0/src/microsim/engine/GenericEngineModel.cpp
--- sumo-1.17.0/src/microsim/engine/GenericEngineModel.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/engine/GenericEngineModel.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/engine/GenericEngineModel.h sumo-1.18.0/src/microsim/engine/GenericEngineModel.h
--- sumo-1.17.0/src/microsim/engine/GenericEngineModel.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/engine/GenericEngineModel.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/engine/RealisticEngineModel.cpp sumo-1.18.0/src/microsim/engine/RealisticEngineModel.cpp
--- sumo-1.17.0/src/microsim/engine/RealisticEngineModel.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/engine/RealisticEngineModel.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/engine/RealisticEngineModel.h sumo-1.18.0/src/microsim/engine/RealisticEngineModel.h
--- sumo-1.17.0/src/microsim/engine/RealisticEngineModel.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/engine/RealisticEngineModel.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/engine/VehicleEngineHandler.cpp sumo-1.18.0/src/microsim/engine/VehicleEngineHandler.cpp
--- sumo-1.17.0/src/microsim/engine/VehicleEngineHandler.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/engine/VehicleEngineHandler.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/engine/VehicleEngineHandler.h sumo-1.18.0/src/microsim/engine/VehicleEngineHandler.h
--- sumo-1.17.0/src/microsim/engine/VehicleEngineHandler.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/engine/VehicleEngineHandler.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/lcmodels/MSAbstractLaneChangeModel.cpp sumo-1.18.0/src/microsim/lcmodels/MSAbstractLaneChangeModel.cpp
--- sumo-1.17.0/src/microsim/lcmodels/MSAbstractLaneChangeModel.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/lcmodels/MSAbstractLaneChangeModel.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/lcmodels/MSAbstractLaneChangeModel.h sumo-1.18.0/src/microsim/lcmodels/MSAbstractLaneChangeModel.h
--- sumo-1.17.0/src/microsim/lcmodels/MSAbstractLaneChangeModel.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/lcmodels/MSAbstractLaneChangeModel.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/lcmodels/MSLCHelper.cpp sumo-1.18.0/src/microsim/lcmodels/MSLCHelper.cpp
--- sumo-1.17.0/src/microsim/lcmodels/MSLCHelper.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/lcmodels/MSLCHelper.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2013-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -217,7 +217,7 @@
 
 
 bool
-MSLCHelper::saveBlockerLength(const MSVehicle& veh,  MSVehicle* blocker, int lcaCounter, double leftSpace, bool reliefConnection, double& leadingBlockerLength) {
+MSLCHelper::updateBlockerLength(const MSVehicle& veh,  MSVehicle* blocker, int lcaCounter, double leftSpace, bool reliefConnection, double& leadingBlockerLength) {
 #ifdef DEBUG_SAVE_BLOCKER_LENGTH
     if (DEBUG_COND) {
         std::cout << SIMTIME
@@ -262,8 +262,17 @@
             }
 #endif
             if (!canReserve && !reliefConnection) {
-                // reserve anyway and try to avoid deadlock with emergency deceleration
-                leadingBlockerLength = MAX2(blocker->getVehicleType().getLengthWithGap(), leadingBlockerLength);
+                const int blockerState = blocker->getLaneChangeModel().getOwnState();
+                if ((blockerState & LCA_STRATEGIC) != 0
+                        && (blockerState & LCA_URGENT) != 0) {
+                    // reserve anyway and try to avoid deadlock with emergency deceleration
+                    leadingBlockerLength = MAX2(blocker->getVehicleType().getLengthWithGap(), leadingBlockerLength);
+#ifdef DEBUG_SAVE_BLOCKER_LENGTH
+                    if (DEBUG_COND) {
+                        std::cout << "   reserving anyway to avoid deadlock (will cause emergency braking)\n";
+                    }
+#endif
+                }
             }
             return canReserve;
         }
@@ -315,4 +324,41 @@
     }
 }
 
+
+bool
+MSLCHelper::isBidiLeader(const MSVehicle* leader, const std::vector& cont) {
+    if (leader == nullptr) {
+        return false;
+    }
+    const MSLane* lane1 = leader->getLane()->getNormalSuccessorLane()->getBidiLane();
+    const MSLane* lane2 = leader->getLane()->getNormalPredecessorLane()->getBidiLane();
+    if (lane1 == nullptr && lane2 == nullptr) {
+        return false;
+    }
+    bool result = std::find(cont.begin(), cont.end(), lane1) != cont.end();
+    if (!result && lane1 != lane2 && lane2 != nullptr) {
+        result = std::find(cont.begin(), cont.end(), lane2) != cont.end();
+    }
+    return result;
+}
+
+
+bool
+MSLCHelper::isBidiFollower(const MSVehicle* ego, const MSVehicle* follower) {
+    if (follower == nullptr) {
+        return false;
+    }
+    bool result = false;
+    const MSLane* lane1 = follower->getLane()->getNormalSuccessorLane()->getBidiLane();
+    const MSLane* lane2 = follower->getLane()->getNormalPredecessorLane()->getBidiLane();
+    const ConstMSEdgeVector& route = ego->getRoute().getEdges();
+    if (lane1 != nullptr) {
+        result = std::find(route.begin(), route.end(), &lane1->getEdge()) != route.end();
+    }
+    if (!result && lane1 != lane2 && lane2 != nullptr) {
+        result = std::find(route.begin(), route.end(), &lane2->getEdge()) != route.end();
+    }
+    return result;
+}
+
 /****************************************************************************/
diff -Nru sumo-1.17.0/src/microsim/lcmodels/MSLCHelper.h sumo-1.18.0/src/microsim/lcmodels/MSLCHelper.h
--- sumo-1.17.0/src/microsim/lcmodels/MSLCHelper.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/lcmodels/MSLCHelper.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2013-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -64,7 +64,7 @@
      * @param[in,out] leadingBlockerLength: the length to reserve at the end of the lane
      * @return Whether sufficient space has been reserved (by vehicle or blocker)
      */
-    static bool saveBlockerLength(const MSVehicle& veh, MSVehicle* blocker, int lcaCounter, double leftSpace, bool reliefConnection, double& leadingBlockerLength);
+    static bool updateBlockerLength(const MSVehicle& veh, MSVehicle* blocker, int lcaCounter, double leftSpace, bool reliefConnection, double& leadingBlockerLength);
 
     /* @brief return saveable space
      * @param[in] requested The space that should be saved for another vehicle
@@ -77,4 +77,9 @@
     static bool divergentRoute(const MSVehicle& v1, const MSVehicle& v2);
 
     static double getSpeedPreservingSecureGap(const MSVehicle& leader, const MSVehicle& follower, double currentGap, double leaderPlannedSpeed);
+
+    static bool isBidiLeader(const MSVehicle* leader, const std::vector& cont);
+
+    static bool isBidiFollower(const MSVehicle* ego, const MSVehicle* follower);
+
 };
diff -Nru sumo-1.17.0/src/microsim/lcmodels/MSLCM_DK2008.cpp sumo-1.18.0/src/microsim/lcmodels/MSLCM_DK2008.cpp
--- sumo-1.17.0/src/microsim/lcmodels/MSLCM_DK2008.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/lcmodels/MSLCM_DK2008.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2005-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/lcmodels/MSLCM_DK2008.h sumo-1.18.0/src/microsim/lcmodels/MSLCM_DK2008.h
--- sumo-1.17.0/src/microsim/lcmodels/MSLCM_DK2008.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/lcmodels/MSLCM_DK2008.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2005-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/lcmodels/MSLCM_LC2013.cpp sumo-1.18.0/src/microsim/lcmodels/MSLCM_LC2013.cpp
--- sumo-1.17.0/src/microsim/lcmodels/MSLCM_LC2013.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/lcmodels/MSLCM_LC2013.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -44,6 +44,7 @@
 // ===========================================================================
 // variable definitions
 // ===========================================================================
+#define MAGIC_OFFSET  1.
 #define LOOK_FORWARD 10.
 
 #define JAM_FACTOR 1.
@@ -238,18 +239,17 @@
 #endif
 
     // letting vehicles merge in at the end of the lane in case of counter-lane change, step#2
-    double MAGIC_offset = 1.;
     double nVSafe = wanted;
     bool gotOne = false;
     //   if we want to change and have a blocking leader and there is enough room for him in front of us
     if (myLeadingBlockerLength != 0) {
-        double space = myLeftSpace - myLeadingBlockerLength - MAGIC_offset - myVehicle.getVehicleType().getMinGap();
+        double space = myLeftSpace - myLeadingBlockerLength - MAGIC_OFFSET - myVehicle.getVehicleType().getMinGap();
 #ifdef DEBUG_PATCH_SPEED
         if (DEBUG_COND) {
             std::cout << SIMTIME << " veh=" << myVehicle.getID() << " myLeftSpace=" << myLeftSpace << " myLeadingBlockerLength=" << myLeadingBlockerLength << " space=" << space << "\n";
         }
 #endif
-        if (space > 0) { // XXX space > -MAGIC_offset
+        if (space > 0) { // XXX space > -MAGIC_OFFSET
             // compute speed for decelerating towards a place which allows the blocking leader to merge in in front
             const double vMinEmergency = myVehicle.getCarFollowModel().minNextSpeedEmergency(myVehicle.getSpeed(), &myVehicle);
             double safe = cfModel.stopSpeed(&myVehicle, myVehicle.getSpeed(), space, MSCFModel::CalcReason::LANE_CHANGE);
@@ -1238,10 +1238,8 @@
     double laDist = myLookAheadSpeed * LOOK_FORWARD * myStrategicParam * (right ? 1 : myLookaheadLeft);
     laDist += myVehicle.getVehicleType().getLengthWithGap() *  2.;
     const bool hasStoppedLeader = leader.first != 0 && leader.first->isStopped() && leader.second < (currentDist - posOnLane);
-    const bool hasBidiLeader = (myVehicle.getLane()->getBidiLane() != nullptr
-                                && leader.first != nullptr
-                                && leader.first->getLane()->getBidiLane() != nullptr
-                                && std::find(curr.bestContinuations.begin(), curr.bestContinuations.end(), leader.first->getLane()->getBidiLane()) != curr.bestContinuations.end());
+    const bool hasBidiLeader = myVehicle.getLane()->getBidiLane() != nullptr && MSLCHelper::isBidiLeader(leader.first, curr.bestContinuations);
+    const bool hasBidiNeighLeader = neighLane.getBidiLane() != nullptr && MSLCHelper::isBidiLeader(neighLead.first, neigh.bestContinuations);
 
     if (bestLaneOffset == 0 && hasBidiLeader) {
         // getting out of the way is enough to clear the blockage
@@ -1253,7 +1251,7 @@
         laDist = 0.5 * (myVehicle.getVehicleType().getLengthWithGap()
                         + leader.first->getVehicleType().getLengthWithGap()
                         + leader.second);
-    } else if (bestLaneOffset == laneOffset && neighLead.first != 0 && neighLead.first->isStopped() && neighLead.second < (currentDist - posOnLane)) {
+    } else if (bestLaneOffset == laneOffset && neighLead.first != 0 && (neighLead.first->isStopped() || hasBidiNeighLeader) && neighLead.second < (currentDist - posOnLane)) {
         // react to a stopped leader on the target lane (if it is the bestLane)
         if (isOpposite()) {
             // always allow changing back
@@ -1261,7 +1259,8 @@
                       + neighLead.first->getVehicleType().getLengthWithGap()
                       + neighLead.second);
         } else if (!hasStoppedLeader &&
-                   (neighLead.second + myVehicle.getVehicleType().getLengthWithGap() + neighLead.first->getVehicleType().getLengthWithGap()) < (currentDist - posOnLane)) {
+                   ((neighLead.second + myVehicle.getVehicleType().getLengthWithGap() + neighLead.first->getVehicleType().getLengthWithGap()) < (currentDist - posOnLane)
+                    || hasBidiNeighLeader)) {
             // do not change to the target lane until passing the stopped vehicle
             // (unless the vehicle blocks our intended stopping position, then we have to wait anyway)
             changeToBest = false;
@@ -1315,6 +1314,8 @@
                   << " maxJam=" << maxJam
                   << " neighDist=" << neighDist
                   << " neighLeftPlace=" << neighLeftPlace
+                  << (hasBidiLeader ? " bidiLeader" : "")
+                  << (hasBidiNeighLeader ? " bidiNeighLeader" : "")
                   << "\n";
     }
 #endif
@@ -1372,7 +1373,7 @@
             }
         }
         const bool currFreeUntilNeighEnd = leader.first == nullptr || neighDist - posOnLane <= leader.second;
-        const double overtakeDist = (leader.first == 0 ? -1 :
+        const double overtakeDist = (leader.first == 0 || hasBidiLeader ? -1 :
                                      leader.second + myVehicle.getVehicleType().getLength() + leader.first->getVehicleType().getLengthWithGap());
         if (leader.first != 0 && (leader.first->isStopped() || hasBidiLeader) && leader.second < REACT_TO_STOPPED_DISTANCE
                 // current destination leaves enough space to overtake the leader
@@ -1394,7 +1395,7 @@
             }
 #endif
             ret = ret | lca | LCA_STRATEGIC | LCA_URGENT;
-        } else if (!changeToBest && (currentDistDisallows(neighLeftPlace, abs(bestLaneOffset) + 2, laDist))) {
+        } else if (!changeToBest && currentDistDisallows(neighLeftPlace, abs(bestLaneOffset) + 2, laDist) && !hasBidiLeader) {
             // the opposite lane-changing direction should be done than the one examined herein
             //  we'll check whether we assume we could change anyhow and get back in time...
             //
@@ -1420,6 +1421,7 @@
             ret = ret | LCA_STAY | LCA_STRATEGIC;
         } else if (bestLaneOffset == 0
                    && (leader.first == 0 || !leader.first->isStopped())
+                   && !hasBidiLeader
                    && neigh.bestContinuations.back()->getLinkCont().size() != 0
                    && roundaboutBonus == 0
                    && !checkOpposite
@@ -1479,9 +1481,9 @@
         // letting vehicles merge in at the end of the lane in case of counter-lane change, step#1
         //   if there is a leader and he wants to change to the opposite direction
         const bool canContinue = curr.bestContinuations.size() > 1;
-        bool canReserve = MSLCHelper::saveBlockerLength(myVehicle, neighLead.first, lcaCounter, myLeftSpace, canContinue, myLeadingBlockerLength);
+        bool canReserve = MSLCHelper::updateBlockerLength(myVehicle, neighLead.first, lcaCounter, myLeftSpace - MAGIC_OFFSET, canContinue, myLeadingBlockerLength);
         if (*firstBlocked != neighLead.first) {
-            canReserve &= MSLCHelper::saveBlockerLength(myVehicle, *firstBlocked, lcaCounter, myLeftSpace,  canContinue, myLeadingBlockerLength);
+            canReserve &= MSLCHelper::updateBlockerLength(myVehicle, *firstBlocked, lcaCounter, myLeftSpace - MAGIC_OFFSET, canContinue, myLeadingBlockerLength);
         }
 #ifdef DEBUG_SAVE_BLOCKER_LENGTH
         if (DEBUG_COND) {
@@ -1500,12 +1502,17 @@
                                          //MAX2(STEPS2TIME(TS), (myLeftSpace-myLeadingBlockerLength) / MAX2(myLookAheadSpeed, NUMERICAL_EPS) / remainingLanes / urgency) :
                                          MAX2(STEPS2TIME(TS), myLeftSpace / MAX2(myLookAheadSpeed, NUMERICAL_EPS) / remainingLanes / urgency) :
                                          myVehicle.getInfluencer().changeRequestRemainingSeconds(currentTime));
-        const double plannedSpeed = informLeader(msgPass, blocked, myLca, neighLead, remainingSeconds);
-        // NOTE: for the  ballistic update case negative speeds may indicate a stop request,
-        //       while informLeader returns -1 in that case. Refs. #2577
-        if (plannedSpeed >= 0 || (!MSGlobals::gSemiImplicitEulerUpdate && plannedSpeed != -1)) {
-            // maybe we need to deal with a blocking follower
-            informFollower(msgPass, blocked, myLca, neighFollow, remainingSeconds, plannedSpeed);
+        if (!hasBidiNeighLeader) {
+            const double plannedSpeed = informLeader(msgPass, blocked, myLca, neighLead, remainingSeconds);
+            // NOTE: for the  ballistic update case negative speeds may indicate a stop request,
+            //       while informLeader returns -1 in that case. Refs. #2577
+            if (plannedSpeed >= 0 || (!MSGlobals::gSemiImplicitEulerUpdate && plannedSpeed != -1)) {
+                // maybe we need to deal with a blocking follower
+                const bool hasBidiNeighFollower = neighLane.getBidiLane() != nullptr && MSLCHelper::isBidiFollower(&myVehicle, neighFollow.first);
+                if (!hasBidiNeighFollower) {
+                    informFollower(msgPass, blocked, myLca, neighFollow, remainingSeconds, plannedSpeed);
+                }
+            }
         }
 
 #ifdef DEBUG_WANTS_CHANGE
diff -Nru sumo-1.17.0/src/microsim/lcmodels/MSLCM_LC2013.h sumo-1.18.0/src/microsim/lcmodels/MSLCM_LC2013.h
--- sumo-1.17.0/src/microsim/lcmodels/MSLCM_LC2013.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/lcmodels/MSLCM_LC2013.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/lcmodels/MSLCM_SL2015.cpp sumo-1.18.0/src/microsim/lcmodels/MSLCM_SL2015.cpp
--- sumo-1.17.0/src/microsim/lcmodels/MSLCM_SL2015.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/lcmodels/MSLCM_SL2015.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2013-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -1325,9 +1325,9 @@
             std::cout << SIMTIME << " veh=" << myVehicle.getID() << " neighLeaders=" << neighLeaders.toString() << " longest=" << Named::getIDSecure(neighLeadLongest) << " firstBlocked=" << Named::getIDSecure(*firstBlocked) << "\n";
         }
 #endif
-        bool canReserve = MSLCHelper::saveBlockerLength(myVehicle, neighLeadLongest, lcaCounter, myLeftSpace, canContinue, myLeadingBlockerLength);
+        bool canReserve = MSLCHelper::updateBlockerLength(myVehicle, neighLeadLongest, lcaCounter, myLeftSpace - MAGIC_OFFSET, canContinue, myLeadingBlockerLength);
         if (*firstBlocked != neighLeadLongest && tieBrakeLeader(*firstBlocked)) {
-            canReserve &= MSLCHelper::saveBlockerLength(myVehicle, *firstBlocked, lcaCounter, myLeftSpace, canContinue, myLeadingBlockerLength);
+            canReserve &= MSLCHelper::updateBlockerLength(myVehicle, *firstBlocked, lcaCounter, myLeftSpace - MAGIC_OFFSET, canContinue, myLeadingBlockerLength);
         }
         if (!canReserve && !isOpposite()) {
             // we have a low-priority relief connection
@@ -2602,7 +2602,7 @@
                         && vehDist.first->getSpeed() < SUMO_const_haltingSpeed
                         && -vehDist.second < vehDist.first->getVehicleType().getMinGap()
                         && &(myVehicle.getLane()->getEdge()) != &(vehDist.first->getLane()->getEdge()))
-                                                                         )) {
+                                                                                           )) {
 #ifdef DEBUG_BLOCKING
                 if (gDebugFlag2) {
                     std::cout << "       ignoring cfrelated foe=" << vehDist.first->getID()  << "\n";
diff -Nru sumo-1.17.0/src/microsim/lcmodels/MSLCM_SL2015.h sumo-1.18.0/src/microsim/lcmodels/MSLCM_SL2015.h
--- sumo-1.17.0/src/microsim/lcmodels/MSLCM_SL2015.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/lcmodels/MSLCM_SL2015.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2013-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/logging/CastingFunctionBinding.h sumo-1.18.0/src/microsim/logging/CastingFunctionBinding.h
--- sumo-1.17.0/src/microsim/logging/CastingFunctionBinding.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/logging/CastingFunctionBinding.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/logging/CastingFunctionBinding_Param.h sumo-1.18.0/src/microsim/logging/CastingFunctionBinding_Param.h
--- sumo-1.17.0/src/microsim/logging/CastingFunctionBinding_Param.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/logging/CastingFunctionBinding_Param.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/logging/FuncBinding_IntParam.h sumo-1.18.0/src/microsim/logging/FuncBinding_IntParam.h
--- sumo-1.17.0/src/microsim/logging/FuncBinding_IntParam.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/logging/FuncBinding_IntParam.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/logging/FuncBinding_StringParam.h sumo-1.18.0/src/microsim/logging/FuncBinding_StringParam.h
--- sumo-1.17.0/src/microsim/logging/FuncBinding_StringParam.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/logging/FuncBinding_StringParam.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/logging/FunctionBinding.h sumo-1.18.0/src/microsim/logging/FunctionBinding.h
--- sumo-1.17.0/src/microsim/logging/FunctionBinding.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/logging/FunctionBinding.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/MSBaseVehicle.cpp sumo-1.18.0/src/microsim/MSBaseVehicle.cpp
--- sumo-1.17.0/src/microsim/MSBaseVehicle.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/MSBaseVehicle.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -135,22 +135,38 @@
     if (!pars->wasSet(VEHPARS_FORCE_REROUTE)) {
         calculateArrivalParams(true);
     }
-    initJunctionModelParams();
+    initTransientModelParams();
 }
 
 
 MSBaseVehicle::~MSBaseVehicle() {
     delete myEdgeWeights;
-    if (myParameter->repetitionNumber == 0) {
+    if (myParameter->repetitionNumber == -1) {
+        // this is not a flow (flows call checkDist in MSInsertionControl::determineCandidates)
         MSRoute::checkDist(myParameter->routeid);
     }
     for (MSVehicleDevice* dev : myDevices) {
         delete dev;
     }
-    delete myParameter;
     delete myEnergyParams;
     delete myParkingMemory;
-    myRoute->checkRemoval();
+    checkRouteRemoval();
+    delete myParameter;
+}
+
+
+void
+MSBaseVehicle::checkRouteRemoval() {
+    if (myParameter->repetitionNumber == -1
+            || !MSNet::getInstance()->hasFlow(getFlowID())) {
+        myRoute->checkRemoval();
+    }
+}
+
+
+std::string
+MSBaseVehicle::getFlowID() const {
+    return getID().substr(0, getID().rfind('.'));
 }
 
 
@@ -484,7 +500,7 @@
     }
     const bool stopsFromScratch = onInit && myRoute->getStops().empty();
     // assign new route
-    myRoute->checkRemoval();
+    checkRouteRemoval();
     myRoute = newRoute;
     // update arrival definition
     calculateArrivalParams(onInit);
@@ -882,7 +898,7 @@
         }
         assert(pars->departEdge >= 0);
         if (pars->departEdge >= routeEdges) {
-            WRITE_WARNINGF(TL("Ignoring departEdge % for vehicle '% with % route edges"), toString(pars->departEdge), getID(), toString(routeEdges));
+            WRITE_WARNINGF(TL("Ignoring departEdge % for vehicle '%' with % route edges"), toString(pars->departEdge), getID(), toString(routeEdges));
         } else {
             myCurrEdge += pars->departEdge;
         }
@@ -901,8 +917,9 @@
 
 double
 MSBaseVehicle::getImpatience() const {
-    return MAX2(0., MIN2(1., getVehicleType().getImpatience() +
-                         (MSGlobals::gTimeToImpatience > 0 ? (double)getWaitingTime() / (double)MSGlobals::gTimeToImpatience : 0.)));
+    return MAX2(0., MIN2(1., getVehicleType().getImpatience()
+                         + (hasInfluencer() ? getBaseInfluencer()->getExtraImpatience() : 0)
+                         + (MSGlobals::gTimeToImpatience > 0 ? (double)getWaitingTime() / (double)MSGlobals::gTimeToImpatience : 0.)));
 }
 
 
@@ -994,6 +1011,67 @@
     return false;
 }
 
+bool
+MSBaseVehicle::replaceParkingArea(MSParkingArea* parkingArea, std::string& errorMsg) {
+    // Check if there is a parking area to be replaced
+    if (parkingArea == 0) {
+        errorMsg = "new parkingArea is NULL";
+        return false;
+    }
+    if (myStops.size() == 0) {
+        errorMsg = "vehicle has no stops";
+        return false;
+    }
+    if (myStops.front().parkingarea == 0) {
+        errorMsg = "first stop is not at parkingArea";
+        return false;
+    }
+    MSStop& first = myStops.front();
+    SUMOVehicleParameter::Stop& stopPar = const_cast(first.pars);
+    // merge subsequent duplicate stops equals to parking area
+    for (std::list::iterator iter = ++myStops.begin(); iter != myStops.end();) {
+        if (iter->parkingarea == parkingArea) {
+            stopPar.duration += iter->duration;
+            myStops.erase(iter++);
+        } else {
+            break;
+        }
+    }
+    stopPar.lane = parkingArea->getLane().getID();
+    stopPar.parkingarea = parkingArea->getID();
+    stopPar.startPos = parkingArea->getBeginLanePosition();
+    stopPar.endPos = parkingArea->getEndLanePosition();
+    first.edge = myRoute->end(); // will be patched in replaceRoute
+    first.lane = &parkingArea->getLane();
+    first.parkingarea = parkingArea;
+    return true;
+}
+
+
+MSParkingArea*
+MSBaseVehicle::getNextParkingArea() {
+    MSParkingArea* nextParkingArea = nullptr;
+    if (!myStops.empty()) {
+        SUMOVehicleParameter::Stop stopPar;
+        MSStop stop = myStops.front();
+        if (!stop.reached && stop.parkingarea != nullptr) {
+            nextParkingArea = stop.parkingarea;
+        }
+    }
+    return nextParkingArea;
+}
+
+
+MSParkingArea*
+MSBaseVehicle::getCurrentParkingArea() {
+    MSParkingArea* currentParkingArea = nullptr;
+    if (isParking()) {
+        currentParkingArea = myStops.begin()->parkingarea;
+    }
+    return currentParkingArea;
+}
+
+
 
 double
 MSBaseVehicle::basePos(const MSEdge* edge) const {
@@ -1689,7 +1767,7 @@
     auto endPos = nextStopIndex == n ? getArrivalPos() : stops[nextStopIndex].pars.endPos;
     SUMOAbstractRouter& router = getBaseInfluencer().getRouterTT(getRNGIndex(), getVClass());
 
-    bool newDestination = nextStopIndex == n;
+    bool newDestination = nextStopIndex == n && stopEdge == oldEdges.back();
 
     ConstMSEdgeVector toNewStop;
     if (!teleport) {
@@ -1959,7 +2037,25 @@
 
 
 void
-MSBaseVehicle::initJunctionModelParams() {
+MSBaseVehicle::setCarFollowModelParameter(const std::string& key, const std::string& value) {
+    // handle some generic params first and then delegate to the carFollowModel itself
+    if (key == toString(SUMO_ATTR_CF_IGNORE_IDS) || key == toString(SUMO_ATTR_CF_IGNORE_TYPES)) {
+        getParameter().parametersSet |= VEHPARS_CFMODEL_PARAMS_SET;
+        const_cast(getParameter()).setParameter(key, value);
+        // checked in MSVehicle::planMove
+    } else {
+        MSVehicle* microVeh = dynamic_cast(this);
+        if (microVeh) {
+            // remove 'carFollowModel.' prefix
+            const std::string attrName = key.substr(15);
+            microVeh->getCarFollowModel().setParameter(microVeh, attrName, value);
+        }
+    }
+}
+
+
+void
+MSBaseVehicle::initTransientModelParams() {
     /* Design idea for additional junction model parameters:
        We can distinguish between 3 levels of parameters
        1. typically shared by multiple vehicles -> vType parameter
@@ -1969,6 +2065,8 @@
     for (auto item : getParameter().getParametersMap()) {
         if (StringUtils::startsWith(item.first, "junctionModel.")) {
             setJunctionModelParameter(item.first, item.second);
+        } else if (StringUtils::startsWith(item.first, "carFollowModel.")) {
+            setCarFollowModelParameter(item.first, item.second);
         }
     }
 }
diff -Nru sumo-1.17.0/src/microsim/MSBaseVehicle.h sumo-1.18.0/src/microsim/MSBaseVehicle.h
--- sumo-1.17.0/src/microsim/MSBaseVehicle.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/MSBaseVehicle.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2010-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -128,6 +128,9 @@
     /// @brief set individual junction model paramete (not type related)
     void setJunctionModelParameter(const std::string& key, const std::string& value);
 
+    /// @brief set individual carFollow model parameters (not type related)
+    void setCarFollowModelParameter(const std::string& key, const std::string& value);
+
     /** @brief Returns the current route
      * @return The route the vehicle uses
      */
@@ -619,6 +622,17 @@
         return !myStops.empty();
     }
 
+    /** @brief replace the current parking area stop with a new stop with merge duration
+     */
+    bool replaceParkingArea(MSParkingArea* parkingArea, std::string& errorMsg);
+
+    /** @brief get the upcoming parking area stop or nullptr
+     */
+    MSParkingArea* getNextParkingArea();
+
+    /** @brief get the current  parking area stop or nullptr */
+    MSParkingArea* getCurrentParkingArea();
+
     /// @brief departure position where the vehicle fits fully onto the edge (if possible)
     double basePos(const MSEdge* edge) const;
 
@@ -837,12 +851,28 @@
         }
 
 
+        /// @brief return the current routing mode
+        double getExtraImpatience() const {
+            return myExtraImpatience;
+        }
+
+        /** @brief Sets routing behavior
+         * @param[in] value an enum value controlling the different modes
+         */
+        void setExtraImpatience(double value) {
+            myExtraImpatience = value;
+        }
+
+
         SUMOAbstractRouter& getRouterTT(const int rngIndex, SUMOVehicleClass svc) const;
 
     protected:
         ///@brief routing mode (see TraCIConstants.h)
         int myRoutingMode;
 
+        /// @brief dynamic impatience offset
+        double myExtraImpatience = 0;
+
     };
 
 
@@ -1038,7 +1068,14 @@
 
     static NumericalID myCurrentNumericalIndex;
 
-    void initJunctionModelParams();
+    /// @brief init model parameters from generic params
+    void initTransientModelParams();
+
+    /// @brief reconstruct flow id from vehicle id
+    std::string getFlowID() const;
+
+    /// @brief remove route at the end of the simulation
+    void checkRouteRemoval();
 
 private:
     /// invalidated assignment operator
diff -Nru sumo-1.17.0/src/microsim/MSBitSetLogic.h sumo-1.18.0/src/microsim/MSBitSetLogic.h
--- sumo-1.17.0/src/microsim/MSBitSetLogic.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/MSBitSetLogic.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/MSDriverState.cpp sumo-1.18.0/src/microsim/MSDriverState.cpp
--- sumo-1.17.0/src/microsim/MSDriverState.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/MSDriverState.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/MSDriverState.h sumo-1.18.0/src/microsim/MSDriverState.h
--- sumo-1.17.0/src/microsim/MSDriverState.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/MSDriverState.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/MSDynamicShapeUpdater.cpp sumo-1.18.0/src/microsim/MSDynamicShapeUpdater.cpp
--- sumo-1.17.0/src/microsim/MSDynamicShapeUpdater.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/MSDynamicShapeUpdater.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2019-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/MSDynamicShapeUpdater.h sumo-1.18.0/src/microsim/MSDynamicShapeUpdater.h
--- sumo-1.17.0/src/microsim/MSDynamicShapeUpdater.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/MSDynamicShapeUpdater.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2019-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/MSEdgeControl.cpp sumo-1.18.0/src/microsim/MSEdgeControl.cpp
--- sumo-1.17.0/src/microsim/MSEdgeControl.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/MSEdgeControl.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/MSEdgeControl.h sumo-1.18.0/src/microsim/MSEdgeControl.h
--- sumo-1.17.0/src/microsim/MSEdgeControl.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/MSEdgeControl.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/MSEdge.cpp sumo-1.18.0/src/microsim/MSEdge.cpp
--- sumo-1.17.0/src/microsim/MSEdge.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/MSEdge.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -1297,7 +1297,7 @@
         int numBidiLanes = 0;
         for (MSLane* l1 : *myLanes) {
             for (MSLane* l2 : *myBidiEdge->myLanes) {
-                if (l1->getShape().reverse() == l2->getShape()) {
+                if (l1->getShape().reverse().almostSame(l2->getShape(), POSITION_EPS)) {
                     l1->setBidiLane(l2);
                     numBidiLanes++;
                 }
diff -Nru sumo-1.17.0/src/microsim/MSEdge.h sumo-1.18.0/src/microsim/MSEdge.h
--- sumo-1.17.0/src/microsim/MSEdge.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/MSEdge.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/MSEdgeWeightsStorage.cpp sumo-1.18.0/src/microsim/MSEdgeWeightsStorage.cpp
--- sumo-1.17.0/src/microsim/MSEdgeWeightsStorage.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/MSEdgeWeightsStorage.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/MSEdgeWeightsStorage.h sumo-1.18.0/src/microsim/MSEdgeWeightsStorage.h
--- sumo-1.17.0/src/microsim/MSEdgeWeightsStorage.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/MSEdgeWeightsStorage.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/MSEventControl.cpp sumo-1.18.0/src/microsim/MSEventControl.cpp
--- sumo-1.17.0/src/microsim/MSEventControl.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/MSEventControl.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/MSEventControl.h sumo-1.18.0/src/microsim/MSEventControl.h
--- sumo-1.17.0/src/microsim/MSEventControl.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/MSEventControl.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/MSFrame.cpp sumo-1.18.0/src/microsim/MSFrame.cpp
--- sumo-1.17.0/src/microsim/MSFrame.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/MSFrame.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2002-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -379,9 +379,15 @@
     oc.doRegister("collision.action", new Option_String("teleport"));
     oc.addDescription("collision.action", "Processing", TL("How to deal with collisions: [none,warn,teleport,remove]"));
 
+    oc.doRegister("intermodal-collision.action", new Option_String("warn"));
+    oc.addDescription("intermodal-collision.action", "Processing", TL("How to deal with collisions between vehicle and pedestrian: [none,warn,teleport,remove]"));
+
     oc.doRegister("collision.stoptime", new Option_String("0", "TIME"));
     oc.addDescription("collision.stoptime", "Processing", TL("Let vehicle stop for TIME before performing collision.action (except for action 'none')"));
 
+    oc.doRegister("intermodal-collision.stoptime", new Option_String("0", "TIME"));
+    oc.addDescription("intermodal-collision.stoptime", "Processing", TL("Let vehicle stop for TIME before performing intermodal-collision.action (except for action 'none')"));
+
     oc.doRegister("collision.check-junctions", new Option_Bool(false));
     oc.addDescription("collision.check-junctions", "Processing", TL("Enables collisions checks on junctions"));
 
@@ -686,7 +692,7 @@
     oc.addDescription("meso-recheck", "Mesoscopic", TL("Time interval for rechecking insertion into the next segment after failure"));
 
     // add rand options
-    RandHelper::insertRandOptions();
+    RandHelper::insertRandOptions(oc);
     oc.doRegister("thread-rngs", new Option_Integer(64));
     oc.addDescription("thread-rngs", "Random Number",
                       "Number of pre-allocated random number generators to ensure repeatable multi-threaded simulations (should be at least the number of threads for repeatable simulations).");
@@ -881,7 +887,7 @@
             if (end > 0 && saveT >= end) {
                 WRITE_WARNINGF(TL("The save-state time=% will not be used before simulation end at %."), timeStr, time2string(end));
             } else {
-                checkStepLengthMultiple(saveT, " for save-state.times", deltaT);
+                checkStepLengthMultiple(saveT, " for save-state.times", deltaT, begin);
             }
         } catch (ProcessError& e) {
             WRITE_ERROR("Invalid time '" + timeStr + "' for option 'save-state.times'. " + e.what());
@@ -996,7 +1002,7 @@
     }
 
     ok &= MSDevice::checkOptions(oc);
-    ok &= SystemFrame::checkOptions();
+    ok &= SystemFrame::checkOptions(oc);
 
     return ok;
 }
diff -Nru sumo-1.17.0/src/microsim/MSFrame.h sumo-1.18.0/src/microsim/MSFrame.h
--- sumo-1.17.0/src/microsim/MSFrame.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/MSFrame.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/MSGlobals.cpp sumo-1.18.0/src/microsim/MSGlobals.cpp
--- sumo-1.17.0/src/microsim/MSGlobals.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/MSGlobals.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2003-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/MSGlobals.h sumo-1.18.0/src/microsim/MSGlobals.h
--- sumo-1.17.0/src/microsim/MSGlobals.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/MSGlobals.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2003-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/MSInsertionControl.cpp sumo-1.18.0/src/microsim/MSInsertionControl.cpp
--- sumo-1.17.0/src/microsim/MSInsertionControl.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/MSInsertionControl.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/MSInsertionControl.h sumo-1.18.0/src/microsim/MSInsertionControl.h
--- sumo-1.17.0/src/microsim/MSInsertionControl.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/MSInsertionControl.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -168,6 +168,11 @@
         return &myFlowRNG;
     }
 
+    /// @brief checks whether the given flow still exists
+    bool hasFlow(const std::string& id) const {
+        return myFlowIDs.count(id) != 0;
+    }
+
 private:
     /** @brief Tries to emit the vehicle
      *
diff -Nru sumo-1.17.0/src/microsim/MSInternalJunction.cpp sumo-1.18.0/src/microsim/MSInternalJunction.cpp
--- sumo-1.17.0/src/microsim/MSInternalJunction.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/MSInternalJunction.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/MSInternalJunction.h sumo-1.18.0/src/microsim/MSInternalJunction.h
--- sumo-1.17.0/src/microsim/MSInternalJunction.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/MSInternalJunction.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/MSJunctionControl.cpp sumo-1.18.0/src/microsim/MSJunctionControl.cpp
--- sumo-1.17.0/src/microsim/MSJunctionControl.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/MSJunctionControl.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/MSJunctionControl.h sumo-1.18.0/src/microsim/MSJunctionControl.h
--- sumo-1.17.0/src/microsim/MSJunctionControl.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/MSJunctionControl.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/MSJunction.cpp sumo-1.18.0/src/microsim/MSJunction.cpp
--- sumo-1.17.0/src/microsim/MSJunction.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/MSJunction.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/MSJunction.h sumo-1.18.0/src/microsim/MSJunction.h
--- sumo-1.17.0/src/microsim/MSJunction.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/MSJunction.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/MSJunctionLogic.cpp sumo-1.18.0/src/microsim/MSJunctionLogic.cpp
--- sumo-1.17.0/src/microsim/MSJunctionLogic.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/MSJunctionLogic.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/MSJunctionLogic.h sumo-1.18.0/src/microsim/MSJunctionLogic.h
--- sumo-1.17.0/src/microsim/MSJunctionLogic.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/MSJunctionLogic.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/MSLaneChanger.cpp sumo-1.18.0/src/microsim/MSLaneChanger.cpp
--- sumo-1.17.0/src/microsim/MSLaneChanger.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/MSLaneChanger.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2002-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -553,21 +553,34 @@
             //if (vehicle->getID() == "flow.21") std::cout << SIMTIME << " neighLead=" << Named::getIDSecure(neighLead) << " (422)\n";
         }
     }
-    if (neighLead == nullptr) {
+    // extra check for shared lane
+    const bool checkBidi = target->lane->getBidiLane() != nullptr && target->lane->getBidiLane()->getVehicleNumberWithPartials() > 0;
+    if (neighLead == nullptr || checkBidi) {
 #ifdef DEBUG_SURROUNDING_VEHICLES
         if (DEBUG_COND) {
             std::cout << "Looking for leader on consecutive lanes." << std::endl;
         }
 #endif
         // There's no leader on the target lane. Look for leaders on consecutive lanes.
-        // (there might also be partial leaders due to continuous lane changing)
+        // (there might also be partial leaders due to continuous lane changing or bidiLane)
         MSLane* targetLane = target->lane;
         const double egoBack = vehicle->getBackPositionOnLane();
         double leaderBack = targetLane->getLength();
+        if (neighLead != nullptr) {
+            leaderBack = neighLead->getBackPositionOnLane(targetLane);
+        }
         for (MSVehicle* pl : targetLane->myPartialVehicles) {
             double plBack = pl->getBackPositionOnLane(targetLane);
-            if (plBack < leaderBack &&
-                    pl->getPositionOnLane(targetLane) + pl->getVehicleType().getMinGap() >= egoBack) {
+            if (pl->isBidiOn(targetLane)) {
+                plBack -= pl->getVehicleType().getLengthWithGap();
+            }
+            const double plPos = plBack + pl->getVehicleType().getLength();
+#ifdef DEBUG_SURROUNDING_VEHICLES
+            if (DEBUG_COND) {
+                std::cout << "   partial=" << pl->getID() << " plBack=" << plBack << " plPos=" << plPos << " leaderBack=" << leaderBack << " egoBack=" << egoBack << "\n";
+            }
+#endif
+            if (plBack < leaderBack && plPos + pl->getVehicleType().getMinGap() >= egoBack) {
                 neighLead = pl;
                 leaderBack = plBack;
             }
@@ -578,7 +591,8 @@
                 std::cout << "  found leader=" << neighLead->getID() << " (partial)\n";
             }
 #endif
-            return std::pair(neighLead, leaderBack - vehicle->getPositionOnLane() - vehicle->getVehicleType().getMinGap());
+            const double gap = leaderBack - vehicle->getPositionOnLane() - vehicle->getVehicleType().getMinGap();
+            return std::pair(neighLead, gap);
         }
         double seen = myCandi->lane->getLength() - vehicle->getPositionOnLane();
         double speed = vehicle->getSpeed();
diff -Nru sumo-1.17.0/src/microsim/MSLaneChanger.h sumo-1.18.0/src/microsim/MSLaneChanger.h
--- sumo-1.17.0/src/microsim/MSLaneChanger.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/MSLaneChanger.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2002-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/MSLaneChangerSublane.cpp sumo-1.18.0/src/microsim/MSLaneChangerSublane.cpp
--- sumo-1.17.0/src/microsim/MSLaneChangerSublane.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/MSLaneChangerSublane.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2002-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/MSLaneChangerSublane.h sumo-1.18.0/src/microsim/MSLaneChangerSublane.h
--- sumo-1.17.0/src/microsim/MSLaneChangerSublane.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/MSLaneChangerSublane.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2002-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/MSLane.cpp sumo-1.18.0/src/microsim/MSLane.cpp
--- sumo-1.17.0/src/microsim/MSLane.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/MSLane.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -100,9 +100,11 @@
 // ===========================================================================
 MSLane::DictType MSLane::myDict;
 MSLane::CollisionAction MSLane::myCollisionAction(MSLane::COLLISION_ACTION_TELEPORT);
+MSLane::CollisionAction MSLane::myIntermodalCollisionAction(MSLane::COLLISION_ACTION_WARN);
 bool MSLane::myCheckJunctionCollisions(false);
 double MSLane::myCheckJunctionCollisionMinGap(0);
 SUMOTime MSLane::myCollisionStopTime(0);
+SUMOTime MSLane::myIntermodalCollisionStopTime(0);
 double MSLane::myCollisionMinGapFactor(1.0);
 bool MSLane::myExtrapolateSubstepDepart(false);
 std::vector MSLane::myRNGs;
@@ -425,7 +427,7 @@
     if (wasInactive) {
         MSNet::getInstance()->getEdgeControl().gotActive(this);
     }
-    if (!isRailway(veh->getVClass()) && getBidiLane() != nullptr) {
+    if (getBidiLane() != nullptr && (!isRailway(veh->getVClass()) || (getPermissions() & ~SVC_RAIL_CLASSES) != 0)) {
         // railways don't need to "see" each other when moving in opposite directions on the same track (efficiency)
         getBidiLane()->setPartialOccupation(veh);
     }
@@ -680,7 +682,20 @@
         case DepartPosDefinition::BASE:
         case DepartPosDefinition::DEFAULT:
         default:
-            pos = veh.basePos(myEdge);
+            if (pars.departProcedure == DepartDefinition::SPLIT) {
+                pos = getLength();
+                // find the vehicle from which we are splitting off (should only be a single lane to check)
+                AnyVehicleIterator end = anyVehiclesEnd();
+                for (AnyVehicleIterator it = anyVehiclesBegin(); it != end; ++it) {
+                    const MSVehicle* cand = *it;
+                    if (cand->isStopped() && cand->getNextStopParameter()->split == veh.getID()) {
+                        pos = cand->getBackPositionOnLane() - veh.getVehicleType().getMinGap();
+                        break;
+                    }
+                }
+            } else {
+                pos = veh.basePos(myEdge);
+            }
             break;
     }
     // determine the lateral position for special cases
@@ -1613,19 +1628,19 @@
                         }
                     }
                 }
-                detectPedestrianJunctionCollision(collider, colliderBoundary, foeLane, timestep, stage);
+                detectPedestrianJunctionCollision(collider, colliderBoundary, foeLane, timestep, stage, toRemove, toTeleport);
             }
             if (myLinks.front()->getWalkingAreaFoe() != nullptr) {
-                detectPedestrianJunctionCollision(collider, colliderBoundary, myLinks.front()->getWalkingAreaFoe(), timestep, stage);
+                detectPedestrianJunctionCollision(collider, colliderBoundary, myLinks.front()->getWalkingAreaFoe(), timestep, stage, toRemove, toTeleport);
             }
             if (myLinks.front()->getWalkingAreaFoeExit() != nullptr) {
-                detectPedestrianJunctionCollision(collider, colliderBoundary, myLinks.front()->getWalkingAreaFoeExit(), timestep, stage);
+                detectPedestrianJunctionCollision(collider, colliderBoundary, myLinks.front()->getWalkingAreaFoeExit(), timestep, stage, toRemove, toTeleport);
             }
         }
     }
 
 
-    if (myEdge->getPersons().size() > 0 && hasPedestrians()) {
+    if (myIntermodalCollisionAction != COLLISION_ACTION_NONE && myEdge->getPersons().size() > 0 && hasPedestrians()) {
 #ifdef DEBUG_PEDESTRIAN_COLLISIONS
         if (DEBUG_COND) {
             std::cout << SIMTIME << " detect pedestrian collisions stage=" << stage << " lane=" << getID() << "\n";
@@ -1653,12 +1668,8 @@
                     // aircraft wings and body are above walking level
                     continue;
                 }
-                const bool newCollision = MSNet::getInstance()->registerCollision(v, leader.first, "sharedLane", this, leader.first->getEdgePos());
-                if (newCollision) {
-                    WRITE_WARNINGF(TL("Vehicle '%' collision with person '%', lane='%', gap=%, time=%, stage=%."),
-                                   v->getID(), leader.first->getID(), getID(), leader.second - length, time2string(timestep), stage);
-                    MSNet::getInstance()->getVehicleControl().registerCollision(false);
-                }
+                const double gap = leader.second - length;
+                handleIntermodalCollisionBetween(timestep, stage, v, leader.first, gap, "sharedLane", toRemove, toTeleport);
             }
         }
     }
@@ -1693,6 +1704,12 @@
                         if (*veh == *veh2 && !isRailway((*veh)->getVClass())) {
                             continue;
                         }
+                        if ((*veh)->getLane() == (*veh2)->getLane() ||
+                                (*veh)->getLane() == (*veh2)->getBackLane() ||
+                                (*veh)->getBackLane() == (*veh2)->getLane()) {
+                            // vehicles are not in a bidi relation
+                            continue;
+                        }
                         double low2 = myLength - (*veh2)->getPositionOnLane(bidiLane);
                         double high2 = myLength - (*veh2)->getBackPositionOnLane(bidiLane);
                         if (stage == MSNet::STAGE_MOVEMENTS) {
@@ -1765,8 +1782,10 @@
 
 void
 MSLane::detectPedestrianJunctionCollision(const MSVehicle* collider, const PositionVector& colliderBoundary, const MSLane* foeLane,
-        SUMOTime timestep, const std::string& stage) {
-    if (foeLane->getEdge().getPersons().size() > 0 && foeLane->hasPedestrians()) {
+        SUMOTime timestep, const std::string& stage,
+        std::set& toRemove,
+        std::set& toTeleport) {
+    if (myIntermodalCollisionAction != COLLISION_ACTION_NONE && foeLane->getEdge().getPersons().size() > 0 && foeLane->hasPedestrians()) {
 #ifdef DEBUG_PEDESTRIAN_COLLISIONS
         if (DEBUG_COND) {
             std::cout << SIMTIME << " detect pedestrian junction collisions stage=" << stage << " lane=" << getID() << " foeLane=" << foeLane->getID() << "\n";
@@ -1795,12 +1814,7 @@
                 } else if (foeLane->getEdge().isWalkingArea()) {
                     collisionType = "walkingarea";
                 }
-                const bool newCollision = MSNet::getInstance()->registerCollision(collider, *it_p, collisionType, foeLane, (*it_p)->getEdgePos());
-                if (newCollision) {
-                    WRITE_WARNINGF(TL("Vehicle '%' collision with person '%', lane='%', time=%, stage=%."),
-                                   collider->getID(), (*it_p)->getID(), getID(), time2string(timestep), stage);
-                    MSNet::getInstance()->getVehicleControl().registerCollision(false);
-                }
+                handleIntermodalCollisionBetween(timestep, stage, collider, *it_p, 0, collisionType, toRemove, toTeleport);
             }
         }
     }
@@ -1821,8 +1835,8 @@
         return false;
     }
 
-    const bool colliderOpposite = collider->getLaneChangeModel().isOpposite() || collider->getLane() == getBidiLane();
-    const bool victimOpposite = victim->getLaneChangeModel().isOpposite() || victim->getLane() == getBidiLane();
+    const bool colliderOpposite = collider->getLaneChangeModel().isOpposite() || collider->isBidiOn(this);
+    const bool victimOpposite = victim->getLaneChangeModel().isOpposite() || victim->isBidiOn(this);
     const bool bothOpposite = victimOpposite && colliderOpposite;
     if (bothOpposite) {
         std::swap(victim, collider);
@@ -2048,6 +2062,83 @@
 
 
 void
+MSLane::handleIntermodalCollisionBetween(SUMOTime timestep, const std::string& stage, const MSVehicle* collider, const MSTransportable* victim,
+        double gap, const std::string& collisionType,
+        std::set& toRemove,
+        std::set& toTeleport) const {
+    if (collider->ignoreCollision()) {
+        return;
+    }
+    std::string prefix = TLF("Vehicle '%'", collider->getID());
+    if (myIntermodalCollisionStopTime > 0) {
+        if (collider->collisionStopTime() >= 0) {
+            return;
+        }
+        std::string dummyError;
+        SUMOVehicleParameter::Stop stop;
+        stop.duration = myIntermodalCollisionStopTime;
+        stop.parametersSet |= STOP_DURATION_SET;
+        // determine new speeds from collision angle (@todo account for vehicle mass)
+        double colliderSpeed = collider->getSpeed();
+        const double victimStopPos = victim->getEdgePos();
+        // double victimOrigSpeed = victim->getSpeed();
+        // double colliderOrigSpeed = collider->getSpeed();
+        if (collider->collisionStopTime() < 0) {
+            stop.collision = true;
+            stop.lane = collider->getLane()->getID();
+            stop.startPos = MIN2(collider->getPositionOnLane() + collider->getCarFollowModel().brakeGap(colliderSpeed, collider->getCarFollowModel().getEmergencyDecel(), 0),
+                                 MAX3(0.0, victimStopPos - 0.75 * victim->getVehicleType().getLength(),
+                                      collider->getPositionOnLane() - SPEED2DIST(collider->getSpeed())));
+            stop.endPos = stop.startPos;
+            stop.parametersSet |= STOP_START_SET | STOP_END_SET;
+            ((MSBaseVehicle*)collider)->addStop(stop, dummyError, 0);
+        }
+    } else {
+        switch (myIntermodalCollisionAction) {
+            case COLLISION_ACTION_WARN:
+                break;
+            case COLLISION_ACTION_TELEPORT:
+                prefix = TLF("Teleporting vehicle '%' after", collider->getID());
+                toRemove.insert(collider);
+                toTeleport.insert(collider);
+                break;
+            case COLLISION_ACTION_REMOVE: {
+                prefix = TLF("Removing vehicle '%' after", collider->getID());
+                bool removeCollider = true;
+                removeCollider = !(collider->hasInfluencer() && collider->getInfluencer()->isRemoteAffected(timestep));
+                if (!removeCollider) {
+                    prefix = TLF("Keeping remote-controlled  vehicle '%' after", collider->getID());
+                } else {
+                    toRemove.insert(collider);
+                }
+                break;
+            }
+            default:
+                break;
+        }
+    }
+    const bool newCollision = MSNet::getInstance()->registerCollision(collider, victim, collisionType, this, victim->getEdgePos());
+    if (newCollision) {
+        if (gap != 0) {
+            WRITE_WARNING(prefix + TLF(" collision with person '%', lane='%', gap=%, time=%, stage=%.",
+                                       victim->getID(), getID(), gap, time2string(timestep), stage));
+        } else {
+            WRITE_WARNING(prefix + TLF(" collision with person '%', lane='%', time=%, stage=%.",
+                                       victim->getID(), getID(), time2string(timestep), stage));
+        }
+        MSNet::getInstance()->informVehicleStateListener(collider, MSNet::VehicleState::COLLISION);
+        MSNet::getInstance()->getVehicleControl().registerCollision(myIntermodalCollisionAction == COLLISION_ACTION_TELEPORT);
+    }
+#ifdef DEBUG_COLLISIONS
+    if (DEBUG_COND2(collider)) {
+        toRemove.erase(collider);
+        toTeleport.erase(collider);
+    }
+#endif
+}
+
+
+void
 MSLane::executeMovements(const SUMOTime t) {
     // multithreading: there are concurrent writes to myNeedsCollisionCheck but all of them should set it to true
     myNeedsCollisionCheck = true;
@@ -3609,7 +3700,8 @@
                     const MSLink::LinkLeaders linkLeaders = (*it).viaLink->getLeaderInfo(ego, -backOffset);
                     for (const auto& ll : linkLeaders) {
                         if (ll.vehAndGap.first != nullptr) {
-                            const bool egoIsLeader = ll.vehAndGap.first->isLeader((*it).viaLink, ego, ll.vehAndGap.second);
+                            const bool bidiFoe = (*it).viaLink->getLane() == ll.vehAndGap.first->getLane()->getNormalPredecessorLane()->getBidiLane();
+                            const bool egoIsLeader = !bidiFoe && ll.vehAndGap.first->isLeader((*it).viaLink, ego, ll.vehAndGap.second);
                             // if ego is leader the returned gap still assumes that ego follows the leader
                             // if the foe vehicle follows ego we need to deduce that gap
                             const double gap = (egoIsLeader
@@ -3621,6 +3713,7 @@
                                 std::cout << SIMTIME << " ego=" << ego->getID() << "    link=" << (*it).viaLink->getViaLaneOrLane()->getID()
                                           << " (3) added veh=" << Named::getIDSecure(ll.vehAndGap.first)
                                           << " gap=" << ll.vehAndGap.second << " dtC=" << ll.distToCrossing
+                                          << " bidiFoe=" << bidiFoe
                                           << " egoIsLeader=" << egoIsLeader << " gap2=" << gap
                                           << "\n";
                             }
@@ -3669,12 +3762,17 @@
                                 }
                             }
                         } else {
-                            agap = (*it).length - v->getPositionOnLane() + backOffset - v->getVehicleType().getMinGap();
+                            if (next->getBidiLane() != nullptr && v->isBidiOn(next)) {
+                                agap = v->getPositionOnLane() + backOffset - v->getVehicleType().getLengthWithGap();
+                            } else {
+                                agap = (*it).length - v->getPositionOnLane() + backOffset - v->getVehicleType().getMinGap();
+                            }
                             if (!(*it).viaLink->havePriority() && !ego->onFurtherEdge(&(*it).lane->getEdge())
                                     && ego->isOnRoad() // during insertion, this can lead to collisions because ego's further lanes are not set (see #3053)
                                     && !ego->getLaneChangeModel().isOpposite()
+                                    && v->getSpeed() < SUMO_const_haltingSpeed
                                ) {
-                                // if v comes from a minor side road it should not block lane changing
+                                // if v is stopped on a minor side road it should not block lane changing
                                 agap = MAX2(agap, 0.0);
                             }
                         }
@@ -4168,24 +4266,30 @@
     }
 }
 
-
 void
-MSLane::initCollisionOptions(const OptionsCont& oc) {
-    const std::string action = oc.getString("collision.action");
+MSLane::initCollisionAction(const OptionsCont& oc, const std::string& option, CollisionAction& myAction) {
+    const std::string action = oc.getString(option);
     if (action == "none") {
-        myCollisionAction = COLLISION_ACTION_NONE;
+        myAction = COLLISION_ACTION_NONE;
     } else if (action == "warn") {
-        myCollisionAction = COLLISION_ACTION_WARN;
+        myAction = COLLISION_ACTION_WARN;
     } else if (action == "teleport") {
-        myCollisionAction = COLLISION_ACTION_TELEPORT;
+        myAction = COLLISION_ACTION_TELEPORT;
     } else if (action == "remove") {
-        myCollisionAction = COLLISION_ACTION_REMOVE;
+        myAction = COLLISION_ACTION_REMOVE;
     } else {
-        WRITE_ERRORF(TL("Invalid collision.action '%'."), action);
+        WRITE_ERROR(TLF("Invalid % '%'.", option, action));
     }
+}
+
+void
+MSLane::initCollisionOptions(const OptionsCont& oc) {
+    initCollisionAction(oc, "collision.action", myCollisionAction);
+    initCollisionAction(oc, "intermodal-collision.action", myIntermodalCollisionAction);
     myCheckJunctionCollisions = oc.getBool("collision.check-junctions");
     myCheckJunctionCollisionMinGap = oc.getFloat("collision.check-junctions.mingap");
     myCollisionStopTime = string2time(oc.getString("collision.stoptime"));
+    myIntermodalCollisionStopTime = string2time(oc.getString("intermodal-collision.stoptime"));
     myCollisionMinGapFactor = oc.getFloat("collision.mingap-factor");
     myExtrapolateSubstepDepart = oc.getBool("extrapolate-departpos");
 }
@@ -4325,7 +4429,10 @@
 
 bool
 MSLane::mustCheckJunctionCollisions() const {
-    return myCheckJunctionCollisions && myEdge->isInternal() && myLinks.front()->getFoeLanes().size() > 0;
+    return myCheckJunctionCollisions && myEdge->isInternal() && (
+               myLinks.front()->getFoeLanes().size() > 0
+               || myLinks.front()->getWalkingAreaFoe() != nullptr
+               || myLinks.front()->getWalkingAreaFoeExit() != nullptr);
 }
 
 
diff -Nru sumo-1.17.0/src/microsim/MSLane.h sumo-1.18.0/src/microsim/MSLane.h
--- sumo-1.17.0/src/microsim/MSLane.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/MSLane.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -1321,11 +1321,16 @@
     double getMaximumBrakeDist() const;
 
     static void initCollisionOptions(const OptionsCont& oc);
+    static void initCollisionAction(const OptionsCont& oc, const std::string& option, CollisionAction& myAction);
 
     static CollisionAction getCollisionAction() {
         return myCollisionAction;
     }
 
+    static CollisionAction getIntermodalCollisionAction() {
+        return myIntermodalCollisionAction;
+    }
+
     static const long CHANGE_PERMISSIONS_PERMANENT = 0;
     static const long CHANGE_PERMISSIONS_GUI = 1;
 
@@ -1350,7 +1355,9 @@
 
     /// @brief detect whether a vehicle collids with pedestrians on the junction
     void detectPedestrianJunctionCollision(const MSVehicle* collider, const PositionVector& colliderBoundary, const MSLane* foeLane,
-                                           SUMOTime timestep, const std::string& stage);
+                                           SUMOTime timestep, const std::string& stage,
+                                           std::set& toRemove,
+                                           std::set& toTeleport);
 
     /// @brief detect whether there is a collision between the two vehicles
     bool detectCollisionBetween(SUMOTime timestep, const std::string& stage, MSVehicle* collider, MSVehicle* victim,
@@ -1363,6 +1370,11 @@
                                 std::set& toRemove,
                                 std::set& toTeleport) const;
 
+    void handleIntermodalCollisionBetween(SUMOTime timestep, const std::string& stage, const MSVehicle* collider, const MSTransportable* victim,
+                                          double gap, const std::string& collisionType,
+                                          std::set& toRemove,
+                                          std::set& toTeleport) const;
+
     /* @brief determine depart speed and whether it may be patched
      * @param[in] veh The departing vehicle
      * @param[out] whether the speed may be patched to account for safety
@@ -1560,9 +1572,11 @@
 
     /// @brief the action to take on collisions
     static CollisionAction myCollisionAction;
+    static CollisionAction myIntermodalCollisionAction;
     static bool myCheckJunctionCollisions;
     static double myCheckJunctionCollisionMinGap;
     static SUMOTime myCollisionStopTime;
+    static SUMOTime myIntermodalCollisionStopTime;
     static double myCollisionMinGapFactor;
     static bool myExtrapolateSubstepDepart;
 
diff -Nru sumo-1.17.0/src/microsim/MSLeaderInfo.cpp sumo-1.18.0/src/microsim/MSLeaderInfo.cpp
--- sumo-1.17.0/src/microsim/MSLeaderInfo.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/MSLeaderInfo.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2002-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/MSLeaderInfo.h sumo-1.18.0/src/microsim/MSLeaderInfo.h
--- sumo-1.17.0/src/microsim/MSLeaderInfo.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/MSLeaderInfo.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2002-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/MSLink.cpp sumo-1.18.0/src/microsim/MSLink.cpp
--- sumo-1.17.0/src/microsim/MSLink.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/MSLink.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -362,6 +362,7 @@
                     const double widthFactor = 1 / MAX2(sin(DEG2RAD(angleDiff)), 0.2) * 2 - 1;
                     //std::cout << "  intersection of " << lane->getID() << " with " << foeLane->getID() << " angle1=" << angle1 << " angle2=" << angle2 << " angleDiff=" << angleDiff << " widthFactor=" << widthFactor << "\n";
                     conflictSize *= widthFactor;
+                    conflictSize = MIN2(conflictSize, lane->getLength());
                     // lane width affects the crossing point
                     intersections1.back() -= conflictSize / 2;
                     // ensure non-negative offset for weird geometries
@@ -1049,7 +1050,7 @@
 
 #ifdef MSLink_DEBUG_OPENED
     const double x2 = (sqrt(4 * (v - d) * (v - d) - 8 * m * a) * 0.5 - d + v) / m;
-    if (gDebugFlag6 || ISNAN(x)) {
+    if (gDebugFlag6 || std::isnan(x)) {
         std::cout << SIMTIME << "   dist=" << dist << " dist2=" << dist2  << " at=" << STEPS2TIME(arrivalTime) << " m=" << m << " d=" << d << " v=" << v << " a=" << a << " x=" << x << " x2=" << x2 << "\n";
     }
 #endif
@@ -1428,14 +1429,15 @@
             const double l2 = ego != nullptr ? ego->getLength() + 2 : 0; // add some slack to account for further meeting-angle effects
             const double sagitta = ego != nullptr && myRadius != std::numeric_limits::max() ? myRadius - sqrt(myRadius * myRadius - 0.25 * l2 * l2) : 0;
             const bool pastTheCrossingPoint = leaderBackDist + foeCrossingWidth + sagitta < 0;
-            const bool beforeTheCrossingPoint = leaderBackDist < leader->getVehicleType().getLength();
+            const bool enteredTheCrossingPoint = leaderBackDist < leader->getVehicleType().getLength();
             const bool foeIsBicycleTurn = (leader->getVehicleType().getVehicleClass() == SVC_BICYCLE
                                            && foeLane->getIncomingLanes().front().viaLink->getDirection() == LinkDirection::LEFT);
             const bool ignoreIndirectBicycleTurn = pastTheCrossingPoint && foeIsBicycleTurn;
             const bool cannotIgnore = ((contLane && !ignoreIndirectBicycleTurn) || sameTarget || sameSource) && ego != nullptr;
-            const bool inTheWay = (((!pastTheCrossingPoint && distToCrossing > 0) || (sameTarget && distToCrossing > leaderBackDist - leader->getLength()))
-                                   && beforeTheCrossingPoint
-                                   && (!foeExitLink->isInternalJunctionLink() || foeIsBicycleTurn));
+            const bool inTheWay = ((((!pastTheCrossingPoint && distToCrossing > 0) || (sameTarget && distToCrossing > leaderBackDist - leader->getLength()))
+                                    && enteredTheCrossingPoint
+                                    && (!foeExitLink->isInternalJunctionLink() || foeIsBicycleTurn))
+                                   || foeExitLink->getLaneBefore()->getNormalPredecessorLane() == myLane->getBidiLane());
             const bool isOpposite = leader->getLaneChangeModel().isOpposite();
             const auto avi = foeExitLink->getApproaching(leader);
             // if leader is not found, assume that it performed a lane change in the last step
@@ -1450,7 +1452,7 @@
                           << " r=" << myRadius
                           << " sagitta=" << sagitta
                           << " foePastCP=" << pastTheCrossingPoint
-                          << " foeBeforeCP=" << beforeTheCrossingPoint
+                          << " foeEnteredCP=" << enteredTheCrossingPoint
                           << " inTheWay=" << inTheWay
                           << " willPass=" << willPass
                           << " isFrontOnLane=" << leader->isFrontOnLane(foeLane)
@@ -1501,12 +1503,17 @@
                 }
                 continue;
             }
+            if (leader->isBidiOn(foeLane)) {
+                // conflict resolved via forward lane of the foe
+                continue;
+            }
             // check whether foe is blocked and might need to change before leaving the junction
             const bool foeStrategicBlocked = (leader->getLaneChangeModel().isStrategicBlocked() &&
                                               leader->getCarFollowModel().brakeGap(leader->getSpeed()) <= foeLane->getLength() - leaderBack);
             const bool sameInternalEdge = &myInternalLaneBefore->getEdge() == &foeExitLink->getInternalLaneBefore()->getEdge();
 
-            if (MSGlobals::gSublane && ego != nullptr && (sameSource || sameTarget)
+            const bool foeLaneIsBidi = myInternalLaneBefore->getBidiLane() == foeLane;
+            if (MSGlobals::gSublane && ego != nullptr && (sameSource || sameTarget || foeLaneIsBidi)
                     && (!foeStrategicBlocked || sameInternalEdge)) {
                 if (ego->getLane() == leader->getLane()) {
                     continue;
@@ -1514,7 +1521,11 @@
                 // ignore vehicles if not in conflict sublane-wise
                 const double egoLatOffset = isShadowLink ? ego->getLatOffset(ego->getLaneChangeModel().getShadowLane()) : 0;
                 const double posLat = ego->getLateralPositionOnLane() + egoLatOffset;
-                const double posLatLeader = leader->getLateralPositionOnLane() + leader->getLatOffset(foeLane);
+                double posLatLeader = leader->getLateralPositionOnLane() + leader->getLatOffset(foeLane);
+                if (foeLaneIsBidi) {
+                    // leader is oncoming
+                    posLatLeader = foeLane->getWidth() - posLatLeader;
+                }
                 const double latGap = (fabs(posLat - posLatLeader)
                                        - 0.5 * (ego->getVehicleType().getWidth() + leader->getVehicleType().getWidth()));
                 const double maneuverDist = leader->getLaneChangeModel().getManeuverDist() * (posLat < posLatLeader ? -1 : 1);
@@ -1522,6 +1533,7 @@
                     std::cout << " checkIgnore sublaneFoe lane=" << myInternalLaneBefore->getID()
                               << " sameSource=" << sameSource
                               << " sameTarget=" << sameTarget
+                              << " foeLaneIsBidi=" << foeLaneIsBidi
                               << " foeLane=" << foeLane->getID()
                               << " leader=" << leader->getID()
                               << " egoLane=" << ego->getLane()->getID()
@@ -1551,7 +1563,7 @@
                             }
                             continue;
                         }
-                    } else {
+                    } else if (sameTarget) {
                         // for lanes from different edges we cannot rely on the
                         // index due to wrap-around issues
                         if (myDirection != foeEntryLink->getDirection()) {
@@ -1574,6 +1586,11 @@
                         } else {
                             // XXX figure out relative direction somehow
                         }
+                    } else {
+                        if (gDebugFlag1) {
+                            std::cout << "   ignored oncoming bidi leader\n";
+                        }
+                        continue;
                     }
                 }
             }
@@ -1601,18 +1618,29 @@
                 } else if ((contLane && !sameSource && !ignoreIndirectBicycleTurn) || isOpposite) {
                     gap = -std::numeric_limits::max(); // always break for vehicles which are on a continuation lane or for opposite-direction vehicles
                 } else {
-                    if (gDebugFlag1) {
-                        std::cout << " distToCrossing=" << distToCrossing << " leader back=" << leaderBack << " backDist=" << leaderBackDist
-                                  << " blockedStrategic=" << leader->getLaneChangeModel().isStrategicBlocked()
-                                  //<< " stateRight=" << toString((LaneChangeAction)leader->getLaneChangeModel().getSavedState(-1).second)
-                                  << "\n";
-                    }
                     if (pastTheCrossingPoint && !sameTarget) {
                         // leader is completely past the crossing point
                         // or there is no crossing point
-                        continue; // next vehicle
+                        if (gDebugFlag1) {
+                            std::cout << " foePastCP ignored\n";
+                        }
+                        continue;
+                    }
+                    double leaderBackDist2 = leaderBackDist;
+                    if (sameTarget && leaderBackDist2 < 0) {
+                        const double mismatch = myConflicts[i].getFoeLengthBehindCrossing(foeExitLink) - myConflicts[i].getLengthBehindCrossing(this);
+                        if (mismatch > 0) {
+                            leaderBackDist2 += mismatch;
+                        }
+                    }
+                    if (gDebugFlag1) {
+                        std::cout << " distToCrossing=" << distToCrossing << " leaderBack=" << leaderBack
+                                  << " backDist=" << leaderBackDist
+                                  << " backDist2=" << leaderBackDist2
+                                  << " blockedStrategic=" << leader->getLaneChangeModel().isStrategicBlocked()
+                                  << "\n";
                     }
-                    gap = distToCrossing - ego->getVehicleType().getMinGap() - leaderBackDist - foeCrossingWidth;
+                    gap = distToCrossing - ego->getVehicleType().getMinGap() - leaderBackDist2 - foeCrossingWidth;
                     if (leader->getLaneChangeModel().isStrategicBlocked()) {
                         // do not encroach on leader when it tries to change lanes
                         // factor 2 is to give some slack for lane-changing
@@ -1748,16 +1776,19 @@
             }
 #endif
             if (dist < ego->getVehicleType().getWidth() / 2 || inFront) {
-                if (inFront && isOnComingPed(ego, p)) {
-                    // account for pedestrian movement while closing in
-                    const double timeToStop = (ego->getSpeed() + ACCEL2SPEED(ego->getCarFollowModel().getMaxAccel())) / ego->getCarFollowModel().getMaxDecel();
-                    const double pedDist = p->getMaxSpeed() * MAX2(timeToStop, TS);
-                    dist = MAX2(0.0, dist - pedDist);
+                if (inFront) {
+                    const double oncomingFactor = isOnComingPed(ego, p);
+                    if (oncomingFactor > 0) {
+                        // account for pedestrian movement while closing in
+                        const double timeToStop = sqrt(dist) / 2;
+                        const double pedDist = p->getMaxSpeed() * MAX2(timeToStop, TS) * oncomingFactor;
+                        dist = MAX2(0.0, dist - pedDist);
 #ifdef DEBUG_WALKINGAREA
-                    if (ego->isSelected()) {
-                        std::cout << "    timeToStop=" << timeToStop << " pedDist=" << pedDist << " dist2=" << dist << "\n";
-                    }
+                        if (ego->isSelected()) {
+                            std::cout << "    timeToStop=" << timeToStop << " pedDist=" << pedDist << " factor=" << oncomingFactor << " dist2=" << dist << "\n";
+                        }
 #endif
+                    }
                 }
                 if (ignoreFoe(ego, p)) {
                     continue;
@@ -1791,16 +1822,21 @@
 }
 
 
-bool
+double
 MSLink::isOnComingPed(const MSVehicle* ego, const MSPerson* p) const {
     const double pedToEgoAngle = p->getPosition().angleTo2D(ego->getPosition());
     const double angleDiff = fabs(GeomHelper::angleDiff(p->getAngle(), pedToEgoAngle));
 #ifdef DEBUG_WALKINGAREA
     if (ego->isSelected()) {
-        std::cout << " ped-angleDiff=" << RAD2DEG(angleDiff) << "\n";
+        std::cout << " ped-angleDiff=" << RAD2DEG(angleDiff) << " res=" << cos(angleDiff) << "\n";
     }
 #endif
-    return angleDiff < DEG2RAD(75);
+    if (angleDiff <= DEG2RAD(90)) {
+        ;
+        return cos(angleDiff);
+    } else {
+        return 0;
+    }
 }
 
 
@@ -1857,7 +1893,7 @@
 double
 MSLink::getZipperSpeed(const MSVehicle* ego, const double dist, double vSafe,
                        SUMOTime arrivalTime,
-                       BlockingFoes* collectFoes) const {
+                       const BlockingFoes* foes) const {
     if (myFoeLinks.size() == 0) {
         // link should have LINKSTATE_MAJOR in this case
         assert(false);
@@ -1881,11 +1917,11 @@
                                         << " dist=" << dist
                                         << " brakeGap=" << brakeGap
                                         << " vSafe=" << vSafe
-                                        << " numFoes=" << collectFoes->size()
+                                        << " numFoes=" << foes->size()
                                         << "\n")
 #endif
         MSLink* foeLink = myFoeLinks[0];
-    for (const auto& item : *collectFoes) {
+    for (const auto& item : *foes) {
         const MSVehicle* foe = dynamic_cast(item);
         assert(foe != 0);
         const ApproachingVehicleInformation& avi = foeLink->getApproaching(foe);
diff -Nru sumo-1.17.0/src/microsim/MSLink.h sumo-1.18.0/src/microsim/MSLink.h
--- sumo-1.17.0/src/microsim/MSLink.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/MSLink.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2002-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -556,7 +556,7 @@
     /// @brief return the speed at which ego vehicle must approach the zipper link
     double getZipperSpeed(const MSVehicle* ego, const double dist, double vSafe,
                           SUMOTime arrivalTime,
-                          BlockingFoes* collectFoes) const;
+                          const BlockingFoes* foes) const;
 
     /// @brief return the via lane if it exists and the lane otherwise
     inline MSLane* getViaLaneOrLane() const {
@@ -681,8 +681,8 @@
     /// @brief whether the given person is in front of the car
     bool isInFront(const MSVehicle* ego, const PositionVector& egoPath, const Position& pPos) const;
 
-    /// @brief whether the given person is walking towards the car
-    bool isOnComingPed(const MSVehicle* ego, const MSPerson* p) const;
+    /// @brief whether the given person is walking towards the car returned as a factor in [0, 1]
+    double isOnComingPed(const MSVehicle* ego, const MSPerson* p) const;
 
     /// @brief return extrapolated position of the given person after the given time
     Position getFuturePosition(const MSPerson* p, double timeHorizon = 1) const;
diff -Nru sumo-1.17.0/src/microsim/MSLogicJunction.cpp sumo-1.18.0/src/microsim/MSLogicJunction.cpp
--- sumo-1.17.0/src/microsim/MSLogicJunction.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/MSLogicJunction.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/MSLogicJunction.h sumo-1.18.0/src/microsim/MSLogicJunction.h
--- sumo-1.17.0/src/microsim/MSLogicJunction.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/MSLogicJunction.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/MSMoveReminder.cpp sumo-1.18.0/src/microsim/MSMoveReminder.cpp
--- sumo-1.17.0/src/microsim/MSMoveReminder.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/MSMoveReminder.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2008-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/MSMoveReminder.h sumo-1.18.0/src/microsim/MSMoveReminder.h
--- sumo-1.17.0/src/microsim/MSMoveReminder.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/MSMoveReminder.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2003-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -258,6 +258,11 @@
         return myDescription;
     }
 
+    // @brief return whether this moveReminder triggers parking reroute
+    virtual bool isParkingRerouter() const {
+        return false;
+    }
+
 protected:
     void removeFromVehicleUpdateValues(SUMOTrafficObject& veh);
 
diff -Nru sumo-1.17.0/src/microsim/MSNet.cpp sumo-1.18.0/src/microsim/MSNet.cpp
--- sumo-1.17.0/src/microsim/MSNet.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/MSNet.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -296,6 +296,7 @@
     // delete mean data
     delete myEdges;
     delete myInserter;
+    myInserter = nullptr;
     delete myLogics;
     delete myRouteLoaders;
     if (myPersonControl != nullptr) {
@@ -382,6 +383,14 @@
     return myMesoEdgeTypes[typeID];
 }
 
+
+bool
+MSNet::hasFlow(const std::string& id) const {
+    // inserter is deleted at the end of the simulation
+    return myInserter != nullptr && myInserter->hasFlow(id);
+}
+
+
 MSNet::SimulationState
 MSNet::simulate(SUMOTime start, SUMOTime stop) {
     // report the begin when wished
@@ -477,6 +486,9 @@
         if (myVehicleControl->getEmergencyStops() > 0) {
             msg << " Emergency Stops: " << myVehicleControl->getEmergencyStops() << "\n";
         }
+        if (myVehicleControl->getEmergencyBrakingCount() > 0) {
+            msg << " Emergency Braking: " << myVehicleControl->getEmergencyBrakingCount() << "\n";
+        }
         if (myPersonControl != nullptr && myPersonControl->getLoadedNumber() > 0) {
             msg << "Persons: " << "\n"
                 << " Inserted: " << myPersonControl->getLoadedNumber() << "\n"
@@ -574,6 +586,7 @@
     od.openTag("safety");
     od.writeAttr("collisions", myVehicleControl->getCollisionCount());
     od.writeAttr("emergencyStops", myVehicleControl->getEmergencyStops());
+    od.writeAttr("emergencyBraking", myVehicleControl->getEmergencyBrakingCount());
     od.closeTag();
     od.openTag("persons");
     od.writeAttr("loaded", myPersonControl != nullptr ? myPersonControl->getLoadedNumber() : 0);
diff -Nru sumo-1.17.0/src/microsim/MSNet.h sumo-1.18.0/src/microsim/MSNet.h
--- sumo-1.17.0/src/microsim/MSNet.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/MSNet.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -248,6 +248,8 @@
      */
     static void clearAll();
 
+    /// @brief return whether the given flow is known
+    bool hasFlow(const std::string& id) const;
 
     /** @brief Simulates from timestep start to stop
      * @param[in] start The begin time step of the simulation
@@ -813,6 +815,11 @@
         return myAmInterrupted;
     }
 
+    /// @brief gui may prevent final meanData reset to keep live data visible
+    virtual bool skipFinalReset() const {
+        return false;
+    }
+
     /// @brief find electrical substation by its id
     MSTractionSubstation* findTractionSubstation(const std::string& substationId);
 
diff -Nru sumo-1.17.0/src/microsim/MSNoLogicJunction.cpp sumo-1.18.0/src/microsim/MSNoLogicJunction.cpp
--- sumo-1.17.0/src/microsim/MSNoLogicJunction.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/MSNoLogicJunction.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2002-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/MSNoLogicJunction.h sumo-1.18.0/src/microsim/MSNoLogicJunction.h
--- sumo-1.17.0/src/microsim/MSNoLogicJunction.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/MSNoLogicJunction.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/MSParkingArea.cpp sumo-1.18.0/src/microsim/MSParkingArea.cpp
--- sumo-1.17.0/src/microsim/MSParkingArea.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/MSParkingArea.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2015-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -45,14 +45,14 @@
 MSParkingArea::MSParkingArea(const std::string& id, const std::vector& lines,
                              MSLane& lane, double begPos, double endPos, int capacity, double width, double length,
                              double angle, const std::string& name, bool onRoad,
-                             const std::string& departPos) :
+                             const std::string& departPos, bool lefthand) :
     MSStoppingPlace(id, SUMO_TAG_PARKING_AREA, lines, lane, begPos, endPos, name),
     myRoadSideCapacity(capacity),
     myCapacity(0),
     myOnRoad(onRoad),
     myWidth(width),
     myLength(length),
-    myAngle(angle),
+    myAngle(lefthand ? -angle : angle),
     myEgressBlocked(false),
     myReservationTime(-1),
     myReservations(0),
@@ -83,7 +83,7 @@
         }
     }
 
-    const double offset = MSGlobals::gLefthand ? -1 : 1;
+    const double offset = (MSGlobals::gLefthand != lefthand) ? -1 : 1;
     myShape = lane.getShape().getSubpart(
                   lane.interpolateLanePosToGeometryPos(begPos),
                   lane.interpolateLanePosToGeometryPos(endPos));
diff -Nru sumo-1.17.0/src/microsim/MSParkingArea.h sumo-1.18.0/src/microsim/MSParkingArea.h
--- sumo-1.17.0/src/microsim/MSParkingArea.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/MSParkingArea.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2015-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -76,7 +76,8 @@
                   double begPos, double endPos, int capacity,
                   double width, double length, double angle, const std::string& name,
                   bool onRoad,
-                  const std::string& departPos);
+                  const std::string& departPos,
+                  bool lefthand);
 
     /// @brief Destructor
     virtual ~MSParkingArea();
diff -Nru sumo-1.17.0/src/microsim/MSRightOfWayJunction.cpp sumo-1.18.0/src/microsim/MSRightOfWayJunction.cpp
--- sumo-1.17.0/src/microsim/MSRightOfWayJunction.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/MSRightOfWayJunction.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -132,7 +132,8 @@
                     }
                     if (linkFoes.test(c)) {
                         myLinkFoeInternalLanes[link].push_back(myInternalLanes[li]);
-                        if (linkResponse.test(c) || sortedLinks[c].second->isIndirect()) {
+                        if (linkResponse.test(c) || sortedLinks[c].second->isIndirect() ||
+                                link->getLane()->getBidiLane() == sortedLinks[c].second->getLaneBefore()) {
                             const std::vector& l = myInternalLanes[li]->getIncomingLanes();
                             if (l.size() == 1 && l[0].lane->getEdge().isInternal()) {
                                 myLinkFoeInternalLanes[link].push_back(l[0].lane);
diff -Nru sumo-1.17.0/src/microsim/MSRightOfWayJunction.h sumo-1.18.0/src/microsim/MSRightOfWayJunction.h
--- sumo-1.17.0/src/microsim/MSRightOfWayJunction.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/MSRightOfWayJunction.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/MSRoute.cpp sumo-1.18.0/src/microsim/MSRoute.cpp
--- sumo-1.17.0/src/microsim/MSRoute.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/MSRoute.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2002-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -190,6 +190,10 @@
 #endif
     RouteDistDict::iterator it = myDistDict.find(id);
     if (it != myDistDict.end() && !it->second.second) {
+        for (ConstMSRoutePtr rp : it->second.first->getVals()) {
+            const MSRoute& r = *rp;
+            r.checkRemoval();
+        }
         delete it->second.first;
         myDistDict.erase(it);
     }
diff -Nru sumo-1.17.0/src/microsim/MSRoute.h sumo-1.18.0/src/microsim/MSRoute.h
--- sumo-1.17.0/src/microsim/MSRoute.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/MSRoute.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2002-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/MSRouteHandler.cpp sumo-1.18.0/src/microsim/MSRouteHandler.cpp
--- sumo-1.17.0/src/microsim/MSRouteHandler.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/MSRouteHandler.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -303,7 +303,7 @@
     }
     myActiveRouteRefID = attrs.getOpt(SUMO_ATTR_REFID, myActiveRouteID.c_str(), ok, "");
     if (myActiveRouteRefID != "" && MSRoute::dictionary(myActiveRouteRefID, &myParsingRNG) == nullptr) {
-        WRITE_ERRORF(TL("Invalid reference to route '%' in route %."), myActiveRouteRefID, rid);
+        throw ProcessError(TLF("Invalid reference to route '%' in route %.", myActiveRouteRefID, rid));
     }
     myActiveRouteProbability = attrs.getOpt(SUMO_ATTR_PROB, myActiveRouteID.c_str(), ok, DEFAULT_VEH_PROB);
     myActiveRouteColor = attrs.hasAttribute(SUMO_ATTR_COLOR) ? new RGBColor(attrs.get(SUMO_ATTR_COLOR, myActiveRouteID.c_str(), ok)) : nullptr;
@@ -319,21 +319,24 @@
     if (myActiveRouteRepeat > 0) {
         if (MSGlobals::gCheckRoutes) {
             SUMOVehicleClass vClass = SVC_IGNORING;
+            std::string errSuffix = ".";
             if (myVehicleParameter != nullptr) {
                 MSVehicleControl& vehControl = MSNet::getInstance()->getVehicleControl();
                 MSVehicleType* vtype = vehControl.getVType(myVehicleParameter->vtypeid, &myParsingRNG);
                 if (vtype != nullptr) {
                     vClass = vtype->getVehicleClass();
+                    errSuffix = TLF(" for vehicle '%' with vClass %.", myVehicleParameter->id, vClass);
                 }
             }
             if (myActiveRoute.size() > 0 && !myActiveRoute.back()->isConnectedTo(*myActiveRoute.front(), vClass)) {
-                WRITE_ERRORF(TL("Disconnected route % when repeating."), rid);
+                throw ProcessError(TLF("Disconnected route % when repeating. Last edge '%' is not connected to first edge '%'%",
+                            rid, myActiveRoute.back()->getID(), myActiveRoute.front()->getID(), errSuffix));
             }
         }
     }
     myCurrentCosts = attrs.getOpt(SUMO_ATTR_COST, myActiveRouteID.c_str(), ok, -1);
     if (ok && myCurrentCosts != -1 && myCurrentCosts < 0) {
-        WRITE_ERRORF(TL("Invalid cost for route '%'."), myActiveRouteID);
+        WRITE_WARNING(TLF("Invalid cost for route '%'.", myActiveRouteID));
     }
 }
 
@@ -426,7 +429,7 @@
             }
         }
         MSRoute* route = new MSRoute(myActiveRouteID, myActiveRoute,
-                                     myVehicleParameter == nullptr || myVehicleParameter->repetitionNumber >= 1,
+                                     myVehicleParameter == nullptr,
                                      myActiveRouteColor, myActiveRouteStops,
                                      myActiveRouteReplacedAtTime, myActiveRouteReplacedIndex);
         route->setPeriod(myActiveRoutePeriod);
@@ -468,6 +471,8 @@
         // ok, a vehicle is wrapping the route,
         //  we may use this vehicle's id as default
         myCurrentRouteDistributionID = "!" + myVehicleParameter->id; // !!! document this
+        // we have to record this or we cannot remove the distribution later
+        myVehicleParameter->routeid = myCurrentRouteDistributionID;
     } else {
         bool ok = true;
         myCurrentRouteDistributionID = attrs.get(SUMO_ATTR_ID, nullptr, ok);
@@ -1124,33 +1129,33 @@
         toStop = MSNet::getInstance()->getStoppingPlace(stop.busstop, SUMO_TAG_BUS_STOP);
         if (toStop == nullptr) {
             ok = false;
-            WRITE_ERRORF(TL("The busStop '%' is not known%."), stop.busstop, errorSuffix);
+            WRITE_ERROR(TLF("The busStop '%' is not known%.", stop.busstop, errorSuffix));
         }
     } else if (stop.containerstop != "") {
         toStop = MSNet::getInstance()->getStoppingPlace(stop.containerstop, SUMO_TAG_CONTAINER_STOP);
         if (toStop == nullptr) {
             ok = false;
-            WRITE_ERRORF(TL("The containerStop '%' is not known%."), stop.containerstop, errorSuffix);
+            WRITE_ERROR(TLF("The containerStop '%' is not known%.", stop.containerstop, errorSuffix));
         }
     } else if (stop.parkingarea != "") {
         toStop = MSNet::getInstance()->getStoppingPlace(stop.parkingarea, SUMO_TAG_PARKING_AREA);
         if (toStop == nullptr) {
             ok = false;
-            WRITE_ERRORF(TL("The parkingArea '%' is not known%."), stop.parkingarea, errorSuffix);
+            WRITE_ERROR(TLF("The parkingArea '%' is not known%.", stop.parkingarea, errorSuffix));
         }
     } else if (stop.chargingStation != "") {
         // ok, we have a charging station
         toStop = MSNet::getInstance()->getStoppingPlace(stop.chargingStation, SUMO_TAG_CHARGING_STATION);
         if (toStop == nullptr) {
             ok = false;
-            WRITE_ERRORF(TL("The chargingStation '%' is not known%."), stop.chargingStation, errorSuffix);
+            WRITE_ERROR(TLF("The chargingStation '%' is not known%.", stop.chargingStation, errorSuffix));
         }
     } else if (stop.overheadWireSegment != "") {
         // ok, we have an overhead wire segment
         toStop = MSNet::getInstance()->getStoppingPlace(stop.overheadWireSegment, SUMO_TAG_OVERHEAD_WIRE_SEGMENT);
         if (toStop == nullptr) {
             ok = false;
-            WRITE_ERRORF(TL("The overhead wire segment '%' is not known%."), stop.overheadWireSegment, errorSuffix);
+            WRITE_ERROR(TLF("The overhead wire segment '%' is not known%.", stop.overheadWireSegment, errorSuffix));
         }
     }
     if (!ok && MSGlobals::gCheckRoutes) {
@@ -1159,8 +1164,9 @@
     return toStop;
 }
 
-void
+Parameterised*
 MSRouteHandler::addStop(const SUMOSAXAttributes& attrs) {
+    Parameterised* result = nullptr;
     try {
         std::string errorSuffix;
         if (myActiveType == ObjectTypeEnum::PERSON) {
@@ -1175,7 +1181,10 @@
         SUMOVehicleParameter::Stop stop;
         bool ok = parseStop(stop, attrs, errorSuffix, MsgHandler::getErrorInstance());
         if (!ok) {
-            return;
+            if (MSGlobals::gCheckRoutes) {
+                throw ProcessError();
+            }
+            return result;
         }
         const MSEdge* edge = nullptr;
         MSStoppingPlace* toStop = retrieveStoppingPlace(attrs, errorSuffix, &stop);
@@ -1198,8 +1207,7 @@
             if (ok && stop.edge != "") { // edge is given directly
                 edge = MSEdge::dictionary(stop.edge);
                 if (edge == nullptr || (edge->isInternal() && !MSGlobals::gUsingInternalLanes)) {
-                    WRITE_ERROR("The edge '" + stop.edge + "' for a stop is not known" + errorSuffix);
-                    return;
+                    throw ProcessError("The edge '" + stop.edge + "' for a stop is not known" + errorSuffix);
                 }
             } else if (ok && stop.lane != "") { // lane is given directly
                 MSLane* stopLane = MSLane::dictionary(stop.lane);
@@ -1213,8 +1221,7 @@
                     edge = &stopLane->getEdge();
                 }
                 if (stopLane == nullptr || (stopLane->isInternal() && !MSGlobals::gUsingInternalLanes)) {
-                    WRITE_ERROR("The lane '" + stop.lane + "' for a stop is not known" + errorSuffix);
-                    return;
+                    throw ProcessError("The lane '" + stop.lane + "' for a stop is not known" + errorSuffix);
                 }
             } else {
                 if (myActiveTransportablePlan && !myActiveTransportablePlan->empty()) { // use end of movement before
@@ -1231,8 +1238,13 @@
                         stop.startPos = MAX2(0., stop.endPos - MIN_STOP_LENGTH);
                     }
                 } else {
-                    WRITE_ERROR("A stop must be placed on a busStop, a chargingStation, an overheadWireSegment, a containerStop, a parkingArea, an edge or a lane" + errorSuffix);
-                    return;
+                    const std::string msg = TL("A stop must be placed on a busStop, a chargingStation, an overheadWireSegment, a containerStop, a parkingArea, an edge or a lane") + errorSuffix;
+                    if (MSGlobals::gCheckRoutes) {
+                        throw ProcessError(msg);
+                    } else {
+                        WRITE_WARNING(msg);
+                        return result;
+                    }
                 }
             }
             stop.endPos = attrs.getOpt(SUMO_ATTR_ENDPOS, nullptr, ok, edge->getLength());
@@ -1242,13 +1254,13 @@
             }
             stop.startPos = attrs.getOpt(SUMO_ATTR_STARTPOS, nullptr, ok, MAX2(0., stop.endPos - MIN_STOP_LENGTH));
             if (!myAmLoadingState) {
-                const bool friendlyPos = attrs.getOpt(SUMO_ATTR_FRIENDLY_POS, nullptr, ok, !attrs.hasAttribute(SUMO_ATTR_STARTPOS) && !attrs.hasAttribute(SUMO_ATTR_ENDPOS));
+                const bool friendlyPos = attrs.getOpt(SUMO_ATTR_FRIENDLY_POS, nullptr, ok, !attrs.hasAttribute(SUMO_ATTR_STARTPOS) && !attrs.hasAttribute(SUMO_ATTR_ENDPOS))
+                    || !MSGlobals::gCheckRoutes;
                 if (!ok || (checkStopPos(stop.startPos, stop.endPos, edge->getLength(), 0, friendlyPos) != StopPos::STOPPOS_VALID)) {
-                    WRITE_ERROR("Invalid start or end position for stop on "
+                    throw ProcessError("Invalid start or end position for stop on "
                                 + (stop.lane != ""
                                    ? ("lane '" + stop.lane)
                                    : ("edge '" + stop.edge)) + "'" + errorSuffix);
-                    return;
                 }
             }
         }
@@ -1280,11 +1292,14 @@
                 pos = myActiveTransportablePlan->back()->getArrivalPos();
             }
             myActiveTransportablePlan->push_back(new MSStageWaiting(edge, toStop, stop.duration, stop.until, pos, actType, false));
+            result = myActiveTransportablePlan->back();
 
         } else if (myVehicleParameter != nullptr) {
             myVehicleParameter->stops.push_back(stop);
+            result = &myVehicleParameter->stops.back();
         } else {
             myActiveRouteStops.push_back(stop);
+            result = &myActiveRouteStops.back();
         }
         if (myInsertStopEdgesAt >= 0) {
             //std::cout << " myInsertStopEdgesAt=" << myInsertStopEdgesAt << " edge=" << edge->getID() << " myRoute=" << toString(myActiveRoute) << "\n";
@@ -1309,6 +1324,7 @@
         deleteActivePlanAndVehicleParameter();
         throw;
     }
+    return result;
 }
 
 
diff -Nru sumo-1.17.0/src/microsim/MSRouteHandler.h sumo-1.18.0/src/microsim/MSRouteHandler.h
--- sumo-1.17.0/src/microsim/MSRouteHandler.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/MSRouteHandler.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -153,7 +153,7 @@
     MSStoppingPlace* retrieveStoppingPlace(const SUMOSAXAttributes& attrs, const std::string& errorSuffix, SUMOVehicleParameter::Stop* stopParam = nullptr);
 
     /// @brief Processing of a stop
-    void addStop(const SUMOSAXAttributes& attrs);
+    Parameterised* addStop(const SUMOSAXAttributes& attrs);
 
     /// @brief add a routing request for a walking or intermodal person
     void addPersonTrip(const SUMOSAXAttributes& attrs);
diff -Nru sumo-1.17.0/src/microsim/MSStateHandler.cpp sumo-1.18.0/src/microsim/MSStateHandler.cpp
--- sumo-1.17.0/src/microsim/MSStateHandler.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/MSStateHandler.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -471,6 +471,7 @@
                 // register route for deadlock prevention (vehicleStateChanged would not be called otherwise)
                 MSRailSignalControl::getInstance().vehicleStateChanged(v, MSNet::VehicleState::NEWROUTE, "loadState");
             }
+            vc.handleTriggeredDepart(v, false);
         }
         while (!myDeviceAttrs.empty()) {
             const std::string attrID = myDeviceAttrs.back()->getString(SUMO_ATTR_ID);
diff -Nru sumo-1.17.0/src/microsim/MSStateHandler.h sumo-1.18.0/src/microsim/MSStateHandler.h
--- sumo-1.17.0/src/microsim/MSStateHandler.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/MSStateHandler.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/MSStop.cpp sumo-1.18.0/src/microsim/MSStop.cpp
--- sumo-1.17.0/src/microsim/MSStop.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/MSStop.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2005-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -104,6 +104,7 @@
     if (pars.started >= 0 && (pars.parametersSet & STOP_STARTED_SET) == 0) {
         dev.writeAttr(SUMO_ATTR_STARTED, time2string(pars.started));
     }
+    pars.writeParams(dev);
     dev.closeTag();
 }
 
diff -Nru sumo-1.17.0/src/microsim/MSStop.h sumo-1.18.0/src/microsim/MSStop.h
--- sumo-1.17.0/src/microsim/MSStop.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/MSStop.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2005-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/MSStoppingPlace.cpp sumo-1.18.0/src/microsim/MSStoppingPlace.cpp
--- sumo-1.17.0/src/microsim/MSStoppingPlace.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/MSStoppingPlace.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2005-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/MSStoppingPlace.h sumo-1.18.0/src/microsim/MSStoppingPlace.h
--- sumo-1.17.0/src/microsim/MSStoppingPlace.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/MSStoppingPlace.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2005-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/MSVehicleContainer.cpp sumo-1.18.0/src/microsim/MSVehicleContainer.cpp
--- sumo-1.17.0/src/microsim/MSVehicleContainer.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/MSVehicleContainer.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/MSVehicleContainer.h sumo-1.18.0/src/microsim/MSVehicleContainer.h
--- sumo-1.17.0/src/microsim/MSVehicleContainer.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/MSVehicleContainer.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/MSVehicleControl.cpp sumo-1.18.0/src/microsim/MSVehicleControl.cpp
--- sumo-1.17.0/src/microsim/MSVehicleControl.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/MSVehicleControl.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -52,6 +52,7 @@
     myTeleportsYield(0),
     myTeleportsWrongLane(0),
     myEmergencyStops(0),
+    myEmergencyBrakingCount(0),
     myStoppedVehicles(0),
     myTotalDepartureDelay(0),
     myTotalTravelTime(0),
@@ -263,6 +264,7 @@
     myTeleportsYield = 0;
     myTeleportsWrongLane = 0;
     myEmergencyStops = 0;
+    myEmergencyBrakingCount = 0;
     myStoppedVehicles = 0;
     myTotalDepartureDelay = 0;
     myTotalTravelTime = 0;
@@ -275,9 +277,23 @@
     if (it == myVehicleDict.end()) {
         // id not in myVehicleDict.
         myVehicleDict[id] = v;
+        handleTriggeredDepart(v, true);
         const SUMOVehicleParameter& pars = v->getParameter();
-        if (pars.departProcedure == DepartDefinition::TRIGGERED || pars.departProcedure == DepartDefinition::CONTAINER_TRIGGERED || pars.departProcedure == DepartDefinition::SPLIT) {
-            const MSEdge* const firstEdge = v->getRoute().getEdges()[0];
+        if (v->getVClass() != SVC_TAXI && pars.line != "" && pars.repetitionNumber < 0) {
+            myPTVehicles.push_back(v);
+        }
+        return true;
+    }
+    return false;
+}
+
+
+void
+MSVehicleControl::handleTriggeredDepart(SUMOVehicle* v, bool add) {
+    const SUMOVehicleParameter& pars = v->getParameter();
+    if (pars.departProcedure == DepartDefinition::TRIGGERED || pars.departProcedure == DepartDefinition::CONTAINER_TRIGGERED || pars.departProcedure == DepartDefinition::SPLIT) {
+        const MSEdge* const firstEdge = v->getRoute().getEdges()[pars.departEdge];
+        if (add) {
             if (!MSGlobals::gUseMesoSim) {
                 // position will be checked against person position later
                 static_cast(v)->setTentativeLaneAndPosition(nullptr, v->getParameter().departPos);
@@ -290,13 +306,17 @@
                 firstEdge->addWaiting(v);
             }
             registerOneWaiting();
+        } else {
+            if (firstEdge->isTazConnector()) {
+                for (MSEdge* out : firstEdge->getSuccessors()) {
+                    out->removeWaiting(v);
+                }
+            } else {
+                firstEdge->removeWaiting(v);
+            }
+            unregisterOneWaiting();
         }
-        if (v->getVClass() != SVC_TAXI && pars.line != "" && pars.repetitionNumber < 0) {
-            myPTVehicles.push_back(v);
-        }
-        return true;
     }
-    return false;
 }
 
 
diff -Nru sumo-1.17.0/src/microsim/MSVehicleControl.h sumo-1.18.0/src/microsim/MSVehicleControl.h
--- sumo-1.17.0/src/microsim/MSVehicleControl.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/MSVehicleControl.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -194,6 +194,8 @@
     /// @}
 
 
+    /// @brief register / unregister depart-triggered vehicles with edges
+    void handleTriggeredDepart(SUMOVehicle* v, bool add);
 
     /// @name Setting vehicle statistics
     /// @{
@@ -330,6 +332,11 @@
         return myEmergencyStops;
     }
 
+    /// @brief return the number of emergency stops
+    int getEmergencyBrakingCount() const {
+        return myEmergencyBrakingCount;
+    }
+
     /// @brief return the number of vehicles that are currently stopped
     int getStoppedVehiclesCount() const {
         return myStoppedVehicles;
@@ -477,6 +484,11 @@
     }
 
     /// @brief register emergency stop
+    void registerEmergencyBraking() {
+        myEmergencyBrakingCount++;
+    }
+
+    /// @brief register emergency stop
     void registerStopStarted() {
         myStoppedVehicles++;
     }
@@ -592,6 +604,9 @@
     /// @brief The number of emergency stops
     int myEmergencyStops;
 
+    /// @brief The number of emergency stops
+    int myEmergencyBrakingCount;
+
     /// @brief The number of stopped vehicles
     int myStoppedVehicles;
     /// @}
diff -Nru sumo-1.17.0/src/microsim/MSVehicle.cpp sumo-1.18.0/src/microsim/MSVehicle.cpp
--- sumo-1.17.0/src/microsim/MSVehicle.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/MSVehicle.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -1001,8 +1001,12 @@
 
 void
 MSVehicle::cleanupFurtherLanes() {
-    for (std::vector::iterator i = myFurtherLanes.begin(); i != myFurtherLanes.end(); ++i) {
-        (*i)->resetPartialOccupation(this);
+    for (MSLane* further : myFurtherLanes) {
+        further->resetPartialOccupation(this);
+        if (further->getBidiLane() != nullptr
+                && (!isRailway(getVClass()) || (further->getPermissions() & ~SVC_RAIL_CLASSES) != 0)) {
+            further->getBidiLane()->resetPartialOccupation(this);
+        }
     }
     if (myLaneChangeModel != nullptr) {
         removeApproachingInformation(myLFLinkLanes);
@@ -1097,6 +1101,9 @@
         myLastBestLanesInternalLane = nullptr;
         updateBestLanes(true, onInit ? (*myCurrEdge)->getLanes().front() : 0);
         assert(!removeStops || haveValidStopEdges());
+        if (myStops.size() == 0) {
+            myStopDist = std::numeric_limits::max();
+        }
         return true;
     }
     return false;
@@ -1237,10 +1244,45 @@
     if (offset == 0. && !changingLanes) {
         if (myCachedPosition == Position::INVALID) {
             myCachedPosition = validatePosition(myLane->geometryPositionAtOffset(myState.myPos, posLat));
+            if (MSNet::getInstance()->hasElevation() && MSGlobals::gSublane) {
+                interpolateLateralZ(myCachedPosition, myState.myPos, posLat);
+            }
         }
         return myCachedPosition;
     }
     Position result = validatePosition(myLane->geometryPositionAtOffset(getPositionOnLane() + offset, posLat), offset);
+    interpolateLateralZ(result, getPositionOnLane() + offset, posLat);
+    return result;
+}
+
+
+void
+MSVehicle::interpolateLateralZ(Position& pos, double offset, double posLat) const {
+    const MSLane* shadow = myLaneChangeModel->getShadowLane();
+    if (shadow != nullptr && pos != Position::INVALID) {
+        // ignore negative offset
+        const Position shadowPos = shadow->geometryPositionAtOffset(MAX2(0.0, offset));
+        if (shadowPos != Position::INVALID && pos.z() != shadowPos.z()) {
+            const double centerDist = (myLane->getWidth() + shadow->getWidth()) * 0.5;
+            double relOffset = fabs(posLat) / centerDist;
+            double newZ = (1 - relOffset) * pos.z() + relOffset * shadowPos.z();
+            pos.setz(newZ);
+        }
+    }
+}
+
+
+double
+MSVehicle::getDistanceToLeaveJunction() const {
+    double result = getLength() - getPositionOnLane();
+    if (myLane->isNormal()) {
+        return MAX2(0.0, result);
+    }
+    const MSLane* lane = myLane;
+    while (lane->isInternal()) {
+        result += lane->getLength();
+        lane = lane->getCanonicalSuccessorLane();
+    }
     return result;
 }
 
@@ -1468,9 +1510,10 @@
 const Position
 MSVehicle::getBackPosition() const {
     const double posLat = MSGlobals::gLefthand ? myState.myPosLat : -myState.myPosLat;
+    Position result;
     if (myState.myPos >= myType->getLength()) {
         // vehicle is fully on the new lane
-        return myLane->geometryPositionAtOffset(myState.myPos - myType->getLength(), posLat);
+        result = myLane->geometryPositionAtOffset(myState.myPos - myType->getLength(), posLat);
     } else {
         if (myLaneChangeModel->isChangingLanes() && myFurtherLanes.size() > 0 && myLaneChangeModel->getShadowLane(myFurtherLanes.back()) == nullptr) {
             // special case where the target lane has no predecessor
@@ -1479,7 +1522,7 @@
                 std::cout << "    getBackPosition veh=" << getID() << " specialCase using myLane=" << myLane->getID() << " pos=0 posLat=" << myState.myPosLat << " result=" << myLane->geometryPositionAtOffset(0, posLat) << "\n";
             }
 #endif
-            return myLane->geometryPositionAtOffset(0, posLat);
+            result = myLane->geometryPositionAtOffset(0, posLat);
         } else {
 #ifdef DEBUG_FURTHER
             if (DEBUG_COND) {
@@ -1489,73 +1532,16 @@
             if (myFurtherLanes.size() > 0 && !myLaneChangeModel->isChangingLanes()) {
                 // truncate to 0 if vehicle starts on an edge that is shorter than it's length
                 const double backPos = MAX2(0.0, getBackPositionOnLane(myFurtherLanes.back()));
-                return myFurtherLanes.back()->geometryPositionAtOffset(backPos, -myFurtherLanesPosLat.back() * (MSGlobals::gLefthand ? -1 : 1));
+                result = myFurtherLanes.back()->geometryPositionAtOffset(backPos, -myFurtherLanesPosLat.back() * (MSGlobals::gLefthand ? -1 : 1));
             } else {
-                return myLane->geometryPositionAtOffset(0, posLat);
+                result = myLane->geometryPositionAtOffset(0, posLat);
             }
         }
     }
-}
-
-
-bool
-MSVehicle::replaceParkingArea(MSParkingArea* parkingArea, std::string& errorMsg) {
-    // Check if there is a parking area to be replaced
-    if (parkingArea == 0) {
-        errorMsg = "new parkingArea is NULL";
-        return false;
-    }
-    if (myStops.size() == 0) {
-        errorMsg = "vehicle has no stops";
-        return false;
-    }
-    if (myStops.front().parkingarea == 0) {
-        errorMsg = "first stop is not at parkingArea";
-        return false;
-    }
-    MSStop& first = myStops.front();
-    SUMOVehicleParameter::Stop& stopPar = const_cast(first.pars);
-    // merge subsequent duplicate stops equals to parking area
-    for (std::list::iterator iter = ++myStops.begin(); iter != myStops.end();) {
-        if (iter->parkingarea == parkingArea) {
-            stopPar.duration += iter->duration;
-            myStops.erase(iter++);
-        } else {
-            break;
-        }
-    }
-    stopPar.lane = parkingArea->getLane().getID();
-    stopPar.parkingarea = parkingArea->getID();
-    stopPar.startPos = parkingArea->getBeginLanePosition();
-    stopPar.endPos = parkingArea->getEndLanePosition();
-    first.edge = myRoute->end(); // will be patched in replaceRoute
-    first.lane = &parkingArea->getLane();
-    first.parkingarea = parkingArea;
-    return true;
-}
-
-
-MSParkingArea*
-MSVehicle::getNextParkingArea() {
-    MSParkingArea* nextParkingArea = nullptr;
-    if (!myStops.empty()) {
-        SUMOVehicleParameter::Stop stopPar;
-        MSStop stop = myStops.front();
-        if (!stop.reached && stop.parkingarea != nullptr) {
-            nextParkingArea = stop.parkingarea;
-        }
+    if (MSNet::getInstance()->hasElevation() && MSGlobals::gSublane) {
+        interpolateLateralZ(result, myState.myPos - myType->getLength(), posLat);
     }
-    return nextParkingArea;
-}
-
-
-MSParkingArea*
-MSVehicle::getCurrentParkingArea() {
-    MSParkingArea* currentParkingArea = nullptr;
-    if (isParking()) {
-        currentParkingArea = myStops.begin()->parkingarea;
-    }
-    return currentParkingArea;
+    return result;
 }
 
 
@@ -1762,11 +1748,12 @@
                 if (stop.parkingarea->getOccupancy() >= stop.parkingarea->getCapacity()) {
                     fitsOnStoppingPlace = false;
                     // trigger potential parkingZoneReroute
-                    for (std::vector< MSMoveReminder* >::const_iterator rem = myLane->getMoveReminders().begin(); rem != myLane->getMoveReminders().end(); ++rem) {
-                        addReminder(*rem);
-                    }
                     MSParkingArea* oldParkingArea = stop.parkingarea;
-                    activateReminders(MSMoveReminder::NOTIFICATION_PARKING_REROUTE, myLane);
+                    for (MSMoveReminder* rem : myLane->getMoveReminders()) {
+                        if (rem->isParkingRerouter()) {
+                            rem->notifyEnter(*this, MSMoveReminder::NOTIFICATION_PARKING_REROUTE, myLane);
+                        }
+                    }
                     if (myStops.empty() || myStops.front().parkingarea != oldParkingArea) {
                         // rerouted, keep driving
                         return currentVelocity;
@@ -2101,27 +2088,27 @@
     //const double overlap = getLateralOverlap(futurePosLat, link->getViaLaneOrLane());
     //const double edgeWidth = link->getViaLaneOrLane()->getEdge().getWidth();
     const double futurePosLat = getLateralPositionOnLane() + (
-            lane != myLane && lane->isInternal() ? lane->getIncomingLanes()[0].viaLink->getLateralShift() : 0);
+                                    lane != myLane && lane->isInternal() ? lane->getIncomingLanes()[0].viaLink->getLateralShift() : 0);
     const double overlap = getLateralOverlap(futurePosLat, lane);
     const double edgeWidth = lane->getEdge().getWidth();
     const bool result = (overlap > POSITION_EPS
-            // do not get stuck on narrow edges
-            && getVehicleType().getWidth() <= edgeWidth
-            && link->getViaLane() == nullptr
-            // this is the exit link of a junction. The normal edge should support the shadow
-            && ((myLaneChangeModel->getShadowLane(link->getLane()) == nullptr)
-                // the internal lane after an internal junction has no parallel lane. make sure there is no shadow before continuing
-                || (lane->getEdge().isInternal() && lane->getIncomingLanes()[0].lane->getEdge().isInternal()))
-            // ignore situations where the shadow lane is part of a double-connection with the current lane
-            && (myLaneChangeModel->getShadowLane() == nullptr
-                || myLaneChangeModel->getShadowLane()->getLinkCont().size() == 0
-                || myLaneChangeModel->getShadowLane()->getLinkCont().front()->getLane() != link->getLane()));
+                         // do not get stuck on narrow edges
+                         && getVehicleType().getWidth() <= edgeWidth
+                         && link->getViaLane() == nullptr
+                         // this is the exit link of a junction. The normal edge should support the shadow
+                         && ((myLaneChangeModel->getShadowLane(link->getLane()) == nullptr)
+                             // the internal lane after an internal junction has no parallel lane. make sure there is no shadow before continuing
+                             || (lane->getEdge().isInternal() && lane->getIncomingLanes()[0].lane->getEdge().isInternal()))
+                         // ignore situations where the shadow lane is part of a double-connection with the current lane
+                         && (myLaneChangeModel->getShadowLane() == nullptr
+                             || myLaneChangeModel->getShadowLane()->getLinkCont().size() == 0
+                             || myLaneChangeModel->getShadowLane()->getLinkCont().front()->getLane() != link->getLane()));
 
 #ifdef DEBUG_PLAN_MOVE
     if (DEBUG_COND) {
         std::cout << SIMTIME << " veh=" << getID() << " link=" << link->getDescription() << " lane=" << lane->getID()
-            << " shift=" << link->getLateralShift()
-            << " fpLat=" << futurePosLat << " overlap=" << overlap << " w=" << getVehicleType().getWidth() << " result=" << result << "\n";
+                  << " shift=" << link->getLateralShift()
+                  << " fpLat=" << futurePosLat << " overlap=" << overlap << " w=" << getVehicleType().getWidth() << " result=" << result << "\n";
     }
 #endif
     return result;
@@ -2758,7 +2745,7 @@
         const bool couldBrakeForMinor = !(*link)->havePriority() && brakeDist < seen && !(*link)->lastWasContMajor();
         if (couldBrakeForMinor && !determinedFoePresence) {
             // vehicle decelerates just enough to be able to stop if necessary and then accelerates
-            double maxSpeedAtVisibilityDist = cfModel.maximumSafeStopSpeed(visibilityDistance, cfModel.getMaxDecel(), myState.mySpeed, false, 0.);
+            double maxSpeedAtVisibilityDist = cfModel.maximumSafeStopSpeed(visibilityDistance, cfModel.getMaxDecel(), myState.mySpeed, false, 0., false);
             // XXX: estimateSpeedAfterDistance does not use euler-logic (thus returns a lower value than possible here...)
             double maxArrivalSpeed = cfModel.estimateSpeedAfterDistance(visibilityDistance, maxSpeedAtVisibilityDist, cfModel.getMaxAccel());
             arrivalSpeed = MIN2(vLinkPass, maxArrivalSpeed);
@@ -2791,17 +2778,24 @@
                 }
             }
         }
-        if (couldBrakeForMinor && (*link)->getLane()->getEdge().isRoundabout()) {
-            slowedDownForMinor = true;
+
+        const SUMOTime arrivalTime = getArrivalTime(t, seen, v, arrivalSpeed);
+        if (couldBrakeForMinor && determinedFoePresence && (*link)->getLane()->getEdge().isRoundabout()) {
+            const bool wasOpened = (*link)->opened(arrivalTime, arrivalSpeed, arrivalSpeed,
+                                           getLength(), getImpatience(),
+                                           getCarFollowModel().getMaxDecel(),
+                                           getWaitingTime(), getLateralPositionOnLane(),
+                                           nullptr, false, this);
+            if (!wasOpened) {
+                slowedDownForMinor = true;
+            }
 #ifdef DEBUG_PLAN_MOVE
             if (DEBUG_COND) {
-                std::cout << "   slowedDownForMinor at roundabout\n";
+                std::cout << "   slowedDownForMinor at roundabout=" << (!wasOpened) << "\n";
             }
 #endif
         }
 
-        const SUMOTime arrivalTime = getArrivalTime(t, seen, v, arrivalSpeed);
-
         // compute arrival speed and arrival time if vehicle starts braking now
         // if stopping is possible, arrivalTime can be arbitrarily large. A small value keeps fractional times (impatience) meaningful
         double arrivalSpeedBraking = 0;
@@ -2981,6 +2975,7 @@
             double gap = (lastLink == nullptr
                           ? predBack - myState.myPos - getVehicleType().getMinGap()
                           : predBack + seen - lane->getLength() - getVehicleType().getMinGap());
+            bool oncoming = false;
             if (myLaneChangeModel->isOpposite()) {
                 if (pred->getLaneChangeModel().isOpposite() || lane == pred->getLaneChangeModel().getShadowLane()) {
                     // ego might and leader are driving against lane
@@ -3007,19 +3002,19 @@
                     gap -= predMaxDist;
                 }
             } else if (pred->getLane() == lane->getBidiLane()) {
-                gap += -pred->getVehicleType().getLength() - pred->getVehicleType().getMinGap();
-                // when computing followSpeed, the distance of the vehicle is
-                // interpreted with the wrong sign. We increase the gap to compensate
-                gap -= pred->getSpeed() + ACCEL2SPEED(pred->getCarFollowModel().getMaxAccel())
-                       * (getSpeed() + ACCEL2SPEED(getCarFollowModel().getMaxAccel())) / getCarFollowModel().getMaxAccel();
-                gap = MAX2(0.0, gap);
+                gap -= pred->getVehicleType().getLengthWithGap();
+                oncoming = true;
             }
 #ifdef DEBUG_PLAN_MOVE
             if (DEBUG_COND) {
-                std::cout << "     pred=" << pred->getID() << " predLane=" << pred->getLane()->getID() << " predPos=" << pred->getPositionOnLane() << " gap=" << gap << " predBack=" << predBack << " seen=" << seen << " lane=" << lane->getID() << " myLane=" << myLane->getID() << " lastLink=" << (lastLink == nullptr ? "NULL" : lastLink->myLink->getDescription()) << "\n";
+                std::cout << "     pred=" << pred->getID() << " predLane=" << pred->getLane()->getID() << " predPos=" << pred->getPositionOnLane() << " gap=" << gap << " predBack=" << predBack << " seen=" << seen << " lane=" << lane->getID() << " myLane=" << myLane->getID() << " lastLink=" << (lastLink == nullptr ? "NULL" : lastLink->myLink->getDescription()) << " oncoming=" << oncoming << "\n";
             }
 #endif
-            adaptToLeader(std::make_pair(pred, gap), seen, lastLink, v, vLinkPass);
+            if (oncoming && gap >= 0) {
+                adaptToOncomingLeader(std::make_pair(pred, gap), lastLink, v, vLinkPass);
+            } else {
+                adaptToLeader(std::make_pair(pred, gap), seen, lastLink, v, vLinkPass);
+            }
         }
     }
 }
@@ -3062,7 +3057,14 @@
                          DriveProcessItem* const lastLink,
                          double& v, double& vLinkPass) const {
     if (leaderInfo.first != 0) {
-        assert(leaderInfo.first != 0);
+        if (ignoreFoe(leaderInfo.first)) {
+#ifdef DEBUG_PLAN_MOVE_LEADERINFO
+            if (DEBUG_COND) {
+                std::cout << "  foe ignored\n";
+            }
+#endif
+            return;
+        }
         const MSCFModel& cfModel = getCarFollowModel();
         double vsafeLeader = 0;
         if (!MSGlobals::gSemiImplicitEulerUpdate) {
@@ -3141,6 +3143,14 @@
                                  const MSLane* const lane, double& v, double& vLinkPass,
                                  double distToCrossing) const {
     if (leaderInfo.first != 0) {
+        if (ignoreFoe(leaderInfo.first)) {
+#ifdef DEBUG_PLAN_MOVE_LEADERINFO
+            if (DEBUG_COND) {
+                std::cout << "  junction foe ignored\n";
+            }
+#endif
+            return;
+        }
         const MSCFModel& cfModel = getCarFollowModel();
         double vsafeLeader = 0;
         if (!MSGlobals::gSemiImplicitEulerUpdate) {
@@ -3234,6 +3244,71 @@
 
 
 void
+MSVehicle::adaptToOncomingLeader(const std::pair leaderInfo,
+                                 DriveProcessItem* const lastLink,
+                                 double& v, double& vLinkPass) const {
+    if (leaderInfo.first != 0) {
+        if (ignoreFoe(leaderInfo.first)) {
+#ifdef DEBUG_PLAN_MOVE_LEADERINFO
+            if (DEBUG_COND) {
+                std::cout << "  oncoming foe ignored\n";
+            }
+#endif
+            return;
+        }
+        const MSCFModel& cfModel = getCarFollowModel();
+        const MSVehicle* lead = leaderInfo.first;
+        const MSCFModel& cfModelL = lead->getCarFollowModel();
+        // assume the leader reacts symmetrically (neither stopping instantly nor ignoring ego)
+        const double leaderBrakeGap = cfModelL.brakeGap(lead->getSpeed(), cfModelL.getMaxDecel(), 0);
+        const double egoBrakeGap = cfModel.brakeGap(getSpeed(), cfModel.getMaxDecel(), 0);
+        const double gapSum = leaderBrakeGap + egoBrakeGap;
+        // ensure that both vehicles can leave an intersection if they are currently on it
+        double egoExit = getDistanceToLeaveJunction();
+        const double leaderExit = lead->getDistanceToLeaveJunction();
+        double gap = leaderInfo.second;
+        if (egoExit + leaderExit < gap) {
+            gap -= egoExit + leaderExit;
+        } else {
+            egoExit = 0;
+        }
+        // assume remaining distance is allocated in proportion to braking distance
+        const double gapRatio = gapSum > 0 ? egoBrakeGap / gapSum : 0.5;
+        const double vsafeLeader = cfModel.stopSpeed(this, getSpeed(), gap * gapRatio + egoExit);
+        if (lastLink != nullptr) {
+            const double futureVSafe = cfModel.stopSpeed(this, lastLink->accelV, leaderInfo.second, MSCFModel::CalcReason::FUTURE);
+            lastLink->adaptLeaveSpeed(futureVSafe);
+#ifdef DEBUG_PLAN_MOVE
+            if (DEBUG_COND) {
+                std::cout << "   vlinkpass=" << lastLink->myVLinkPass << " futureVSafe=" << futureVSafe << "\n";
+            }
+#endif
+        }
+        v = MIN2(v, vsafeLeader);
+        vLinkPass = MIN2(vLinkPass, vsafeLeader);
+#ifdef DEBUG_PLAN_MOVE
+        if (DEBUG_COND) std::cout
+                    << SIMTIME
+                    //std::cout << std::setprecision(10);
+                    << " veh=" << getID()
+                    << " oncomingLead=" << lead->getID()
+                    << " leadSpeed=" << lead->getSpeed()
+                    << " gap=" << leaderInfo.second
+                    << " gap2=" << gap
+                    << " gapRatio=" << gapRatio
+                    << " leadLane=" << lead->getLane()->getID()
+                    << " predPos=" << lead->getPositionOnLane()
+                    << " myLane=" << myLane->getID()
+                    << " v=" << v
+                    << " vSafeLeader=" << vsafeLeader
+                    << " vLinkPass=" << vLinkPass
+                    << "\n";
+#endif
+    }
+}
+
+
+void
 MSVehicle::checkLinkLeaderCurrentAndParallel(const MSLink* link, const MSLane* lane, double seen,
         DriveProcessItem* const lastLink, double& v, double& vLinkPass, double& vLinkWait, bool& setRequest) const {
     if (MSGlobals::gUsingInternalLanes && (myInfluencer == nullptr || myInfluencer->getRespectJunctionLeaderPriority())) {
@@ -3940,6 +4015,9 @@
     } else {
         myWaitingTime = 0;
         myWaitingTimeCollector.passTime(DELTA_T, false);
+        if (hasInfluencer()) {
+            getInfluencer().setExtraImpatience(0);
+        }
     }
 }
 
@@ -4620,6 +4698,7 @@
                                //+ " prevAccel=" + toString(previousAcceleration)
                                //+ " reserve=" + toString(MAX2(NUMERICAL_EPS, getCarFollowModel().getEmergencyDecel() - getCarFollowModel().getMaxDecel()))
                                getID(), myLane->getID(), -myAcceleration, getCarFollowModel().getMaxDecel(), emergencyFraction, time2string(SIMSTEP));
+                MSNet::getInstance()->getVehicleControl().registerEmergencyBraking();
             }
         }
     }
@@ -4682,8 +4761,12 @@
                                   << " passed=" << toString(passedLanes)
                                   << "\n";
 #endif
-    for (std::vector::iterator i = furtherLanes.begin(); i != furtherLanes.end(); ++i) {
-        (*i)->resetPartialOccupation(this);
+    for (MSLane* further : furtherLanes) {
+        further->resetPartialOccupation(this);
+        if (further->getBidiLane() != nullptr
+                && (!isRailway(getVClass()) || (further->getPermissions() & ~SVC_RAIL_CLASSES) != 0)) {
+            further->getBidiLane()->resetPartialOccupation(this);
+        }
     }
 
     std::vector newFurther;
@@ -4696,9 +4779,14 @@
         std::vector::const_iterator fpi = furtherLanesPosLat.begin();
         for (auto pi = passedLanes.rbegin() + 1; pi != passedLanes.rend() && backPosOnPreviousLane < 0; ++pi) {
             // As long as vehicle back reaches into passed lane, add it to the further lanes
-            newFurther.push_back(*pi);
-            backPosOnPreviousLane += (*pi)->setPartialOccupation(this);
-            if (fi != furtherLanes.end() && *pi == *fi) {
+            MSLane* further = *pi;
+            newFurther.push_back(further);
+            backPosOnPreviousLane += further->setPartialOccupation(this);
+            if (further->getBidiLane() != nullptr
+                    && (!isRailway(getVClass()) || (further->getPermissions() & ~SVC_RAIL_CLASSES) != 0)) {
+                further->getBidiLane()->setPartialOccupation(this);
+            }
+            if (fi != furtherLanes.end() && further == *fi) {
                 // Lateral position on this lane is already known. Assume constant and use old value.
                 newFurtherPosLat.push_back(*fpi);
                 ++fi;
@@ -4721,7 +4809,7 @@
 #ifdef DEBUG_SETFURTHER
             if (DEBUG_COND) {
                 std::cout << SIMTIME << " updateFurtherLanes \n"
-                          << "    further lane '" << (*pi)->getID() << "' backPosOnPreviousLane=" << backPosOnPreviousLane
+                          << "    further lane '" << further->getID() << "' backPosOnPreviousLane=" << backPosOnPreviousLane
                           << std::endl;
             }
 #endif
@@ -4800,13 +4888,6 @@
             return myState.myBackPos / myFurtherLanes.back()->getLength() * lane->getLength();
         }
     } else {
-        if (lane->getBidiLane() != nullptr) {
-            if (myLane == lane->getBidiLane()) {
-                return lane->getLength() - (myState.myPos - myType->getLength());
-            } else if (myFurtherLanes.size() > 0 && lane->getBidiLane() == myFurtherLanes.back()) {
-                return lane->getLength() - myState.myBackPos;
-            }
-        }
         //if (DEBUG_COND) std::cout << SIMTIME << " veh=" << getID() << " myFurtherLanes=" << toString(myFurtherLanes) << "\n";
         double leftLength = myType->getLength() - myState.myPos;
 
@@ -4816,6 +4897,8 @@
             //if (DEBUG_COND) std::cout << " comparing i=" << (*i)->getID() << " lane=" << lane->getID() << "\n";
             if (*i == lane) {
                 return -leftLength;
+            } else if (*i == lane->getBidiLane()) {
+                return lane->getLength() + leftLength - (calledByGetPosition ? 2 * myType->getLength() : 0);
             }
             ++i;
         }
@@ -5218,8 +5301,9 @@
             const double range2 = (myLane->getWidth() - getVehicleType().getWidth()) * 0.5 + overlap;
             myState.myPosLat *= range2 / range;
         }
-        if (!isRailway(getVClass()) && myLane->getBidiLane() != nullptr) {
+        if (myLane->getBidiLane() != nullptr && (!isRailway(getVClass()) || (myLane->getPermissions() & ~SVC_RAIL_CLASSES) != 0)) {
             // railways don't need to "see" each other when moving in opposite directions on the same track (efficiency)
+            // (unless the lane is shared with cars)
             myLane->getBidiLane()->setPartialOccupation(this);
         }
     } else {
@@ -5257,8 +5341,9 @@
         std::cout << SIMTIME << " enterLaneAtLaneChange entered=" << Named::getIDSecure(enteredLane) << " oldFurther=" << toString(myFurtherLanes) << "\n";
     }
 #endif
-    if (!isRailway(getVClass()) && myLane->getBidiLane() != nullptr) {
+    if (myLane->getBidiLane() != nullptr && (!isRailway(getVClass()) || (myLane->getPermissions() & ~SVC_RAIL_CLASSES) != 0)) {
         // railways don't need to "see" each other when moving in opposite directions on the same track (efficiency)
+        // (unless the lane is shared with cars)
         myLane->getBidiLane()->setPartialOccupation(this);
     }
     for (int i = 0; i < (int)myFurtherLanes.size(); i++) {
@@ -5273,11 +5358,19 @@
         if (leftLength > 0) {
             if (lane != nullptr) {
                 myFurtherLanes[i]->resetPartialOccupation(this);
+                if (myFurtherLanes[i]->getBidiLane() != nullptr
+                        && (!isRailway(getVClass()) || (myFurtherLanes[i]->getPermissions() & ~SVC_RAIL_CLASSES) != 0)) {
+                    myFurtherLanes[i]->getBidiLane()->resetPartialOccupation(this);
+                }
                 // lane changing onto longer lanes may reduce the number of
                 // remaining further lanes
                 myFurtherLanes[i] = lane;
                 myFurtherLanesPosLat[i] = myState.myPosLat;
-                leftLength -= (lane)->setPartialOccupation(this);
+                leftLength -= lane->setPartialOccupation(this);
+                if (lane->getBidiLane() != nullptr
+                        && (!isRailway(getVClass()) || (lane->getPermissions() & ~SVC_RAIL_CLASSES) != 0)) {
+                    lane->getBidiLane()->setPartialOccupation(this);
+                }
                 myState.myBackPos = -leftLength;
 #ifdef DEBUG_SETFURTHER
                 if (DEBUG_COND) {
@@ -5300,6 +5393,10 @@
             }
         } else {
             myFurtherLanes[i]->resetPartialOccupation(this);
+            if (myFurtherLanes[i]->getBidiLane() != nullptr
+                    && (!isRailway(getVClass()) || (myFurtherLanes[i]->getPermissions() & ~SVC_RAIL_CLASSES) != 0)) {
+                myFurtherLanes[i]->getBidiLane()->resetPartialOccupation(this);
+            }
             deleteFurther++;
         }
     }
@@ -5355,6 +5452,10 @@
                 myFurtherLanes.push_back(clane);
                 myFurtherLanesPosLat.push_back(myState.myPosLat);
                 clane->setPartialOccupation(this);
+                if (clane->getBidiLane() != nullptr
+                        && (!isRailway(getVClass()) || (clane->getPermissions() & ~SVC_RAIL_CLASSES) != 0)) {
+                    clane->getBidiLane()->setPartialOccupation(this);
+                }
             }
             leftLength -= clane->getLength();
         }
@@ -5366,13 +5467,17 @@
 #endif
     } else {
         // clear partial occupation
-        for (std::vector::iterator i = myFurtherLanes.begin(); i != myFurtherLanes.end(); ++i) {
+        for (MSLane* further : myFurtherLanes) {
 #ifdef DEBUG_SETFURTHER
             if (DEBUG_COND) {
-                std::cout << SIMTIME << " opposite: resetPartialOccupation " << (*i)->getID() << " \n";
+                std::cout << SIMTIME << " opposite: resetPartialOccupation " << further->getID() << " \n";
             }
 #endif
-            (*i)->resetPartialOccupation(this);
+            further->resetPartialOccupation(this);
+            if (further->getBidiLane() != nullptr
+                    && (!isRailway(getVClass()) || (further->getPermissions() & ~SVC_RAIL_CLASSES) != 0)) {
+                further->getBidiLane()->resetPartialOccupation(this);
+            }
         }
         myFurtherLanes.clear();
         myFurtherLanesPosLat.clear();
@@ -5442,19 +5547,24 @@
     if ((reason == MSMoveReminder::NOTIFICATION_JUNCTION || reason == MSMoveReminder::NOTIFICATION_TELEPORT) && myLane != nullptr) {
         myOdometer += getLane()->getLength();
     }
-    if (myLane != nullptr && myLane->getBidiLane() != nullptr && myAmOnNet && !isRailway(getVClass())) {
+    if (myLane != nullptr && myLane->getBidiLane() != nullptr && myAmOnNet
+            && (!isRailway(getVClass()) || (myLane->getPermissions() & ~SVC_RAIL_CLASSES) != 0)) {
         myLane->getBidiLane()->resetPartialOccupation(this);
     }
     if (reason != MSMoveReminder::NOTIFICATION_JUNCTION && reason != MSMoveReminder::NOTIFICATION_LANE_CHANGE) {
         // @note. In case of lane change, myFurtherLanes and partial occupation
         // are handled in enterLaneAtLaneChange()
-        for (std::vector::iterator i = myFurtherLanes.begin(); i != myFurtherLanes.end(); ++i) {
+        for (MSLane* further : myFurtherLanes) {
 #ifdef DEBUG_FURTHER
             if (DEBUG_COND) {
                 std::cout << SIMTIME << " leaveLane \n";
             }
 #endif
-            (*i)->resetPartialOccupation(this);
+            further->resetPartialOccupation(this);
+            if (further->getBidiLane() != nullptr
+                    && (!isRailway(getVClass()) || (further->getPermissions() & ~SVC_RAIL_CLASSES) != 0)) {
+                further->getBidiLane()->resetPartialOccupation(this);
+            }
         }
         myFurtherLanes.clear();
         myFurtherLanesPosLat.clear();
@@ -6463,6 +6573,13 @@
                                               << "\n";
 #endif
                 return lane->getRightSideOnEdge() + myFurtherLanesPosLat[i] + 0.5 * lane->getWidth();
+            } else if (myFurtherLanes[i]->getBidiLane() == lane) {
+#ifdef DEBUG_FURTHER
+                if (DEBUG_COND) std::cout << "    getCenterOnEdge veh=" << getID() << " lane=" << lane->getID() << " i=" << i << " furtherLat(bidi)=" << myFurtherLanesPosLat[i]
+                                              << " result=" << lane->getRightSideOnEdge() + myFurtherLanesPosLat[i] + 0.5 * lane->getWidth()
+                                              << "\n";
+#endif
+                return lane->getRightSideOnEdge() - myFurtherLanesPosLat[i] + 0.5 * lane->getWidth();
             }
         }
         //if (DEBUG_COND) std::cout << SIMTIME << " veh=" << getID() << " myShadowFurtherLanes=" << toString(myLaneChangeModel->getShadowFurtherLanes()) << "\n";
@@ -6500,6 +6617,13 @@
                 }
 #endif
                 return myFurtherLanesPosLat[i] - myState.myPosLat;
+            } else if (myFurtherLanes[i]->getBidiLane() == lane) {
+#ifdef DEBUG_FURTHER
+                if (DEBUG_COND) {
+                    std::cout << "    getLatOffset veh=" << getID() << " lane=" << lane->getID() << " i=" << i << " posLat=" << myState.myPosLat << " furtherBidiLat=" << myFurtherLanesPosLat[i] << "\n";
+                }
+#endif
+                return -2 * (myFurtherLanesPosLat[i] - myState.myPosLat);
             }
         }
 #ifdef DEBUG_FURTHER
@@ -6761,6 +6885,15 @@
     return false;
 }
 
+
+bool
+MSVehicle::isBidiOn(const MSLane* lane) const {
+    return lane->getBidiLane() != nullptr && (
+               myLane == lane->getBidiLane()
+               || onFurtherEdge(&lane->getBidiLane()->getEdge()));
+}
+
+
 bool
 MSVehicle::rerouteParkingArea(const std::string& parkingAreaID, std::string& errorMsg) {
     // this function is based on MSTriggeredRerouter::rerouteParkingArea in order to keep
@@ -6904,6 +7037,10 @@
         // the current stop is no longer valid
         myLane->getEdge().removeWaiting(this);
         // MSStopOut needs to know whether the stop had a loaded 'ended' value so we call this before replacing the value
+        if (stop.pars.started == -1) {
+            // waypoint edge was passed in a single step
+            stop.pars.started = MSNet::getInstance()->getCurrentTimeStep();
+        }
         if (MSStopOut::active()) {
             MSStopOut::getInstance()->stopEnded(this, stop.pars, stop.lane->getID());
         }
@@ -7056,6 +7193,23 @@
     }
 }
 
+bool
+MSVehicle::ignoreFoe(const SUMOTrafficObject* foe) const {
+    if (!getParameter().wasSet(VEHPARS_CFMODEL_PARAMS_SET)) {
+        return false;
+    }
+    for (const std::string& typeID : StringTokenizer(getParameter().getParameter(toString(SUMO_ATTR_CF_IGNORE_TYPES), "")).getVector()) {
+        if (typeID == foe->getVehicleType().getID()) {
+            return true;
+        }
+    }
+    for (const std::string& id : StringTokenizer(getParameter().getParameter(toString(SUMO_ATTR_CF_IGNORE_IDS), "")).getVector()) {
+        if (id == foe->getID()) {
+            return true;
+        }
+    }
+    return false;
+}
 
 bool
 MSVehicle::passingMinor() const {
@@ -7114,14 +7268,19 @@
                     // ensure that vehicles which are stuck on the intersection may exit
                     if (!foeEntry->haveRed() && veh->getSpeed() > SUMO_const_haltingSpeed && gap < 0) {
                         // foe might be oncoming, don't drive unless foe can still brake safely
-                        const double foeGap = -gap - veh->getLength();
+                        const double foeNextSpeed = veh->getSpeed() + ACCEL2SPEED(veh->getCarFollowModel().getMaxAccel());
+                        const double foeBrakeGap = veh->getCarFollowModel().brakeGap(
+                                foeNextSpeed, veh->getCarFollowModel().getMaxDecel(), veh->getCarFollowModel().getHeadwayTime());
+                        // the minGap was subtracted from gap in MSLink::getLeaderInfo (enlarging the negative gap)
+                        // so the -2* makes it point in the right direction
+                        const double foeGap = -gap - veh->getLength() - 2 * getVehicleType().getMinGap();
 #ifdef DEBUG_PLAN_MOVE_LEADERINFO
                         if (DEBUG_COND) {
-                            std::cout << " foeGap=" << foeGap << " foeBGap=" << veh->getBrakeGap(true) << "\n";
+                            std::cout << " foeGap=" << foeGap << " foeBGap=" << foeBrakeGap << "\n";
 
                         }
 #endif
-                        if (foeGap < veh->getBrakeGap(true)) {
+                        if (foeGap < foeBrakeGap) {
                             response = true;
                             response2 = false;
                         } else {
@@ -7242,6 +7401,7 @@
         if ((stop.parametersSet & STOP_ENDED_SET) == 0) {
             out.writeAttr(SUMO_ATTR_ENDED, time2string(stop.ended));
         }
+        stop.writeParams(out);
         out.closeTag();
     }
     // save upcoming stops
@@ -7288,6 +7448,10 @@
             calculateArrivalParams(true);
         }
     }
+    if (getActionStepLength() == DELTA_T && !isActionStep(SIMSTEP)) {
+        myLastActionTime -= (myLastActionTime - SIMSTEP) % DELTA_T;
+        WRITE_WARNINGF(TL("Action steps are out of sync for loaded vehicle '%'."), getID());
+    }
     std::istringstream pis(attrs.getString(SUMO_ATTR_POSITION));
     pis >> myState.myPos >> myState.myBackPos >> myState.myLastCoveredDist;
     std::istringstream sis(attrs.getString(SUMO_ATTR_SPEED));
diff -Nru sumo-1.17.0/src/microsim/MSVehicle.h sumo-1.18.0/src/microsim/MSVehicle.h
--- sumo-1.17.0/src/microsim/MSVehicle.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/MSVehicle.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -593,6 +593,8 @@
         return myLane;
     }
 
+    // @brief return the lane on which the back of this vehicle resides
+    const MSLane* getBackLane() const;
 
     /** @brief Returns the maximal speed for the vehicle on its current lane (including speed factor and deviation,
      *         i.e., not necessarily the allowed speed limit)
@@ -854,6 +856,9 @@
     /// @brief whether this vehicle has its back (and no its front) on the given edge
     bool onFurtherEdge(const MSEdge* edge) const;
 
+    /// @brief whether this vehicle is driving against lane
+    bool isBidiOn(const MSLane* lane) const;
+
     /// @name strategical/tactical lane choosing methods
     /// @{
 
@@ -995,27 +1000,13 @@
         return myCFVariables;
     }
 
-    /// @name vehicle stops definitions and i/o
-    //@{
-
-
-
-    /** @brief replace the current parking area stop with a new stop with merge duration
-     */
-    bool replaceParkingArea(MSParkingArea* parkingArea, std::string& errorMsg);
-
-    /** @brief get the upcoming parking area stop or nullptr
-     */
-    MSParkingArea* getNextParkingArea();
-
-    /** @brief get the current  parking area stop or nullptr */
-    MSParkingArea* getCurrentParkingArea();
-
     /** @brief Whether this vehicle is equipped with a MSDriverState
      */
     inline bool hasDriverState() const {
         return myDriverState != nullptr;
     }
+    /// @name vehicle stops definitions and i/o
+    //@{
 
     /// @brief Returns the remaining stop duration for a stopped vehicle or 0
     SUMOTime remainingStopDuration() const;
@@ -1853,6 +1844,14 @@
     /// @brief optionally return an upper bound on speed to stay within the schedule
     double slowDownForSchedule(double vMinComfortable) const;
 
+    /// @brief perform lateral z interpolation in elevated networks
+    void interpolateLateralZ(Position& pos, double offset, double posLat) const;
+
+    /** @brief get the distance from the start of this lane to the start of the next normal lane
+     * (or 0 if this lane is a normal lane)
+     */
+    double getDistanceToLeaveJunction() const;
+
 protected:
 
     /// @brief The time the vehicle waits (is not faster than 0.1m/s) in seconds
@@ -2047,9 +2046,16 @@
                                const MSLane* const lane, double& v, double& vLinkPass,
                                double distToCrossing = -1) const;
 
-    /// @brief decide whether a red (or yellow light) may be ignore
+    void adaptToOncomingLeader(const std::pair leaderInfo,
+                               DriveProcessItem* const lastLink,
+                               double& v, double& vLinkPass) const;
+
+    /// @brief decide whether a red (or yellow light) may be ignored
     bool ignoreRed(const MSLink* link, bool canBrake) const;
 
+    /// @brief decide whether a given foe object may be ignored
+    bool ignoreFoe(const SUMOTrafficObject* foe) const;
+
     /// @brief maximum acceleration to consider a vehicle as 'waiting' at low speed
     inline double accelThresholdForWaiting() const {
         return 0.5 * getCarFollowModel().getMaxAccel();
@@ -2087,9 +2093,6 @@
                                            DriveProcessItem* const lastLink, double& v, double& vLinkPass, double& vLinkWait, bool& setRequest) const;
 
 
-    // @brief return the lane on which the back of this vehicle resides
-    const MSLane* getBackLane() const;
-
     /** @brief updates the vehicles state, given a next value for its speed.
      *         This value can be negative in case of the ballistic update to indicate
      *         a stop within the next timestep. (You can call this a 'hack' to
diff -Nru sumo-1.17.0/src/microsim/MSVehicleTransfer.cpp sumo-1.18.0/src/microsim/MSVehicleTransfer.cpp
--- sumo-1.17.0/src/microsim/MSVehicleTransfer.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/MSVehicleTransfer.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -164,7 +164,8 @@
             MSLane* l = (nextEdge != nullptr ? e->getFreeLane(e->allowedLanes(*nextEdge, vclass), vclass, departPos) :
                          e->getFreeLane(nullptr, vclass, departPos));
             // handle teleporting vehicles, lane may be 0 because permissions were modified by a closing rerouter or TraCI
-            if (l != nullptr && l->freeInsertion(*(desc.myVeh), MIN2(l->getSpeedLimit(), desc.myVeh->getMaxSpeed()), 0, MSMoveReminder::NOTIFICATION_TELEPORT)) {
+            const bool busyBidi = l != nullptr && l->getBidiLane() != nullptr && l->getBidiLane()->getVehicleNumberWithPartials() > 0;
+            if (l != nullptr && !busyBidi && l->freeInsertion(*(desc.myVeh), MIN2(l->getSpeedLimit(), desc.myVeh->getMaxSpeed()), 0, MSMoveReminder::NOTIFICATION_TELEPORT)) {
                 if (!desc.myJumping) {
                     WRITE_WARNINGF(TL("Vehicle '%' ends teleporting on edge '%', time=%."), desc.myVeh->getID(), e->getID(), time2string(time));
                 }
diff -Nru sumo-1.17.0/src/microsim/MSVehicleTransfer.h sumo-1.18.0/src/microsim/MSVehicleTransfer.h
--- sumo-1.17.0/src/microsim/MSVehicleTransfer.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/MSVehicleTransfer.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2003-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/MSVehicleType.cpp sumo-1.18.0/src/microsim/MSVehicleType.cpp
--- sumo-1.17.0/src/microsim/MSVehicleType.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/MSVehicleType.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -278,16 +278,26 @@
 
 void
 MSVehicleType::setImpatience(const double impatience) {
-    if (myOriginalType != nullptr && impatience < 0) {
-        myParameter.impatience = myOriginalType->getImpatience();
-    } else {
-        myParameter.impatience = impatience;
-    }
+    myParameter.impatience = impatience;
     myParameter.parametersSet |= VTYPEPARS_IMPATIENCE_SET;
 }
 
 
 void
+MSVehicleType::setBoardingDuration(SUMOTime duration, bool isPerson) {
+    if (myOriginalType != nullptr && duration < 0) {
+        myParameter.boardingDuration = myOriginalType->getBoardingDuration(isPerson);
+    } else {
+        if (isPerson) {
+            myParameter.boardingDuration = duration;
+        } else {
+            myParameter.loadingDuration = duration;
+        }
+    }
+    myParameter.parametersSet |= VTYPEPARS_BOARDING_DURATION;
+}
+
+void
 MSVehicleType::setShape(SUMOVehicleShape shape) {
     myParameter.shape = shape;
     myParameter.parametersSet |= VTYPEPARS_SHAPE_SET;
diff -Nru sumo-1.17.0/src/microsim/MSVehicleType.h sumo-1.18.0/src/microsim/MSVehicleType.h
--- sumo-1.17.0/src/microsim/MSVehicleType.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/MSVehicleType.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -531,6 +531,12 @@
      */
     void setShape(SUMOVehicleShape shape);
 
+    /** @brief Set a new value for this type's boardingDuration
+     * @param[in] boardingDuration The new boardingDuration of this type
+     * @param[in] isPerson Whether to set boardingDuration or loadingDuration
+     */
+    void setBoardingDuration(SUMOTime duration, bool isPerson = true);
+
     /** @brief Set a new value for this type's impatience
      * @param[in] impatience The new impatience of this type
      */
diff -Nru sumo-1.17.0/src/microsim/output/MSAmitranTrajectories.cpp sumo-1.18.0/src/microsim/output/MSAmitranTrajectories.cpp
--- sumo-1.17.0/src/microsim/output/MSAmitranTrajectories.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/output/MSAmitranTrajectories.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2014-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/output/MSAmitranTrajectories.h sumo-1.18.0/src/microsim/output/MSAmitranTrajectories.h
--- sumo-1.17.0/src/microsim/output/MSAmitranTrajectories.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/output/MSAmitranTrajectories.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2014-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/output/MSBatteryExport.cpp sumo-1.18.0/src/microsim/output/MSBatteryExport.cpp
--- sumo-1.17.0/src/microsim/output/MSBatteryExport.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/output/MSBatteryExport.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/output/MSBatteryExport.h sumo-1.18.0/src/microsim/output/MSBatteryExport.h
--- sumo-1.17.0/src/microsim/output/MSBatteryExport.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/output/MSBatteryExport.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/output/MSCrossSection.h sumo-1.18.0/src/microsim/output/MSCrossSection.h
--- sumo-1.17.0/src/microsim/output/MSCrossSection.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/output/MSCrossSection.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/output/MSDetectorControl.cpp sumo-1.18.0/src/microsim/output/MSDetectorControl.cpp
--- sumo-1.17.0/src/microsim/output/MSDetectorControl.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/output/MSDetectorControl.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/output/MSDetectorControl.h sumo-1.18.0/src/microsim/output/MSDetectorControl.h
--- sumo-1.17.0/src/microsim/output/MSDetectorControl.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/output/MSDetectorControl.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/output/MSDetectorFileOutput.cpp sumo-1.18.0/src/microsim/output/MSDetectorFileOutput.cpp
--- sumo-1.17.0/src/microsim/output/MSDetectorFileOutput.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/output/MSDetectorFileOutput.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/output/MSDetectorFileOutput.h sumo-1.18.0/src/microsim/output/MSDetectorFileOutput.h
--- sumo-1.17.0/src/microsim/output/MSDetectorFileOutput.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/output/MSDetectorFileOutput.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/output/MSE2Collector.cpp sumo-1.18.0/src/microsim/output/MSE2Collector.cpp
--- sumo-1.17.0/src/microsim/output/MSE2Collector.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/output/MSE2Collector.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/output/MSE2Collector.h sumo-1.18.0/src/microsim/output/MSE2Collector.h
--- sumo-1.17.0/src/microsim/output/MSE2Collector.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/output/MSE2Collector.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/output/MSE3Collector.cpp sumo-1.18.0/src/microsim/output/MSE3Collector.cpp
--- sumo-1.17.0/src/microsim/output/MSE3Collector.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/output/MSE3Collector.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -157,7 +157,9 @@
         ScopedLocker<> lock(myCollector.myContainerMutex, MSGlobals::gNumSimThreads > 1);
 #endif
         if (myCollector.myEnteredContainer.erase(&veh) > 0) {
-            WRITE_WARNINGF("Vehicle '%' arrived inside % '%'.", veh.getID(), toString(SUMO_TAG_E3DETECTOR), myCollector.getID());
+            if (!myCollector.myExpectArrival) {
+                WRITE_WARNINGF("Vehicle '%' arrived inside % '%'.", veh.getID(), toString(SUMO_TAG_E3DETECTOR), myCollector.getID());
+            }
         }
         return false;
     }
@@ -287,7 +289,9 @@
     }
     if (reason >= MSMoveReminder::NOTIFICATION_ARRIVED) {
         if (myCollector.myEnteredContainer.erase(&veh) > 0) {
-            WRITE_WARNINGF("Vehicle '%' arrived inside % '%'.", veh.getID(), toString(SUMO_TAG_E3DETECTOR), myCollector.getID());
+            if (!myCollector.myExpectArrival) {
+                WRITE_WARNINGF("Vehicle '%' arrived inside % '%'.", veh.getID(), toString(SUMO_TAG_E3DETECTOR), myCollector.getID());
+            }
         }
         return false;
     }
@@ -305,7 +309,7 @@
                              const std::string name, const std::string& vTypes,
                              const std::string& nextEdges,
                              int detectPersons,
-                             bool openEntry) :
+                             bool openEntry, bool expectArrival) :
     MSDetectorFileOutput(id, vTypes, nextEdges, detectPersons),
     myName(name),
     myEntries(entries),
@@ -313,7 +317,7 @@
     myHaltingTimeThreshold(haltingTimeThreshold), myHaltingSpeedThreshold(haltingSpeedThreshold),
     myCurrentMeanSpeed(0), myCurrentHaltingsNumber(0),
     myLastMeanTravelTime(0), myLastMeanHaltsPerVehicle(0), myLastMeanTimeLoss(0), myLastVehicleSum(0),
-    myLastResetTime(-1), myOpenEntry(openEntry) {
+    myLastResetTime(-1), myOpenEntry(openEntry), myExpectArrival(expectArrival) {
     // Set MoveReminders to entries and exits
     for (CrossSectionVectorConstIt crossSec1 = entries.begin(); crossSec1 != entries.end(); ++crossSec1) {
         myEntryReminders.push_back(new MSE3EntryReminder(*crossSec1, *this));
diff -Nru sumo-1.17.0/src/microsim/output/MSE3Collector.h sumo-1.18.0/src/microsim/output/MSE3Collector.h
--- sumo-1.17.0/src/microsim/output/MSE3Collector.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/output/MSE3Collector.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2003-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -235,7 +235,7 @@
                   SUMOTime haltingTimeThreshold,
                   const std::string name, const std::string& vTypes,
                   const std::string& nextEdges,
-                  int detectPersons, bool openEntry);
+                  int detectPersons, bool openEntry, bool expectArrival);
 
 
     /// @brief Destructor
@@ -471,6 +471,8 @@
 
     /// @brief whether this dector is declared as having incomplete entry detectors
     const bool myOpenEntry;
+    /// @brief Whether the detector expects vehicles to arrive inside (and doesn't issue a warning in this case)
+    const bool myExpectArrival;
 
 private:
     /// @brief Invalidated copy constructor.
diff -Nru sumo-1.17.0/src/microsim/output/MSElecHybridExport.cpp sumo-1.18.0/src/microsim/output/MSElecHybridExport.cpp
--- sumo-1.17.0/src/microsim/output/MSElecHybridExport.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/output/MSElecHybridExport.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/output/MSElecHybridExport.h sumo-1.18.0/src/microsim/output/MSElecHybridExport.h
--- sumo-1.17.0/src/microsim/output/MSElecHybridExport.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/output/MSElecHybridExport.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/output/MSEmissionExport.cpp sumo-1.18.0/src/microsim/output/MSEmissionExport.cpp
--- sumo-1.17.0/src/microsim/output/MSEmissionExport.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/output/MSEmissionExport.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/output/MSEmissionExport.h sumo-1.18.0/src/microsim/output/MSEmissionExport.h
--- sumo-1.17.0/src/microsim/output/MSEmissionExport.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/output/MSEmissionExport.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/output/MSFCDExport.cpp sumo-1.18.0/src/microsim/output/MSFCDExport.cpp
--- sumo-1.17.0/src/microsim/output/MSFCDExport.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/output/MSFCDExport.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/output/MSFCDExport.h sumo-1.18.0/src/microsim/output/MSFCDExport.h
--- sumo-1.17.0/src/microsim/output/MSFCDExport.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/output/MSFCDExport.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/output/MSFullExport.cpp sumo-1.18.0/src/microsim/output/MSFullExport.cpp
--- sumo-1.17.0/src/microsim/output/MSFullExport.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/output/MSFullExport.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/output/MSFullExport.h sumo-1.18.0/src/microsim/output/MSFullExport.h
--- sumo-1.17.0/src/microsim/output/MSFullExport.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/output/MSFullExport.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/output/MSInductLoop.cpp sumo-1.18.0/src/microsim/output/MSInductLoop.cpp
--- sumo-1.17.0/src/microsim/output/MSInductLoop.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/output/MSInductLoop.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/output/MSInductLoop.h sumo-1.18.0/src/microsim/output/MSInductLoop.h
--- sumo-1.17.0/src/microsim/output/MSInductLoop.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/output/MSInductLoop.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2004-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/output/MSInstantInductLoop.cpp sumo-1.18.0/src/microsim/output/MSInstantInductLoop.cpp
--- sumo-1.17.0/src/microsim/output/MSInstantInductLoop.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/output/MSInstantInductLoop.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2011-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/output/MSInstantInductLoop.h sumo-1.18.0/src/microsim/output/MSInstantInductLoop.h
--- sumo-1.17.0/src/microsim/output/MSInstantInductLoop.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/output/MSInstantInductLoop.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2011-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/output/MSMeanData_Amitran.cpp sumo-1.18.0/src/microsim/output/MSMeanData_Amitran.cpp
--- sumo-1.17.0/src/microsim/output/MSMeanData_Amitran.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/output/MSMeanData_Amitran.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/output/MSMeanData_Amitran.h sumo-1.18.0/src/microsim/output/MSMeanData_Amitran.h
--- sumo-1.17.0/src/microsim/output/MSMeanData_Amitran.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/output/MSMeanData_Amitran.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/output/MSMeanData.cpp sumo-1.18.0/src/microsim/output/MSMeanData.cpp
--- sumo-1.17.0/src/microsim/output/MSMeanData.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/output/MSMeanData.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -568,7 +568,9 @@
     for (const std::vector& edgeValues : myMeasures) {
         for (MeanDataValues* meanData : edgeValues) {
             meanData->addTo(*sumData);
-            meanData->reset();
+            if (!MSNet::getInstance()->skipFinalReset()) {
+                meanData->reset();
+            }
         }
     }
     if (MSGlobals::gUseMesoSim) {
@@ -612,7 +614,9 @@
                             edge->getSpeedLimit(),
                             myPrintDefaults ? edge->getLength() / edge->getSpeedLimit() : -1.);
             }
-            data->reset(true);
+            if (!MSNet::getInstance()->skipFinalReset()) {
+                data->reset(true);
+            }
             return;
         }
     }
@@ -636,7 +640,9 @@
                 meanData.write(dev, myWrittenAttributes, stopTime - startTime, 1.f, meanData.getLane()->getSpeedLimit(),
                                myPrintDefaults ? meanData.getLane()->getLength() / meanData.getLane()->getSpeedLimit() : -1.);
             }
-            meanData.reset(true);
+            if (!MSNet::getInstance()->skipFinalReset()) {
+                meanData.reset(true);
+            }
         }
         if (writeCheck) {
             dev.closeTag();
@@ -648,13 +654,17 @@
                 meanData.write(dev, myWrittenAttributes, stopTime - startTime, (double)edge->getLanes().size(), edge->getSpeedLimit(),
                                myPrintDefaults ? edge->getLength() / edge->getSpeedLimit() : -1.);
             }
-            meanData.reset(true);
+            if (!MSNet::getInstance()->skipFinalReset()) {
+                meanData.reset(true);
+            }
         } else {
             MeanDataValues* sumData = createValues(nullptr, edge->getLength(), false);
             for (lane = edgeValues.begin(); lane != edgeValues.end(); ++lane) {
                 MeanDataValues& meanData = **lane;
                 meanData.addTo(*sumData);
-                meanData.reset();
+                if (!MSNet::getInstance()->skipFinalReset()) {
+                    meanData.reset();
+                }
             }
             if (writePrefix(dev, *sumData, SUMO_TAG_EDGE, getEdgeID(edge))) {
                 sumData->write(dev, myWrittenAttributes, stopTime - startTime, (double)edge->getLanes().size(), edge->getSpeedLimit(),
diff -Nru sumo-1.17.0/src/microsim/output/MSMeanData_Emissions.cpp sumo-1.18.0/src/microsim/output/MSMeanData_Emissions.cpp
--- sumo-1.17.0/src/microsim/output/MSMeanData_Emissions.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/output/MSMeanData_Emissions.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/output/MSMeanData_Emissions.h sumo-1.18.0/src/microsim/output/MSMeanData_Emissions.h
--- sumo-1.17.0/src/microsim/output/MSMeanData_Emissions.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/output/MSMeanData_Emissions.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/output/MSMeanData.h sumo-1.18.0/src/microsim/output/MSMeanData.h
--- sumo-1.17.0/src/microsim/output/MSMeanData.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/output/MSMeanData.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/output/MSMeanData_Harmonoise.cpp sumo-1.18.0/src/microsim/output/MSMeanData_Harmonoise.cpp
--- sumo-1.17.0/src/microsim/output/MSMeanData_Harmonoise.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/output/MSMeanData_Harmonoise.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/output/MSMeanData_Harmonoise.h sumo-1.18.0/src/microsim/output/MSMeanData_Harmonoise.h
--- sumo-1.17.0/src/microsim/output/MSMeanData_Harmonoise.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/output/MSMeanData_Harmonoise.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/output/MSMeanData_Net.cpp sumo-1.18.0/src/microsim/output/MSMeanData_Net.cpp
--- sumo-1.17.0/src/microsim/output/MSMeanData_Net.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/output/MSMeanData_Net.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2004-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/output/MSMeanData_Net.h sumo-1.18.0/src/microsim/output/MSMeanData_Net.h
--- sumo-1.17.0/src/microsim/output/MSMeanData_Net.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/output/MSMeanData_Net.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2004-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/output/MSQueueExport.cpp sumo-1.18.0/src/microsim/output/MSQueueExport.cpp
--- sumo-1.17.0/src/microsim/output/MSQueueExport.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/output/MSQueueExport.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/output/MSQueueExport.h sumo-1.18.0/src/microsim/output/MSQueueExport.h
--- sumo-1.17.0/src/microsim/output/MSQueueExport.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/output/MSQueueExport.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/output/MSRouteProbe.cpp sumo-1.18.0/src/microsim/output/MSRouteProbe.cpp
--- sumo-1.17.0/src/microsim/output/MSRouteProbe.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/output/MSRouteProbe.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2008-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/output/MSRouteProbe.h sumo-1.18.0/src/microsim/output/MSRouteProbe.h
--- sumo-1.17.0/src/microsim/output/MSRouteProbe.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/output/MSRouteProbe.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/output/MSStopOut.cpp sumo-1.18.0/src/microsim/output/MSStopOut.cpp
--- sumo-1.17.0/src/microsim/output/MSStopOut.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/output/MSStopOut.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -125,8 +125,8 @@
     }
     myDevice.writeAttr(SUMO_ATTR_POSITION, veh->getPositionOnLane());
     myDevice.writeAttr(SUMO_ATTR_PARKING, stop.parking);
-    myDevice.writeAttr("started", time2string(stop.started));
-    myDevice.writeAttr("ended", simEnd ? "-1" : time2string(SIMSTEP));
+    myDevice.writeAttr(SUMO_ATTR_STARTED, time2string(stop.started));
+    myDevice.writeAttr(SUMO_ATTR_ENDED, simEnd ? "-1" : time2string(SIMSTEP));
     if (stop.until >= 0) {
         myDevice.writeAttr("delay", delay);
     }
diff -Nru sumo-1.17.0/src/microsim/output/MSStopOut.h sumo-1.18.0/src/microsim/output/MSStopOut.h
--- sumo-1.17.0/src/microsim/output/MSStopOut.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/output/MSStopOut.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/output/MSVTKExport.cpp sumo-1.18.0/src/microsim/output/MSVTKExport.cpp
--- sumo-1.17.0/src/microsim/output/MSVTKExport.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/output/MSVTKExport.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/output/MSVTKExport.h sumo-1.18.0/src/microsim/output/MSVTKExport.h
--- sumo-1.17.0/src/microsim/output/MSVTKExport.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/output/MSVTKExport.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/output/MSVTypeProbe.cpp sumo-1.18.0/src/microsim/output/MSVTypeProbe.cpp
--- sumo-1.17.0/src/microsim/output/MSVTypeProbe.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/output/MSVTypeProbe.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/output/MSVTypeProbe.h sumo-1.18.0/src/microsim/output/MSVTypeProbe.h
--- sumo-1.17.0/src/microsim/output/MSVTypeProbe.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/output/MSVTypeProbe.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/output/MSXMLRawOut.cpp sumo-1.18.0/src/microsim/output/MSXMLRawOut.cpp
--- sumo-1.17.0/src/microsim/output/MSXMLRawOut.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/output/MSXMLRawOut.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/output/MSXMLRawOut.h sumo-1.18.0/src/microsim/output/MSXMLRawOut.h
--- sumo-1.17.0/src/microsim/output/MSXMLRawOut.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/output/MSXMLRawOut.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/traffic_lights/MSActuatedTrafficLightLogic.cpp sumo-1.18.0/src/microsim/traffic_lights/MSActuatedTrafficLightLogic.cpp
--- sumo-1.17.0/src/microsim/traffic_lights/MSActuatedTrafficLightLogic.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/traffic_lights/MSActuatedTrafficLightLogic.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -219,15 +219,14 @@
                 // Build the induct loop and set it into the container
                 const double detLength = getDouble("detector-length:" + lane->getID(), detDefaultLength);
                 std::string id = myDetectorPrefix + "D" + toString(detEdgeIndex) + "." + toString(detLaneIndex);
-                loop = static_cast(nb.createInductLoop(id, placementLane, ilpos, detLength, myVehicleTypes, "", "", (int)PersonMode::NONE, myShowDetectors));
+                loop = static_cast(nb.createInductLoop(id, placementLane, ilpos, detLength, "", myVehicleTypes, "", (int)PersonMode::NONE, myShowDetectors));
                 MSNet::getInstance()->getDetectorControl().add(SUMO_TAG_INDUCTION_LOOP, loop, myFile, myFreq);
             } else if (customID == NO_DETECTOR) {
                 continue;
             } else {
                 loop = dynamic_cast(MSNet::getInstance()->getDetectorControl().getTypedDetectors(SUMO_TAG_INDUCTION_LOOP).get(customID));
                 if (loop == nullptr) {
-                    WRITE_ERRORF(TL("Unknown inductionLoop '%' given as custom detector for actuated tlLogic '%', program '%."), customID, getID(), getProgramID());
-                    continue;
+                    throw ProcessError(TLF("Unknown inductionLoop '%' given as custom detector for actuated tlLogic '%', program '%.", customID, getID(), getProgramID()));
                 }
                 ilpos = loop->getPosition();
                 inductLoopPosition = length - ilpos;
diff -Nru sumo-1.17.0/src/microsim/traffic_lights/MSActuatedTrafficLightLogic.h sumo-1.18.0/src/microsim/traffic_lights/MSActuatedTrafficLightLogic.h
--- sumo-1.17.0/src/microsim/traffic_lights/MSActuatedTrafficLightLogic.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/traffic_lights/MSActuatedTrafficLightLogic.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2002-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/traffic_lights/MSDelayBasedTrafficLightLogic.cpp sumo-1.18.0/src/microsim/traffic_lights/MSDelayBasedTrafficLightLogic.cpp
--- sumo-1.17.0/src/microsim/traffic_lights/MSDelayBasedTrafficLightLogic.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/traffic_lights/MSDelayBasedTrafficLightLogic.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -112,7 +112,7 @@
                     length = MIN2(length, myDetectionRange);
 
                     std::string id = "TLS" + myID + "_" + myProgramID + "_E2CollectorOn_" + lane->getID();
-                    det = nb.createE2Detector(id, DU_TL_CONTROL, lane, INVALID_POSITION, lane->getLength(), length, 0, 0, 0, myVehicleTypes, "", "", (int)PersonMode::NONE, myShowDetectors);
+                    det = nb.createE2Detector(id, DU_TL_CONTROL, lane, INVALID_POSITION, lane->getLength(), length, 0, 0, 0, "", myVehicleTypes, "", (int)PersonMode::NONE, myShowDetectors);
                     MSNet::getInstance()->getDetectorControl().add(SUMO_TAG_LANE_AREA_DETECTOR, det, myFile, myFreq);
                 }
                 myLaneDetectors[lane] = det;
diff -Nru sumo-1.17.0/src/microsim/traffic_lights/MSDelayBasedTrafficLightLogic.h sumo-1.18.0/src/microsim/traffic_lights/MSDelayBasedTrafficLightLogic.h
--- sumo-1.17.0/src/microsim/traffic_lights/MSDelayBasedTrafficLightLogic.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/traffic_lights/MSDelayBasedTrafficLightLogic.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2002-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/traffic_lights/MSDeterministicHiLevelTrafficLightLogic.cpp sumo-1.18.0/src/microsim/traffic_lights/MSDeterministicHiLevelTrafficLightLogic.cpp
--- sumo-1.17.0/src/microsim/traffic_lights/MSDeterministicHiLevelTrafficLightLogic.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/traffic_lights/MSDeterministicHiLevelTrafficLightLogic.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2010-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/traffic_lights/MSDeterministicHiLevelTrafficLightLogic.h sumo-1.18.0/src/microsim/traffic_lights/MSDeterministicHiLevelTrafficLightLogic.h
--- sumo-1.17.0/src/microsim/traffic_lights/MSDeterministicHiLevelTrafficLightLogic.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/traffic_lights/MSDeterministicHiLevelTrafficLightLogic.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2010-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/traffic_lights/MSOffTrafficLightLogic.cpp sumo-1.18.0/src/microsim/traffic_lights/MSOffTrafficLightLogic.cpp
--- sumo-1.17.0/src/microsim/traffic_lights/MSOffTrafficLightLogic.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/traffic_lights/MSOffTrafficLightLogic.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/traffic_lights/MSOffTrafficLightLogic.h sumo-1.18.0/src/microsim/traffic_lights/MSOffTrafficLightLogic.h
--- sumo-1.17.0/src/microsim/traffic_lights/MSOffTrafficLightLogic.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/traffic_lights/MSOffTrafficLightLogic.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/traffic_lights/MSPhaseDefinition.h sumo-1.18.0/src/microsim/traffic_lights/MSPhaseDefinition.h
--- sumo-1.17.0/src/microsim/traffic_lights/MSPhaseDefinition.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/traffic_lights/MSPhaseDefinition.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -194,6 +194,17 @@
     }
 
 
+    /** @brief Returns whether this phase is an "all red" phase
+     *
+     * "all red " means in this case that at all streams have red
+     *  and no stream has yellow.
+     * @return Whether this phase is an "all red" phase
+     */
+    bool isAllRedPhase() const {
+        return (int)myState.size() == (int)std::count(myState.begin(), myState.end(), 'r');
+    }
+
+
     /** @brief Returns the state of the tls signal at the given position
      * @param[in] pos The position of the signal to return the state for
      * @return The state of the signal at the given position
diff -Nru sumo-1.17.0/src/microsim/traffic_lights/MSPushButton.cpp sumo-1.18.0/src/microsim/traffic_lights/MSPushButton.cpp
--- sumo-1.17.0/src/microsim/traffic_lights/MSPushButton.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/traffic_lights/MSPushButton.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2010-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/traffic_lights/MSPushButton.h sumo-1.18.0/src/microsim/traffic_lights/MSPushButton.h
--- sumo-1.17.0/src/microsim/traffic_lights/MSPushButton.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/traffic_lights/MSPushButton.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2010-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/traffic_lights/MSRailCrossing.cpp sumo-1.18.0/src/microsim/traffic_lights/MSRailCrossing.cpp
--- sumo-1.17.0/src/microsim/traffic_lights/MSRailCrossing.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/traffic_lights/MSRailCrossing.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/traffic_lights/MSRailCrossing.h sumo-1.18.0/src/microsim/traffic_lights/MSRailCrossing.h
--- sumo-1.17.0/src/microsim/traffic_lights/MSRailCrossing.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/traffic_lights/MSRailCrossing.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2002-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/traffic_lights/MSRailSignalConstraint.cpp sumo-1.18.0/src/microsim/traffic_lights/MSRailSignalConstraint.cpp
--- sumo-1.17.0/src/microsim/traffic_lights/MSRailSignalConstraint.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/traffic_lights/MSRailSignalConstraint.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/traffic_lights/MSRailSignalConstraint.h sumo-1.18.0/src/microsim/traffic_lights/MSRailSignalConstraint.h
--- sumo-1.17.0/src/microsim/traffic_lights/MSRailSignalConstraint.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/traffic_lights/MSRailSignalConstraint.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2002-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/traffic_lights/MSRailSignalControl.cpp sumo-1.18.0/src/microsim/traffic_lights/MSRailSignalControl.cpp
--- sumo-1.17.0/src/microsim/traffic_lights/MSRailSignalControl.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/traffic_lights/MSRailSignalControl.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/traffic_lights/MSRailSignalControl.h sumo-1.18.0/src/microsim/traffic_lights/MSRailSignalControl.h
--- sumo-1.17.0/src/microsim/traffic_lights/MSRailSignalControl.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/traffic_lights/MSRailSignalControl.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2002-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/traffic_lights/MSRailSignal.cpp sumo-1.18.0/src/microsim/traffic_lights/MSRailSignal.cpp
--- sumo-1.17.0/src/microsim/traffic_lights/MSRailSignal.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/traffic_lights/MSRailSignal.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -71,7 +71,7 @@
 #define DEBUG_COND DEBUG_HELPER(this)
 #define DEBUG_COND_LINKINFO DEBUG_HELPER(myLink->getTLLogic())
 #define DEBUG_HELPER(obj) ((obj)->isSelected())
-//#define DEBUG_HELPER(obj) ((obj)->getID() == "w2")
+//#define DEBUG_HELPER(obj) ((obj)->getID() == "")
 //#define DEBUG_HELPER(obj) (true)
 
 // ===========================================================================
@@ -736,7 +736,7 @@
     }
 
 #ifdef DEBUG_BUILD_DRIVEWAY
-    if (DEBUG_COND_LINKINFO || true) {
+    if (DEBUG_COND_LINKINFO) {
         std::cout << "  buildDriveWay railSignal=" << getID()
                   << "\n    route=" << toString(dw.myRoute)
                   << "\n    forward=" << toString(dw.myForward)
@@ -1187,7 +1187,7 @@
     bool foundUnsafeSwitch = false;
     MSLane* toLane = origin->getViaLaneOrLane();
 #ifdef DEBUG_DRIVEWAY_BUILDROUTE
-    gDebugFlag4 = true; //getClickableTLLinkID(origin) == "junction 's24', link 0";
+    gDebugFlag4 = DEBUG_HELPER(origin->getTLLogic());
     if (gDebugFlag4) std::cout << "buildRoute origin=" << getTLLinkID(origin) << " vehRoute=" << toString(ConstMSEdgeVector(next, end))
                                    << " visited=" << formatVisitedMap(visited) << "\n";
 #endif
diff -Nru sumo-1.17.0/src/microsim/traffic_lights/MSRailSignal.h sumo-1.18.0/src/microsim/traffic_lights/MSRailSignal.h
--- sumo-1.17.0/src/microsim/traffic_lights/MSRailSignal.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/traffic_lights/MSRailSignal.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2002-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/traffic_lights/MSSimpleTrafficLightLogic.cpp sumo-1.18.0/src/microsim/traffic_lights/MSSimpleTrafficLightLogic.cpp
--- sumo-1.17.0/src/microsim/traffic_lights/MSSimpleTrafficLightLogic.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/traffic_lights/MSSimpleTrafficLightLogic.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/traffic_lights/MSSimpleTrafficLightLogic.h sumo-1.18.0/src/microsim/traffic_lights/MSSimpleTrafficLightLogic.h
--- sumo-1.17.0/src/microsim/traffic_lights/MSSimpleTrafficLightLogic.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/traffic_lights/MSSimpleTrafficLightLogic.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/traffic_lights/MSSOTLCongestionPolicy.cpp sumo-1.18.0/src/microsim/traffic_lights/MSSOTLCongestionPolicy.cpp
--- sumo-1.17.0/src/microsim/traffic_lights/MSSOTLCongestionPolicy.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/traffic_lights/MSSOTLCongestionPolicy.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2014-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/traffic_lights/MSSOTLCongestionPolicy.h sumo-1.18.0/src/microsim/traffic_lights/MSSOTLCongestionPolicy.h
--- sumo-1.17.0/src/microsim/traffic_lights/MSSOTLCongestionPolicy.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/traffic_lights/MSSOTLCongestionPolicy.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2014-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/traffic_lights/MSSOTLDefinitions.h sumo-1.18.0/src/microsim/traffic_lights/MSSOTLDefinitions.h
--- sumo-1.17.0/src/microsim/traffic_lights/MSSOTLDefinitions.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/traffic_lights/MSSOTLDefinitions.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2010-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/traffic_lights/MSSOTLE2Sensors.cpp sumo-1.18.0/src/microsim/traffic_lights/MSSOTLE2Sensors.cpp
--- sumo-1.17.0/src/microsim/traffic_lights/MSSOTLE2Sensors.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/traffic_lights/MSSOTLE2Sensors.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2010-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/traffic_lights/MSSOTLE2Sensors.h sumo-1.18.0/src/microsim/traffic_lights/MSSOTLE2Sensors.h
--- sumo-1.17.0/src/microsim/traffic_lights/MSSOTLE2Sensors.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/traffic_lights/MSSOTLE2Sensors.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2010-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/traffic_lights/MSSOTLHiLevelTrafficLightLogic.cpp sumo-1.18.0/src/microsim/traffic_lights/MSSOTLHiLevelTrafficLightLogic.cpp
--- sumo-1.17.0/src/microsim/traffic_lights/MSSOTLHiLevelTrafficLightLogic.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/traffic_lights/MSSOTLHiLevelTrafficLightLogic.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2013-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/traffic_lights/MSSOTLHiLevelTrafficLightLogic.h sumo-1.18.0/src/microsim/traffic_lights/MSSOTLHiLevelTrafficLightLogic.h
--- sumo-1.17.0/src/microsim/traffic_lights/MSSOTLHiLevelTrafficLightLogic.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/traffic_lights/MSSOTLHiLevelTrafficLightLogic.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2013-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/traffic_lights/MSSOTLMarchingPolicy.cpp sumo-1.18.0/src/microsim/traffic_lights/MSSOTLMarchingPolicy.cpp
--- sumo-1.17.0/src/microsim/traffic_lights/MSSOTLMarchingPolicy.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/traffic_lights/MSSOTLMarchingPolicy.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2014-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/traffic_lights/MSSOTLMarchingPolicy.h sumo-1.18.0/src/microsim/traffic_lights/MSSOTLMarchingPolicy.h
--- sumo-1.17.0/src/microsim/traffic_lights/MSSOTLMarchingPolicy.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/traffic_lights/MSSOTLMarchingPolicy.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2014-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/traffic_lights/MSSOTLPhasePolicy.cpp sumo-1.18.0/src/microsim/traffic_lights/MSSOTLPhasePolicy.cpp
--- sumo-1.17.0/src/microsim/traffic_lights/MSSOTLPhasePolicy.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/traffic_lights/MSSOTLPhasePolicy.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2010-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/traffic_lights/MSSOTLPhasePolicy.h sumo-1.18.0/src/microsim/traffic_lights/MSSOTLPhasePolicy.h
--- sumo-1.17.0/src/microsim/traffic_lights/MSSOTLPhasePolicy.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/traffic_lights/MSSOTLPhasePolicy.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2010-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/traffic_lights/MSSOTLPhaseTrafficLightLogic.cpp sumo-1.18.0/src/microsim/traffic_lights/MSSOTLPhaseTrafficLightLogic.cpp
--- sumo-1.17.0/src/microsim/traffic_lights/MSSOTLPhaseTrafficLightLogic.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/traffic_lights/MSSOTLPhaseTrafficLightLogic.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2010-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/traffic_lights/MSSOTLPhaseTrafficLightLogic.h sumo-1.18.0/src/microsim/traffic_lights/MSSOTLPhaseTrafficLightLogic.h
--- sumo-1.17.0/src/microsim/traffic_lights/MSSOTLPhaseTrafficLightLogic.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/traffic_lights/MSSOTLPhaseTrafficLightLogic.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2010-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/traffic_lights/MSSOTLPlatoonPolicy.cpp sumo-1.18.0/src/microsim/traffic_lights/MSSOTLPlatoonPolicy.cpp
--- sumo-1.17.0/src/microsim/traffic_lights/MSSOTLPlatoonPolicy.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/traffic_lights/MSSOTLPlatoonPolicy.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2010-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/traffic_lights/MSSOTLPlatoonPolicy.h sumo-1.18.0/src/microsim/traffic_lights/MSSOTLPlatoonPolicy.h
--- sumo-1.17.0/src/microsim/traffic_lights/MSSOTLPlatoonPolicy.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/traffic_lights/MSSOTLPlatoonPolicy.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2010-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/traffic_lights/MSSOTLPolicy3DStimulus.cpp sumo-1.18.0/src/microsim/traffic_lights/MSSOTLPolicy3DStimulus.cpp
--- sumo-1.17.0/src/microsim/traffic_lights/MSSOTLPolicy3DStimulus.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/traffic_lights/MSSOTLPolicy3DStimulus.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2013-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/traffic_lights/MSSOTLPolicy3DStimulus.h sumo-1.18.0/src/microsim/traffic_lights/MSSOTLPolicy3DStimulus.h
--- sumo-1.17.0/src/microsim/traffic_lights/MSSOTLPolicy3DStimulus.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/traffic_lights/MSSOTLPolicy3DStimulus.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2013-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/traffic_lights/MSSOTLPolicy5DFamilyStimulus.cpp sumo-1.18.0/src/microsim/traffic_lights/MSSOTLPolicy5DFamilyStimulus.cpp
--- sumo-1.17.0/src/microsim/traffic_lights/MSSOTLPolicy5DFamilyStimulus.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/traffic_lights/MSSOTLPolicy5DFamilyStimulus.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2014-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/traffic_lights/MSSOTLPolicy5DFamilyStimulus.h sumo-1.18.0/src/microsim/traffic_lights/MSSOTLPolicy5DFamilyStimulus.h
--- sumo-1.17.0/src/microsim/traffic_lights/MSSOTLPolicy5DFamilyStimulus.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/traffic_lights/MSSOTLPolicy5DFamilyStimulus.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2013-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/traffic_lights/MSSOTLPolicy5DStimulus.cpp sumo-1.18.0/src/microsim/traffic_lights/MSSOTLPolicy5DStimulus.cpp
--- sumo-1.17.0/src/microsim/traffic_lights/MSSOTLPolicy5DStimulus.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/traffic_lights/MSSOTLPolicy5DStimulus.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2013-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/traffic_lights/MSSOTLPolicy5DStimulus.h sumo-1.18.0/src/microsim/traffic_lights/MSSOTLPolicy5DStimulus.h
--- sumo-1.17.0/src/microsim/traffic_lights/MSSOTLPolicy5DStimulus.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/traffic_lights/MSSOTLPolicy5DStimulus.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2013-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/traffic_lights/MSSOTLPolicyBasedTrafficLightLogic.cpp sumo-1.18.0/src/microsim/traffic_lights/MSSOTLPolicyBasedTrafficLightLogic.cpp
--- sumo-1.17.0/src/microsim/traffic_lights/MSSOTLPolicyBasedTrafficLightLogic.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/traffic_lights/MSSOTLPolicyBasedTrafficLightLogic.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2010-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/traffic_lights/MSSOTLPolicyBasedTrafficLightLogic.h sumo-1.18.0/src/microsim/traffic_lights/MSSOTLPolicyBasedTrafficLightLogic.h
--- sumo-1.17.0/src/microsim/traffic_lights/MSSOTLPolicyBasedTrafficLightLogic.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/traffic_lights/MSSOTLPolicyBasedTrafficLightLogic.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2010-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/traffic_lights/MSSOTLPolicy.cpp sumo-1.18.0/src/microsim/traffic_lights/MSSOTLPolicy.cpp
--- sumo-1.17.0/src/microsim/traffic_lights/MSSOTLPolicy.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/traffic_lights/MSSOTLPolicy.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2013-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/traffic_lights/MSSOTLPolicyDesirability.cpp sumo-1.18.0/src/microsim/traffic_lights/MSSOTLPolicyDesirability.cpp
--- sumo-1.17.0/src/microsim/traffic_lights/MSSOTLPolicyDesirability.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/traffic_lights/MSSOTLPolicyDesirability.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2013-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/traffic_lights/MSSOTLPolicyDesirability.h sumo-1.18.0/src/microsim/traffic_lights/MSSOTLPolicyDesirability.h
--- sumo-1.17.0/src/microsim/traffic_lights/MSSOTLPolicyDesirability.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/traffic_lights/MSSOTLPolicyDesirability.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2013-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/traffic_lights/MSSOTLPolicy.h sumo-1.18.0/src/microsim/traffic_lights/MSSOTLPolicy.h
--- sumo-1.17.0/src/microsim/traffic_lights/MSSOTLPolicy.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/traffic_lights/MSSOTLPolicy.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2013-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/traffic_lights/MSSOTLRequestPolicy.cpp sumo-1.18.0/src/microsim/traffic_lights/MSSOTLRequestPolicy.cpp
--- sumo-1.17.0/src/microsim/traffic_lights/MSSOTLRequestPolicy.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/traffic_lights/MSSOTLRequestPolicy.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2010-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/traffic_lights/MSSOTLRequestPolicy.h sumo-1.18.0/src/microsim/traffic_lights/MSSOTLRequestPolicy.h
--- sumo-1.17.0/src/microsim/traffic_lights/MSSOTLRequestPolicy.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/traffic_lights/MSSOTLRequestPolicy.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2010-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/traffic_lights/MSSOTLSensors.cpp sumo-1.18.0/src/microsim/traffic_lights/MSSOTLSensors.cpp
--- sumo-1.17.0/src/microsim/traffic_lights/MSSOTLSensors.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/traffic_lights/MSSOTLSensors.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2010-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/traffic_lights/MSSOTLSensors.h sumo-1.18.0/src/microsim/traffic_lights/MSSOTLSensors.h
--- sumo-1.17.0/src/microsim/traffic_lights/MSSOTLSensors.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/traffic_lights/MSSOTLSensors.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2010-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/traffic_lights/MSSOTLTrafficLightLogic.cpp sumo-1.18.0/src/microsim/traffic_lights/MSSOTLTrafficLightLogic.cpp
--- sumo-1.17.0/src/microsim/traffic_lights/MSSOTLTrafficLightLogic.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/traffic_lights/MSSOTLTrafficLightLogic.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2013-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/traffic_lights/MSSOTLTrafficLightLogic.h sumo-1.18.0/src/microsim/traffic_lights/MSSOTLTrafficLightLogic.h
--- sumo-1.17.0/src/microsim/traffic_lights/MSSOTLTrafficLightLogic.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/traffic_lights/MSSOTLTrafficLightLogic.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2013-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/traffic_lights/MSSOTLWaveTrafficLightLogic.cpp sumo-1.18.0/src/microsim/traffic_lights/MSSOTLWaveTrafficLightLogic.cpp
--- sumo-1.17.0/src/microsim/traffic_lights/MSSOTLWaveTrafficLightLogic.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/traffic_lights/MSSOTLWaveTrafficLightLogic.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2010-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/traffic_lights/MSSOTLWaveTrafficLightLogic.h sumo-1.18.0/src/microsim/traffic_lights/MSSOTLWaveTrafficLightLogic.h
--- sumo-1.17.0/src/microsim/traffic_lights/MSSOTLWaveTrafficLightLogic.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/traffic_lights/MSSOTLWaveTrafficLightLogic.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2010-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/traffic_lights/MSSwarmTrafficLightLogic.cpp sumo-1.18.0/src/microsim/traffic_lights/MSSwarmTrafficLightLogic.cpp
--- sumo-1.17.0/src/microsim/traffic_lights/MSSwarmTrafficLightLogic.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/traffic_lights/MSSwarmTrafficLightLogic.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2010-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/traffic_lights/MSSwarmTrafficLightLogic.h sumo-1.18.0/src/microsim/traffic_lights/MSSwarmTrafficLightLogic.h
--- sumo-1.17.0/src/microsim/traffic_lights/MSSwarmTrafficLightLogic.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/traffic_lights/MSSwarmTrafficLightLogic.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2010-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/traffic_lights/MSTLLogicControl.cpp sumo-1.18.0/src/microsim/traffic_lights/MSTLLogicControl.cpp
--- sumo-1.17.0/src/microsim/traffic_lights/MSTLLogicControl.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/traffic_lights/MSTLLogicControl.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/traffic_lights/MSTLLogicControl.h sumo-1.18.0/src/microsim/traffic_lights/MSTLLogicControl.h
--- sumo-1.17.0/src/microsim/traffic_lights/MSTLLogicControl.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/traffic_lights/MSTLLogicControl.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/traffic_lights/MSTrafficLightLogic.cpp sumo-1.18.0/src/microsim/traffic_lights/MSTrafficLightLogic.cpp
--- sumo-1.17.0/src/microsim/traffic_lights/MSTrafficLightLogic.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/traffic_lights/MSTrafficLightLogic.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -238,10 +238,11 @@
             if (logic != nullptr) {
                 // find symmetrical response
                 const int logicSize = logic->getLogicSize();
+                bool foundProblem = false;
                 std::vector tlIndex;
-                for (int u = 0; u < logicSize; u++) {
+                for (int u = 0; u < logicSize && !foundProblem; u++) {
                     const MSLogicJunction::LinkBits& response = logic->getResponseFor(u);
-                    for (int v = 0; v < logicSize; v++) {
+                    for (int v = 0; v < logicSize && !foundProblem; v++) {
                         if (response.test(v)) {
                             if (logic->getResponseFor(v).test(u)) {
                                 // get tls link index for links u and v
@@ -264,10 +265,13 @@
                                     for (MSPhaseDefinition* p : phases) {
                                         if (minor.find(p->getState()[tlu]) != std::string::npos
                                                 && minor.find(p->getState()[tlv]) != std::string::npos) {
-                                            WRITE_ERRORF(TL("Program '%' at tlLogic '%' is incompatible with logic at junction '%' (mutual conflict between link indices %,% tl indices %,% phase %).\n"
-                                                            "  Rebuild the network with option '--tls.ignore-internal-junction-jam' or include the program when building."),
-                                                         getProgramID(), getID(), junction->getID(), u, v, tlu, tlv, phaseIndex);
-                                            return;
+                                            WRITE_WARNING(TLF("Program '%' at tlLogic '%' is incompatible with logic at junction '%' (mutual conflict between link indices %,% tl indices %,% phase %).\n"
+                                                            "  To avoid deadlock/collisions, either: rebuild the signal plan with a newer version of netconvert/netedit\n"
+                                                            "  or rebuild the network with option '--tls.ignore-internal-junction-jam' or include the program when building.",
+                                                         getProgramID(), getID(), junction->getID(), u, v, tlu, tlv, phaseIndex));
+                                            // only one warning per program
+                                            foundProblem = true;
+                                            break;
                                         }
                                         phaseIndex++;
                                     }
diff -Nru sumo-1.17.0/src/microsim/traffic_lights/MSTrafficLightLogic.h sumo-1.18.0/src/microsim/traffic_lights/MSTrafficLightLogic.h
--- sumo-1.17.0/src/microsim/traffic_lights/MSTrafficLightLogic.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/traffic_lights/MSTrafficLightLogic.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/traffic_lights/NEMAController.cpp sumo-1.18.0/src/microsim/traffic_lights/NEMAController.cpp
--- sumo-1.17.0/src/microsim/traffic_lights/NEMAController.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/traffic_lights/NEMAController.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/traffic_lights/NEMAController.h sumo-1.18.0/src/microsim/traffic_lights/NEMAController.h
--- sumo-1.17.0/src/microsim/traffic_lights/NEMAController.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/traffic_lights/NEMAController.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/transportables/MSPerson.cpp sumo-1.18.0/src/microsim/transportables/MSPerson.cpp
--- sumo-1.17.0/src/microsim/transportables/MSPerson.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/transportables/MSPerson.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -435,11 +435,13 @@
 /* -------------------------------------------------------------------------
 * MSPerson::MSPersonStage_Access - methods
 * ----------------------------------------------------------------------- */
-MSPerson::MSPersonStage_Access::MSPersonStage_Access(const MSEdge* destination, MSStoppingPlace* toStop,
+MSPerson::MSPersonStage_Access::MSPersonStage_Access(const MSEdge* origin, const MSEdge* destination, MSStoppingPlace* toStop,
         const double arrivalPos, const double dist, const bool isExit) :
     MSStage(destination, toStop, arrivalPos, MSStageType::ACCESS),
+    myOrigin(origin),
     myDist(dist), myAmExit(isExit) {
-    myPath.push_back(destination->getLanes()[0]->geometryPositionAtOffset(myDestinationStop->getAccessPos(destination)));
+    const MSEdge* accessEdge = myAmExit ? destination : origin;
+    myPath.push_back(accessEdge->getLanes()[0]->geometryPositionAtOffset(myDestinationStop->getAccessPos(accessEdge)));
     myPath.push_back(toStop->getCenterPos());
     if (isExit) {
         myPath = myPath.reverse();
@@ -451,7 +453,7 @@
 
 MSStage*
 MSPerson::MSPersonStage_Access::clone() const {
-    return new MSPersonStage_Access(myDestination, myDestinationStop, myArrivalPos, myDist, myAmExit);
+    return new MSPersonStage_Access(myOrigin, myDestination, myDestinationStop, myArrivalPos, myDist, myAmExit);
 }
 
 void
@@ -538,17 +540,18 @@
         prevStop = dynamic_cast(prior)->getOriginStop();
     }
     if (prevStop != nullptr) {
+        const MSEdge* stopEdge = &prevStop->getLane().getEdge();
         if (waitAtStop) {
             const double accessDist = prevStop->getAccessDistance(prior->getDestination());
             if (accessDist > 0.) {
                 const double arrivalAtBs = (prevStop->getBeginLanePosition() + prevStop->getEndLanePosition()) / 2;
-                myStep = myPlan->insert(myStep, new MSPersonStage_Access(prior->getDestination(), prevStop, arrivalAtBs, accessDist, false));
+                myStep = myPlan->insert(myStep, new MSPersonStage_Access(prior->getDestination(), stopEdge, prevStop, arrivalAtBs, accessDist, false));
                 return true;
             }
         } else {
             const double accessDist = prevStop->getAccessDistance((*myStep)->getFromEdge());
             if (accessDist > 0.) {
-                myStep = myPlan->insert(myStep, new MSPersonStage_Access((*myStep)->getFromEdge(), prevStop, prevStop->getAccessPos((*myStep)->getFromEdge()), accessDist, true));
+                myStep = myPlan->insert(myStep, new MSPersonStage_Access(stopEdge, (*myStep)->getFromEdge(), prevStop, prevStop->getAccessPos((*myStep)->getFromEdge()), accessDist, true));
                 return true;
             }
         }
@@ -557,6 +560,12 @@
 }
 
 
+double
+MSPerson::getImpatience() const {
+    return MAX2(0., MIN2(1., getVehicleType().getImpatience()
+                         + STEPS2TIME((*myStep)->getWaitingTime(SIMSTEP)) / MSPModel_Striping::MAX_WAIT_TOLERANCE));
+}
+
 const std::string&
 MSPerson::getNextEdge() const {
 //    if (getCurrentStageType() == WALKING) {
diff -Nru sumo-1.17.0/src/microsim/transportables/MSPerson.h sumo-1.18.0/src/microsim/transportables/MSPerson.h
--- sumo-1.17.0/src/microsim/transportables/MSPerson.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/transportables/MSPerson.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -181,7 +181,7 @@
     class MSPersonStage_Access : public MSStage {
     public:
         /// constructor
-        MSPersonStage_Access(const MSEdge* destination, MSStoppingPlace* toStop,
+        MSPersonStage_Access(const MSEdge* origin, const MSEdge* destination, MSStoppingPlace* toStop,
                              const double arrivalPos, const double dist, const bool isExit);
 
         /// destructor
@@ -234,6 +234,8 @@
         };
 
     private:
+        /// the origin edge
+        const MSEdge* myOrigin;
         const double myDist;
         const bool myAmExit;
         SUMOTime myEstimatedArrival;
@@ -270,6 +272,8 @@
         myChosenSpeedFactor = factor;
     }
 
+    double getImpatience() const;
+
     /// @brief whether the person is jammed as defined by the current pedestrian model
     bool isJammed() const;
 
diff -Nru sumo-1.17.0/src/microsim/transportables/MSPModel.cpp sumo-1.18.0/src/microsim/transportables/MSPModel.cpp
--- sumo-1.17.0/src/microsim/transportables/MSPModel.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/transportables/MSPModel.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2014-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/transportables/MSPModel.h sumo-1.18.0/src/microsim/transportables/MSPModel.h
--- sumo-1.17.0/src/microsim/transportables/MSPModel.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/transportables/MSPModel.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2014-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/transportables/MSPModel_NonInteracting.cpp sumo-1.18.0/src/microsim/transportables/MSPModel_NonInteracting.cpp
--- sumo-1.17.0/src/microsim/transportables/MSPModel_NonInteracting.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/transportables/MSPModel_NonInteracting.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2014-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/transportables/MSPModel_NonInteracting.h sumo-1.18.0/src/microsim/transportables/MSPModel_NonInteracting.h
--- sumo-1.17.0/src/microsim/transportables/MSPModel_NonInteracting.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/transportables/MSPModel_NonInteracting.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2014-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/transportables/MSPModel_Remote.cpp sumo-1.18.0/src/microsim/transportables/MSPModel_Remote.cpp
--- sumo-1.17.0/src/microsim/transportables/MSPModel_Remote.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/transportables/MSPModel_Remote.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2014-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/transportables/MSPModel_Remote.h sumo-1.18.0/src/microsim/transportables/MSPModel_Remote.h
--- sumo-1.17.0/src/microsim/transportables/MSPModel_Remote.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/transportables/MSPModel_Remote.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2014-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/transportables/MSPModel_Striping.cpp sumo-1.18.0/src/microsim/transportables/MSPModel_Striping.cpp
--- sumo-1.17.0/src/microsim/transportables/MSPModel_Striping.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/transportables/MSPModel_Striping.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2014-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -373,78 +373,83 @@
 
     // build walkingareaPaths
     for (MSEdgeVector::const_iterator i = MSEdge::getAllEdges().begin(); i != MSEdge::getAllEdges().end(); ++i) {
-        const MSEdge* edge = *i;
-        if (edge->isWalkingArea()) {
-            const MSLane* walkingArea = getSidewalk(edge);
-            myMinNextLengths[walkingArea] = walkingArea->getLength();
-            // build all possible paths across this walkingArea
-            // gather all incident lanes
-            std::vector lanes;
-            for (const MSEdge* in : edge->getPredecessors()) {
-                if (!in->isTazConnector()) {
-                    lanes.push_back(getSidewalk(in));
-                    if (lanes.back() == nullptr) {
-                        throw ProcessError("Invalid connection from edge '" + in->getID() + "' to walkingarea edge '" + edge->getID() + "'");
-                    }
+        insertWalkArePaths(*i, myWalkingAreaPaths);
+    }
+}
+
+
+void
+MSPModel_Striping::insertWalkArePaths(const MSEdge* edge, WalkingAreaPaths& into) {
+    if (edge->isWalkingArea()) {
+        const MSLane* walkingArea = getSidewalk(edge);
+        myMinNextLengths[walkingArea] = walkingArea->getLength();
+        // build all possible paths across this walkingArea
+        // gather all incident lanes
+        std::vector lanes;
+        for (const MSEdge* in : edge->getPredecessors()) {
+            if (!in->isTazConnector()) {
+                lanes.push_back(getSidewalk(in));
+                if (lanes.back() == nullptr) {
+                    throw ProcessError("Invalid connection from edge '" + in->getID() + "' to walkingarea edge '" + edge->getID() + "'");
                 }
             }
-            for (const MSEdge* out : edge->getSuccessors()) {
-                if (!out->isTazConnector()) {
-                    lanes.push_back(getSidewalk(out));
-                    if (lanes.back() == nullptr) {
-                        throw ProcessError("Invalid connection from walkingarea edge '" + edge->getID() + "' to edge '" + out->getID() + "'");
-                    }
+        }
+        for (const MSEdge* out : edge->getSuccessors()) {
+            if (!out->isTazConnector()) {
+                lanes.push_back(getSidewalk(out));
+                if (lanes.back() == nullptr) {
+                    throw ProcessError("Invalid connection from walkingarea edge '" + edge->getID() + "' to edge '" + out->getID() + "'");
                 }
             }
-            // build all combinations
-            for (int j = 0; j < (int)lanes.size(); ++j) {
-                for (int k = 0; k < (int)lanes.size(); ++k) {
-                    if (j != k) {
-                        // build the walkingArea
-                        const MSLane* const from = lanes[j];
-                        const MSLane* const to = lanes[k];
-                        const int fromDir = from->getLinkTo(walkingArea) != nullptr ? FORWARD : BACKWARD;
-                        const int toDir = walkingArea->getLinkTo(to) != nullptr ? FORWARD : BACKWARD;
-                        PositionVector shape;
-                        Position fromPos = from->getShape()[fromDir == FORWARD ? -1 : 0];
-                        Position toPos = to->getShape()[toDir == FORWARD ? 0 : -1];
-                        const double maxExtent = fromPos.distanceTo2D(toPos) / 4; // prevent sharp corners
-                        const double extrapolateBy = MIN2(maxExtent, walkingArea->getWidth() / 2);
-                        // assemble shape
-                        shape.push_back(fromPos);
-                        if (extrapolateBy > POSITION_EPS) {
-                            PositionVector fromShp = from->getShape();
-                            fromShp.extrapolate(extrapolateBy);
-                            shape.push_back_noDoublePos(fromDir == FORWARD ? fromShp.back() : fromShp.front());
-                            PositionVector nextShp = to->getShape();
-                            nextShp.extrapolate(extrapolateBy);
-                            shape.push_back_noDoublePos(toDir == FORWARD ? nextShp.front() : nextShp.back());
-                        }
-                        shape.push_back_noDoublePos(toPos);
-                        if (shape.size() < 2) {
-                            PositionVector fromShp = from->getShape();
-                            fromShp.extrapolate(1.5 * POSITION_EPS); // noDoublePos requires a difference of POSITION_EPS in at least one coordinate
-                            shape.push_back_noDoublePos(fromDir == FORWARD ? fromShp.back() : fromShp.front());
-                            assert(shape.size() == 2);
-                        } else if (myWalkingAreaDetail > 4) {
-                            shape = shape.bezier(myWalkingAreaDetail);
-                        }
-                        double angleOverride = INVALID_DOUBLE;
-                        if (shape.size() >= 4 && shape.length() < walkingArea->getWidth()) {
-                            const double aStart = shape.angleAt2D(0);
-                            const double aEnd = shape.angleAt2D((int)shape.size() - 2);
-                            if (fabs(aStart - aEnd) < DEG2RAD(10)) {
-                                angleOverride = (aStart + aEnd) / 2;
-                            }
-                        }
-                        if (fromDir == BACKWARD) {
-                            // will be walking backward on walkingArea
-                            shape = shape.reverse();
+        }
+        // build all combinations
+        for (int j = 0; j < (int)lanes.size(); ++j) {
+            for (int k = 0; k < (int)lanes.size(); ++k) {
+                if (j != k) {
+                    // build the walkingArea
+                    const MSLane* const from = lanes[j];
+                    const MSLane* const to = lanes[k];
+                    const int fromDir = from->getLinkTo(walkingArea) != nullptr ? FORWARD : BACKWARD;
+                    const int toDir = walkingArea->getLinkTo(to) != nullptr ? FORWARD : BACKWARD;
+                    PositionVector shape;
+                    Position fromPos = from->getShape()[fromDir == FORWARD ? -1 : 0];
+                    Position toPos = to->getShape()[toDir == FORWARD ? 0 : -1];
+                    const double maxExtent = fromPos.distanceTo2D(toPos) / 4; // prevent sharp corners
+                    const double extrapolateBy = MIN2(maxExtent, walkingArea->getWidth() / 2);
+                    // assemble shape
+                    shape.push_back(fromPos);
+                    if (extrapolateBy > POSITION_EPS) {
+                        PositionVector fromShp = from->getShape();
+                        fromShp.extrapolate(extrapolateBy);
+                        shape.push_back_noDoublePos(fromDir == FORWARD ? fromShp.back() : fromShp.front());
+                        PositionVector nextShp = to->getShape();
+                        nextShp.extrapolate(extrapolateBy);
+                        shape.push_back_noDoublePos(toDir == FORWARD ? nextShp.front() : nextShp.back());
+                    }
+                    shape.push_back_noDoublePos(toPos);
+                    if (shape.size() < 2) {
+                        PositionVector fromShp = from->getShape();
+                        fromShp.extrapolate(1.5 * POSITION_EPS); // noDoublePos requires a difference of POSITION_EPS in at least one coordinate
+                        shape.push_back_noDoublePos(fromDir == FORWARD ? fromShp.back() : fromShp.front());
+                        assert(shape.size() == 2);
+                    } else if (myWalkingAreaDetail > 4) {
+                        shape = shape.bezier(myWalkingAreaDetail);
+                    }
+                    double angleOverride = INVALID_DOUBLE;
+                    if (shape.size() >= 4 && shape.length() < walkingArea->getWidth()) {
+                        const double aStart = shape.angleAt2D(0);
+                        const double aEnd = shape.angleAt2D((int)shape.size() - 2);
+                        if (fabs(aStart - aEnd) < DEG2RAD(10)) {
+                            angleOverride = (aStart + aEnd) / 2;
                         }
-                        WalkingAreaPath wap = WalkingAreaPath(from, walkingArea, to, shape, fromDir, angleOverride);
-                        myWalkingAreaPaths.insert(std::make_pair(std::make_pair(from, to), wap));
-                        myMinNextLengths[walkingArea] = MIN2(myMinNextLengths[walkingArea], wap.length);
                     }
+                    if (fromDir == BACKWARD) {
+                        // will be walking backward on walkingArea
+                        shape = shape.reverse();
+                    }
+                    WalkingAreaPath wap = WalkingAreaPath(from, walkingArea, to, shape, fromDir, angleOverride);
+                    into.insert(std::make_pair(std::make_pair(from, to), wap));
+                    myMinNextLengths[walkingArea] = MIN2(myMinNextLengths[walkingArea], wap.length);
                 }
             }
         }
diff -Nru sumo-1.17.0/src/microsim/transportables/MSPModel_Striping.h sumo-1.18.0/src/microsim/transportables/MSPModel_Striping.h
--- sumo-1.17.0/src/microsim/transportables/MSPModel_Striping.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/transportables/MSPModel_Striping.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2014-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -52,6 +52,29 @@
 
 public:
 
+    struct WalkingAreaPath {
+        WalkingAreaPath(const MSLane* _from, const MSLane* _walkingArea, const MSLane* _to, const PositionVector& _shape, int _dir, double _angleOverride) :
+            from(_from),
+            to(_to),
+            lane(_walkingArea),
+            shape(_shape),
+            dir(_dir),
+            angleOverride(_angleOverride),
+            length(_shape.length()) {
+        }
+
+        const MSLane* const from;
+        const MSLane* const to;
+        const MSLane* const lane; // the walkingArea;
+        const PositionVector shape;
+        const int dir; // the direction when entering this path
+        const double angleOverride;
+        const double length;
+
+    };
+
+    typedef std::map, const WalkingAreaPath> WalkingAreaPaths;
+
     /// @brief Constructor (it should not be necessary to construct more than one instance)
     MSPModel_Striping(const OptionsCont& oc, MSNet* net);
 
@@ -170,13 +193,11 @@
     };
 
     struct Obstacle;
-    struct WalkingAreaPath;
     class PState;
     typedef std::vector Pedestrians;
     typedef std::map ActiveLanes;
     typedef std::vector Obstacles;
     typedef std::map NextLanesObstacles;
-    typedef std::map, const WalkingAreaPath> WalkingAreaPaths;
     typedef std::map MinNextLengths;
 
     struct NextLaneInfo {
@@ -234,27 +255,6 @@
         bool closer(const Obstacle& o, int dir);
     };
 
-    struct WalkingAreaPath {
-        WalkingAreaPath(const MSLane* _from, const MSLane* _walkingArea, const MSLane* _to, const PositionVector& _shape, int _dir, double _angleOverride) :
-            from(_from),
-            to(_to),
-            lane(_walkingArea),
-            shape(_shape),
-            dir(_dir),
-            angleOverride(_angleOverride),
-            length(_shape.length()) {
-        }
-
-        const MSLane* const from;
-        const MSLane* const to;
-        const MSLane* const lane; // the walkingArea;
-        const PositionVector shape;
-        const int dir; // the direction when entering this path
-        const double angleOverride;
-        const double length;
-
-    };
-
     class walkingarea_path_sorter {
     public:
         /// comparing operation
@@ -495,6 +495,9 @@
 
     static void initWalkingAreaPaths(const MSNet* net);
 
+    /// @brief creates and inserts all paths into the given map
+    static void insertWalkArePaths(const MSEdge* edge, WalkingAreaPaths& into);
+
     static const WalkingAreaPath* getWalkingAreaPath(const MSEdge* walkingArea, const MSLane* before, const MSLane* after);
 
     /// @brief return an arbitrary path across the given walkingArea
diff -Nru sumo-1.17.0/src/microsim/transportables/MSStage.cpp sumo-1.18.0/src/microsim/transportables/MSStage.cpp
--- sumo-1.17.0/src/microsim/transportables/MSStage.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/transportables/MSStage.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/transportables/MSStageDriving.cpp sumo-1.18.0/src/microsim/transportables/MSStageDriving.cpp
--- sumo-1.17.0/src/microsim/transportables/MSStageDriving.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/transportables/MSStageDriving.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -245,14 +245,7 @@
         }
         myVehicle->addTransportable(transportable);
         net->getInsertionControl().add(myVehicle);
-        if (myVehicle->getEdge()->isTazConnector()) {
-            for (MSEdge* out : myVehicle->getEdge()->getSuccessors()) {
-                out->removeWaiting(myVehicle);
-            }
-        } else {
-            myWaitingEdge->removeWaiting(myVehicle);
-        }
-        net->getVehicleControl().unregisterOneWaiting();
+        net->getVehicleControl().handleTriggeredDepart(myVehicle, false);
     } else {
         registerWaiting(transportable, now);
     }
diff -Nru sumo-1.17.0/src/microsim/transportables/MSStageDriving.h sumo-1.18.0/src/microsim/transportables/MSStageDriving.h
--- sumo-1.17.0/src/microsim/transportables/MSStageDriving.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/transportables/MSStageDriving.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/transportables/MSStage.h sumo-1.18.0/src/microsim/transportables/MSStage.h
--- sumo-1.17.0/src/microsim/transportables/MSStage.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/transportables/MSStage.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -65,7 +65,7 @@
 * The "abstract" class for a single stage of a movement
 * Contains the destination of the current movement step
 */
-class MSStage {
+class MSStage : public Parameterised {
 public:
     /// constructor
     MSStage(const MSEdge* destination, MSStoppingPlace* toStop, const double arrivalPos, MSStageType type, const std::string& group = "");
diff -Nru sumo-1.17.0/src/microsim/transportables/MSStageMoving.cpp sumo-1.18.0/src/microsim/transportables/MSStageMoving.cpp
--- sumo-1.17.0/src/microsim/transportables/MSStageMoving.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/transportables/MSStageMoving.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/transportables/MSStageMoving.h sumo-1.18.0/src/microsim/transportables/MSStageMoving.h
--- sumo-1.17.0/src/microsim/transportables/MSStageMoving.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/transportables/MSStageMoving.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/transportables/MSStageTranship.cpp sumo-1.18.0/src/microsim/transportables/MSStageTranship.cpp
--- sumo-1.17.0/src/microsim/transportables/MSStageTranship.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/transportables/MSStageTranship.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/transportables/MSStageTranship.h sumo-1.18.0/src/microsim/transportables/MSStageTranship.h
--- sumo-1.17.0/src/microsim/transportables/MSStageTranship.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/transportables/MSStageTranship.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/transportables/MSStageTrip.cpp sumo-1.18.0/src/microsim/transportables/MSStageTrip.cpp
--- sumo-1.17.0/src/microsim/transportables/MSStageTrip.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/transportables/MSStageTrip.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -274,7 +274,7 @@
                 if (vehicle != nullptr) {
                     vehControl.deleteVehicle(vehicle, true);
                 }
-                return "No connection found between edge '" + myOrigin->getID() + "' and edge '" + (myDestinationStop != nullptr ? myDestinationStop->getID() : myDestination->getID()) + "' for person '" + transportable->getID() + "'.";
+                return "No connection found between " + getOriginDescription() + " and " + getDestinationDescription() + " for person '" + transportable->getID() + "'.";
             }
         }
         if (vehicle != nullptr && (isTaxi || !carUsed)) {
@@ -283,9 +283,13 @@
     }
     if (transportable->getNumStages() == oldNumStages) {
         // append stage so the GUI won't crash due to inconsistent state
-        transportable->appendStage(new MSPerson::MSPersonStage_Walking(transportable->getID(), ConstMSEdgeVector({ myOrigin, myDestination }), myDestinationStop, myDuration, mySpeed, previous->getArrivalPos(), myArrivalPos, myDepartPosLat), -1);
-        if (MSGlobals::gCheckRoutes) {  // if not pedestrians will teleport
-            return "Empty route between edge '" + myOrigin->getID() + "' and edge '" + (myDestinationStop != nullptr ? myDestinationStop->getID() : myDestination->getID()) + "' for person '" + transportable->getID() + "'.";
+        if (myOriginStop != nullptr && myOriginStop == myDestinationStop) {
+            transportable->appendStage(new MSStageWaiting(myDestination, myDestinationStop, 0, -1, previous->getArrivalPos(), "sameStop", false));
+        } else {
+            transportable->appendStage(new MSPerson::MSPersonStage_Walking(transportable->getID(), ConstMSEdgeVector({ myOrigin, myDestination }), myDestinationStop, myDuration, mySpeed, previous->getArrivalPos(), myArrivalPos, myDepartPosLat), -1);
+            if (MSGlobals::gCheckRoutes) {  // if not pedestrians will teleport
+                return "Empty route between " + getOriginDescription() + " and " + getDestinationDescription() + " for person '" + transportable->getID() + "'.";
+            }
         }
     }
     return "";
@@ -300,8 +304,22 @@
 
 
 std::string
+MSStageTrip::getOriginDescription() const {
+    return (myOriginStop != nullptr
+            ? toString(myOriginStop->getElement()) + " '" + myOriginStop->getID()
+            : "edge '" + myOrigin->getID()) + "'";
+}
+
+std::string
+MSStageTrip::getDestinationDescription() const {
+    return (myDestinationStop != nullptr
+            ? toString(myDestinationStop->getElement()) + " '" + myDestinationStop->getID()
+            : "edge '" + myDestination->getID()) + "'";
+}
+
+std::string
 MSStageTrip::getStageSummary(const bool) const {
-    return "trip from '" + myOrigin->getID() + "' to '" + getDestination()->getID() + "'";
+    return "trip from " + getOriginDescription() + " to " + getDestinationDescription();
 }
 
 void
diff -Nru sumo-1.17.0/src/microsim/transportables/MSStageTrip.h sumo-1.18.0/src/microsim/transportables/MSStageTrip.h
--- sumo-1.17.0/src/microsim/transportables/MSStageTrip.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/transportables/MSStageTrip.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -74,6 +74,9 @@
         return "trip";
     }
 
+    std::string getOriginDescription() const;
+    std::string getDestinationDescription() const;
+
     std::string getStageSummary(const bool isPerson) const;
 
     /// logs end of the step
diff -Nru sumo-1.17.0/src/microsim/transportables/MSStageWaiting.cpp sumo-1.18.0/src/microsim/transportables/MSStageWaiting.cpp
--- sumo-1.17.0/src/microsim/transportables/MSStageWaiting.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/transportables/MSStageWaiting.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -142,6 +142,8 @@
         if (myActType != "") {
             os.writeAttr(SUMO_ATTR_ACTTYPE, myActType);
         }
+        // Write rest of parameters
+        writeParams(os);
         os.closeTag(comment);
     }
 }
diff -Nru sumo-1.17.0/src/microsim/transportables/MSStageWaiting.h sumo-1.18.0/src/microsim/transportables/MSStageWaiting.h
--- sumo-1.17.0/src/microsim/transportables/MSStageWaiting.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/transportables/MSStageWaiting.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/transportables/MSTransportableControl.cpp sumo-1.18.0/src/microsim/transportables/MSTransportableControl.cpp
--- sumo-1.17.0/src/microsim/transportables/MSTransportableControl.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/transportables/MSTransportableControl.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/transportables/MSTransportableControl.h sumo-1.18.0/src/microsim/transportables/MSTransportableControl.h
--- sumo-1.17.0/src/microsim/transportables/MSTransportableControl.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/transportables/MSTransportableControl.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/transportables/MSTransportable.cpp sumo-1.18.0/src/microsim/transportables/MSTransportable.cpp
--- sumo-1.17.0/src/microsim/transportables/MSTransportable.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/transportables/MSTransportable.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/transportables/MSTransportable.h sumo-1.18.0/src/microsim/transportables/MSTransportable.h
--- sumo-1.17.0/src/microsim/transportables/MSTransportable.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/transportables/MSTransportable.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/trigger/MSCalibrator.cpp sumo-1.18.0/src/microsim/trigger/MSCalibrator.cpp
--- sumo-1.17.0/src/microsim/trigger/MSCalibrator.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/trigger/MSCalibrator.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2005-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/trigger/MSCalibrator.h sumo-1.18.0/src/microsim/trigger/MSCalibrator.h
--- sumo-1.17.0/src/microsim/trigger/MSCalibrator.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/trigger/MSCalibrator.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2005-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/trigger/MSChargingStation.cpp sumo-1.18.0/src/microsim/trigger/MSChargingStation.cpp
--- sumo-1.17.0/src/microsim/trigger/MSChargingStation.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/trigger/MSChargingStation.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/trigger/MSChargingStation.h sumo-1.18.0/src/microsim/trigger/MSChargingStation.h
--- sumo-1.17.0/src/microsim/trigger/MSChargingStation.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/trigger/MSChargingStation.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/trigger/MSLaneSpeedTrigger.cpp sumo-1.18.0/src/microsim/trigger/MSLaneSpeedTrigger.cpp
--- sumo-1.17.0/src/microsim/trigger/MSLaneSpeedTrigger.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/trigger/MSLaneSpeedTrigger.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/trigger/MSLaneSpeedTrigger.h sumo-1.18.0/src/microsim/trigger/MSLaneSpeedTrigger.h
--- sumo-1.17.0/src/microsim/trigger/MSLaneSpeedTrigger.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/trigger/MSLaneSpeedTrigger.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/trigger/MSOverheadWire.cpp sumo-1.18.0/src/microsim/trigger/MSOverheadWire.cpp
--- sumo-1.17.0/src/microsim/trigger/MSOverheadWire.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/trigger/MSOverheadWire.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2002-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/trigger/MSOverheadWire.h sumo-1.18.0/src/microsim/trigger/MSOverheadWire.h
--- sumo-1.17.0/src/microsim/trigger/MSOverheadWire.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/trigger/MSOverheadWire.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2002-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/microsim/trigger/MSTriggeredRerouter.cpp sumo-1.18.0/src/microsim/trigger/MSTriggeredRerouter.cpp
--- sumo-1.17.0/src/microsim/trigger/MSTriggeredRerouter.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/trigger/MSTriggeredRerouter.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -82,7 +82,9 @@
     myProbability(prob),
     myUserProbability(prob),
     myAmInUserMode(false),
-    myTimeThreshold(timeThreshold) {
+    myTimeThreshold(timeThreshold),
+    myHaveParkProbs(false)
+{
     myInstances[id] = this;
     // build actors
     for (MSEdgeVector::const_iterator j = edges.begin(); j != edges.end(); ++j) {
@@ -232,6 +234,7 @@
         const bool visible = attrs.getOpt(SUMO_ATTR_VISIBLE, getID().c_str(), ok, false);
         // add
         myCurrentParkProb.add(std::make_pair(pa, visible), prob);
+        myHaveParkProbs = true;
         //MSEdge* to = &(pa->getLane().getEdge());
         //myCurrentEdgeProb.add(prob, to);
     }
@@ -595,7 +598,7 @@
 
 
 double
-MSTriggeredRerouter::getWeight(SUMOVehicle& veh, const std::string param, const double defaultWeight) const {
+MSTriggeredRerouter::getWeight(SUMOVehicle& veh, const std::string param, const double defaultWeight) {
     // get custom vehicle parameter
     if (veh.getParameter().knowsParameter(param)) {
         try {
@@ -620,7 +623,7 @@
 
 MSParkingArea*
 MSTriggeredRerouter::rerouteParkingArea(const MSTriggeredRerouter::RerouteInterval* rerouteDef,
-                                        SUMOVehicle& veh, bool& newDestination, ConstMSEdgeVector& newRoute) const {
+                                        SUMOVehicle& veh, bool& newDestination, ConstMSEdgeVector& newRoute) {
     // Reroute destination from initial parking area to an alternative parking area
     // if the following conditions are met:
     // - next stop target is a parking area
@@ -640,13 +643,11 @@
         // not driving towards a parkingArea
         return nullptr;
     }
+    // if the vehicle is on the destParkArea edge it is always visible
+    bool destVisible = (&destParkArea->getLane().getEdge() == veh.getEdge());
 
-    bool destVisible = false;
     for (auto paVis : parks) {
-        if (paVis.first == destParkArea
-                && (paVis.second
-                    // if the vehicle is on the destParkArea edge it is always visible
-                    || &(destParkArea->getLane().getEdge()) == veh.getEdge())) {
+        if (paVis.first == destParkArea && paVis.second) {
             destVisible = true;
             break;
         }
@@ -1016,7 +1017,7 @@
                                    MSParkingAreaMap_t& parkAreas,
                                    std::map& newRoutes,
                                    std::map& parkApproaches,
-                                   ParkingParamMap_t& maxValues) const {
+                                   ParkingParamMap_t& maxValues) {
     // a map stores the parking values
     ParkingParamMap_t parkValues;
 
diff -Nru sumo-1.17.0/src/microsim/trigger/MSTriggeredRerouter.h sumo-1.18.0/src/microsim/trigger/MSTriggeredRerouter.h
--- sumo-1.17.0/src/microsim/trigger/MSTriggeredRerouter.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/microsim/trigger/MSTriggeredRerouter.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -169,10 +169,15 @@
     /// Returns the rerouting probability given by the user
     double getUserProbability() const;
 
-    double getWeight(SUMOVehicle& veh, const std::string param, const double defaultWeight) const;
+    // @brief return whether this moveReminder triggers parking reroute
+    bool isParkingRerouter() const {
+        return myHaveParkProbs;
+    }
+
+    static double getWeight(SUMOVehicle& veh, const std::string param, const double defaultWeight);
 
-    MSParkingArea* rerouteParkingArea(const MSTriggeredRerouter::RerouteInterval* rerouteDef,
-                                      SUMOVehicle& veh, bool& newDestination, ConstMSEdgeVector& newRoute) const;
+    static MSParkingArea* rerouteParkingArea(const MSTriggeredRerouter::RerouteInterval* rerouteDef,
+            SUMOVehicle& veh, bool& newDestination, ConstMSEdgeVector& newRoute);
 
     /// @brief return all rerouter instances
     static const std::map& getInstances() {
@@ -217,13 +222,13 @@
     typedef std::map MSParkingAreaMap_t;
 
     /// determine attributes of candiate parking area for scoring
-    bool addParkValues(SUMOVehicle& veh, double brakeGap, bool newDestination,
-                       MSParkingArea* pa, double paOccupancy, double prob,
-                       SUMOAbstractRouter& router,
-                       MSParkingAreaMap_t& parkAreas,
-                       std::map& newRoutes,
-                       std::map& parkApproaches,
-                       ParkingParamMap_t& maxValues) const;
+    static bool addParkValues(SUMOVehicle& veh, double brakeGap, bool newDestination,
+                              MSParkingArea* pa, double paOccupancy, double prob,
+                              SUMOAbstractRouter& router,
+                              MSParkingAreaMap_t& parkAreas,
+                              std::map& newRoutes,
+                              std::map& parkApproaches,
+                              ParkingParamMap_t& maxValues);
 
 protected:
     /// @brief edges where vehicles are notified
@@ -263,6 +268,8 @@
     RandomDistributor myCurrentRouteProb;
     //@}
 
+    /// whether this rerouter has loaded parkingReroute definitions
+    bool myHaveParkProbs;
 
     /// @brief special destination values
     static MSEdge mySpecialDest_keepDestination;
diff -Nru sumo-1.17.0/src/netbuild/NBAlgorithms.cpp sumo-1.18.0/src/netbuild/NBAlgorithms.cpp
--- sumo-1.17.0/src/netbuild/NBAlgorithms.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netbuild/NBAlgorithms.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -37,7 +37,10 @@
 
 
 //#define DEBUG_SETPRIORITIES
+//#define DEBUG_TURNAROUNDS
 #define DEBUGCOND (n.getID() == "C")
+//#define DEBUGCOND2(obj) (obj->getID() == "")
+#define DEBUGCOND2(obj) (true)
 
 // ===========================================================================
 // method definitions
@@ -62,19 +65,26 @@
     }
     std::vector combinations;
     const bool geometryLike = node->geometryLike();
-    for (std::vector::const_iterator j = outgoing.begin(); j != outgoing.end(); ++j) {
-        NBEdge* outedge = *j;
-        for (std::vector::const_iterator k = incoming.begin(); k != incoming.end(); ++k) {
-            NBEdge* e = *k;
+    for (NBEdge* outedge : outgoing) {
+        for (NBEdge* e : incoming) {
             // @todo: check whether NBHelpers::relAngle is properly defined and whether it should really be used, here
             const double signedAngle = NBHelpers::normRelAngle(e->getAngleAtNode(node), outedge->getAngleAtNode(node));
             if (signedAngle > 0 && signedAngle < 177 && e->getGeometry().back().distanceTo2D(outedge->getGeometry().front()) < POSITION_EPS) {
                 // backwards curving edges can only be turnaround when there are
                 // non-default endpoints
+#ifdef DEBUG_TURNAROUNDS
+                if (DEBUGCOND2(node)) {
+                    std::cout << "incoming=" << e->getID() << " outgoing=" << outedge->getID() << " signedAngle=" << signedAngle << " skipped\n";
+                }
+#endif
                 continue;
             }
             double angle = fabs(signedAngle);
-            // std::cout << "incoming=" << e->getID() << " outgoing=" << outedge->getID() << " relAngle=" << NBHelpers::relAngle(e->getAngleAtNode(node), outedge->getAngleAtNode(node)) << "\n";
+#ifdef DEBUG_TURNAROUNDS
+            if (DEBUGCOND2(node)) {
+                std::cout << "incoming=" << e->getID() << " outgoing=" << outedge->getID() << " relAngle=" << NBHelpers::relAngle(e->getAngleAtNode(node), outedge->getAngleAtNode(node)) << "\n";
+            }
+#endif
             const bool badPermissions = ((outedge->getPermissions() & e->getPermissions() & ~SVC_PEDESTRIAN) == 0
                                          && !geometryLike
                                          && outedge->getPermissions() != e->getPermissions());
@@ -94,7 +104,23 @@
                 angle += 360;
             }
             if (angle < 160) {
-                continue;
+                if (angle > 135) {
+                    // could be a turnaround with a green median island, look at
+                    // angle further away from the junction
+                    const double inFA = getFarAngleAtNode(e, node);
+                    const double outFA = getFarAngleAtNode(outedge, node);
+                    const double signedFarAngle = NBHelpers::normRelAngle(inFA, outFA);
+#ifdef DEBUG_TURNAROUNDS
+                    if (DEBUGCOND2(node)) {
+                        std::cout << "    inFA=" << inFA << " outFA=" << outFA << " sFA=" << signedFarAngle << "\n";
+                    }
+#endif
+                    if (signedFarAngle > -160) {
+                        continue;
+                    }
+                } else {
+                    continue;
+                }
             }
             if (badPermissions) {
                 // penalty
@@ -110,9 +136,17 @@
     // sort combinations so that the ones with the highest angle are at the begin
     std::sort(combinations.begin(), combinations.end(), combination_by_angle_sorter());
     std::set seen;
-    //std::cout << "check combinations at " << node->getID() << "\n";
+#ifdef DEBUG_TURNAROUNDS
+    if (DEBUGCOND2(node)) {
+        std::cout << "check combinations at " << node->getID() << "\n";
+    }
+#endif
     for (std::vector::const_iterator j = combinations.begin(); j != combinations.end(); ++j) {
-        //std::cout << " from=" << (*j).from->getID() << " to=" << (*j).to->getID() << " a=" << (*j).angle << "\n";
+#ifdef DEBUG_TURNAROUNDS
+        if (DEBUGCOND2(node)) {
+            std::cout << " from=" << (*j).from->getID() << " to=" << (*j).to->getID() << " a=" << (*j).angle << "\n";
+        }
+#endif
         if (seen.find((*j).from) != seen.end() || seen.find((*j).to) != seen.end()) {
             // do not regard already set edges
             if ((*j).angle > 360 && warn) {
@@ -127,12 +161,67 @@
         seen.insert((*j).to);
         // set turnaround information
         bool onlyPossible = (*j).from->getConnections().size() != 0 && !(*j).from->isConnectedTo((*j).to);
-        //std::cout << "    setTurningDestination from=" << (*j).from->getID() << " to=" << (*j).to->getID() << " onlyPossible=" << onlyPossible << "\n";
+#ifdef DEBUG_TURNAROUNDS
+        if (DEBUGCOND2(node)) {
+            std::cout << "    setTurningDestination from=" << (*j).from->getID() << " to=" << (*j).to->getID() << " onlyPossible=" << onlyPossible << "\n";
+        }
+#endif
         (*j).from->setTurningDestination((*j).to, onlyPossible);
     }
 }
 
 
+double
+NBTurningDirectionsComputer::getFarAngleAtNode(const NBEdge* e, const NBNode* n, double dist) {
+    Position atNode;
+    Position far;
+    double angle;
+    const NBEdge* next = e;
+    if (e->getToNode() == n) {
+        // search upstream
+        atNode = e->getGeometry().back();
+        while (dist > 0) {
+            const double length = next->getGeometry().length();
+            if (dist <= length) {
+                far = next->getGeometry().positionAtOffset(length - dist);
+                break;
+            } else {
+                far = next->getGeometry().front();
+                dist -= length;
+                if (next->getToNode()->getIncomingEdges().size() == 1) {
+                    next = next->getToNode()->getIncomingEdges().front();
+                } else {
+                    break;
+                }
+            }
+        }
+        angle = far.angleTo2D(atNode);
+        //std::cout << " e=" << e->getID() << " n=" << n->getID() << " far=" << far << " atNode=" << atNode << " a=" << RAD2DEG(angle) << "\n";
+    } else {
+        // search downstream
+        atNode = e->getGeometry().front();
+        while (dist > 0) {
+            const double length = next->getGeometry().length();
+            if (dist <= length) {
+                far = next->getGeometry().positionAtOffset(dist);
+                break;
+            } else {
+                far = next->getGeometry().back();
+                dist -= length;
+                if (next->getToNode()->getOutgoingEdges().size() == 1) {
+                    next = next->getToNode()->getOutgoingEdges().front();
+                } else {
+                    break;
+                }
+            }
+        }
+        angle = atNode.angleTo2D(far);
+        //std::cout << " e=" << e->getID() << " n=" << n->getID() << " atNode=" << atNode << " far=" << far << " a=" << RAD2DEG(angle) << "\n";
+    }
+    return GeomHelper::legacyDegree(angle);
+}
+
+
 // ---------------------------------------------------------------------------
 // NBNodesEdgesSorter
 // ---------------------------------------------------------------------------
@@ -291,7 +380,7 @@
 NBNodeTypeComputer::isRailwayNode(const NBNode* n) {
     bool hasRailway = false;
     for (NBEdge* e : n->getIncomingEdges()) {
-        if ((e->getPermissions() & ~SVC_RAIL_CLASSES) != 0) {
+        if ((e->getPermissions() & ~(SVC_RAIL_CLASSES | SVC_TAXI)) != 0) {
             return false;
         } else if ((e->getPermissions() & SVC_RAIL_CLASSES) != 0) {
             hasRailway = true;
diff -Nru sumo-1.17.0/src/netbuild/NBAlgorithms.h sumo-1.18.0/src/netbuild/NBAlgorithms.h
--- sumo-1.17.0/src/netbuild/NBAlgorithms.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netbuild/NBAlgorithms.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -55,6 +55,9 @@
      */
     static void computeTurnDirectionsForNode(NBNode* node, bool warn);
 
+    /// @brief compute angle to junction at a point further away
+    static double getFarAngleAtNode(const NBEdge* e, const NBNode* n, double dist = 50);
+
 private:
     /** @struct Combination
      * @brief Stores the information about the angle between an incoming ("from") and an outgoing ("to") edge
@@ -80,8 +83,22 @@
                 return c1.angle > c2.angle;
             }
             if (c1.from != c2.from) {
+                if (c1.to == c2.to && c1.from->getPermissions() != c2.from->getPermissions()) {
+                    if (c1.from->getPermissions() == c1.to->getPermissions()) {
+                        return true;
+                    } else if (c2.from->getPermissions() == c1.to->getPermissions()) {
+                        return false;
+                    }
+                }
                 return c1.from->getID() < c2.from->getID();
             }
+            if (c1.to->getPermissions() != c2.to->getPermissions()) {
+                if (c1.to->getPermissions() == c1.from->getPermissions()) {
+                    return true;
+                } else if (c2.to->getPermissions() == c1.from->getPermissions()) {
+                    return false;
+                }
+            }
             return c1.to->getID() < c2.to->getID();
         }
     };
diff -Nru sumo-1.17.0/src/netbuild/NBAlgorithms_Railway.cpp sumo-1.18.0/src/netbuild/NBAlgorithms_Railway.cpp
--- sumo-1.17.0/src/netbuild/NBAlgorithms_Railway.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netbuild/NBAlgorithms_Railway.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -112,13 +112,16 @@
 
 int
 NBRailwayTopologyAnalyzer::repairTopology(NBEdgeCont& ec, NBPTStopCont& sc, NBPTLineCont& lc) {
+    const bool minimal = OptionsCont::getOptions().getBool("railway.topology.repair.minimal");
     int addedBidi = 0;
-    addedBidi += extendBidiEdges(ec);
-    addedBidi += reverseEdges(ec, sc); // technically not bidi but new edges nevertheless
-    addedBidi += addBidiEdgesForBufferStops(ec);
-    addedBidi += addBidiEdgesBetweenSwitches(ec);
+    if (!minimal) {
+        addedBidi += extendBidiEdges(ec);
+        addedBidi += reverseEdges(ec, sc); // technically not bidi but new edges nevertheless
+        addedBidi += addBidiEdgesForBufferStops(ec);
+        addedBidi += addBidiEdgesBetweenSwitches(ec);
+    }
     if (lc.getLines().size() > 0) {
-        addedBidi += addBidiEdgesForStops(ec, lc, sc);
+        addedBidi += addBidiEdgesForStops(ec, lc, sc, minimal);
     }
     if (OptionsCont::getOptions().getBool("railway.topology.repair.connect-straight")) {
         addedBidi += addBidiEdgesForStraightConnectivity(ec, true);
@@ -862,8 +865,8 @@
 }
 
 int
-NBRailwayTopologyAnalyzer::addBidiEdgesForStops(NBEdgeCont& ec, NBPTLineCont& lc, NBPTStopCont& sc) {
-    const bool minimal = OptionsCont::getOptions().getBool("railway.topology.repair.minimal");
+NBRailwayTopologyAnalyzer::addBidiEdgesForStops(NBEdgeCont& ec, NBPTLineCont& lc, NBPTStopCont& sc, bool minimal) {
+    const double penalty = OptionsCont::getOptions().getFloat("railway.topology.repair.bidi-penalty");
     // generate bidirectional routing graph
     std::vector tracks;
     for (NBEdge* edge : ec.getAllEdges()) {
@@ -871,7 +874,7 @@
     }
     const int numEdges = (int)tracks.size();
     for (NBEdge* edge : ec.getAllEdges()) {
-        tracks.push_back(new Track(edge, (int)tracks.size(), edge->getID() + "_reverse"));
+        tracks.push_back(new Track(edge, (int)tracks.size(), edge->getID() + "_reverse", penalty));
     }
     // add special tracks for starting end ending in both directions
     std::map > stopTracks;
@@ -955,6 +958,10 @@
     for (const auto& item : lc.getLines()) {
         NBPTLine* line = item.second;
         std::vector > stops = line->getStopEdges(ec);
+        std::vector stopEdges;
+        for (auto it : stops) {
+            stopEdges.push_back(it.first);
+        }
         NBEdge* routeStart = line->getRouteStart(ec);
         NBEdge* routeEnd = line->getRouteEnd(ec);
         if (routeStart != nullptr) {
@@ -966,10 +973,6 @@
         if (stops.size() < 2) {
             continue;
         }
-        std::vector stopEdges;
-        for (auto it : stops) {
-            stopEdges.push_back(it.first);
-        }
         if (!line->isConsistent(stopEdges) && requireBidi.count(line) == 0) {
             WRITE_WARNINGF(TL("Edge sequence is not consistent with stop sequence in line '%', not adding bidi edges."), item.first);
             continue;
@@ -981,7 +984,7 @@
             const std::string toStop = (it + 1)->second;
             std::pair trip(fromStop, toStop);
             std::pair reverseTrip(toStop, fromStop);
-            //std::cout << " trip=" << Named::getIDSecure(fromEdge) << "->" << Named::getIDSecure(toEdge) << " visited=" << (visited.count(trip) != 0) << "\n";
+            //std::cout << " line=" << line->getLineID() << " trip=" << Named::getIDSecure(fromEdge) << "->" << Named::getIDSecure(toEdge) << " visited=" << (visited.count(trip) != 0) << " fromStop=" << fromStop << " toStop=" << toStop << "\n";
             if (visited.count(trip) != 0) {
                 continue;
             } else {
@@ -1018,16 +1021,20 @@
                                 }
                             } else if (isStop && needBidi) {
                                 std::shared_ptr fs = sc.get(fromStop);
-                                std::shared_ptr fromReverse = sc.getReverseStop(fs, ec);
-                                if (fromReverse) {
-                                    sc.insert(fromReverse);
-                                    fs->setBidiStop(fromReverse);
+                                if (fs) {
+                                    std::shared_ptr fromReverse = sc.getReverseStop(fs, ec);
+                                    if (fromReverse) {
+                                        sc.insert(fromReverse);
+                                        fs->setBidiStop(fromReverse);
+                                    }
                                 }
                                 std::shared_ptr ts = sc.get(toStop);
-                                std::shared_ptr toReverse = sc.getReverseStop(ts, ec);
-                                if (toReverse) {
-                                    sc.insert(toReverse);
-                                    ts->setBidiStop(toReverse);
+                                if (ts) {
+                                    std::shared_ptr toReverse = sc.getReverseStop(ts, ec);
+                                    if (toReverse) {
+                                        sc.insert(toReverse);
+                                        ts->setBidiStop(toReverse);
+                                    }
                                 }
                             }
                         }
@@ -1162,7 +1169,7 @@
 
 double
 NBRailwayTopologyAnalyzer::getTravelTimeStatic(const Track* const track, const NBVehicle* const veh, double time) {
-    return NBEdge::getTravelTimeStatic(track->edge, veh, time);
+    return NBEdge::getTravelTimeStatic(track->edge, veh, time) * track->penalty;
 }
 
 
@@ -1288,5 +1295,71 @@
     }
 }
 
+// ---------------------------------------------------------------------------
+// NBRailwaySignalGuesser methods
+// ---------------------------------------------------------------------------
+
+int
+NBRailwaySignalGuesser::guessRailSignals(NBEdgeCont& ec, NBPTStopCont& sc) {
+    const OptionsCont& oc = OptionsCont::getOptions();
+    int addedSignals = 0;
+    if (oc.exists("railway.signal.guess.by-stops")) {
+        if (oc.getBool("railway.signal.guess.by-stops")) {
+            const double minLength = oc.getFloat("osm.stop-output.length.train");
+            addedSignals += guessByStops(ec, sc, minLength);
+        }
+    }
+    return addedSignals;
+}
+
+
+int
+NBRailwaySignalGuesser::guessByStops(NBEdgeCont& ec, NBPTStopCont& sc, double minLength) {
+    int addedSignals = 0;
+    for (auto& item : sc.getStops()) {
+        const NBEdge* stopEdge = ec.retrieve(item.second->getEdgeId());
+        if (stopEdge != nullptr && isRailway(stopEdge->getPermissions())) {
+            NBNode* to = stopEdge->getToNode();
+            if (to->getType() != SumoXMLNodeType::RAIL_SIGNAL) {
+                to->reinit(to->getPosition(), SumoXMLNodeType::RAIL_SIGNAL);
+                addedSignals++;
+            }
+            NBNode* from = stopEdge->getFromNode();
+            if (stopEdge->getLoadedLength() >= minLength) {
+                /// XXX should split edge if it is too long
+                if (from->getType() != SumoXMLNodeType::RAIL_SIGNAL) {
+                    from->reinit(from->getPosition(), SumoXMLNodeType::RAIL_SIGNAL);
+                    addedSignals++;
+                }
+            } else {
+                double searchDist = minLength - stopEdge->getLoadedLength();
+                while (searchDist > 0 && from->geometryLike()) {
+                    for (const NBEdge* in : from->getIncomingEdges()) {
+                        if (in->getFromNode() != stopEdge->getToNode()) {
+                            // found edge that isn't a bidi predecessor
+                            stopEdge = in;
+                            break;
+                        }
+                    }
+                    if (stopEdge->getFromNode() == from) {
+                        // bidi edge without predecessor
+                        break;
+                    } else {
+                        from = stopEdge->getFromNode();
+                    }
+                    searchDist -= stopEdge->getLoadedLength();
+                }
+                if (searchDist <= 0 && from->getType() != SumoXMLNodeType::RAIL_SIGNAL) {
+                    from->reinit(from->getPosition(), SumoXMLNodeType::RAIL_SIGNAL);
+                    addedSignals++;
+                }
+            }
+        }
+    }
+    WRITE_MESSAGEF(TL("Added % rail signals at % stops."), addedSignals, sc.getStops().size());
+    return addedSignals;
+}
+
+
 
 /****************************************************************************/
diff -Nru sumo-1.17.0/src/netbuild/NBAlgorithms_Railway.h sumo-1.18.0/src/netbuild/NBAlgorithms_Railway.h
--- sumo-1.17.0/src/netbuild/NBAlgorithms_Railway.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netbuild/NBAlgorithms_Railway.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -56,8 +56,9 @@
     /// routing edge
     class Track {
     public:
-        Track(NBEdge* e, int i = -1, const std::string& _id = "") :
+        Track(NBEdge* e, int i = -1, const std::string& _id = "", double _penalty = 1) :
             edge(e),
+            penalty(_penalty),
             index(i < 0 ? edge->getNumericalID() : i),
             id(_id == "" ? edge->getID() : _id),
             minPermissions(edge->getPermissions()) {
@@ -74,7 +75,7 @@
             return index;
         }
         double getLength() const {
-            return 0.;
+            return 0;
         }
         const Track* getBidiEdge() const {
             return this;
@@ -90,6 +91,7 @@
         }
 
         NBEdge* edge;
+        double penalty;
 
     private:
         const int index;
@@ -140,7 +142,7 @@
     static int addBidiEdgesBetweenSwitches(NBEdgeCont& ec);
 
     /// @brief add bidi-edges to connect successive public transport stops
-    static int addBidiEdgesForStops(NBEdgeCont& ec, NBPTLineCont& lc, NBPTStopCont& sc);
+    static int addBidiEdgesForStops(NBEdgeCont& ec, NBPTLineCont& lc, NBPTStopCont& sc, bool minimal);
 
     /// @brief add bidi-edges to connect straight tracks
     static int addBidiEdgesForStraightConnectivity(NBEdgeCont& ec, bool geometryLike);
@@ -152,3 +154,13 @@
     static std::set findBidiCandidates(NBPTLineCont& lc);
 
 };
+
+
+class NBRailwaySignalGuesser {
+
+public:
+    static int guessRailSignals(NBEdgeCont& ec, NBPTStopCont& sc);
+
+private:
+    static int guessByStops(NBEdgeCont& ec, NBPTStopCont& sc, double minLength);
+};
diff -Nru sumo-1.17.0/src/netbuild/NBAlgorithms_Ramps.cpp sumo-1.18.0/src/netbuild/NBAlgorithms_Ramps.cpp
--- sumo-1.17.0/src/netbuild/NBAlgorithms_Ramps.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netbuild/NBAlgorithms_Ramps.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netbuild/NBAlgorithms_Ramps.h sumo-1.18.0/src/netbuild/NBAlgorithms_Ramps.h
--- sumo-1.17.0/src/netbuild/NBAlgorithms_Ramps.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netbuild/NBAlgorithms_Ramps.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netbuild/NBCapacity2Lanes.h sumo-1.18.0/src/netbuild/NBCapacity2Lanes.h
--- sumo-1.17.0/src/netbuild/NBCapacity2Lanes.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netbuild/NBCapacity2Lanes.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netbuild/NBConnection.cpp sumo-1.18.0/src/netbuild/NBConnection.cpp
--- sumo-1.17.0/src/netbuild/NBConnection.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netbuild/NBConnection.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netbuild/NBConnectionDefs.h sumo-1.18.0/src/netbuild/NBConnectionDefs.h
--- sumo-1.17.0/src/netbuild/NBConnectionDefs.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netbuild/NBConnectionDefs.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netbuild/NBConnection.h sumo-1.18.0/src/netbuild/NBConnection.h
--- sumo-1.17.0/src/netbuild/NBConnection.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netbuild/NBConnection.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netbuild/NBCont.h sumo-1.18.0/src/netbuild/NBCont.h
--- sumo-1.17.0/src/netbuild/NBCont.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netbuild/NBCont.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netbuild/NBContHelper.cpp sumo-1.18.0/src/netbuild/NBContHelper.cpp
--- sumo-1.17.0/src/netbuild/NBContHelper.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netbuild/NBContHelper.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netbuild/NBContHelper.h sumo-1.18.0/src/netbuild/NBContHelper.h
--- sumo-1.17.0/src/netbuild/NBContHelper.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netbuild/NBContHelper.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netbuild/NBDistrictCont.cpp sumo-1.18.0/src/netbuild/NBDistrictCont.cpp
--- sumo-1.17.0/src/netbuild/NBDistrictCont.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netbuild/NBDistrictCont.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netbuild/NBDistrictCont.h sumo-1.18.0/src/netbuild/NBDistrictCont.h
--- sumo-1.17.0/src/netbuild/NBDistrictCont.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netbuild/NBDistrictCont.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netbuild/NBDistrict.cpp sumo-1.18.0/src/netbuild/NBDistrict.cpp
--- sumo-1.17.0/src/netbuild/NBDistrict.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netbuild/NBDistrict.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netbuild/NBDistrict.h sumo-1.18.0/src/netbuild/NBDistrict.h
--- sumo-1.17.0/src/netbuild/NBDistrict.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netbuild/NBDistrict.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netbuild/NBEdgeCont.cpp sumo-1.18.0/src/netbuild/NBEdgeCont.cpp
--- sumo-1.17.0/src/netbuild/NBEdgeCont.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netbuild/NBEdgeCont.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -2075,4 +2075,16 @@
     }
 }
 
+
+std::set
+NBEdgeCont::getUsedTypes() const {
+    std::set result;
+    for (auto item : myEdges) {
+        if (item.second->getTypeID() != "") {
+            result.insert(item.second->getTypeID());
+        }
+    }
+    return result;
+}
+
 /****************************************************************************/
diff -Nru sumo-1.17.0/src/netbuild/NBEdgeCont.h sumo-1.18.0/src/netbuild/NBEdgeCont.h
--- sumo-1.17.0/src/netbuild/NBEdgeCont.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netbuild/NBEdgeCont.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -601,6 +601,9 @@
     /// @brief compute all edge angles
     void computeAngles();
 
+    /// @brief return all edge types in used
+    std::set getUsedTypes() const;
+
 private:
     /// @brief compute the form factor for a loop of edges
     static double formFactor(const EdgeVector& loopEdges);
diff -Nru sumo-1.17.0/src/netbuild/NBEdge.cpp sumo-1.18.0/src/netbuild/NBEdge.cpp
--- sumo-1.17.0/src/netbuild/NBEdge.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netbuild/NBEdge.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -730,6 +730,7 @@
     return (isRailway(getPermissions())
             && (ignoreSpread || myLaneSpreadFunction == LaneSpreadFunction::CENTER)
             && myPossibleTurnDestination != nullptr
+            && myPossibleTurnDestination->myPossibleTurnDestination == this
             && (ignoreSpread || myPossibleTurnDestination->getLaneSpreadFunction() == LaneSpreadFunction::CENTER)
             && isRailway(myPossibleTurnDestination->getPermissions())
             && myPossibleTurnDestination->getGeometry().reverse() == getGeometry());
@@ -739,6 +740,7 @@
 bool
 NBEdge::isBidiEdge(bool checkPotential) const {
     return myPossibleTurnDestination != nullptr
+           && myPossibleTurnDestination->myPossibleTurnDestination == this
            && (myIsBidi || myPossibleTurnDestination->myIsBidi || checkPotential)
            && myPossibleTurnDestination->getToNode() == getFromNode()
            && myPossibleTurnDestination->getLaneSpreadFunction() == myLaneSpreadFunction
@@ -1216,7 +1218,7 @@
 
 
 std::vector
-NBEdge::getConnectionsFromLane(int lane, NBEdge* to, int toLane) const {
+NBEdge::getConnectionsFromLane(int lane, const NBEdge* to, int toLane) const {
     std::vector ret;
     for (const Connection& c : myConnections) {
         if ((lane < 0 || c.fromLane == lane)
@@ -1753,8 +1755,9 @@
                     const bool indirectTurnConflit = con.indirectLeft && this == i2 && dir2 == LinkDirection::STRAIGHT;
                     const bool mergeConflict = myTo->mergeConflict(this, con, i2, k2, true);
                     const bool mergeResponse = myTo->mergeConflict(this, con, i2, k2, false);
+                    const bool bidiConflict = myTo->bidiConflict(this, con, i2, k2, true);
                     // compute foe internal lanes
-                    if (foes || rightTurnConflict || oppositeLeftIntersect || mergeConflict || indirectTurnConflit) {
+                    if (foes || rightTurnConflict || oppositeLeftIntersect || mergeConflict || indirectTurnConflit || bidiConflict) {
                         foeInternalLinks.push_back(index);
                     }
                     // only warn once per pair of intersecting turns
@@ -2689,9 +2692,13 @@
             continue;
         }
         const NBEdge* to = dirMap[dir];
+        int candidates = to->getNumLanesThatAllow(SVC_PASSENGER);
+        if (candidates == 0) {
+            WRITE_WARNINGF(TL("Cannot apply turn sign information for edge '%' because the target edge '%' has no suitable lanes"), getID(), to->getID());
+            return false;
+        }
         std::vector& knownTargets = toLaneMap[to];
         if ((int)knownTargets.size() < item.second) {
-            int candidates = to->getNumLanesThatAllow(SVC_PASSENGER);
             if (candidates < item.second) {
                 WRITE_WARNINGF(TL("Cannot apply turn sign information for edge '%' because there are % signed connections with directions '%' but target edge '%' has only % suitable lanes"),
                                getID(), item.second, toString(dir), to->getID(), candidates);
@@ -2750,23 +2757,25 @@
                             // if the source permits passenger traffic, the target should too
                             fromP = SVC_PASSENGER;
                         }
-                        int toLane = 0;
+                        int toLane = toLaneMap[to][0];
                         while ((to->getPermissions(toLane) & fromP) == 0) {
                             toLane++;
+                            /*
                             if (toLane == to->getNumLanes()) {
                                 SOFT_ASSERT(false);
-#ifdef DEBUG_TURNSIGNS
+                            #ifdef DEBUG_TURNSIGNS
                                 std::cout << "  could not find passenger lane for target=" << to->getID() << "\n";
-#endif
+                            #endif
                                 return false;
                             }
+                            */
                         }
 #ifdef DEBUG_TURNSIGNS
                         std::cout << "  target=" << to->getID() << " initial toLane=" << toLane << "\n";
 #endif
                         toLaneIndex[to] = toLane;
                     }
-                    setConnection(i, to, toLaneMap[to][toLaneIndex[to]++], Lane2LaneInfoType::VALIDATED, true);
+                    setConnection(i, to, toLaneIndex[to]++, Lane2LaneInfoType::VALIDATED, true);
                 }
             }
         }
@@ -3731,6 +3740,14 @@
     if (minLength > 0 && (possContinuation->getLoadedLength() < minLength || getLoadedLength() < minLength)) {
         return true;
     }
+    const double maxJunctionSize = OptionsCont::getOptions().getFloat("geometry.remove.max-junction-size");
+    if (maxJunctionSize >= 0) {
+        const double junctionSize = myGeom.back().distanceTo2D(possContinuation->myGeom.front());
+        if (junctionSize > maxJunctionSize + POSITION_EPS) {
+            reason = "junction size (" + toString(junctionSize) + ") > max-junction-size (" + toString(maxJunctionSize) + ")";
+            return false;
+        }
+    }
     // the priority, too (?)
     if (getPriority() != possContinuation->getPriority()) {
         reason = "priority";
diff -Nru sumo-1.17.0/src/netbuild/NBEdge.h sumo-1.18.0/src/netbuild/NBEdge.h
--- sumo-1.17.0/src/netbuild/NBEdge.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netbuild/NBEdge.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -989,7 +989,7 @@
      * @return The connections from the given lane
      * @see NBEdge::Connection
      */
-    std::vector getConnectionsFromLane(int lane, NBEdge* to = nullptr, int toLane = -1) const;
+    std::vector getConnectionsFromLane(int lane, const NBEdge* to = nullptr, int toLane = -1) const;
 
     /** @brief Returns the specified connection (unmodifiable)
      * This method goes through "myConnections" and returns the specified one
diff -Nru sumo-1.17.0/src/netbuild/NBFrame.cpp sumo-1.18.0/src/netbuild/NBFrame.cpp
--- sumo-1.17.0/src/netbuild/NBFrame.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netbuild/NBFrame.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -23,13 +23,6 @@
 
 #include 
 #include 
-#include "NBFrame.h"
-#include "NBNodeCont.h"
-#include "NBEdgeCont.h"
-#include "NBTrafficLightLogicCont.h"
-#include "NBDistrictCont.h"
-#include "NBRequest.h"
-#include "NBTypeCont.h"
 #include 
 #include 
 #include 
@@ -39,13 +32,20 @@
 #include 
 #include 
 
+#include "NBFrame.h"
+#include "NBNodeCont.h"
+#include "NBEdgeCont.h"
+#include "NBTrafficLightLogicCont.h"
+#include "NBDistrictCont.h"
+#include "NBRequest.h"
+#include "NBTypeCont.h"
 
 // ===========================================================================
 // method definitions
 // ===========================================================================
+
 void
-NBFrame::fillOptions(bool forNetgen) {
-    OptionsCont& oc = OptionsCont::getOptions();
+NBFrame::fillOptions(OptionsCont& oc, bool forNetgen) {
     // register building defaults
     oc.doRegister("default.lanenumber", 'L', new Option_Integer(1));
     oc.addSynonyme("default.lanenumber", "lanenumber", true);
@@ -184,6 +184,10 @@
     oc.addDescription("geometry.remove.width-tolerance", "Processing",
                       "Allow merging edges with differing lane widths if the difference is below FLOAT");
 
+    oc.doRegister("geometry.remove.max-junction-size", new Option_Float(-1));
+    oc.addDescription("geometry.remove.max-junction-size", "Processing",
+                      "Prevent removal of junctions with a size above FLOAT as defined by custom edge endpoints");
+
     oc.doRegister("geometry.max-segment-length", new Option_Float(0));
     oc.addDescription("geometry.max-segment-length", "Processing", TL("splits geometry to restrict segment length"));
 
@@ -234,6 +238,9 @@
         oc.doRegister("railway.topology.repair.stop-turn", new Option_Bool(false));
         oc.addDescription("railway.topology.repair.stop-turn", "Railway", TL("Add turn-around connections at all loaded stops."));
 
+        oc.doRegister("railway.topology.repair.bidi-penalty", new Option_Float(1.2));
+        oc.addDescription("railway.topology.repair.bidi-penalty", "Railway", TL("Penalty factor for adding new bidi edges to connect public transport stops"));
+
         oc.doRegister("railway.topology.all-bidi", new Option_Bool(false));
         oc.addDescription("railway.topology.all-bidi", "Railway", TL("Make all rails usable in both direction"));
 
@@ -246,6 +253,9 @@
         oc.doRegister("railway.topology.extend-priority", new Option_Bool(false));
         oc.addDescription("railway.topology.extend-priority", "Railway", TL("Extend loaded edge priority values based on estimated main direction"));
 
+        oc.doRegister("railway.signal.guess.by-stops", new Option_Bool(false));
+        oc.addDescription("railway.signal.guess.by-stops", "Railway", TL("Guess signals that guard public transport stops"));
+
         oc.doRegister("railway.access-distance", new Option_Float(150.f));
         oc.addDescription("railway.access-distance", "Railway", TL("The search radius for finding suitable road accesses for rail stops"));
         oc.addSynonyme("railway.access-distance", "osm.stop-output.footway-access-distance", true);
@@ -381,7 +391,6 @@
     oc.addDescription("junctions.limit-turn-speed.warn.turn", "Junctions",
                       "Warn about turn speed limits that reduce the speed of turning connections (no u-turns) by more than FLOAT");
 
-
     oc.doRegister("junctions.small-radius", new Option_Float(1.5));
     oc.addDescription("junctions.small-radius", "Junctions",
                       "Default radius for junctions that do not require wide vehicle turns");
@@ -390,6 +399,10 @@
     oc.addDescription("junctions.higher-speed", "Junctions",
                       "Use maximum value of incoming and outgoing edge speed on junction instead of average");
 
+    oc.doRegister("junctions.minimal-shape", new Option_Bool(false));
+    oc.addDescription("junctions.minimal-shape", "Junctions",
+                      "Build junctions with minimal shapes (igoring edge overlap)");
+
     oc.doRegister("internal-junctions.vehicle-width", new Option_Float(1.8));
     oc.addDescription("internal-junctions.vehicle-width", "Junctions",
                       "Assumed vehicle width for computing internal junction positions");
@@ -495,6 +508,9 @@
     oc.addDescription("tls.join-dist", "TLS Building",
                       "Determines the maximal distance for joining traffic lights (defaults to 20)");
 
+    oc.doRegister("tls.join-exclude", new Option_StringVector());
+    oc.addDescription("tls.join-exclude", "TLS Building", TL("Interprets STR[] as list of tls ids to exclude from joining"));
+
     oc.doRegister("tls.uncontrolled-within", new Option_Bool(false));
     oc.addDescription("tls.uncontrolled-within", "TLS Building",
                       "Do not control edges that lie fully within a joined traffic light. This may cause collisions but allows old traffic light plans to be used");
@@ -705,8 +721,7 @@
 
 
 bool
-NBFrame::checkOptions() {
-    OptionsCont& oc = OptionsCont::getOptions();
+NBFrame::checkOptions(OptionsCont& oc) {
     bool ok = true;
     //
     if (!SUMOXMLDefinitions::TrafficLightTypes.hasString(oc.getString("tls.default-type"))) {
@@ -793,5 +808,4 @@
     return ok;
 }
 
-
 /****************************************************************************/
diff -Nru sumo-1.17.0/src/netbuild/NBFrame.h sumo-1.18.0/src/netbuild/NBFrame.h
--- sumo-1.17.0/src/netbuild/NBFrame.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netbuild/NBFrame.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -25,14 +25,14 @@
 #include 
 #include 
 #include 
+#include 
+
 #include "NBEdgeCont.h"
 #include "NBTypeCont.h"
 #include "NBNodeCont.h"
 #include "NBNode.h"
 #include "NBTrafficLightLogicCont.h"
 #include "NBDistrictCont.h"
-#include 
-
 
 // ===========================================================================
 // class definitions
@@ -42,17 +42,16 @@
  * @brief Sets and checks options for netbuild
  */
 class NBFrame {
+
 public:
     /** @brief Inserts options used by the network converter
      * @param[in] forNetgen Whether netconvert options shall be omitted
      */
-    static void fillOptions(bool forNetgen);
+    static void fillOptions(OptionsCont& oc, bool forNetgen);
 
 
     /** @brief Checks set options from the OptionsCont-singleton for being valid
      * @return Whether needed (netbuild) options are set and have proper values
      */
-    static bool checkOptions();
-
-
+    static bool checkOptions(OptionsCont& oc);
 };
diff -Nru sumo-1.17.0/src/netbuild/NBHeightMapper.cpp sumo-1.18.0/src/netbuild/NBHeightMapper.cpp
--- sumo-1.17.0/src/netbuild/NBHeightMapper.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netbuild/NBHeightMapper.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2011-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netbuild/NBHeightMapper.h sumo-1.18.0/src/netbuild/NBHeightMapper.h
--- sumo-1.17.0/src/netbuild/NBHeightMapper.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netbuild/NBHeightMapper.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2011-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netbuild/NBHelpers.cpp sumo-1.18.0/src/netbuild/NBHelpers.cpp
--- sumo-1.17.0/src/netbuild/NBHelpers.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netbuild/NBHelpers.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netbuild/NBHelpers.h sumo-1.18.0/src/netbuild/NBHelpers.h
--- sumo-1.17.0/src/netbuild/NBHelpers.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netbuild/NBHelpers.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netbuild/NBLinkPossibilityMatrix.h sumo-1.18.0/src/netbuild/NBLinkPossibilityMatrix.h
--- sumo-1.17.0/src/netbuild/NBLinkPossibilityMatrix.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netbuild/NBLinkPossibilityMatrix.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netbuild/NBLoadedSUMOTLDef.cpp sumo-1.18.0/src/netbuild/NBLoadedSUMOTLDef.cpp
--- sumo-1.17.0/src/netbuild/NBLoadedSUMOTLDef.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netbuild/NBLoadedSUMOTLDef.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2011-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netbuild/NBLoadedSUMOTLDef.h sumo-1.18.0/src/netbuild/NBLoadedSUMOTLDef.h
--- sumo-1.17.0/src/netbuild/NBLoadedSUMOTLDef.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netbuild/NBLoadedSUMOTLDef.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2011-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -175,6 +175,9 @@
     /// @brief perform optional final checks (on writing)
     void finalChecks() const;
 
+    /// @brief replace the given link index in all connections
+    void replaceIndex(int oldIndex, int newIndex);
+
 protected:
     /// @brief Collects the links participating in this traffic light (only if not previously loaded)
     void collectLinks();
@@ -205,9 +208,6 @@
     /// @brief return whether the given link index is used by any connectons
     bool isUsed(int index) const;
 
-    /// @brief replace the given link index in all connections
-    void replaceIndex(int oldIndex, int newIndex);
-
     /// brief retrieve all edges with connections that use the given traffic light index
     std::set getEdgesUsingIndex(int index) const;
 
diff -Nru sumo-1.17.0/src/netbuild/NBLoadedTLDef.cpp sumo-1.18.0/src/netbuild/NBLoadedTLDef.cpp
--- sumo-1.17.0/src/netbuild/NBLoadedTLDef.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netbuild/NBLoadedTLDef.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netbuild/NBLoadedTLDef.h sumo-1.18.0/src/netbuild/NBLoadedTLDef.h
--- sumo-1.17.0/src/netbuild/NBLoadedTLDef.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netbuild/NBLoadedTLDef.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netbuild/NBNetBuilder.cpp sumo-1.18.0/src/netbuild/NBNetBuilder.cpp
--- sumo-1.17.0/src/netbuild/NBNetBuilder.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netbuild/NBNetBuilder.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -150,7 +150,6 @@
         myPTStopCont.alignIdSigns();
         PROGRESS_TIME_MESSAGE(before);
     }
-
     // analyze and fix railway topology
     int numAddedBidi = 0;
     if (oc.exists("railway.topology.all-bidi") && oc.getBool("railway.topology.all-bidi")) {
@@ -164,6 +163,7 @@
         NBTurningDirectionsComputer::computeTurnDirections(myNodeCont, false);
         numAddedBidi = NBRailwayTopologyAnalyzer::repairTopology(myEdgeCont, myPTStopCont, myPTLineCont);
     }
+    NBRailwaySignalGuesser::guessRailSignals(myEdgeCont, myPTStopCont);
     if (numAddedBidi > 0) {
         // update routes
         myPTLineCont.process(myEdgeCont, myPTStopCont, true);
@@ -575,6 +575,9 @@
         progCount = "(" + toString(numbers.second) + " programs) ";
     }
     WRITE_MESSAGEF(TL(" % traffic light(s) %computed."), toString(numbers.first), progCount);
+    if (oc.exists("opendrive-files") && oc.isSet("opendrive-files") && oc.getBool("opendrive.signal-groups")) {
+        myTLLCont.applyOpenDriveControllers(oc);
+    }
 
     for (std::map::const_iterator i = myEdgeCont.begin(); i != myEdgeCont.end(); ++i) {
         (*i).second->sortOutgoingConnectionsByIndex();
diff -Nru sumo-1.17.0/src/netbuild/NBNetBuilder.h sumo-1.18.0/src/netbuild/NBNetBuilder.h
--- sumo-1.17.0/src/netbuild/NBNetBuilder.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netbuild/NBNetBuilder.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netbuild/NBNodeCont.cpp sumo-1.18.0/src/netbuild/NBNodeCont.cpp
--- sumo-1.17.0/src/netbuild/NBNodeCont.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netbuild/NBNodeCont.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -605,9 +605,9 @@
                             && (e->getPermissions() & (SVC_PASSENGER | SVC_TRAM)) == 0
                             && n->getPosition().distanceTo2D(s->getPosition()) > SUMO_const_laneWidth))) {
 #ifdef DEBUG_JOINJUNCTIONS
-                        if (DEBUGCOND(s)) {
-                            std::cout << " ignored s=" << s->getID() << " pedestrian edge=" << e->getID() << " cd=" << n->getPosition().distanceTo2D(s->getPosition()) << "\n";
-                        }
+                    if (DEBUGCOND(s)) {
+                        std::cout << " ignored s=" << s->getID() << " pedestrian edge=" << e->getID() << " cd=" << n->getPosition().distanceTo2D(s->getPosition()) << "\n";
+                    }
 #endif
                     continue;
                 }
@@ -1747,13 +1747,21 @@
 
     // determine possible connectivity from outside edges
     std::map reachable;
-    for (NBEdge* e : clusterIncoming) {
+    std::map, SVCPermissions> conPermissions;
+    EdgeSet specialPermissions;
+    for (NBEdge* const e : clusterIncoming) {
         EdgeVector open;
         EdgeSet seen;
         open.push_back(e);
         while (open.size() > 0) {
-            NBEdge* cur = open.back();
-            //std::cout << "   e=" << e->getID() << " cur=" << cur->getID() << " open=" << toString(open) << "\n";
+            NBEdge* const cur = open.back();
+            const SVCPermissions pCur = conPermissions.count({e, cur}) == 0 ? cur->getPermissions() : conPermissions[ {e, cur}];
+#ifdef DEBUG_JOINJUNCTIONS_CONNECTIONS
+            if (e->getID() == "625058945") {
+                std::cout << "e=" << e->getID() << " cur=" << cur->getID() << " pCur=" << getVehicleClassNames(cur->getPermissions()) << " open=" << toString(open) << "\n";
+                std::cout << "e=" << e->getID() << " cur=" << cur->getID() << " pCur=" << getVehicleClassNames(pCur) << " open=" << toString(open) << "\n";
+            }
+#endif
             seen.insert(cur);
             open.pop_back();
             if (cluster.count(cur->getToNode()) == 0) {
@@ -1764,19 +1772,34 @@
             if (cons.size() == 0 || ec.hasPostProcessConnection(cur->getID()) || cur->getStep() == NBEdge::EdgeBuildingStep::INIT) {
                 // check permissions to determine reachability
                 for (NBEdge* out : cur->getToNode()->getOutgoingEdges()) {
-                    if (seen.count(out) == 0
-                            && allEdges.count(out) != 0
-                            && (out->getPermissions() & cur->getPermissions() & ~SVC_PEDESTRIAN) != 0) {
-                        open.push_back(out);
+                    if (allEdges.count(out) != 0) {
+                        const SVCPermissions p = pCur & out->getPermissions();
+                        if (seen.count(out) == 0 || (~conPermissions[ {e, out}] & p) != 0) {
+                            if ((p & ~SVC_PEDESTRIAN) != 0) {
+                                open.push_back(out);
+                                conPermissions[ {e, out}] |= p;
+#ifdef DEBUG_JOINJUNCTIONS_CONNECTIONS
+                                if (e->getID() == "625058945") {
+                                    std::cout << "  e=" << e->getID() << " out=" << out->getID() << " pOut=" << getVehicleClassNames(out->getPermissions()) << "\n    p=" << getVehicleClassNames(p) << "\n    q=" << getVehicleClassNames(conPermissions[ {e, out}]) << "\n";
+                                }
+#endif
+                            }
+                        }
                     }
                 }
             } else {
                 // check existing connections
                 for (const auto& con : cons) {
-                    if (con.toEdge != nullptr
-                            && seen.count(con.toEdge) == 0
-                            && allEdges.count(con.toEdge) != 0) {
-                        open.push_back(con.toEdge);
+                    if (con.toEdge != nullptr && allEdges.count(con.toEdge) != 0) {
+                        SVCPermissions p = pCur & con.toEdge->getPermissions();
+                        if (con.permissions != SVC_UNSPECIFIED) {
+                            p &= con.permissions;
+                        }
+                        if (seen.count(con.toEdge) == 0 || (~conPermissions[ {e, con.toEdge}] & p) != 0) {
+                            open.push_back(con.toEdge);
+                            conPermissions[ {e, con.toEdge}] |= p;
+                            //std::cout << "  e=" << e->getID() << " con.toEdge=" << con.toEdge->getID() << " pSpecial=" << toString(con.permissions) << " pOut=" << getVehicleClassNames(con.toEdge->getPermissions()) << "\n    p=" << getVehicleClassNames(p) << "\n    q=" << getVehicleClassNames(conPermissions[{e, con.toEdge}]) << "\n";
+                        }
                     }
                 }
             }
@@ -1786,6 +1809,15 @@
             // filter out inside edges from reached
             if (inside.count(reached) == 0) {
                 reachable[e].insert(reached);
+                const SVCPermissions pDefault = e->getPermissions() & reached->getPermissions();
+                if (conPermissions[ {e, reached}] != pDefault) {
+                    specialPermissions.insert(e);
+#ifdef DEBUG_JOINJUNCTIONS_CONNECTIONS
+                    if (e->getID() == "625058945") {
+                        std::cout << "e=" << e->getID() << " out=" << reached->getID() << " special=" << getVehicleClassNames(conPermissions[ {e, reached}]) << "\n";
+                    }
+#endif
+                }
             }
         }
 #ifdef DEBUG_JOINJUNCTIONS_CONNECTIONS
@@ -1844,11 +1876,21 @@
     }
     if (!resetConnections) {
         // disable connections that were impossible with the old topology
+        // if connectivity has special permissions, set edge to edge connections explicitly
         for (NBEdge* in : newNode->getIncomingEdges()) {
             for (NBEdge* out : newNode->getOutgoingEdges()) {
-                if (reachable[in].count(out) == 0 && !ec.hasPostProcessConnection(in->getID(), out->getID())) {
-                    //std::cout << " removeUnreachable in=" << in->getID() << " out=" << out->getID() << "\n";
-                    in->removeFromConnections(out, -1, -1, true, false, true);
+                if (reachable[in].count(out) == 0) {
+                    if (!ec.hasPostProcessConnection(in->getID(), out->getID())) {
+                        //std::cout << " removeUnreachable in=" << in->getID() << " out=" << out->getID() << "\n";
+                        in->removeFromConnections(out, -1, -1, true, false, true);
+                    } else {
+                        //std::cout << " hasPostProcessConnection in=" << in->getID() << " out=" << out->getID() << "\n";
+                    }
+                } else if (specialPermissions.count(in) != 0) {
+                    SVCPermissions pDefault = in->getPermissions() & out->getPermissions();
+                    SVCPermissions p = conPermissions[ {in, out}] == 0 ? pDefault : conPermissions[ {in, out}];
+                    in->addEdge2EdgeConnection(out, true, p == pDefault ? SVC_UNSPECIFIED : p);
+                    //std::cout << " addEdge2Edge in=" << in->getID() << " out=" << out->getID() << "\n";
                 }
             }
         }
@@ -2303,11 +2345,13 @@
 
 void
 NBNodeCont::joinTLS(NBTrafficLightLogicCont& tlc, double maxdist) {
+    const std::vector excludeList = OptionsCont::getOptions().getStringVector("tls.join-exclude");
+    std::set exclude(excludeList.begin(), excludeList.end());
     NodeClusters cands;
     generateNodeClusters(maxdist, cands);
     for (NodeSet& c : cands) {
         for (NodeSet::iterator j = c.begin(); j != c.end();) {
-            if (!(*j)->isTLControlled()) {
+            if (!(*j)->isTLControlled() || exclude.count((*(*j)->getControllingTLS().begin())->getID()) != 0) {
                 c.erase(j++);
             } else {
                 ++j;
diff -Nru sumo-1.17.0/src/netbuild/NBNodeCont.h sumo-1.18.0/src/netbuild/NBNodeCont.h
--- sumo-1.17.0/src/netbuild/NBNodeCont.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netbuild/NBNodeCont.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -360,7 +360,7 @@
         myUnsetTLS.insert(node);
     }
 
-    /// @brief remap node IDs accoring to options --numerical-ids and --reserved-ids
+    /// @brief remap node IDs according to options --numerical-ids and --reserved-ids
     int remapIDs(bool numericaIDs, bool reservedIDs, const std::string& prefix, NBTrafficLightLogicCont& tlc);
 
     /// @brief guess and mark fringe nodes
diff -Nru sumo-1.17.0/src/netbuild/NBNode.cpp sumo-1.18.0/src/netbuild/NBNode.cpp
--- sumo-1.17.0/src/netbuild/NBNode.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netbuild/NBNode.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -1131,7 +1131,7 @@
     }
     try {
         NBNodeShapeComputer computer(*this);
-        myPoly = computer.compute();
+        myPoly = computer.compute(OptionsCont::getOptions().getBool("junctions.minimal-shape"));
         if (myRadius == UNSPECIFIED_RADIUS && !OptionsCont::getOptions().isDefault("default.junctions.radius")) {
             myRadius = computer.getRadius();
         }
@@ -2068,6 +2068,15 @@
 }
 
 bool
+NBNode::bidiConflict(const NBEdge* from, const NBEdge::Connection& con,
+                     const NBEdge* prohibitorFrom,  const NBEdge::Connection& prohibitorCon, bool foes) const {
+    if (myRequest == nullptr) {
+        return false;
+    }
+    return myRequest->bidiConflict(from, con, prohibitorFrom, prohibitorCon, foes);
+}
+
+bool
 NBNode::turnFoes(const NBEdge* from, const NBEdge* to, int fromLane,
                  const NBEdge* from2, const NBEdge* to2, int fromLane2,
                  bool lefthand) const {
diff -Nru sumo-1.17.0/src/netbuild/NBNode.h sumo-1.18.0/src/netbuild/NBNode.h
--- sumo-1.17.0/src/netbuild/NBNode.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netbuild/NBNode.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -485,10 +485,14 @@
     /// @brief whether one of multple connections from the same edge targeting the same lane must yield
     bool mergeConflictYields(const NBEdge* from, int fromLane, int fromLaneFoe, NBEdge* to, int toLane) const;
 
-    /// @brief whether multple connections from the same edge target the same lane
+    /// @brief whether multiple connections from the same edge target the same lane
     bool mergeConflict(const NBEdge* from, const NBEdge::Connection& con,
                        const NBEdge* prohibitorFrom, const NBEdge::Connection& prohibitorCon, bool foes) const;
 
+    /// @brief whether the foe connections is oncoming on the same lane
+    bool bidiConflict(const NBEdge* from, const NBEdge::Connection& con,
+                      const NBEdge* prohibitorFrom, const NBEdge::Connection& prohibitorCon, bool foes) const;
+
     bool zipperConflict(const NBEdge* incoming, const NBEdge* outgoing, int fromLane, int toLane) const;
 
     /// @brief return whether the given laneToLane connection originate from the same edge and are in conflict due to turning across each other
diff -Nru sumo-1.17.0/src/netbuild/NBNodeShapeComputer.cpp sumo-1.18.0/src/netbuild/NBNodeShapeComputer.cpp
--- sumo-1.17.0/src/netbuild/NBNodeShapeComputer.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netbuild/NBNodeShapeComputer.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -32,6 +32,7 @@
 #include 
 #include 
 #include "NBNode.h"
+#include "NBAlgorithms.h"
 #include "NBNodeShapeComputer.h"
 
 //#define DEBUG_NODE_SHAPE
@@ -40,7 +41,6 @@
 #define DEBUGCOND (myNode.getID() == "C")
 
 
-#define EXT 100.0
 #define EXT2 10.0
 
 // foot and bicycle paths as well as pure service roads should not get large junctions
@@ -53,7 +53,13 @@
 // ===========================================================================
 NBNodeShapeComputer::NBNodeShapeComputer(const NBNode& node) :
     myNode(node),
-    myRadius(node.getRadius()) {
+    myRadius(node.getRadius()) 
+{
+    if (node.getEdges().size() > 4 && !NBNodeTypeComputer::isRailwayNode(&node)) {
+        EXT = 50;
+    } else {
+        EXT = 100;
+    }
 }
 
 
@@ -61,7 +67,7 @@
 
 
 const PositionVector
-NBNodeShapeComputer::compute() {
+NBNodeShapeComputer::compute(bool forceSmall) {
 #ifdef DEBUG_NODE_SHAPE
     if (DEBUGCOND) {
         // annotate edges edges to make their ordering visible
@@ -74,7 +80,7 @@
 #endif
     // check whether the node is a dead end node or a node where only turning is possible
     //  in this case, we will use "computeNodeShapeSmall"
-    if (myNode.getEdges().size() == 1) {
+    if (myNode.getEdges().size() == 1 || forceSmall) {
         return computeNodeShapeSmall();
     }
     if (myNode.getEdges().size() == 2 && myNode.getIncomingEdges().size() == 1) {
@@ -93,7 +99,7 @@
 
 
 void
-computeSameEnd(PositionVector& l1, PositionVector& l2) {
+NBNodeShapeComputer::computeSameEnd(PositionVector& l1, PositionVector& l2) {
     assert(l1[0].distanceTo2D(l1[1]) >= EXT);
     assert(l2[0].distanceTo2D(l2[1]) >= EXT);
     PositionVector tmp;
@@ -265,6 +271,9 @@
                         }
                         radius2 = MAX2(radius2, width / 2);
                     }
+                    if (!useDefaultRadius) {
+                        radius2 = MAX2(radius2, myRadius);
+                    }
                     dist += radius2;
 #ifdef DEBUG_NODE_SHAPE
                     if (DEBUGCOND) {
diff -Nru sumo-1.17.0/src/netbuild/NBNodeShapeComputer.h sumo-1.18.0/src/netbuild/NBNodeShapeComputer.h
--- sumo-1.17.0/src/netbuild/NBNodeShapeComputer.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netbuild/NBNodeShapeComputer.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -48,7 +48,7 @@
     ~NBNodeShapeComputer();
 
     /// Computes the shape of the assigned junction
-    const PositionVector compute();
+    const PositionVector compute(bool forceSmall);
 
     /// @brief get computed radius for node
     double getRadius() const {
@@ -148,6 +148,8 @@
     /// @brief determine the default radius appropriate for the current junction
     double getDefaultRadius(const OptionsCont& oc);
 
+    void computeSameEnd(PositionVector& l1, PositionVector& l2); 
+
     /// @brief compute with of rightmost lanes that exlude the given permissions
     static double getExtraWidth(const NBEdge* e, SVCPermissions exclude);
 
@@ -158,6 +160,9 @@
     /// @brief the computed node radius
     double myRadius;
 
+    /// @brief the maximum distance to search for a place where neighboring edges intersect and do not overlap
+    double EXT;
+
     static const SVCPermissions SVC_LARGE_TURN;
 
 private:
diff -Nru sumo-1.17.0/src/netbuild/NBOwnTLDef.cpp sumo-1.18.0/src/netbuild/NBOwnTLDef.cpp
--- sumo-1.17.0/src/netbuild/NBOwnTLDef.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netbuild/NBOwnTLDef.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -43,6 +43,7 @@
 
 //#define DEBUG_STREAM_ORDERING
 //#define DEBUG_PHASES
+//#define DEBUG_CONTRELATION
 //#define DEBUGCOND (getID() == "cluster_251050941_280598736_280598739_28902891_3142549227_3142550438")
 //#define DEBUGEDGE(edge) (edge->getID() == "23209153#1" || edge->getID() == "319583927#0")
 #define DEBUGCOND (true)
@@ -272,7 +273,10 @@
 
 NBTrafficLightLogic*
 NBOwnTLDef::computeLogicAndConts(int brakingTimeSeconds, bool onlyConts) {
-    myNeedsContRelation.clear();
+    if (myControlledNodes.size() == 1) {
+        // otherwise, use values from previous call to initNeedsContRelation
+        myNeedsContRelation.clear();
+    }
     myRightOnRedConflicts.clear();
     const bool isNEMA = myType == TrafficLightType::NEMA;
     const SUMOTime brakingTime = TIME2STEPS(brakingTimeSeconds);
@@ -501,6 +505,11 @@
         if (!isNEMA) {
             // correct behaviour for those that are not in chosen, but may drive, though
             state = allowCompatible(state, fromEdges, toEdges, fromLanes, toLanes);
+#ifdef DEBUG_PHASES
+            if (DEBUGCOND) {
+                std::cout << " state after allowing compatible " << state << "\n";
+            }
+#endif
             if (groupTram) {
                 state = allowByVClass(state, fromEdges, toEdges, SVC_TRAM);
             } else if (groupOther) {
@@ -747,6 +756,10 @@
             }
             leftStates.push_back(leftState);
         }
+        // fix edges within joined traffic lights that did not get the green light yet
+        if (myEdgesWithin.size() > 0 && !isNEMA && toProc.size() == 0) {
+            addGreenWithin(logic, fromEdges, toProc);
+        }
     }
     // fix pedestrian crossings that did not get the green light yet
     if (crossings.size() > 0) {
@@ -957,16 +970,37 @@
 NBOwnTLDef::initNeedsContRelation() const {
     if (!myNeedsContRelationReady) {
         if (myControlledNodes.size() > 0) {
+            // setParticipantsInformation resets myAmInTLS so we need to make a copy
+            std::vector edgeInsideTLS;
+            for (const NBEdge* e : myIncomingEdges) {
+                edgeInsideTLS.push_back(e->isInsideTLS());
+            }
             // we use a dummy node just to maintain const-correctness
             myNeedsContRelation.clear();
-            NBOwnTLDef dummy(DummyID, myControlledNodes, 0, TrafficLightType::STATIC);
-            dummy.setParticipantsInformation();
-            NBTrafficLightLogic* tllDummy = dummy.computeLogicAndConts(0, true);
-            delete tllDummy;
-            myNeedsContRelation = dummy.myNeedsContRelation;
-            for (std::vector::const_iterator i = myControlledNodes.begin(); i != myControlledNodes.end(); i++) {
-                (*i)->removeTrafficLight(&dummy);
+            for (NBNode* n : myControlledNodes) {
+                NBOwnTLDef dummy(DummyID, n, 0, TrafficLightType::STATIC);
+                dummy.setParticipantsInformation();
+                NBTrafficLightLogic* tllDummy = dummy.computeLogicAndConts(0, true);
+                delete tllDummy;
+                myNeedsContRelation.insert(dummy.myNeedsContRelation.begin(), dummy.myNeedsContRelation.end());
+                n->removeTrafficLight(&dummy);
+            }
+            if (myControlledNodes.size() > 1) {
+                int i = 0;
+                for (NBEdge* e : myIncomingEdges) {
+                    e->setInsideTLS(edgeInsideTLS[i]);
+                    i++;
+                }
+            }
+#ifdef DEBUG_CONTRELATION
+            if (DEBUGCOND) {
+                std::cout << " contRelations at " << getID() << " prog=" << getProgramID() << ":\n";
+                for (const StreamPair& s : myNeedsContRelation) {
+                    std::cout << "   " << s.from1->getID() << "->" << s.to1->getID() << " foe " << s.from2->getID() << "->" << s.to2->getID() << "\n";
+                }
             }
+#endif
+
         }
         myNeedsContRelationReady = true;
     }
@@ -991,8 +1025,25 @@
 NBOwnTLDef::allowCompatible(std::string state, const EdgeVector& fromEdges, const EdgeVector& toEdges,
                             const std::vector& fromLanes, const std::vector& toLanes) {
     state = allowSingleEdge(state, fromEdges);
-    state = allowFollowers(state, fromEdges, toEdges);
-    state = allowPredecessors(state, fromEdges, toEdges, fromLanes, toLanes);
+#ifdef DEBUG_PHASES
+    if (DEBUGCOND) {
+        std::cout << " state after allowSingle " << state << "\n";
+    }
+#endif
+    if (myControlledNodes.size() > 1) {
+        state = allowFollowers(state, fromEdges, toEdges);
+#ifdef DEBUG_PHASES
+        if (DEBUGCOND) {
+            std::cout << " state after allowFollowers " << state << "\n";
+        }
+#endif
+        state = allowPredecessors(state, fromEdges, toEdges, fromLanes, toLanes);
+#ifdef DEBUG_PHASES
+        if (DEBUGCOND) {
+            std::cout << " state after allowPredecessors " << state << "\n";
+        }
+#endif
+    }
     return state;
 }
 
@@ -1032,9 +1083,9 @@
             if (state[i1] == 'G') {
                 continue;
             }
-            //if (forbidden(state, i1, fromEdges, toEdges)) {
-            //    continue;
-            //}
+            if (forbidden(state, i1, fromEdges, toEdges, true)) {
+                continue;
+            }
             bool followsChosen = false;
             for (int i2 = 0; i2 < (int)fromEdges.size(); ++i2) {
                 if (state[i2] == 'G' && fromEdges[i1] == toEdges[i2]) {
@@ -1064,7 +1115,7 @@
             if (state[i1] == 'G') {
                 continue;
             }
-            if (forbidden(state, i1, fromEdges, toEdges)) {
+            if (forbidden(state, i1, fromEdges, toEdges, false)) {
                 continue;
             }
             bool preceedsChosen = false;
@@ -1122,10 +1173,14 @@
 
 
 bool
-NBOwnTLDef::forbidden(const std::string& state, int index, const EdgeVector& fromEdges, const EdgeVector& toEdges) {
+NBOwnTLDef::forbidden(const std::string& state, int index, const EdgeVector& fromEdges, const EdgeVector& toEdges, bool allowCont) {
     for (int i2 = 0; i2 < (int)fromEdges.size(); ++i2) {
         if (state[i2] == 'G' && foes(fromEdges[i2], toEdges[i2], fromEdges[index], toEdges[index])) {
-            return true;
+            if (!allowCont || (
+                        !needsCont(fromEdges[i2], toEdges[i2], fromEdges[index], toEdges[index]) &&
+                        !needsCont(fromEdges[index], toEdges[index], fromEdges[i2], toEdges[i2]))) {
+                return true;
+            }
         }
     }
     return false;
@@ -1152,7 +1207,9 @@
                     }
                     if (forbids(fromEdges[i2], toEdges[i2], fromEdges[i1], toEdges[i1], true, controlledWithin) || rightTurnConflicts[i1]) {
                         state[i1] = 'g';
-                        myNeedsContRelation.insert(StreamPair(fromEdges[i1], toEdges[i1], fromEdges[i2], toEdges[i2]));
+                        if (myControlledNodes.size() == 1) {
+                            myNeedsContRelation.insert(StreamPair(fromEdges[i1], toEdges[i1], fromEdges[i2], toEdges[i2]));
+                        }
                         if (!isTurnaround[i1] && !hadGreenMajor[i1] && !rightTurnConflicts[i1]) {
                             haveForbiddenLeftMover = true;
                         }
@@ -1223,6 +1280,29 @@
 }
 
 
+void
+NBOwnTLDef::addGreenWithin(NBTrafficLightLogic* logic, const EdgeVector& fromEdges, EdgeVector& toProc) {
+    std::vector foundGreen(fromEdges.size(), false);
+    for (const auto& phase : logic->getPhases()) {
+        const std::string state = phase.state;
+        for (int j = 0; j < (int)fromEdges.size(); j++) {
+            LinkState ls = (LinkState)state[j];
+            if (ls == LINKSTATE_TL_GREEN_MAJOR || ls == LINKSTATE_TL_GREEN_MINOR) {
+                foundGreen[j] = true;
+            }
+        }
+    }
+    for (int j = 0; j < (int)foundGreen.size(); j++) {
+        if (!foundGreen[j]) {
+            NBEdge* e = fromEdges[j];
+            if (std::find(toProc.begin(), toProc.end(), e) == toProc.end()) {
+                toProc.push_back(e);
+            }
+        }
+    }
+}
+
+
 void
 NBOwnTLDef::addPedestrianScramble(NBTrafficLightLogic* logic, int totalNumLinks, SUMOTime /* greenTime */, SUMOTime brakingTime,
                                   const std::vector& crossings, const EdgeVector& fromEdges, const EdgeVector& toEdges) {
diff -Nru sumo-1.17.0/src/netbuild/NBOwnTLDef.h sumo-1.18.0/src/netbuild/NBOwnTLDef.h
--- sumo-1.17.0/src/netbuild/NBOwnTLDef.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netbuild/NBOwnTLDef.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -102,6 +102,9 @@
         myHaveSinglePhase = true;
     }
 
+    /// @brief ensure inner edges all get the green light eventually
+    static void addGreenWithin(NBTrafficLightLogic* logic, const EdgeVector& fromEdges, EdgeVector& toProc);
+
     /// @brief add an additional pedestrian phase if there are crossings that did not get green yet
     static void addPedestrianScramble(NBTrafficLightLogic* logic, int totalNumLinks, SUMOTime greenTime, SUMOTime yellowTime,
                                       const std::vector& crossings, const EdgeVector& fromEdges, const EdgeVector& toEdges);
@@ -258,7 +261,7 @@
     std::string allowByVClass(std::string state, const EdgeVector& fromEdges, const EdgeVector& toEdges, SVCPermissions perm);
 
     /// @brief whether the given index is forbidden by a green link in the current state
-    bool forbidden(const std::string& state, int index, const EdgeVector& fromEdges, const EdgeVector& toEdges);
+    bool forbidden(const std::string& state, int index, const EdgeVector& fromEdges, const EdgeVector& toEdges, bool allowCont);
 
     /** @brief change 'G' to 'g' for conflicting connections
      * @param[in] state
diff -Nru sumo-1.17.0/src/netbuild/NBParking.cpp sumo-1.18.0/src/netbuild/NBParking.cpp
--- sumo-1.17.0/src/netbuild/NBParking.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netbuild/NBParking.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netbuild/NBParking.h sumo-1.18.0/src/netbuild/NBParking.h
--- sumo-1.17.0/src/netbuild/NBParking.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netbuild/NBParking.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netbuild/NBPTLineCont.cpp sumo-1.18.0/src/netbuild/NBPTLineCont.cpp
--- sumo-1.17.0/src/netbuild/NBPTLineCont.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netbuild/NBPTLineCont.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -35,7 +35,7 @@
 //#define DEBUG_FIND_WAY
 //#define DEBUG_CONSTRUCT_ROUTE
 
-#define DEBUGLINEID "1986097"
+#define DEBUGLINEID ""
 #define DEBUGSTOPID ""
 
 // ===========================================================================
@@ -79,6 +79,22 @@
                 reviseStops(line, ec, sc);
             }
         }
+        // fix circular line if necessary
+        if (line->getStops().size() > 1
+                && line->getStops().front() == line->getStops().back()
+                && line->getRoute().size() > 1
+                && line->getRoute().front() != line->getRoute().back()) {
+            // we need to duplicate either the first or the last edge depending on the stop locations
+            const std::string firstStopEdge = line->getStops().front()->getEdgeId();
+            const std::string lastStopEdge = line->getStops().back()->getEdgeId();
+            std::vector edges = line->getRoute();
+            if (firstStopEdge == edges.back()->getID()) {
+                edges.insert(edges.begin(), edges.back());
+            } else if (lastStopEdge == edges.front()->getID()) {
+                edges.push_back(edges.front());
+            }
+            line->setEdges(edges);
+        }
         line->deleteInvalidStops(ec, sc);
         //line->deleteDuplicateStops();
         for (std::shared_ptr stop : line->getStops()) {
@@ -293,30 +309,43 @@
     std::vector currentWayMinusEdges;
     for (auto it3 = pTLine->getWays().begin(); it3 != pTLine->getWays().end(); it3++) {
 
+        int foundForward = 0;
         if (cont.retrieve(*it3, false) != nullptr) {
             currentWayEdges.push_back(cont.retrieve(*it3, false));
+            foundForward++;
         } else {
             int i = 0;
             while (cont.retrieve(*it3 + "#" + std::to_string(i), true) != nullptr) {
                 if (cont.retrieve(*it3 + "#" + std::to_string(i), false)) {
                     currentWayEdges.push_back(cont.retrieve(*it3 + "#" + std::to_string(i), false));
+                    foundForward++;
                 }
                 i++;
             }
         }
 
+        int foundReverse = 0;
         if (cont.retrieve("-" + *it3, false) != nullptr) {
             currentWayMinusEdges.push_back(cont.retrieve("-" + *it3, false));
+            foundReverse++;
         } else {
             int i = 0;
             while (cont.retrieve("-" + *it3 + "#" + std::to_string(i), true) != nullptr) {
                 if (cont.retrieve("-" + *it3 + "#" + std::to_string(i), false)) {
                     currentWayMinusEdges.insert(currentWayMinusEdges.begin(),
                                                 cont.retrieve("-" + *it3 + "#" + std::to_string(i), false));
+                    foundReverse++;
                 }
                 i++;
             }
         }
+        bool fakeMinus = false;
+        if (foundReverse == 0 && foundForward > 0 && isRailway(pTLine->getVClass())) {
+            // rail tracks may be used in both directions and are often not tagged as such.
+            // This can be repaired later with option --railway.topology.repair
+            currentWayMinusEdges.insert(currentWayMinusEdges.begin(), currentWayEdges.rbegin(), currentWayEdges.rbegin() + foundForward);
+            fakeMinus = true;
+        }
 #ifdef DEBUG_CONSTRUCT_ROUTE
         if (pTLine->getLineID() == DEBUGLINEID) {
             std::cout << " way=" << (*it3)
@@ -351,7 +380,11 @@
                 continue;
             } else {
                 edges.insert(edges.end(), currentWayMinusEdges.begin(), currentWayMinusEdges.end());
-                last = currentWayMinusEdges.back()->getToNode();
+                if (fakeMinus) {
+                    last = currentWayMinusEdges.back()->getFromNode();
+                } else {
+                    last = currentWayMinusEdges.back()->getToNode();
+                }
             }
         } else if (first == currentWayEdges.front()->getFromNode() && first != nullptr) {
             edges.insert(edges.end(), prevWayMinusEdges.begin(), prevWayMinusEdges.end());
diff -Nru sumo-1.17.0/src/netbuild/NBPTLineCont.h sumo-1.18.0/src/netbuild/NBPTLineCont.h
--- sumo-1.17.0/src/netbuild/NBPTLineCont.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netbuild/NBPTLineCont.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netbuild/NBPTLine.cpp sumo-1.18.0/src/netbuild/NBPTLine.cpp
--- sumo-1.17.0/src/netbuild/NBPTLine.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netbuild/NBPTLine.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -239,10 +239,18 @@
 
 
 bool
-NBPTLine::isConsistent(const std::vector& stops) const {
+NBPTLine::isConsistent(std::vector stops) const {
     if (myRoute.empty() || stops.empty()) {
         return true;
     }
+    if (stops.size() > 1 && stops.front() == stops.back()) {
+        // circular route where we don't expect the route edges to occur twice
+        if (myRoute.front() == stops.front()) {
+            stops.pop_back();
+        } else if (myRoute.back() == stops.back()) {
+            stops.erase(stops.begin());
+        }
+    }
     std::vector::const_iterator stopIt = stops.begin();
     for (const NBEdge* const e : myRoute) {
         while (stopIt != stops.end() && e == *stopIt) {
diff -Nru sumo-1.17.0/src/netbuild/NBPTLine.h sumo-1.18.0/src/netbuild/NBPTLine.h
--- sumo-1.17.0/src/netbuild/NBPTLine.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netbuild/NBPTLine.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -84,7 +84,7 @@
     NBEdge* getRouteEnd(const NBEdgeCont& ec) const;
 
     /// @brief return whether the mentioned edges appear in that order in the route
-    bool isConsistent(const std::vector& stops) const;
+    bool isConsistent(std::vector stops) const;
 
     SUMOVehicleClass getVClass() const {
         return myVClass;
diff -Nru sumo-1.17.0/src/netbuild/NBPTPlatform.cpp sumo-1.18.0/src/netbuild/NBPTPlatform.cpp
--- sumo-1.17.0/src/netbuild/NBPTPlatform.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netbuild/NBPTPlatform.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netbuild/NBPTPlatform.h sumo-1.18.0/src/netbuild/NBPTPlatform.h
--- sumo-1.17.0/src/netbuild/NBPTPlatform.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netbuild/NBPTPlatform.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netbuild/NBPTStopCont.cpp sumo-1.18.0/src/netbuild/NBPTStopCont.cpp
--- sumo-1.17.0/src/netbuild/NBPTStopCont.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netbuild/NBPTStopCont.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netbuild/NBPTStopCont.h sumo-1.18.0/src/netbuild/NBPTStopCont.h
--- sumo-1.17.0/src/netbuild/NBPTStopCont.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netbuild/NBPTStopCont.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netbuild/NBPTStop.cpp sumo-1.18.0/src/netbuild/NBPTStop.cpp
--- sumo-1.17.0/src/netbuild/NBPTStop.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netbuild/NBPTStop.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netbuild/NBPTStop.h sumo-1.18.0/src/netbuild/NBPTStop.h
--- sumo-1.17.0/src/netbuild/NBPTStop.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netbuild/NBPTStop.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netbuild/NBRequest.cpp sumo-1.18.0/src/netbuild/NBRequest.cpp
--- sumo-1.17.0/src/netbuild/NBRequest.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netbuild/NBRequest.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -688,11 +688,12 @@
                     const bool hasLaneConflict = (!(checkLaneFoes || checkLaneFoesByClass(queryCon, *i, connected[k])
                                                     || checkLaneFoesByCooperation(from, queryCon, *i, connected[k]))
                                                   || laneConflict(from, to, toLane, *i, connected[k].toEdge, connected[k].toLane));
-                    if (((myForbids[idx2][idx] || (zipper && myForbids[idx][idx2])) && hasLaneConflict)
+                    if (((myForbids[idx2][idx] || (zipper && myForbids[idx][idx2])) && hasLaneConflict && !bidiConflict(*i, connected[k], from, queryCon, false))
                             || rightTurnConflict(from, queryCon, *i, connected[k])
                             || mergeConflict(from, queryCon, *i, connected[k], zipper)
                             || oppositeLeftTurnConflict(from, queryCon, *i, connected[k], zipper)
                             || indirectLeftTurnConflict(from, queryCon, *i, connected[k], zipper)
+                            || bidiConflict(from, queryCon, *i, connected[k], false)
                             || myJunction->rightOnRedConflict(c.tlLinkIndex, connected[k].tlLinkIndex)
                             || (myJunction->tlsContConflict(from, c, *i, connected[k]) && hasLaneConflict
                                 && !OptionsCont::getOptions().getBool("tls.ignore-internal-junction-jam"))
@@ -745,6 +746,7 @@
                         || mergeConflict(from, queryCon, *i, connected[k], true)
                         || oppositeLeftTurnConflict(from, queryCon, *i, connected[k], true)
                         || indirectLeftTurnConflict(from, queryCon, *i, connected[k], true)
+                        || bidiConflict(from, queryCon, *i, connected[k], true)
                    ) {
                     result += '1';
                 } else {
@@ -866,6 +868,38 @@
     }
     return false;
 }
+
+bool
+NBRequest::bidiConflict(const NBEdge* from, const NBEdge::Connection& con,
+                        const NBEdge* prohibitorFrom,  const NBEdge::Connection& prohibitorCon, bool foes) const {
+    if (from == prohibitorFrom) {
+        return false;
+    }
+    if (isRailway(from->getPermissions())) {
+        // railways manage right-of-way via signals
+        return false;
+    }
+    if ((foes && (from->getBidiEdge() == prohibitorCon.toEdge))
+            || prohibitorFrom->getBidiEdge() == con.toEdge) {
+        const bool fromBidi = from->getLaneShape(con.fromLane).reverse().almostSame(
+                                  prohibitorCon.toEdge->getLaneShape(prohibitorCon.toLane), POSITION_EPS);
+        const bool prohibitorFromBidi = prohibitorFrom->getLaneShape(prohibitorCon.fromLane).reverse().almostSame(
+                                            con.toEdge->getLaneShape(con.toLane), POSITION_EPS);
+        if (!foes && fromBidi && prohibitorFromBidi) {
+            // do not create a symmetrical conflict
+            return false;
+        }
+        if (prohibitorFromBidi &&
+                prohibitorFrom->getLaneShape(prohibitorCon.fromLane).reverse().almostSame(
+                    prohibitorCon.toEdge->getLaneShape(prohibitorCon.toLane), POSITION_EPS)) {
+            // prohibitor has a bidi-turnaround
+            return false;
+        }
+
+        return fromBidi || prohibitorFromBidi;
+    }
+    return false;
+}
 
 bool
 NBRequest::checkLaneFoesByClass(const NBEdge::Connection& con,
diff -Nru sumo-1.17.0/src/netbuild/NBRequest.h sumo-1.18.0/src/netbuild/NBRequest.h
--- sumo-1.17.0/src/netbuild/NBRequest.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netbuild/NBRequest.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -158,6 +158,10 @@
     bool indirectLeftTurnConflict(const NBEdge* from, const NBEdge::Connection& con,
                                   const NBEdge* prohibitorFrom,  const NBEdge::Connection& prohibitorCon, bool foes) const;
 
+    /// @brief whether straight connections are in conflict via bidirectional lane use
+    bool bidiConflict(const NBEdge* from, const NBEdge::Connection& con,
+                      const NBEdge* prohibitorFrom,  const NBEdge::Connection& prohibitorCon, bool foes) const;
+
 
     /// @brief whether there are conflicting streams of traffic at this node
     bool hasConflict() const;
diff -Nru sumo-1.17.0/src/netbuild/NBSign.cpp sumo-1.18.0/src/netbuild/NBSign.cpp
--- sumo-1.17.0/src/netbuild/NBSign.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netbuild/NBSign.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netbuild/NBSign.h sumo-1.18.0/src/netbuild/NBSign.h
--- sumo-1.17.0/src/netbuild/NBSign.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netbuild/NBSign.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netbuild/NBTrafficLightDefinition.cpp sumo-1.18.0/src/netbuild/NBTrafficLightDefinition.cpp
--- sumo-1.17.0/src/netbuild/NBTrafficLightDefinition.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netbuild/NBTrafficLightDefinition.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -452,7 +452,7 @@
 void
 NBTrafficLightDefinition::collectAllLinks(NBConnectionVector& into) {
     int tlIndex = 0;
-    // build the list of links which are controled by the traffic light
+    // build the list of links which are controlled by the traffic light
     std::vector indirectLeft;
     for (EdgeVector::iterator i = myIncomingEdges.begin(); i != myIncomingEdges.end(); i++) {
         NBEdge* incoming = *i;
diff -Nru sumo-1.17.0/src/netbuild/NBTrafficLightDefinition.h sumo-1.18.0/src/netbuild/NBTrafficLightDefinition.h
--- sumo-1.17.0/src/netbuild/NBTrafficLightDefinition.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netbuild/NBTrafficLightDefinition.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2002-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netbuild/NBTrafficLightLogicCont.cpp sumo-1.18.0/src/netbuild/NBTrafficLightLogicCont.cpp
--- sumo-1.17.0/src/netbuild/NBTrafficLightLogicCont.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netbuild/NBTrafficLightLogicCont.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -168,9 +168,17 @@
         for (NBTrafficLightDefinition* def : getDefinitions()) {
             NBLoadedSUMOTLDef* lDef = dynamic_cast(def);
             if (lDef != nullptr) {
-                NBOwnTLDef* oDef = new NBOwnTLDef(def->getID(), def->getNodes(), def->getOffset(), def->getType());
+                TrafficLightType type = def->getType();
+                if (!oc.isDefault("tls.default-type")) {
+                    type = SUMOXMLDefinitions::TrafficLightTypes.get(oc.getString("tls.default-type"));
+                }
+                NBOwnTLDef* oDef = new NBOwnTLDef(def->getID(), def->getNodes(), def->getOffset(), type);
                 oDef->setProgramID(def->getProgramID());
                 oDef->setParticipantsInformation();
+                for (NBEdge* e : oDef->getIncomingEdges()) {
+                    e->clearControllingTLInformation();
+                }
+                oDef->setTLControllingInformation();
                 for (NBNode* node : oDef->getNodes()) {
                     node->removeTrafficLight(def);
                 }
@@ -379,6 +387,113 @@
         }
     }
 }
+
+
+void
+NBTrafficLightLogicCont::applyOpenDriveControllers(OptionsCont& oc) {
+    // collect connections with controllerID which can be controlled together
+    Definitions definitions = getDefinitions();
+    std::map defsToGroup;
+    std::map>> controllerID2tlIndex;
+    for (NBTrafficLightDefinition* def : definitions) {
+        bool makeGroups = false;
+        NBConnectionVector& connections = def->getControlledLinks();
+        std::string defID = def->getID();
+
+        for (NBConnection conn : connections) {
+            std::string controllerID = conn.getFrom()->getConnection(conn.getFromLane(), conn.getTo(), conn.getToLane()).getParameter("controllerID");
+            if (controllerID != "") {
+                if (controllerID2tlIndex.find(defID) == controllerID2tlIndex.end()) {
+                    controllerID2tlIndex[defID][controllerID] = std::set({ conn.getTLIndex() });
+                } else if (controllerID2tlIndex[defID].find(controllerID) != controllerID2tlIndex[defID].end()) {
+                    controllerID2tlIndex[defID][controllerID].insert(conn.getTLIndex());
+                } else {
+                    controllerID2tlIndex[defID][controllerID] = std::set({ conn.getTLIndex() });
+                }
+                makeGroups = controllerID2tlIndex[defID][controllerID].size() > 1 || makeGroups;
+            }
+        }
+        if (makeGroups) {
+            defsToGroup[def->getID()] = def;
+        }
+    }
+    bool same = true;
+    for (NBTrafficLightLogic* computed : getComputed()) {
+        const std::string computedID = computed->getID();
+        if (defsToGroup.find(computedID) != defsToGroup.end()) {
+            // remember corresponding tl indices and check if they can be joined
+            // execute tl index joins if possible
+            const std::vector phases = computed->getPhases();
+            std::vector major2minor;
+            for (const auto& indexSet : controllerID2tlIndex[computedID]) {
+                if (indexSet.second.size() < 2) {
+                    continue;
+                }
+                bool toMinor = false;
+                for (NBTrafficLightLogic::PhaseDefinition phase : phases) {
+                    std::set::iterator it = indexSet.second.begin();
+                    char firstChar = phase.state[*it];
+                    if (firstChar == LINKSTATE_TL_GREEN_MAJOR) {
+                        firstChar = LINKSTATE_TL_GREEN_MINOR;
+                    }
+                    it++;
+                    for (; it != indexSet.second.end(); it++) {
+                        const char compareChar = (phase.state[*it] != LINKSTATE_TL_GREEN_MAJOR) ? phase.state[*it] : (char)LINKSTATE_TL_GREEN_MINOR;
+                        if (compareChar != firstChar) {
+                            same = false;
+                            break;
+                        } else if (phase.state[*it] == LINKSTATE_TL_GREEN_MINOR) {
+                            toMinor = true;
+                        }
+                    }
+                    if (!same) {
+                        break;
+                    }
+                }
+                if (toMinor) {
+                    major2minor.push_back(*indexSet.second.begin());
+                }
+            }
+            if (same) {
+                NBLoadedSUMOTLDef* lDef = dynamic_cast(defsToGroup[computedID]);
+                if (lDef == nullptr) {
+                    lDef = new NBLoadedSUMOTLDef(*defsToGroup[computedID], *computed);
+                    lDef->setParticipantsInformation();
+                    for (int index : major2minor) { // update the signal states (G -> g where needed)
+                        for (int i = 0; i < (int)phases.size(); i++) {
+                            if (phases[i].state[index] == LINKSTATE_TL_GREEN_MAJOR) {
+                                lDef->getLogic()->setPhaseState(i, index, LINKSTATE_TL_GREEN_MINOR);
+                            }
+                        }
+                    }
+                    // join signal groups, update the connections
+                    std::vector indexToRemove;
+                    for (const auto& indexSet : controllerID2tlIndex[computedID]) {
+                        int minIndex = *indexSet.second.begin();
+                        for (int index : indexSet.second) {
+                            if (index != minIndex) {
+                                lDef->replaceIndex(index, minIndex);
+                                indexToRemove.push_back(index);
+                            }
+                        }
+                    }
+                    // remove unused indices from signal programs
+                    lDef->cleanupStates();
+                    for (NBNode* node : lDef->getNodes()) {
+                        node->removeTrafficLight(defsToGroup[computedID]);
+                        node->addTrafficLight(lDef);
+                    }
+                    removeProgram(defsToGroup[computedID]->getID(), defsToGroup[computedID]->getProgramID());
+                    insert(lDef);
+                    computeSingleLogic(oc, lDef);
+                }
+            } else { // TODO: try other strategy to build signal groups
+                WRITE_WARNINGF(TL("Was not able to apply the OpenDRIVE signal group information onto the signal program of traffic light % generated by SUMO."), computed->getID());
+            }
+            break;
+        }
+    }
+}
 
 
 NBTrafficLightLogicCont::Logics
diff -Nru sumo-1.17.0/src/netbuild/NBTrafficLightLogicCont.h sumo-1.18.0/src/netbuild/NBTrafficLightLogicCont.h
--- sumo-1.17.0/src/netbuild/NBTrafficLightLogicCont.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netbuild/NBTrafficLightLogicCont.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -197,6 +197,9 @@
     /// @brief set OpenDRIVE signal reference parameters after all link indices are known
     void setOpenDriveSignalParameters();
 
+    /// @brief post processing of signal programs to group tl indices according to OpenDrive controllers (signal groups)
+    void applyOpenDriveControllers(OptionsCont& oc);
+
     /// @brief Returns a list of all definitions (convenience for easier iteration)
     typedef std::vector Definitions;
     Definitions getDefinitions() const;
diff -Nru sumo-1.17.0/src/netbuild/NBTrafficLightLogic.cpp sumo-1.18.0/src/netbuild/NBTrafficLightLogic.cpp
--- sumo-1.17.0/src/netbuild/NBTrafficLightLogic.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netbuild/NBTrafficLightLogic.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netbuild/NBTrafficLightLogic.h sumo-1.18.0/src/netbuild/NBTrafficLightLogic.h
--- sumo-1.17.0/src/netbuild/NBTrafficLightLogic.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netbuild/NBTrafficLightLogic.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netbuild/NBTypeCont.cpp sumo-1.18.0/src/netbuild/NBTypeCont.cpp
--- sumo-1.17.0/src/netbuild/NBTypeCont.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netbuild/NBTypeCont.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -374,9 +374,12 @@
 
 
 void
-NBTypeCont::writeEdgeTypes(OutputDevice& into) const {
+NBTypeCont::writeEdgeTypes(OutputDevice& into,  const std::set& typeIDs) const {
     // iterate over edge types
     for (const auto& edgeType : myEdgeTypes) {
+        if (typeIDs.size() > 0 && typeIDs.count(edgeType.first) == 0) {
+            continue;
+        }
         // open edge type tag
         into.openTag(SUMO_TAG_TYPE);
         // write ID
diff -Nru sumo-1.17.0/src/netbuild/NBTypeCont.h sumo-1.18.0/src/netbuild/NBTypeCont.h
--- sumo-1.17.0/src/netbuild/NBTypeCont.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netbuild/NBTypeCont.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -302,7 +302,7 @@
     bool addLaneTypeRestriction(const std::string& id, const SUMOVehicleClass svc, const double speed);
 
     /// @brief writes all EdgeTypes (and their lanes) as XML
-    void writeEdgeTypes(OutputDevice& into) const;
+    void writeEdgeTypes(OutputDevice& into, const std::set& typeIDs = std::set()) const;
 
     /// @name Type-dependant Retrieval methods
     /// @{
diff -Nru sumo-1.17.0/src/netbuild/NBVehicle.h sumo-1.18.0/src/netbuild/NBVehicle.h
--- sumo-1.17.0/src/netbuild/NBVehicle.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netbuild/NBVehicle.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2002-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netconvert_main.cpp sumo-1.18.0/src/netconvert_main.cpp
--- sumo-1.17.0/src/netconvert_main.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netconvert_main.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -71,19 +71,20 @@
     oc.addOptionSubTopic("Railway");
     oc.addOptionSubTopic("Formats");
 
-    NIFrame::fillOptions();
-    NBFrame::fillOptions(false);
-    NWFrame::fillOptions(false);
-    RandHelper::insertRandOptions();
+    NIFrame::fillOptions(oc);
+    NBFrame::fillOptions(oc, false);
+    NWFrame::fillOptions(oc, false);
+    RandHelper::insertRandOptions(oc);
 }
 
 
 bool
 checkOptions() {
-    bool ok = NIFrame::checkOptions();
-    ok &= NBFrame::checkOptions();
-    ok &= NWFrame::checkOptions();
-    ok &= SystemFrame::checkOptions();
+    OptionsCont& oc = OptionsCont::getOptions();
+    bool ok = NIFrame::checkOptions(oc);
+    ok &= NBFrame::checkOptions(oc);
+    ok &= NWFrame::checkOptions(oc);
+    ok &= SystemFrame::checkOptions(oc);
     return ok;
 }
 
diff -Nru sumo-1.17.0/src/netedit/changes/GNEChange_Additional.cpp sumo-1.18.0/src/netedit/changes/GNEChange_Additional.cpp
--- sumo-1.17.0/src/netedit/changes/GNEChange_Additional.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/changes/GNEChange_Additional.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/changes/GNEChange_Additional.h sumo-1.18.0/src/netedit/changes/GNEChange_Additional.h
--- sumo-1.17.0/src/netedit/changes/GNEChange_Additional.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/changes/GNEChange_Additional.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/changes/GNEChange_Attribute.cpp sumo-1.18.0/src/netedit/changes/GNEChange_Attribute.cpp
--- sumo-1.17.0/src/netedit/changes/GNEChange_Attribute.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/changes/GNEChange_Attribute.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/changes/GNEChange_Attribute.h sumo-1.18.0/src/netedit/changes/GNEChange_Attribute.h
--- sumo-1.17.0/src/netedit/changes/GNEChange_Attribute.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/changes/GNEChange_Attribute.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/changes/GNEChange_Children.cpp sumo-1.18.0/src/netedit/changes/GNEChange_Children.cpp
--- sumo-1.17.0/src/netedit/changes/GNEChange_Children.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/changes/GNEChange_Children.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/changes/GNEChange_Children.h sumo-1.18.0/src/netedit/changes/GNEChange_Children.h
--- sumo-1.17.0/src/netedit/changes/GNEChange_Children.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/changes/GNEChange_Children.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/changes/GNEChange_Connection.cpp sumo-1.18.0/src/netedit/changes/GNEChange_Connection.cpp
--- sumo-1.17.0/src/netedit/changes/GNEChange_Connection.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/changes/GNEChange_Connection.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/changes/GNEChange_Connection.h sumo-1.18.0/src/netedit/changes/GNEChange_Connection.h
--- sumo-1.17.0/src/netedit/changes/GNEChange_Connection.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/changes/GNEChange_Connection.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/changes/GNEChange.cpp sumo-1.18.0/src/netedit/changes/GNEChange.cpp
--- sumo-1.17.0/src/netedit/changes/GNEChange.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/changes/GNEChange.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/changes/GNEChange_Crossing.cpp sumo-1.18.0/src/netedit/changes/GNEChange_Crossing.cpp
--- sumo-1.17.0/src/netedit/changes/GNEChange_Crossing.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/changes/GNEChange_Crossing.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/changes/GNEChange_Crossing.h sumo-1.18.0/src/netedit/changes/GNEChange_Crossing.h
--- sumo-1.17.0/src/netedit/changes/GNEChange_Crossing.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/changes/GNEChange_Crossing.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/changes/GNEChange_DataInterval.cpp sumo-1.18.0/src/netedit/changes/GNEChange_DataInterval.cpp
--- sumo-1.17.0/src/netedit/changes/GNEChange_DataInterval.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/changes/GNEChange_DataInterval.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/changes/GNEChange_DataInterval.h sumo-1.18.0/src/netedit/changes/GNEChange_DataInterval.h
--- sumo-1.17.0/src/netedit/changes/GNEChange_DataInterval.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/changes/GNEChange_DataInterval.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/changes/GNEChange_DataSet.cpp sumo-1.18.0/src/netedit/changes/GNEChange_DataSet.cpp
--- sumo-1.17.0/src/netedit/changes/GNEChange_DataSet.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/changes/GNEChange_DataSet.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/changes/GNEChange_DataSet.h sumo-1.18.0/src/netedit/changes/GNEChange_DataSet.h
--- sumo-1.17.0/src/netedit/changes/GNEChange_DataSet.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/changes/GNEChange_DataSet.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/changes/GNEChange_DemandElement.cpp sumo-1.18.0/src/netedit/changes/GNEChange_DemandElement.cpp
--- sumo-1.17.0/src/netedit/changes/GNEChange_DemandElement.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/changes/GNEChange_DemandElement.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -50,7 +50,7 @@
         // make sure that element isn't in net before removing
         if (myDemandElement->getNet()->getAttributeCarriers()->demandElementExist(myDemandElement)) {
             // remove demand element of network
-            myDemandElement->getNet()->getAttributeCarriers()->deleteDemandElement(myDemandElement);
+            myDemandElement->getNet()->getAttributeCarriers()->deleteDemandElement(myDemandElement, false);
         }
         delete myDemandElement;
     }
@@ -67,7 +67,7 @@
             myDemandElement->unselectAttributeCarrier();
         }
         // delete demand element from net
-        myDemandElement->getNet()->getAttributeCarriers()->deleteDemandElement(myDemandElement);
+        myDemandElement->getNet()->getAttributeCarriers()->deleteDemandElement(myDemandElement, true);
         // restore container
         restoreHierarchicalContainers();
     } else {
@@ -119,7 +119,7 @@
             myDemandElement->unselectAttributeCarrier();
         }
         // delete demand element from net
-        myDemandElement->getNet()->getAttributeCarriers()->deleteDemandElement(myDemandElement);
+        myDemandElement->getNet()->getAttributeCarriers()->deleteDemandElement(myDemandElement, true);
         // remove demand element from parents and children
         removeElementFromParentsAndChildren(myDemandElement);
     }
diff -Nru sumo-1.17.0/src/netedit/changes/GNEChange_DemandElement.h sumo-1.18.0/src/netedit/changes/GNEChange_DemandElement.h
--- sumo-1.17.0/src/netedit/changes/GNEChange_DemandElement.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/changes/GNEChange_DemandElement.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/changes/GNEChange_Edge.cpp sumo-1.18.0/src/netedit/changes/GNEChange_Edge.cpp
--- sumo-1.17.0/src/netedit/changes/GNEChange_Edge.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/changes/GNEChange_Edge.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/changes/GNEChange_Edge.h sumo-1.18.0/src/netedit/changes/GNEChange_Edge.h
--- sumo-1.17.0/src/netedit/changes/GNEChange_Edge.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/changes/GNEChange_Edge.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/changes/GNEChange_EdgeType.cpp sumo-1.18.0/src/netedit/changes/GNEChange_EdgeType.cpp
--- sumo-1.17.0/src/netedit/changes/GNEChange_EdgeType.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/changes/GNEChange_EdgeType.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/changes/GNEChange_EdgeType.h sumo-1.18.0/src/netedit/changes/GNEChange_EdgeType.h
--- sumo-1.17.0/src/netedit/changes/GNEChange_EdgeType.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/changes/GNEChange_EdgeType.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/changes/GNEChange_EnableAttribute.cpp sumo-1.18.0/src/netedit/changes/GNEChange_EnableAttribute.cpp
--- sumo-1.17.0/src/netedit/changes/GNEChange_EnableAttribute.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/changes/GNEChange_EnableAttribute.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -110,9 +110,9 @@
 std::string
 GNEChange_EnableAttribute::undoName() const {
     if (myNewValue) {
-        return (TL("Undo enable ") + myAC->getTagStr() + TL(" attribute in '") + myAC->getID() + "'");
+        return (TLF("Undo enable % attribute in '%'", myAC->getTagStr(), myAC->getID()));
     } else {
-        return (TL("Undo enable ") + myAC->getTagStr() + TL(" attribute in '") + myAC->getID() + "'");
+        return (TLF("Undo enable % attribute in '%'", myAC->getTagStr(), myAC->getID()));
     }
 }
 
@@ -120,9 +120,9 @@
 std::string
 GNEChange_EnableAttribute::redoName() const {
     if (myNewValue) {
-        return (TL("Redo enable ") + myAC->getTagStr() + TL(" attribute in '") + myAC->getID() + "'");
+        return (TLF("Redo enable % attribute in '%'", myAC->getTagStr(), myAC->getID()));
     } else {
-        return (TL("Redo enable ") + myAC->getTagStr() + TL(" attribute in '") + myAC->getID() + "'");
+        return (TLF("Redo enable % attribute in '%'", myAC->getTagStr(), myAC->getID()));
     }
 }
 
diff -Nru sumo-1.17.0/src/netedit/changes/GNEChange_EnableAttribute.h sumo-1.18.0/src/netedit/changes/GNEChange_EnableAttribute.h
--- sumo-1.17.0/src/netedit/changes/GNEChange_EnableAttribute.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/changes/GNEChange_EnableAttribute.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/changes/GNEChange_GenericData.cpp sumo-1.18.0/src/netedit/changes/GNEChange_GenericData.cpp
--- sumo-1.17.0/src/netedit/changes/GNEChange_GenericData.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/changes/GNEChange_GenericData.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/changes/GNEChange_GenericData.h sumo-1.18.0/src/netedit/changes/GNEChange_GenericData.h
--- sumo-1.17.0/src/netedit/changes/GNEChange_GenericData.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/changes/GNEChange_GenericData.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/changes/GNEChangeGroup.cpp sumo-1.18.0/src/netedit/changes/GNEChangeGroup.cpp
--- sumo-1.17.0/src/netedit/changes/GNEChangeGroup.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/changes/GNEChangeGroup.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2006-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/changes/GNEChangeGroup.h sumo-1.18.0/src/netedit/changes/GNEChangeGroup.h
--- sumo-1.17.0/src/netedit/changes/GNEChangeGroup.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/changes/GNEChangeGroup.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2006-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/changes/GNEChange.h sumo-1.18.0/src/netedit/changes/GNEChange.h
--- sumo-1.17.0/src/netedit/changes/GNEChange.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/changes/GNEChange.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/changes/GNEChange_Junction.cpp sumo-1.18.0/src/netedit/changes/GNEChange_Junction.cpp
--- sumo-1.17.0/src/netedit/changes/GNEChange_Junction.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/changes/GNEChange_Junction.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/changes/GNEChange_Junction.h sumo-1.18.0/src/netedit/changes/GNEChange_Junction.h
--- sumo-1.17.0/src/netedit/changes/GNEChange_Junction.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/changes/GNEChange_Junction.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/changes/GNEChange_Lane.cpp sumo-1.18.0/src/netedit/changes/GNEChange_Lane.cpp
--- sumo-1.17.0/src/netedit/changes/GNEChange_Lane.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/changes/GNEChange_Lane.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/changes/GNEChange_Lane.h sumo-1.18.0/src/netedit/changes/GNEChange_Lane.h
--- sumo-1.17.0/src/netedit/changes/GNEChange_Lane.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/changes/GNEChange_Lane.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/changes/GNEChange_MeanData.cpp sumo-1.18.0/src/netedit/changes/GNEChange_MeanData.cpp
--- sumo-1.17.0/src/netedit/changes/GNEChange_MeanData.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/changes/GNEChange_MeanData.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/changes/GNEChange_MeanData.h sumo-1.18.0/src/netedit/changes/GNEChange_MeanData.h
--- sumo-1.17.0/src/netedit/changes/GNEChange_MeanData.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/changes/GNEChange_MeanData.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/changes/GNEChange_TLS.cpp sumo-1.18.0/src/netedit/changes/GNEChange_TLS.cpp
--- sumo-1.17.0/src/netedit/changes/GNEChange_TLS.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/changes/GNEChange_TLS.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/changes/GNEChange_TLS.h sumo-1.18.0/src/netedit/changes/GNEChange_TLS.h
--- sumo-1.17.0/src/netedit/changes/GNEChange_TLS.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/changes/GNEChange_TLS.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/CMakeLists.txt sumo-1.18.0/src/netedit/CMakeLists.txt
--- sumo-1.17.0/src/netedit/CMakeLists.txt	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/CMakeLists.txt	2023-06-28 20:02:17.000000000 +0000
@@ -51,8 +51,8 @@
 target_link_libraries(netedit gui_dialogs utils_gui_cursors utils_gui_shortcuts utils_foxtools foreign_eulerspiral
         netedit_frames_common netedit_frames_network netedit_frames_demand netedit_frames_data netedit_frames 
         netedit_elements netedit_elements_network netedit_elements_additional netedit_elements_demand netedit_elements_data 
-        netedit_changes utils_gui_div utils_gui_settings utils_gui_images netedit_dialogs_tools netedit_tools netedit_dialogs 
-        utils_gui_windows utils_gui_globjects utils_gui_tracker utils_foxtools utils_vehicle utils_emissions
+        netedit_changes utils_gui_div utils_gui_settings utils_gui_images netedit_dialogs_tools netedit_dialogs_options netedit_tools 
+        netedit_dialogs utils_gui_windows utils_gui_globjects utils_gui_tracker utils_foxtools utils_vehicle utils_emissions
         foreign_phemlight foreign_phemlight_V5 ${netconvertlibs} ${FOX_LIBRARY} ${GL2PS_LIBRARIES})
 
 # if we're compiling using Visual Studio, add extra options
diff -Nru sumo-1.17.0/src/netedit/dialogs/CMakeLists.txt sumo-1.18.0/src/netedit/dialogs/CMakeLists.txt
--- sumo-1.17.0/src/netedit/dialogs/CMakeLists.txt	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/dialogs/CMakeLists.txt	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,5 @@
 add_subdirectory(tools)
+add_subdirectory(options)
 
 set(netedit_dialogs_SRCS
    GNEVariableSpeedSignDialog.h
diff -Nru sumo-1.17.0/src/netedit/dialogs/GNEAbout.cpp sumo-1.18.0/src/netedit/dialogs/GNEAbout.cpp
--- sumo-1.17.0/src/netedit/dialogs/GNEAbout.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/dialogs/GNEAbout.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -68,7 +68,7 @@
     (new MFXLinkLabel(this, "SPDX-License-Identifier: EPL-2.0", nullptr, GUIDesignLabelAboutInfo))->setTipText("https://www.eclipse.org/legal/epl-v20.html");
 
     // link to homepage
-    (new MFXLinkLabel(this, "https://www.eclipse.org/sumo", nullptr, GUIDesignLabel(JUSTIFY_NORMAL)))->setTipText("https://www.eclipse.org/sumo");
+    (new MFXLinkLabel(this, "https://www.eclipse.dev/sumo", nullptr, GUIDesignLabel(JUSTIFY_NORMAL)))->setTipText("https://www.eclipse.dev/sumo");
 
     // centered ok-button
     FXHorizontalFrame* buttonFrame = new FXHorizontalFrame(this, GUIDesignHorizontalFrame);
diff -Nru sumo-1.17.0/src/netedit/dialogs/GNEAbout.h sumo-1.18.0/src/netedit/dialogs/GNEAbout.h
--- sumo-1.17.0/src/netedit/dialogs/GNEAbout.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/dialogs/GNEAbout.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/dialogs/GNEAdditionalDialog.cpp sumo-1.18.0/src/netedit/dialogs/GNEAdditionalDialog.cpp
--- sumo-1.17.0/src/netedit/dialogs/GNEAdditionalDialog.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/dialogs/GNEAdditionalDialog.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/dialogs/GNEAdditionalDialog.h sumo-1.18.0/src/netedit/dialogs/GNEAdditionalDialog.h
--- sumo-1.17.0/src/netedit/dialogs/GNEAdditionalDialog.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/dialogs/GNEAdditionalDialog.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/dialogs/GNEAllowVClassesDialog.cpp sumo-1.18.0/src/netedit/dialogs/GNEAllowVClassesDialog.cpp
--- sumo-1.17.0/src/netedit/dialogs/GNEAllowVClassesDialog.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/dialogs/GNEAllowVClassesDialog.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/dialogs/GNEAllowVClassesDialog.h sumo-1.18.0/src/netedit/dialogs/GNEAllowVClassesDialog.h
--- sumo-1.17.0/src/netedit/dialogs/GNEAllowVClassesDialog.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/dialogs/GNEAllowVClassesDialog.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/dialogs/GNECalibratorDialog.cpp sumo-1.18.0/src/netedit/dialogs/GNECalibratorDialog.cpp
--- sumo-1.17.0/src/netedit/dialogs/GNECalibratorDialog.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/dialogs/GNECalibratorDialog.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/dialogs/GNECalibratorDialog.h sumo-1.18.0/src/netedit/dialogs/GNECalibratorDialog.h
--- sumo-1.17.0/src/netedit/dialogs/GNECalibratorDialog.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/dialogs/GNECalibratorDialog.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/dialogs/GNECalibratorFlowDialog.cpp sumo-1.18.0/src/netedit/dialogs/GNECalibratorFlowDialog.cpp
--- sumo-1.17.0/src/netedit/dialogs/GNECalibratorFlowDialog.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/dialogs/GNECalibratorFlowDialog.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/dialogs/GNECalibratorFlowDialog.h sumo-1.18.0/src/netedit/dialogs/GNECalibratorFlowDialog.h
--- sumo-1.17.0/src/netedit/dialogs/GNECalibratorFlowDialog.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/dialogs/GNECalibratorFlowDialog.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/dialogs/GNEDemandElementDialog.cpp sumo-1.18.0/src/netedit/dialogs/GNEDemandElementDialog.cpp
--- sumo-1.17.0/src/netedit/dialogs/GNEDemandElementDialog.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/dialogs/GNEDemandElementDialog.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/dialogs/GNEDemandElementDialog.h sumo-1.18.0/src/netedit/dialogs/GNEDemandElementDialog.h
--- sumo-1.17.0/src/netedit/dialogs/GNEDemandElementDialog.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/dialogs/GNEDemandElementDialog.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/dialogs/GNEDialogACChooser.cpp sumo-1.18.0/src/netedit/dialogs/GNEDialogACChooser.cpp
--- sumo-1.17.0/src/netedit/dialogs/GNEDialogACChooser.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/dialogs/GNEDialogACChooser.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/dialogs/GNEDialogACChooser.h sumo-1.18.0/src/netedit/dialogs/GNEDialogACChooser.h
--- sumo-1.17.0/src/netedit/dialogs/GNEDialogACChooser.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/dialogs/GNEDialogACChooser.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/dialogs/GNEFixAdditionalElements.cpp sumo-1.18.0/src/netedit/dialogs/GNEFixAdditionalElements.cpp
--- sumo-1.17.0/src/netedit/dialogs/GNEFixAdditionalElements.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/dialogs/GNEFixAdditionalElements.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/dialogs/GNEFixAdditionalElements.h sumo-1.18.0/src/netedit/dialogs/GNEFixAdditionalElements.h
--- sumo-1.17.0/src/netedit/dialogs/GNEFixAdditionalElements.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/dialogs/GNEFixAdditionalElements.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/dialogs/GNEFixDemandElements.cpp sumo-1.18.0/src/netedit/dialogs/GNEFixDemandElements.cpp
--- sumo-1.17.0/src/netedit/dialogs/GNEFixDemandElements.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/dialogs/GNEFixDemandElements.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/dialogs/GNEFixDemandElements.h sumo-1.18.0/src/netedit/dialogs/GNEFixDemandElements.h
--- sumo-1.17.0/src/netedit/dialogs/GNEFixDemandElements.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/dialogs/GNEFixDemandElements.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/dialogs/GNEFixNetworkElements.cpp sumo-1.18.0/src/netedit/dialogs/GNEFixNetworkElements.cpp
--- sumo-1.17.0/src/netedit/dialogs/GNEFixNetworkElements.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/dialogs/GNEFixNetworkElements.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/dialogs/GNEFixNetworkElements.h sumo-1.18.0/src/netedit/dialogs/GNEFixNetworkElements.h
--- sumo-1.17.0/src/netedit/dialogs/GNEFixNetworkElements.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/dialogs/GNEFixNetworkElements.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/dialogs/GNEGeometryPointDialog.cpp sumo-1.18.0/src/netedit/dialogs/GNEGeometryPointDialog.cpp
--- sumo-1.17.0/src/netedit/dialogs/GNEGeometryPointDialog.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/dialogs/GNEGeometryPointDialog.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/dialogs/GNEGeometryPointDialog.h sumo-1.18.0/src/netedit/dialogs/GNEGeometryPointDialog.h
--- sumo-1.17.0/src/netedit/dialogs/GNEGeometryPointDialog.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/dialogs/GNEGeometryPointDialog.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/dialogs/GNEMultipleParametersDialog.cpp sumo-1.18.0/src/netedit/dialogs/GNEMultipleParametersDialog.cpp
--- sumo-1.17.0/src/netedit/dialogs/GNEMultipleParametersDialog.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/dialogs/GNEMultipleParametersDialog.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -18,11 +18,12 @@
 // Dialog for edit multiple parameters
 /****************************************************************************/
 
+#include 
+#include 
+#include 
 #include 
 #include 
 #include 
-#include 
-#include 
 
 #include "GNEMultipleParametersDialog.h"
 
@@ -491,7 +492,7 @@
 // GNEMultipleParametersDialog - methods
 // ---------------------------------------------------------------------------
 
-GNEMultipleParametersDialog::GNEMultipleParametersDialog(GNEInspectorFrame::ParametersEditor* parametersEditorInspector) :
+GNEMultipleParametersDialog::GNEMultipleParametersDialog(GNEFrameAttributeModules::ParametersEditor* parametersEditorInspector) :
     FXDialogBox(parametersEditorInspector->getInspectorFrameParent()->getViewNet()->getApp(), "Edit parameters", GUIDesignDialogBoxExplicitStretchable(430, 300)),
     myParametersEditor(parametersEditorInspector) {
     // call auxiliar constructor
diff -Nru sumo-1.17.0/src/netedit/dialogs/GNEMultipleParametersDialog.h sumo-1.18.0/src/netedit/dialogs/GNEMultipleParametersDialog.h
--- sumo-1.17.0/src/netedit/dialogs/GNEMultipleParametersDialog.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/dialogs/GNEMultipleParametersDialog.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -23,7 +23,6 @@
 #include 
 #include 
 #include 
-#include 
 
 // ===========================================================================
 // class definitions
@@ -254,7 +253,7 @@
     };
 
     /// @brief Constructor for parameter editor inspector
-    GNEMultipleParametersDialog(GNEInspectorFrame::ParametersEditor* parametersEditorInspector);
+    GNEMultipleParametersDialog(GNEFrameAttributeModules::ParametersEditor* parametersEditorInspector);
 
     /// @brief destructor
     ~GNEMultipleParametersDialog();
@@ -276,7 +275,7 @@
     FOX_CONSTRUCTOR(GNEMultipleParametersDialog)
 
     /// @brief pointer to ParametersEditor
-    GNEInspectorFrame::ParametersEditor* myParametersEditor;
+    GNEFrameAttributeModules::ParametersEditor* myParametersEditor;
 
     /// @brief pointer to parameters values
     ParametersValues* myParametersValues;
diff -Nru sumo-1.17.0/src/netedit/dialogs/GNEOverwriteElementsDialog.cpp sumo-1.18.0/src/netedit/dialogs/GNEOverwriteElementsDialog.cpp
--- sumo-1.17.0/src/netedit/dialogs/GNEOverwriteElementsDialog.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/dialogs/GNEOverwriteElementsDialog.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/dialogs/GNEOverwriteElementsDialog.h sumo-1.18.0/src/netedit/dialogs/GNEOverwriteElementsDialog.h
--- sumo-1.17.0/src/netedit/dialogs/GNEOverwriteElementsDialog.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/dialogs/GNEOverwriteElementsDialog.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/dialogs/GNERerouterDialog.cpp sumo-1.18.0/src/netedit/dialogs/GNERerouterDialog.cpp
--- sumo-1.17.0/src/netedit/dialogs/GNERerouterDialog.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/dialogs/GNERerouterDialog.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/dialogs/GNERerouterDialog.h sumo-1.18.0/src/netedit/dialogs/GNERerouterDialog.h
--- sumo-1.17.0/src/netedit/dialogs/GNERerouterDialog.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/dialogs/GNERerouterDialog.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/dialogs/GNERerouterIntervalDialog.cpp sumo-1.18.0/src/netedit/dialogs/GNERerouterIntervalDialog.cpp
--- sumo-1.17.0/src/netedit/dialogs/GNERerouterIntervalDialog.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/dialogs/GNERerouterIntervalDialog.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/dialogs/GNERerouterIntervalDialog.h sumo-1.18.0/src/netedit/dialogs/GNERerouterIntervalDialog.h
--- sumo-1.17.0/src/netedit/dialogs/GNERerouterIntervalDialog.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/dialogs/GNERerouterIntervalDialog.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/dialogs/GNERouteDialog.cpp sumo-1.18.0/src/netedit/dialogs/GNERouteDialog.cpp
--- sumo-1.17.0/src/netedit/dialogs/GNERouteDialog.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/dialogs/GNERouteDialog.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/dialogs/GNERouteDialog.h sumo-1.18.0/src/netedit/dialogs/GNERouteDialog.h
--- sumo-1.17.0/src/netedit/dialogs/GNERouteDialog.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/dialogs/GNERouteDialog.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/dialogs/GNESingleParametersDialog.cpp sumo-1.18.0/src/netedit/dialogs/GNESingleParametersDialog.cpp
--- sumo-1.17.0/src/netedit/dialogs/GNESingleParametersDialog.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/dialogs/GNESingleParametersDialog.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -19,6 +19,8 @@
 /****************************************************************************/
 
 #include 
+#include 
+#include 
 #include 
 #include 
 #include 
@@ -490,8 +492,8 @@
 }
 
 
-GNESingleParametersDialog::GNESingleParametersDialog(GNEInspectorFrame::ParametersEditor* parametersEditor) :
-    FXDialogBox(parametersEditor->getInspectorFrameParent()->getViewNet()->getApp(), "Edit parameters", GUIDesignDialogBoxExplicitStretchable(400, 300)),
+GNESingleParametersDialog::GNESingleParametersDialog(GNEFrameAttributeModules::ParametersEditor* parametersEditor) :
+    FXDialogBox(parametersEditor->getViewNet()->getApp(), "Edit parameters", GUIDesignDialogBoxExplicitStretchable(400, 300)),
     myGenericDataAttributes(nullptr),
     myParametersEditor(parametersEditor),
     VTypeAttributeRow(nullptr),
@@ -499,10 +501,17 @@
     myTLDef(nullptr) {
     // call auxiliar constructor
     constructor("Parameters");
-    // get AC Front
-    const GNEAttributeCarrier* AC = parametersEditor->getInspectorFrameParent()->getViewNet()->getInspectedAttributeCarriers().front();
-    // fill myParametersValues
-    myParametersValues->setParameters(AC->getACParameters > >());
+    if (parametersEditor->getInspectorFrameParent()) {
+        // get AC Front
+        const auto AC = parametersEditor->getViewNet()->getInspectedAttributeCarriers().front();
+        // fill myParametersValues
+        myParametersValues->setParameters(AC->getACParameters > >());
+    } else if (parametersEditor->getTypeFrameParent()) {
+        // get type
+        const auto type = parametersEditor->getTypeFrameParent()->getTypeSelector()->getCurrentType();
+        // fill myParametersValues
+        myParametersValues->setParameters(type->getACParameters > >());
+    }
 }
 
 
@@ -606,12 +615,21 @@
         // set parameter in editor creator
         myGenericDataAttributes->setParameters(parameters);
     } else if (myParametersEditor) {
-        // get inspected AC
-        GNEAttributeCarrier* AC = myParametersEditor->getInspectorFrameParent()->getViewNet()->getInspectedAttributeCarriers().front();
-        // set parameter in AC using undoList
-        myParametersEditor->getInspectorFrameParent()->getViewNet()->getUndoList()->begin(AC->getTagProperty().getGUIIcon(), "change parameters");
-        AC->setACParameters(parameters, myParametersEditor->getInspectorFrameParent()->getViewNet()->getUndoList());
-        myParametersEditor->getInspectorFrameParent()->getViewNet()->getUndoList()->end();
+        if (myParametersEditor->getInspectorFrameParent()) {
+            // get inspected AC
+            const auto AC = myParametersEditor->getViewNet()->getInspectedAttributeCarriers().front();
+            // set parameter in AC using undoList
+            myParametersEditor->getViewNet()->getUndoList()->begin(AC->getTagProperty().getGUIIcon(), "change parameters");
+            AC->setACParameters(parameters, myParametersEditor->getViewNet()->getUndoList());
+            myParametersEditor->getViewNet()->getUndoList()->end();
+        } else if (myParametersEditor->getTypeFrameParent()) {
+            // get type
+            const auto type = myParametersEditor->getTypeFrameParent()->getTypeSelector()->getCurrentType();
+            // set parameter in AC using undoList
+            myParametersEditor->getViewNet()->getUndoList()->begin(type->getTagProperty().getGUIIcon(), "change parameters");
+            type->setACParameters(parameters, myParametersEditor->getViewNet()->getUndoList());
+            myParametersEditor->getViewNet()->getUndoList()->end();
+        }
     } else if (VTypeAttributeRow) {
         // set parameter in VTypeAttributeRow
         VTypeAttributeRow->setParameters(parameters);
@@ -650,8 +668,13 @@
     if (myGenericDataAttributes) {
         myParametersValues->setParameters(myGenericDataAttributes->getParameters());
     } else if (myParametersEditor) {
-        const GNEAttributeCarrier* AC = myParametersEditor->getInspectorFrameParent()->getViewNet()->getInspectedAttributeCarriers().front();
-        myParametersValues->setParameters(AC->getACParameters > >());
+        if (myParametersEditor->getInspectorFrameParent()) {
+            const auto AC = myParametersEditor->getViewNet()->getInspectedAttributeCarriers().front();
+            myParametersValues->setParameters(AC->getACParameters > >());
+        } else if (myParametersEditor->getTypeFrameParent()) {
+            const auto type = myParametersEditor->getTypeFrameParent()->getTypeSelector()->getCurrentType();
+            myParametersValues->setParameters(type->getACParameters > >());
+        }
     } else if (VTypeAttributeRow) {
         myParametersValues->setParameters(VTypeAttributeRow->getParametersVectorStr());
     } else if (myAttributeCarrier) {
diff -Nru sumo-1.17.0/src/netedit/dialogs/GNESingleParametersDialog.h sumo-1.18.0/src/netedit/dialogs/GNESingleParametersDialog.h
--- sumo-1.17.0/src/netedit/dialogs/GNESingleParametersDialog.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/dialogs/GNESingleParametersDialog.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -23,7 +23,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 
 // ===========================================================================
@@ -234,7 +233,7 @@
     GNESingleParametersDialog(GNEFrameAttributeModules::GenericDataAttributes* genericDataAttributes);
 
     /// @brief Constructor for parameter editor
-    GNESingleParametersDialog(GNEInspectorFrame::ParametersEditor* parametersEditor);
+    GNESingleParametersDialog(GNEFrameAttributeModules::ParametersEditor* parametersEditor);
 
     /// @brief Constructor for Vehicle Type Row (Vehicle Type Dialog)
     GNESingleParametersDialog(GNEVehicleTypeDialog::VTypeAttributes::VTypeAttributeRow* VTypeAttributeRow, GNEViewNet* viewNet);
@@ -268,7 +267,7 @@
     GNEFrameAttributeModules::GenericDataAttributes* myGenericDataAttributes;
 
     /// @brief pointer to ParametersEditor
-    GNEInspectorFrame::ParametersEditor* myParametersEditor;
+    GNEFrameAttributeModules::ParametersEditor* myParametersEditor;
 
     /// @brief pointer to VTypeAttributeRow
     GNEVehicleTypeDialog::VTypeAttributes::VTypeAttributeRow* VTypeAttributeRow;
diff -Nru sumo-1.17.0/src/netedit/dialogs/GNEUndoListDialog.cpp sumo-1.18.0/src/netedit/dialogs/GNEUndoListDialog.cpp
--- sumo-1.17.0/src/netedit/dialogs/GNEUndoListDialog.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/dialogs/GNEUndoListDialog.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/dialogs/GNEUndoListDialog.h sumo-1.18.0/src/netedit/dialogs/GNEUndoListDialog.h
--- sumo-1.17.0/src/netedit/dialogs/GNEUndoListDialog.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/dialogs/GNEUndoListDialog.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/dialogs/GNEVariableSpeedSignDialog.cpp sumo-1.18.0/src/netedit/dialogs/GNEVariableSpeedSignDialog.cpp
--- sumo-1.17.0/src/netedit/dialogs/GNEVariableSpeedSignDialog.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/dialogs/GNEVariableSpeedSignDialog.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/dialogs/GNEVariableSpeedSignDialog.h sumo-1.18.0/src/netedit/dialogs/GNEVariableSpeedSignDialog.h
--- sumo-1.17.0/src/netedit/dialogs/GNEVariableSpeedSignDialog.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/dialogs/GNEVariableSpeedSignDialog.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/dialogs/GNEVehicleTypeDialog.cpp sumo-1.18.0/src/netedit/dialogs/GNEVehicleTypeDialog.cpp
--- sumo-1.17.0/src/netedit/dialogs/GNEVehicleTypeDialog.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/dialogs/GNEVehicleTypeDialog.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/dialogs/GNEVehicleTypeDialog.h sumo-1.18.0/src/netedit/dialogs/GNEVehicleTypeDialog.h
--- sumo-1.17.0/src/netedit/dialogs/GNEVehicleTypeDialog.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/dialogs/GNEVehicleTypeDialog.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/dialogs/GNEVTypeDistributionsDialog.cpp sumo-1.18.0/src/netedit/dialogs/GNEVTypeDistributionsDialog.cpp
--- sumo-1.17.0/src/netedit/dialogs/GNEVTypeDistributionsDialog.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/dialogs/GNEVTypeDistributionsDialog.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/dialogs/GNEVTypeDistributionsDialog.h sumo-1.18.0/src/netedit/dialogs/GNEVTypeDistributionsDialog.h
--- sumo-1.17.0/src/netedit/dialogs/GNEVTypeDistributionsDialog.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/dialogs/GNEVTypeDistributionsDialog.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/dialogs/options/CMakeLists.txt sumo-1.18.0/src/netedit/dialogs/options/CMakeLists.txt
--- sumo-1.17.0/src/netedit/dialogs/options/CMakeLists.txt	1970-01-01 00:00:00.000000000 +0000
+++ sumo-1.18.0/src/netedit/dialogs/options/CMakeLists.txt	2023-06-28 20:02:17.000000000 +0000
@@ -0,0 +1,10 @@
+set(netedit_dialogs_options_SRCS
+   GNEOptionsDialog.h
+   GNEOptionsDialog.cpp
+   GNEOptionsDialogElements.h
+   GNEOptionsDialogElements.cpp
+   )
+
+add_library(netedit_dialogs_options STATIC ${netedit_dialogs_options_SRCS})
+set_property(TARGET netedit_dialogs_options PROPERTY PROJECT_LABEL "z_netedit_dialogs_options")
+add_dependencies(netedit_dialogs_options generate-version-h)
diff -Nru sumo-1.17.0/src/netedit/dialogs/options/GNEOptionsDialog.cpp sumo-1.18.0/src/netedit/dialogs/options/GNEOptionsDialog.cpp
--- sumo-1.17.0/src/netedit/dialogs/options/GNEOptionsDialog.cpp	1970-01-01 00:00:00.000000000 +0000
+++ sumo-1.18.0/src/netedit/dialogs/options/GNEOptionsDialog.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -0,0 +1,389 @@
+/****************************************************************************/
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
+// Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License 2.0 which is available at
+// https://www.eclipse.org/legal/epl-2.0/
+// This Source Code 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
+/****************************************************************************/
+/// @file    GNEOptionsDialog.cpp
+/// @author  Pablo Alvarez Lopez
+/// @date    May 2023
+///
+// A Dialog for setting options (see OptionsCont)
+/****************************************************************************/
+#include 
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+#include "GNEOptionsDialog.h"
+
+#define TREELISTWIDTH 200
+
+// ===========================================================================
+// FOX callback mapping
+// ===========================================================================
+
+FXDEFMAP(GNEOptionsDialog) GUIDialogOptionsMap[] = {
+    FXMAPFUNC(SEL_COMMAND,  MID_CANCEL,                     GNEOptionsDialog::onCmdCancel),
+    FXMAPFUNC(SEL_COMMAND,  MID_GNE_RESET,                  GNEOptionsDialog::onCmdReset),
+    FXMAPFUNC(SEL_COMMAND,  MID_GNE_RUNNETGENERATE,         GNEOptionsDialog::onCmdRunNetgenerate),
+    FXMAPFUNC(SEL_COMMAND,  MID_GNE_SELECT,                 GNEOptionsDialog::onCmdSelectTopic),
+    FXMAPFUNC(SEL_COMMAND,  MID_GNE_SEARCH_USEDESCRIPTION,  GNEOptionsDialog::onCmdSearch),
+    FXMAPFUNC(SEL_COMMAND,  MID_MTFS_UPDATED,               GNEOptionsDialog::onCmdSearch),
+    FXMAPFUNC(SEL_COMMAND,  MID_SHOWTOOLTIPS_MENU,          GNEOptionsDialog::onCmdShowToolTipsMenu),
+    FXMAPFUNC(SEL_COMMAND,  MID_CHOOSEN_SAVE,               GNEOptionsDialog::onCmdSaveOptions),
+    FXMAPFUNC(SEL_COMMAND,  MID_CHOOSEN_LOAD,               GNEOptionsDialog::onCmdLoadOptions),
+    FXMAPFUNC(SEL_COMMAND,  MID_GNE_BUTTON_DEFAULT,         GNEOptionsDialog::onCmdResetDefault),
+};
+
+// Object implementation
+FXIMPLEMENT(GNEOptionsDialog,   FXDialogBox,    GUIDialogOptionsMap,    ARRAYNUMBER(GUIDialogOptionsMap))
+
+// ===========================================================================
+// method definitions
+// ===========================================================================
+
+std::pair
+GNEOptionsDialog::Options(GNEApplicationWindow* GNEApp, GUIIcon icon, OptionsCont& optionsContainer, const OptionsCont& originalOptionsContainer, const char* titleName) {
+    GNEOptionsDialog* optionsDialog = new GNEOptionsDialog(GNEApp, icon, optionsContainer, originalOptionsContainer, titleName, false);
+    auto result = std::make_pair(optionsDialog->execute(), optionsDialog->myOptionsModified);
+    delete optionsDialog;
+    return result;
+}
+
+
+std::pair
+GNEOptionsDialog::Run(GNEApplicationWindow* GNEApp, GUIIcon icon, OptionsCont& optionsContainer, const OptionsCont& originalOptionsContainer, const char* titleName) {
+    GNEOptionsDialog* optionsDialog = new GNEOptionsDialog(GNEApp, icon, optionsContainer, originalOptionsContainer, titleName, true);
+    auto result = std::make_pair(optionsDialog->execute(), optionsDialog->myOptionsModified);
+    delete optionsDialog;
+    return result;
+}
+
+
+GNEOptionsDialog::~GNEOptionsDialog() { }
+
+
+long
+GNEOptionsDialog::onCmdCancel(FXObject*, FXSelector, void*) {
+    // reset entries
+    for (const auto& entry : myInputOptionEntries) {
+        entry->onCmdResetOption(nullptr, 0, nullptr);
+    }
+    // close dialog canceling changes
+    return handle(this, FXSEL(SEL_COMMAND, ID_CANCEL), nullptr);
+}
+
+
+long
+GNEOptionsDialog::onCmdReset(FXObject*, FXSelector, void*) {
+    // reset entries
+    for (const auto& entry : myInputOptionEntries) {
+        entry->onCmdResetOption(nullptr, 0, nullptr);
+    }
+    return 1;
+}
+
+
+long
+GNEOptionsDialog::onCmdRunNetgenerate(FXObject*, FXSelector, void*) {
+    // close dialog accepting changes
+    handle(this, FXSEL(SEL_COMMAND, ID_ACCEPT), nullptr);
+    // run tool in mainWindow
+    return myGNEApp->handle(this, FXSEL(SEL_COMMAND, MID_GNE_RUNNETGENERATE), nullptr);
+}
+
+
+long
+GNEOptionsDialog::onCmdSelectTopic(FXObject*, FXSelector, void*) {
+    if (mySearchButton->getText().count() == 0) {
+        updateVisibleEntriesByTopic();
+    }
+    return 1;
+}
+
+
+long
+GNEOptionsDialog::onCmdSearch(FXObject*, FXSelector, void*) {
+    if (mySearchButton->getText().count() > 0) {
+        updateVisibleEntriesBySearch(mySearchButton->getText().text());
+    } else {
+        updateVisibleEntriesByTopic();
+    }
+    return 1;
+}
+
+
+long
+GNEOptionsDialog::onCmdShowToolTipsMenu(FXObject*, FXSelector, void*) {
+    // toggle check
+    myShowToolTipsMenu->setChecked(!myShowToolTipsMenu->amChecked());
+    if (myGNEApp->getViewNet()) {
+        myGNEApp->getViewNet()->getViewParent()->getShowToolTipsMenu()->setChecked(myShowToolTipsMenu->amChecked());
+        myGNEApp->getViewNet()->getViewParent()->getShowToolTipsMenu()->update();
+    }
+    // enable/disable static tooltip
+    myGNEApp->getStaticTooltipMenu()->enableStaticToolTip(myShowToolTipsMenu->amChecked());
+    // save in registry
+    getApp()->reg().writeIntEntry("gui", "menuToolTips", myShowToolTipsMenu->amChecked() ? 0 : 1);
+    update();
+
+    return 1;
+}
+
+
+long
+GNEOptionsDialog::onCmdSaveOptions(FXObject*, FXSelector, void*) {
+    // open save dialog
+    const std::string file = GNEApplicationWindowHelper::openOptionFileDialog(this, true);
+    // check file
+    if (file.size() > 0) {
+        std::ofstream out(StringUtils::transcodeToLocal(file));
+        myOptionsContainer.writeConfiguration(out, true, false, false, file, true);
+        out.close();
+    }
+    return 1;
+}
+
+
+long
+GNEOptionsDialog::onCmdLoadOptions(FXObject*, FXSelector, void*) {
+    // open file dialog
+    const std::string file = GNEApplicationWindowHelper::openOptionFileDialog(this, false);
+    // check file
+    if ((file.size() > 0) && loadConfiguration(file)) {
+        // update entries
+        for (const auto& entry : myInputOptionEntries) {
+            entry->updateOption();
+        }
+    }
+    return 1;
+}
+
+
+long
+GNEOptionsDialog::onCmdResetDefault(FXObject*, FXSelector, void*) {
+    // restore entries
+    for (const auto& entry : myInputOptionEntries) {
+        entry->restoreOption();
+    }
+    return 1;
+}
+
+
+GNEOptionsDialog::GNEOptionsDialog() :
+    myGNEApp(nullptr),
+    myOptionsContainer(OptionsCont::EMPTY_OPTIONS),
+    myOriginalOptionsContainer(OptionsCont::EMPTY_OPTIONS) {
+}
+
+
+bool
+GNEOptionsDialog::updateVisibleEntriesByTopic() {
+    // iterate over tree elements and get the selected item
+    for (const auto& treeItemTopic : myTreeItemTopics) {
+        if (treeItemTopic.first->isSelected()) {
+            // iterate over entries
+            for (const auto& entry : myInputOptionEntries) {
+                if (entry->getTopic() == treeItemTopic.second) {
+                    entry->show();
+                } else {
+                    entry->hide();
+                }
+            }
+            myEntriesFrame->recalc();
+            myEntriesFrame->update();
+            return true;
+        }
+    }
+    // no topic selected, then show all
+    for (const auto& entry : myInputOptionEntries) {
+        entry->show();
+    }
+    myEntriesFrame->recalc();
+    myEntriesFrame->update();
+    return true;
+}
+
+
+void
+GNEOptionsDialog::updateVisibleEntriesBySearch(std::string searchText) {
+    // first tolow search text
+    searchText = StringUtils::to_lower_case(searchText);
+    // iterate over entries
+    for (const auto& entry : myInputOptionEntries) {
+        if (searchText.empty()) {
+            // show all entries if searchText is empty
+            entry->show();
+        } else if (entry->getNameLower().find(searchText) != std::string::npos) {
+            entry->show();
+        } else if ((myDescriptionSearchCheckButton->getCheck() == TRUE) &&
+                   (entry->getDescriptionLower().find(searchText) != std::string::npos)) {
+            entry->show();
+        } else {
+            entry->hide();
+        }
+    }
+    myEntriesFrame->recalc();
+    myEntriesFrame->update();
+}
+
+
+bool
+GNEOptionsDialog::loadConfiguration(const std::string& file) {
+    // make all options writables
+    myOptionsContainer.resetWritable();
+    // build parser
+    XERCES_CPP_NAMESPACE::SAXParser parser;
+    parser.setValidationScheme(XERCES_CPP_NAMESPACE::SAXParser::Val_Never);
+    parser.setDisableDefaultEntityResolution(true);
+    // start the parsing
+    OptionsLoader handler(myOptionsContainer);
+    try {
+        parser.setDocumentHandler(&handler);
+        parser.setErrorHandler(&handler);
+        parser.parse(StringUtils::transcodeToLocal(file).c_str());
+        if (handler.errorOccurred()) {
+            WRITE_ERROR(TL("Could not load configuration '") + file + "'.");
+            return false;
+        }
+    } catch (const XERCES_CPP_NAMESPACE::XMLException& e) {
+        WRITE_ERROR(TL("Could not load tool configuration '") + file + "':\n " + StringUtils::transcode(e.getMessage()));
+        return false;
+    }
+    // write info
+    WRITE_MESSAGE(TL("Loaded configuration."));
+    return true;
+}
+
+
+GNEOptionsDialog::GNEOptionsDialog(GNEApplicationWindow* GNEApp, GUIIcon icon, OptionsCont& optionsContainer,
+                                   const OptionsCont& originalOptionsContainer, const char* titleName, const bool runDialog) :
+    FXDialogBox(GNEApp, titleName, GUIDesignDialogBoxExplicitStretchable(800, 600)),
+    myGNEApp(GNEApp),
+    myOptionsContainer(optionsContainer),
+    myOriginalOptionsContainer(originalOptionsContainer) {
+    // set icon
+    setIcon(GUIIconSubSys::getIcon(icon));
+    // create content frame
+    FXVerticalFrame* contentFrame = new FXVerticalFrame(this, GUIDesignContentsFrame);
+    // add buttons frame
+    FXHorizontalFrame* buttonsFrame = new FXHorizontalFrame(contentFrame, GUIDesignHorizontalFrameNoPadding);
+    myShowToolTipsMenu = new MFXCheckableButton(false, buttonsFrame,
+            myGNEApp->getStaticTooltipMenu(), "\tToggle Menu Tooltips\tToggles whether tooltips in the menu shall be shown.",
+            GUIIconSubSys::getIcon(GUIIcon::SHOWTOOLTIPS_MENU), this, MID_SHOWTOOLTIPS_MENU, GUIDesignMFXCheckableButtonSquare);
+    auto saveFile = new MFXButtonTooltip(buttonsFrame, myGNEApp->getStaticTooltipMenu(), TL("Save options"),
+                                         GUIIconSubSys::getIcon(GUIIcon::SAVE), this, MID_CHOOSEN_SAVE, GUIDesignButtonConfiguration);
+    saveFile->setTipText(TL("Save configuration file"));
+    auto loadFile = new MFXButtonTooltip(buttonsFrame, myGNEApp->getStaticTooltipMenu(), TL("Load options"),
+                                         GUIIconSubSys::getIcon(GUIIcon::OPEN), this, MID_CHOOSEN_LOAD, GUIDesignButtonConfiguration);
+    loadFile->setTipText(TL("Load configuration file"));
+    auto resetDefault = new MFXButtonTooltip(buttonsFrame, myGNEApp->getStaticTooltipMenu(), TL("Default options"),
+            GUIIconSubSys::getIcon(GUIIcon::RESET), this, MID_GNE_BUTTON_DEFAULT, GUIDesignButtonConfiguration);
+    resetDefault->setTipText(TL("Reset all options to default"));
+    // add separator
+    new FXSeparator(contentFrame);
+    // create elements frame
+    FXHorizontalFrame* elementsFrame = new FXHorizontalFrame(contentFrame, GUIDesignAuxiliarFrame);
+    FXVerticalFrame* elementsFrameTree = new FXVerticalFrame(elementsFrame, GUIDesignAuxiliarVerticalFrame);
+    FXVerticalFrame* elementsFrameValues = new FXVerticalFrame(elementsFrame, GUIDesignAuxiliarFrame);
+    // Create GroupBox modules
+    MFXGroupBoxModule* groupBoxTree = new MFXGroupBoxModule(elementsFrameTree, TL("Topics"));
+    MFXGroupBoxModule* groupBoxOptions = new MFXGroupBoxModule(elementsFrameValues, TL("Options"));
+    // create FXTreeList
+    myTopicsTreeList = new FXTreeList(groupBoxTree->getCollapsableFrame(), this, MID_GNE_SELECT, GUIDesignTreeListFixedWidth);
+    myTopicsTreeList->setWidth(TREELISTWIDTH);
+    // add root item
+    myRootItem = myTopicsTreeList->appendItem(nullptr, titleName);
+    myRootItem->setExpanded(TRUE);
+    // create scroll
+    FXScrollWindow* scrollTabEntries = new FXScrollWindow(groupBoxOptions->getCollapsableFrame(), LAYOUT_FILL_X | LAYOUT_FILL_Y);
+    // create vertical frame for entries
+    myEntriesFrame = new FXVerticalFrame(scrollTabEntries, GUIDesignAuxiliarFrame);
+    // iterate over all topics
+    for (const auto& topic : myOptionsContainer.getSubTopics()) {
+        // check if we have to ignore this topic
+        if (myIgnoredTopics.count(topic) == 0) {
+            // add topic into myTreeItemTopics and tree
+            myTreeItemTopics[myTopicsTreeList->appendItem(myRootItem, topic.c_str())] = topic;
+            // iterate over entries
+            const std::vector entries = myOptionsContainer.getSubTopicsEntries(topic);
+            for (const auto& entry : entries) {
+                // check if we have to ignore this entry
+                if (myIgnoredEntries.count(entry) == 0) {
+                    // get type
+                    const std::string type = myOptionsContainer.getTypeName(entry);
+                    // get description
+                    const std::string description = myOptionsContainer.getDescription(entry);
+                    // get default value
+                    const std::string defaultValue = myOptionsContainer.getValueString(entry);
+                    // continue depending of type
+                    if (type == "STR") {
+                        myInputOptionEntries.push_back(new GNEOptionsDialogElements::InputString(this, myEntriesFrame, topic, entry, description, defaultValue));
+                    } else if ((type == "FILE") || (type == "NETWORK") || (type == "ADDITIONAL") || (type == "ROUTE") || (type == "DATA")) {
+                        myInputOptionEntries.push_back(new GNEOptionsDialogElements::InputFilename(this, myEntriesFrame, topic, entry, description, defaultValue));
+                    } else if (type == "BOOL") {
+                        myInputOptionEntries.push_back(new GNEOptionsDialogElements::InputBool(this, myEntriesFrame, topic, entry, description, defaultValue));
+                    } else if (type == "INT") {
+                        myInputOptionEntries.push_back(new GNEOptionsDialogElements::InputInt(this, myEntriesFrame, topic, entry, description, defaultValue));
+                    } else if (type == "FLOAT") {
+                        myInputOptionEntries.push_back(new GNEOptionsDialogElements::InputFloat(this, myEntriesFrame, topic, entry, description, defaultValue));
+                    } else if (type == "INT[]") {
+                        myInputOptionEntries.push_back(new GNEOptionsDialogElements::InputIntVector(this, myEntriesFrame, topic, entry, description, defaultValue));
+                    } else if (type == "STR[]") {
+                        myInputOptionEntries.push_back(new GNEOptionsDialogElements::InputStringVector(this, myEntriesFrame, topic, entry, description, defaultValue));
+                    }
+                }
+            }
+        }
+    }
+    // create search elements
+    FXHorizontalFrame* searchFrame = new FXHorizontalFrame(contentFrame, GUIDesignAuxiliarHorizontalFrame);
+    new FXLabel(searchFrame, TL("Search"), nullptr, GUIDesignLabelThickedFixed(TREELISTWIDTH - GUIDesignHeight + 14));
+    myDescriptionSearchCheckButton = new MFXCheckButtonTooltip(searchFrame, myGNEApp->getStaticTooltipMenu(), "", this, MID_GNE_SEARCH_USEDESCRIPTION, GUIDesignCheckButtonThick);
+    myDescriptionSearchCheckButton->setToolTipText(TL("Include description in search"));
+    mySearchButton = new MFXTextFieldSearch(searchFrame, GUIDesignTextFieldNCol, this, MID_GNE_SET_ATTRIBUTE, GUIDesignTextField);
+    // add separator
+    new FXSeparator(contentFrame);
+    // create buttons frame
+    buttonsFrame = new FXHorizontalFrame(contentFrame, GUIDesignHorizontalFrame);
+    new FXHorizontalFrame(buttonsFrame, GUIDesignAuxiliarHorizontalFrame);
+    // continue depending of dialog type
+    if (runDialog) {
+        new FXButton(buttonsFrame, (TL("Run") + std::string("\t\t")).c_str(), GUIIconSubSys::getIcon(GUIIcon::ACCEPT), this, MID_GNE_RUNNETGENERATE, GUIDesignButtonOK);
+    } else {
+        new FXButton(buttonsFrame, (TL("OK") + std::string("\t\t")).c_str(), GUIIconSubSys::getIcon(GUIIcon::ACCEPT), this, ID_ACCEPT, GUIDesignButtonOK);
+    }
+    new FXButton(buttonsFrame, (TL("Cancel") + std::string("\t\t")).c_str(), GUIIconSubSys::getIcon(GUIIcon::CANCEL), this, MID_CANCEL, GUIDesignButtonOK);
+    new FXButton(buttonsFrame, (TL("Reset") + std::string("\t\t")).c_str(), GUIIconSubSys::getIcon(GUIIcon::RESET), this, MID_GNE_RESET, GUIDesignButtonOK);
+    new FXHorizontalFrame(buttonsFrame, GUIDesignAuxiliarHorizontalFrame);
+    // create dialog
+    create();
+    // after creation, adjust entries name sizes
+    for (const auto& entry : myInputOptionEntries) {
+        entry->adjustNameSize();
+    }
+    // set myShowToolTipsMenu
+    myShowToolTipsMenu->setChecked(getApp()->reg().readIntEntry("gui", "menuToolTips", 0) != 1);
+}
+
+/****************************************************************************/
diff -Nru sumo-1.17.0/src/netedit/dialogs/options/GNEOptionsDialogElements.cpp sumo-1.18.0/src/netedit/dialogs/options/GNEOptionsDialogElements.cpp
--- sumo-1.17.0/src/netedit/dialogs/options/GNEOptionsDialogElements.cpp	1970-01-01 00:00:00.000000000 +0000
+++ sumo-1.18.0/src/netedit/dialogs/options/GNEOptionsDialogElements.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -0,0 +1,518 @@
+/****************************************************************************/
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
+// Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License 2.0 which is available at
+// https://www.eclipse.org/legal/epl-2.0/
+// This Source Code 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
+/****************************************************************************/
+/// @file    GNEOptionsDialogElements.cpp
+/// @author  Pablo Alvarez Lopez
+/// @date    May 2023
+///
+// A Dialog for setting options (see OptionsCont)
+/****************************************************************************/
+#include 
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+#include "GNEOptionsDialogElements.h"
+#include "GNEOptionsDialog.h"
+
+
+#define MARGING 4
+#define MINNAMEWIDTH 200
+
+// ===========================================================================
+// FOX callback mapping
+// ===========================================================================
+
+FXDEFMAP(GNEOptionsDialogElements::InputOption) InputOptionMap[] = {
+    FXMAPFUNC(SEL_COMMAND,  MID_GNE_SET_ATTRIBUTE,  GNEOptionsDialogElements::InputOption::onCmdSetOption),
+    FXMAPFUNC(SEL_COMMAND,  MID_GNE_RESET,          GNEOptionsDialogElements::InputOption::onCmdResetOption),
+    FXMAPFUNC(SEL_UPDATE,   MID_GNE_RESET,          GNEOptionsDialogElements::InputOption::onUpdResetOption),
+};
+
+FXDEFMAP(GNEOptionsDialogElements::InputFilename) InputFilenameMap[] = {
+    FXMAPFUNC(SEL_COMMAND,  MID_GNE_SET_ATTRIBUTE_DIALOG,  GNEOptionsDialogElements::InputFilename::onCmdOpenDialog),
+};
+
+// Object implementation
+FXIMPLEMENT_ABSTRACT(GNEOptionsDialogElements::InputOption,     FXHorizontalFrame,                      InputOptionMap,     ARRAYNUMBER(InputOptionMap))
+FXIMPLEMENT_ABSTRACT(GNEOptionsDialogElements::InputFilename,   GNEOptionsDialogElements::InputOption,  InputFilenameMap,   ARRAYNUMBER(InputFilenameMap))
+
+// ===========================================================================
+// method definitions
+// ===========================================================================
+
+// ---------------------------------------------------------------------------
+// GNEOptionsDialogElements::InputOption - methods
+// ---------------------------------------------------------------------------
+
+GNEOptionsDialogElements::InputOption::InputOption(GNEOptionsDialog* GUIDialogOptions, FXComposite* parent, const std::string& topic,
+        const std::string& name, const std::string& description, const std::string& defaultValue) :
+    FXHorizontalFrame(parent, GUIDesignAuxiliarHorizontalFrame),
+    myGUIDialogOptions(GUIDialogOptions),
+    myTopic(topic),
+    myName(name),
+    myDescription(description),
+    myDefaultValue(defaultValue) {
+    // build label with name (default width 150)
+    myNameLabel = new MFXLabelTooltip(this, myGUIDialogOptions->myGNEApp->getStaticTooltipMenu(), name.c_str(), nullptr, GUIDesignLabelThickedFixed(MINNAMEWIDTH));
+    // set description as tooltip
+    myNameLabel->setTipText(description.c_str());
+    // create content frame
+    myContentFrame = new FXHorizontalFrame(this, GUIDesignAuxiliarHorizontalFrame);
+    // Create reset button
+    myResetButton = new FXButton(this, (std::string("\t\t") + TL("Reset value")).c_str(), GUIIconSubSys::getIcon(GUIIcon::RESET), this, MID_GNE_RESET, GUIDesignButtonIcon);
+}
+
+
+void
+GNEOptionsDialogElements::InputOption::adjustNameSize() {
+    const int nameWidth = myNameLabel->getFont()->getTextWidth(myNameLabel->getText().text(), myNameLabel->getText().length() + MARGING);
+    if (nameWidth > MINNAMEWIDTH) {
+        myNameLabel->setWidth(nameWidth);
+    }
+}
+
+
+const std::string&
+GNEOptionsDialogElements::InputOption::getTopic() const {
+    return myTopic;
+}
+
+
+const std::string
+GNEOptionsDialogElements::InputOption::getNameLower() const {
+    return StringUtils::to_lower_case(myName);
+}
+
+
+const std::string
+GNEOptionsDialogElements::InputOption::getDescriptionLower() const {
+    return StringUtils::to_lower_case(myDescription);
+}
+
+
+long
+GNEOptionsDialogElements::InputOption::onUpdResetOption(FXObject*, FXSelector, void*) {
+    if (getValue() != myDefaultValue) {
+        myResetButton->enable();
+    } else {
+        myResetButton->disable();
+    }
+    return 1;
+}
+
+// ---------------------------------------------------------------------------
+// GNEOptionsDialogElements::InputString - methods
+// ---------------------------------------------------------------------------
+
+GNEOptionsDialogElements::InputString::InputString(GNEOptionsDialog* GUIDialogOptions, FXComposite* parent,
+        const std::string& topic, const std::string& name, const std::string& description, const std::string& defaultValue) :
+    InputOption(GUIDialogOptions, parent, topic, name, description, defaultValue) {
+    myStringTextField = new FXTextField(myContentFrame, GUIDesignTextFieldNCol, this, MID_GNE_SET_ATTRIBUTE, GUIDesignTextField);
+    myStringTextField->setText(myGUIDialogOptions->myOptionsContainer.getString(name).c_str());
+    updateOption();
+}
+
+
+void
+GNEOptionsDialogElements::InputString::updateOption() {
+    myStringTextField->setText(myGUIDialogOptions->myOptionsContainer.getString(myName).c_str());
+}
+
+
+void
+GNEOptionsDialogElements::InputString::restoreOption() {
+    myStringTextField->setText(myGUIDialogOptions->myOriginalOptionsContainer.getString(myName).c_str());
+}
+
+
+long
+GNEOptionsDialogElements::InputString::onCmdSetOption(FXObject*, FXSelector, void*) {
+    myGUIDialogOptions->myOptionsContainer.resetWritable();
+    myGUIDialogOptions->myOptionsContainer.set(myName, myStringTextField->getText().text());
+    myGUIDialogOptions->myOptionsModified = true;
+    return 1;
+}
+
+
+long
+GNEOptionsDialogElements::InputString::onCmdResetOption(FXObject*, FXSelector, void*) {
+    myStringTextField->setText(myDefaultValue.c_str());
+    return 1;
+}
+
+
+std::string
+GNEOptionsDialogElements::InputString::getValue() const {
+    return myStringTextField->getText().text();
+}
+
+
+GNEOptionsDialogElements::InputStringVector::InputStringVector(GNEOptionsDialog* GUIDialogOptions, FXComposite* parent,
+        const std::string& topic, const std::string& name, const std::string& description, const std::string& defaultValue) :
+    InputOption(GUIDialogOptions, parent, topic, name, description, defaultValue) {
+    myStringVectorTextField = new FXTextField(myContentFrame, GUIDesignTextFieldNCol, this, MID_GNE_SET_ATTRIBUTE, GUIDesignTextField);
+    updateOption();
+}
+
+
+void
+GNEOptionsDialogElements::InputStringVector::updateOption() {
+    myStringVectorTextField->setText(toString(myGUIDialogOptions->myOptionsContainer.getStringVector(myName)).c_str());
+}
+
+
+void
+GNEOptionsDialogElements::InputStringVector::restoreOption() {
+    myStringVectorTextField->setText(toString(myGUIDialogOptions->myOriginalOptionsContainer.getStringVector(myName)).c_str());
+}
+
+
+long
+GNEOptionsDialogElements::InputStringVector::onCmdSetOption(FXObject*, FXSelector, void*) {
+    myGUIDialogOptions->myOptionsContainer.resetWritable();
+    myGUIDialogOptions->myOptionsContainer.set(myName, myStringVectorTextField->getText().text());
+    myGUIDialogOptions->myOptionsModified = true;
+    return 1;
+}
+
+
+long
+GNEOptionsDialogElements::InputStringVector::onCmdResetOption(FXObject*, FXSelector, void*) {
+    myStringVectorTextField->setText(myDefaultValue.c_str());
+    return 1;
+}
+
+
+std::string
+GNEOptionsDialogElements::InputStringVector::getValue() const {
+    return myStringVectorTextField->getText().text();
+}
+
+// ---------------------------------------------------------------------------
+// GNEOptionsDialogElements::InputBool - methods
+// ---------------------------------------------------------------------------
+
+GNEOptionsDialogElements::InputBool::InputBool(GNEOptionsDialog* GUIDialogOptions, FXComposite* parent,
+        const std::string& topic, const std::string& name, const std::string& description, const std::string& defaultValue) :
+    InputOption(GUIDialogOptions, parent, topic, name, description, defaultValue) {
+    myCheckButton = new FXCheckButton(myContentFrame, "", this, MID_GNE_SET_ATTRIBUTE, GUIDesignCheckButton);
+    updateOption();
+}
+
+
+void
+GNEOptionsDialogElements::InputBool::updateOption() {
+    if (myGUIDialogOptions->myOptionsContainer.getBool(myName)) {
+        myCheckButton->setCheck(TRUE);
+        myCheckButton->setText(TL("true"));
+    } else {
+        myCheckButton->setCheck(FALSE);
+        myCheckButton->setText(TL("false"));
+    }
+}
+
+
+void
+GNEOptionsDialogElements::InputBool::restoreOption() {
+    if (myGUIDialogOptions->myOriginalOptionsContainer.getBool(myName)) {
+        myCheckButton->setCheck(TRUE);
+        myCheckButton->setText(TL("true"));
+    } else {
+        myCheckButton->setCheck(FALSE);
+        myCheckButton->setText(TL("false"));
+    }
+}
+
+
+long
+GNEOptionsDialogElements::InputBool::onCmdSetOption(FXObject*, FXSelector, void*) {
+    myGUIDialogOptions->myOptionsContainer.resetWritable();
+    if (myCheckButton->getCheck()) {
+        myGUIDialogOptions->myOptionsContainer.set(myName, "true");
+        myCheckButton->setText(TL("true"));
+    } else {
+        myGUIDialogOptions->myOptionsContainer.set(myName, "false");
+        myCheckButton->setText(TL("false"));
+    }
+    myGUIDialogOptions->myOptionsModified = true;
+    // special checks for Debug flags
+    if ((myName == "gui-testing-debug") && myGUIDialogOptions->myOptionsContainer.isSet("gui-testing-debug")) {
+        MsgHandler::enableDebugMessages(myGUIDialogOptions->myOptionsContainer.getBool("gui-testing-debug"));
+    }
+    if ((myName == "gui-testing-debug-gl") && myGUIDialogOptions->myOptionsContainer.isSet("gui-testing-debug-gl")) {
+        MsgHandler::enableDebugGLMessages(myGUIDialogOptions->myOptionsContainer.getBool("gui-testing-debug-gl"));
+    }
+    return 1;
+}
+
+
+long
+GNEOptionsDialogElements::InputBool::onCmdResetOption(FXObject*, FXSelector, void*) {
+    if (StringUtils::toBool(myDefaultValue)) {
+        myCheckButton->setCheck(TRUE);
+        myCheckButton->setText(TL("true"));
+    } else {
+        myCheckButton->setCheck(FALSE);
+        myCheckButton->setText(TL("false"));
+    }
+    return 1;
+}
+
+
+std::string
+GNEOptionsDialogElements::InputBool::getValue() const {
+    return myCheckButton->getCheck() ? "true" : "false";
+}
+
+// ---------------------------------------------------------------------------
+// GNEOptionsDialogElements::InputInt - methods
+// ---------------------------------------------------------------------------
+
+GNEOptionsDialogElements::InputInt::InputInt(GNEOptionsDialog* GUIDialogOptions, FXComposite* parent,
+        const std::string& topic, const std::string& name, const std::string& description, const std::string& defaultValue) :
+    InputOption(GUIDialogOptions, parent, topic, name, description, defaultValue) {
+    myIntTextField = new FXTextField(myContentFrame, GUIDesignTextFieldNCol, this, MID_GNE_SET_ATTRIBUTE, GUIDesignTextFieldRestricted(TEXTFIELD_INTEGER));
+    updateOption();
+}
+
+
+void
+GNEOptionsDialogElements::InputInt::updateOption() {
+    myIntTextField->setText(toString(myGUIDialogOptions->myOptionsContainer.getInt(myName)).c_str());
+}
+
+
+void
+GNEOptionsDialogElements::InputInt::restoreOption() {
+    myIntTextField->setText(toString(myGUIDialogOptions->myOriginalOptionsContainer.getInt(myName)).c_str());
+}
+
+
+long
+GNEOptionsDialogElements::InputInt::onCmdSetOption(FXObject*, FXSelector, void*) {
+    if (myIntTextField->getText().empty()) {
+        myIntTextField->setText(myDefaultValue.c_str());
+    } else {
+        myGUIDialogOptions->myOptionsContainer.resetWritable();
+        myGUIDialogOptions->myOptionsContainer.set(myName, myIntTextField->getText().text());
+        myGUIDialogOptions->myOptionsModified = true;
+    }
+    return 1;
+}
+
+
+long
+GNEOptionsDialogElements::InputInt::onCmdResetOption(FXObject*, FXSelector, void*) {
+    myIntTextField->setText(myDefaultValue.c_str());
+    return 1;
+}
+
+
+std::string
+GNEOptionsDialogElements::InputInt::getValue() const {
+    return myIntTextField->getText().text();
+}
+
+// ---------------------------------------------------------------------------
+// GNEOptionsDialogElements::InputIntVector - methods
+// ---------------------------------------------------------------------------
+
+GNEOptionsDialogElements::InputIntVector::InputIntVector(GNEOptionsDialog* GUIDialogOptions, FXComposite* parent,
+        const std::string& topic, const std::string& name, const std::string& description, const std::string& defaultValue) :
+    InputOption(GUIDialogOptions, parent, topic, name, description, defaultValue) {
+    myIntVectorTextField = new FXTextField(myContentFrame, GUIDesignTextFieldNCol, this, MID_GNE_SET_ATTRIBUTE, GUIDesignTextField);
+    myIntVectorTextField->setText(toString(myGUIDialogOptions->myOptionsContainer.getIntVector(name)).c_str());
+    updateOption();
+}
+
+
+void
+GNEOptionsDialogElements::InputIntVector::updateOption() {
+    myIntVectorTextField->setText(toString(myGUIDialogOptions->myOptionsContainer.getIntVector(myName)).c_str());
+}
+
+
+void
+GNEOptionsDialogElements::InputIntVector::restoreOption() {
+    myIntVectorTextField->setText(toString(myGUIDialogOptions->myOriginalOptionsContainer.getIntVector(myName)).c_str());
+}
+
+
+long
+GNEOptionsDialogElements::InputIntVector::onCmdSetOption(FXObject*, FXSelector, void*) {
+    try {
+        // check that int vector can be parsed
+        const auto intVector = StringTokenizer(myIntVectorTextField->getText().text()).getVector();
+        for (const auto& intValue : intVector) {
+            StringUtils::toInt(intValue);
+        }
+        myGUIDialogOptions->myOptionsContainer.resetWritable();
+        myGUIDialogOptions->myOptionsContainer.set(myName, myIntVectorTextField->getText().text());
+        myIntVectorTextField->setTextColor(FXRGB(0, 0, 0));
+        myGUIDialogOptions->myOptionsModified = true;
+    } catch (...) {
+        myIntVectorTextField->setTextColor(FXRGB(255, 0, 0));
+    }
+    return 1;
+}
+
+
+long
+GNEOptionsDialogElements::InputIntVector::onCmdResetOption(FXObject*, FXSelector, void*) {
+    myIntVectorTextField->setText(myDefaultValue.c_str());
+    return 1;
+}
+
+
+std::string
+GNEOptionsDialogElements::InputIntVector::getValue() const {
+    return myIntVectorTextField->getText().text();
+}
+
+// ---------------------------------------------------------------------------
+// GNEOptionsDialogElements::InputFloat - methods
+// ---------------------------------------------------------------------------
+
+GNEOptionsDialogElements::InputFloat::InputFloat(GNEOptionsDialog* GUIDialogOptions, FXComposite* parent, const std::string& topic,
+        const std::string& name, const std::string& description, const std::string& defaultValue) :
+    InputOption(GUIDialogOptions, parent, topic, name, description, parseFloat(defaultValue)) {
+    myFloatTextField = new FXTextField(myContentFrame, GUIDesignTextFieldNCol, this, MID_GNE_SET_ATTRIBUTE, GUIDesignTextFieldRestricted(TEXTFIELD_REAL));
+    myFloatTextField->setText(toString(myGUIDialogOptions->myOptionsContainer.getFloat(name)).c_str());
+    updateOption();
+}
+
+
+void
+GNEOptionsDialogElements::InputFloat::updateOption() {
+    myFloatTextField->setText(toString(myGUIDialogOptions->myOptionsContainer.getFloat(myName)).c_str());
+}
+
+
+void
+GNEOptionsDialogElements::InputFloat::restoreOption() {
+    myFloatTextField->setText(toString(myGUIDialogOptions->myOriginalOptionsContainer.getFloat(myName)).c_str());
+}
+
+
+long
+GNEOptionsDialogElements::InputFloat::onCmdSetOption(FXObject*, FXSelector, void*) {
+    // avoid empty values
+    if (myFloatTextField->getText().empty()) {
+        myFloatTextField->setText(myDefaultValue.c_str());
+    } else {
+        myGUIDialogOptions->myOptionsContainer.resetWritable();
+        myGUIDialogOptions->myOptionsContainer.set(myName, myFloatTextField->getText().text());
+    }
+    return 1;
+}
+
+
+long
+GNEOptionsDialogElements::InputFloat::onCmdResetOption(FXObject*, FXSelector, void*) {
+    myFloatTextField->setText(myDefaultValue.c_str());
+    return 1;
+}
+
+
+std::string
+GNEOptionsDialogElements::InputFloat::getValue() const {
+    return myFloatTextField->getText().text();
+}
+
+
+std::string
+GNEOptionsDialogElements::InputFloat::parseFloat(const std::string& value) const {
+    try {
+        return toString(StringUtils::toDouble(value));
+    } catch (...) {
+        return value;
+    }
+}
+
+// ---------------------------------------------------------------------------
+// GNEOptionsDialogElements::InputFilename - methods
+// ---------------------------------------------------------------------------
+
+GNEOptionsDialogElements::InputFilename::InputFilename(GNEOptionsDialog* GUIDialogOptions, FXComposite* parent, const std::string& topic,
+        const std::string& name, const std::string& description, const std::string& defaultValue) :
+    InputOption(GUIDialogOptions, parent, topic, name, description, defaultValue) {
+    myOpenFilenameButton = new FXButton(myContentFrame, (std::string("\t\t") + TL("Select filename")).c_str(),
+                                        GUIIconSubSys::getIcon(GUIIcon::OPEN), this, MID_GNE_SET_ATTRIBUTE_DIALOG, GUIDesignButtonIcon);
+    myFilenameTextField = new FXTextField(myContentFrame, GUIDesignTextFieldNCol, this, MID_GNE_SET_ATTRIBUTE, GUIDesignTextField);
+    updateOption();
+}
+
+
+void
+GNEOptionsDialogElements::InputFilename::updateOption() {
+    myFilenameTextField->setText(myGUIDialogOptions->myOptionsContainer.getString(myName).c_str());
+}
+
+
+void
+GNEOptionsDialogElements::InputFilename::restoreOption() {
+    myFilenameTextField->setText(myGUIDialogOptions->myOriginalOptionsContainer.getString(myName).c_str());
+}
+
+
+long
+GNEOptionsDialogElements::InputFilename::onCmdOpenDialog(FXObject*, FXSelector, void*) {
+    // get file
+    const auto file = GNEApplicationWindowHelper::openFileDialog(this, (myName.find("output") != std::string::npos), false);
+    // check that file is valid
+    if (file.size() > 0) {
+        myFilenameTextField->setText(file.c_str(), TRUE);
+    }
+    return 1;
+}
+
+
+long
+GNEOptionsDialogElements::InputFilename::onCmdSetOption(FXObject*, FXSelector, void*) {
+    if (SUMOXMLDefinitions::isValidFilename(myFilenameTextField->getText().text())) {
+        myGUIDialogOptions->myOptionsContainer.resetWritable();
+        myGUIDialogOptions->myOptionsContainer.set(myName, myFilenameTextField->getText().text());
+        myFilenameTextField->setTextColor(FXRGB(0, 0, 0));
+        myGUIDialogOptions->myOptionsModified = true;
+    } else {
+        myFilenameTextField->setTextColor(FXRGB(255, 0, 0));
+    }
+    return 1;
+}
+
+
+long
+GNEOptionsDialogElements::InputFilename::onCmdResetOption(FXObject*, FXSelector, void*) {
+    myFilenameTextField->setText(myDefaultValue.c_str());
+    return 1;
+}
+
+
+GNEOptionsDialogElements::InputFilename::InputFilename() {}
+
+
+std::string
+GNEOptionsDialogElements::InputFilename::getValue() const {
+    return myFilenameTextField->getText().text();
+}
+
+/****************************************************************************/
diff -Nru sumo-1.17.0/src/netedit/dialogs/options/GNEOptionsDialogElements.h sumo-1.18.0/src/netedit/dialogs/options/GNEOptionsDialogElements.h
--- sumo-1.17.0/src/netedit/dialogs/options/GNEOptionsDialogElements.h	1970-01-01 00:00:00.000000000 +0000
+++ sumo-1.18.0/src/netedit/dialogs/options/GNEOptionsDialogElements.h	2023-06-28 20:02:17.000000000 +0000
@@ -0,0 +1,323 @@
+/****************************************************************************/
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
+// Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License 2.0 which is available at
+// https://www.eclipse.org/legal/epl-2.0/
+// This Source Code 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
+/****************************************************************************/
+/// @file    GNEOptionsDialogElements.h
+/// @author  Pablo Alvarez Lopez
+/// @date    May 2023
+///
+// A Dialog for setting options (see OptionsCont)
+/****************************************************************************/
+#pragma once
+#include 
+
+#include 
+#include 
+
+// ===========================================================================
+// class declaration
+// ===========================================================================
+
+class GNEOptionsDialog;
+
+// ===========================================================================
+// class definitions
+// ===========================================================================
+/**
+ * @class GNEOptionsDialog
+ * @briefA Dialog for setting options (see OptionsCont)
+ */
+class GNEOptionsDialogElements {
+
+public:
+
+    /// @brief input option
+    class InputOption : public FXHorizontalFrame {
+        /// @brief FOX-declaration
+        FXDECLARE_ABSTRACT(GNEOptionsDialogElements::InputOption)
+
+    public:
+        /// @brief constructor
+        InputOption(GNEOptionsDialog* GUIDialogOptions, FXComposite* parent, const std::string& topic,
+                    const std::string& name, const std::string& description, const std::string& defaultValue);
+
+        /// @brief adjust input name size
+        void adjustNameSize();
+
+        /// @brief get topic
+        const std::string& getTopic() const;
+
+        /// @brief get name (Lower)
+        const std::string getNameLower() const;
+
+        /// @brief get description  (Lower)
+        const std::string getDescriptionLower() const;
+
+        /// @brief update option (used after load options)
+        virtual void updateOption() = 0;
+
+        /// @brief restore option (used for setting original options)
+        virtual void restoreOption() = 0;
+
+        /// @brief called when user set value in textField/button/checkBox
+        virtual long onCmdSetOption(FXObject*, FXSelector, void*) = 0;
+
+        /// @brief called when user press reset button
+        virtual long onCmdResetOption(FXObject*, FXSelector, void*) = 0;
+
+        /// @brief update reset button
+        long onUpdResetOption(FXObject*, FXSelector, void*);
+
+    protected:
+        /// @brief FOX needs this
+        FOX_CONSTRUCTOR(InputOption)
+
+        /// @brief GNEOptionsDialog parent
+        GNEOptionsDialog* myGUIDialogOptions = nullptr;
+
+        /// @brief topic
+        const std::string myTopic;
+
+        /// @brief name
+        const std::string myName;
+
+        /// @brief description
+        const std::string myDescription;
+
+        /// @brief defaul value
+        const std::string myDefaultValue;
+
+        /// @brief content frame
+        FXHorizontalFrame* myContentFrame = nullptr;
+
+    private:
+        /// @brief get value
+        virtual std::string getValue() const = 0;
+
+        /// @brief tooltip label for name
+        MFXLabelTooltip* myNameLabel = nullptr;
+
+        // @brief reset button
+        FXButton* myResetButton = nullptr;
+    };
+
+    /// @brief input string
+    class InputString : public InputOption {
+
+    public:
+        /// @brief constructor
+        InputString(GNEOptionsDialog* GUIDialogOptions, FXComposite* parent, const std::string& topic,
+                    const std::string& name, const std::string& description, const std::string& defaultValue);
+
+        /// @brief update option
+        void updateOption();
+
+        /// @brief restore option
+        void restoreOption();
+
+        /// @brief called when user set value in textField/button/checkBox
+        long onCmdSetOption(FXObject*, FXSelector, void*);
+
+        /// @brief called when user press reset button
+        long onCmdResetOption(FXObject*, FXSelector, void*);
+
+    private:
+        /// @brief get value
+        std::string getValue() const;
+
+        /// @brief text field
+        FXTextField* myStringTextField = nullptr;
+    };
+
+    /// @brief input string vector
+    class InputStringVector : public InputOption {
+
+    public:
+        /// @brief constructor
+        InputStringVector(GNEOptionsDialog* GUIDialogOptions, FXComposite* parent, const std::string& topic,
+                          const std::string& name, const std::string& description, const std::string& defaultValue);
+
+        /// @brief update option
+        void updateOption();
+
+        /// @brief restore option
+        void restoreOption();
+
+        /// @brief called when user set value in textField/button/checkBox
+        long onCmdSetOption(FXObject*, FXSelector, void*);
+
+        /// @brief called when user press reset button
+        long onCmdResetOption(FXObject*, FXSelector, void*);
+
+    private:
+        /// @brief get value
+        std::string getValue() const;
+
+        /// @brief text field
+        FXTextField* myStringVectorTextField = nullptr;
+    };
+
+    /// @brief input bool
+    class InputBool : public InputOption {
+
+    public:
+        /// @brief constructor
+        InputBool(GNEOptionsDialog* GUIDialogOptions, FXComposite* parent, const std::string& topic,
+                  const std::string& name, const std::string& description, const std::string& defaultValue);
+
+        /// @brief update option
+        void updateOption();
+
+        /// @brief restore option
+        void restoreOption();
+
+        /// @brief called when user set value in textField/button/checkBox
+        long onCmdSetOption(FXObject*, FXSelector, void*);
+
+        /// @brief called when user press reset button
+        long onCmdResetOption(FXObject*, FXSelector, void*);
+
+    private:
+        /// @brief get value
+        std::string getValue() const;
+
+        /// @brief menu check
+        FXCheckButton* myCheckButton = nullptr;
+    };
+
+    /// @brief input int
+    class InputInt : public InputOption {
+
+    public:
+        /// @brief
+        InputInt(GNEOptionsDialog* GUIDialogOptions, FXComposite* parent, const std::string& topic,
+                 const std::string& name, const std::string& description, const std::string& defaultValue);
+
+        /// @brief update option
+        void updateOption();
+
+        /// @brief restore option
+        void restoreOption();
+
+        /// @brief called when user set value in textField/button/checkBox
+        long onCmdSetOption(FXObject*, FXSelector, void*);
+
+        /// @brief called when user press reset button
+        long onCmdResetOption(FXObject*, FXSelector, void*);
+
+    private:
+        /// @brief get value
+        std::string getValue() const;
+
+        /// @brief text field
+        FXTextField* myIntTextField = nullptr;
+    };
+
+    /// @brief input int vector
+    class InputIntVector : public InputOption {
+
+    public:
+        /// @brief
+        InputIntVector(GNEOptionsDialog* GUIDialogOptions, FXComposite* parent, const std::string& topic,
+                       const std::string& name, const std::string& description, const std::string& defaultValue);
+
+        /// @brief update option
+        void updateOption();
+
+        /// @brief restore option
+        void restoreOption();
+
+        /// @brief called when user set value in textField/button/checkBox
+        long onCmdSetOption(FXObject*, FXSelector, void*);
+
+        /// @brief called when user press reset button
+        long onCmdResetOption(FXObject*, FXSelector, void*);
+
+    private:
+        /// @brief get value
+        std::string getValue() const;
+
+        /// @brief text field
+        FXTextField* myIntVectorTextField = nullptr;
+    };
+
+    /// @brief input float
+    class InputFloat : public InputOption {
+
+    public:
+        /// @brief constructor
+        InputFloat(GNEOptionsDialog* GUIDialogOptions, FXComposite* parent, const std::string& topic,
+                   const std::string& name, const std::string& description, const std::string& defaultValue);
+
+        /// @brief update option
+        void updateOption();
+
+        /// @brief restore option
+        void restoreOption();
+
+        /// @brief called when user set value in textField/button/checkBox
+        long onCmdSetOption(FXObject*, FXSelector, void*);
+
+        /// @brief called when user press reset button
+        long onCmdResetOption(FXObject*, FXSelector, void*);
+
+    private:
+        /// @brief get value
+        std::string getValue() const;
+
+        /// @brief parse float xx to xx.00
+        std::string parseFloat(const std::string& value) const;
+
+        /// @brief text field
+        FXTextField* myFloatTextField = nullptr;
+    };
+
+    /// @brief input filename
+    class InputFilename : public InputOption {
+        /// @brief FOX-declaration
+        FXDECLARE(GNEOptionsDialogElements::InputFilename)
+
+    public:
+        /// @brief constructor
+        InputFilename(GNEOptionsDialog* GUIDialogOptions, FXComposite* parent, const std::string& topic,
+                      const std::string& name, const std::string& description, const std::string& defaultValue);
+
+        /// @brief update option
+        void updateOption();
+
+        /// @brief restore option
+        void restoreOption();
+
+        /// @brief called when user press open dialog button
+        long onCmdOpenDialog(FXObject*, FXSelector, void*);
+
+        /// @brief called when user set value in textField/button/checkBox
+        long onCmdSetOption(FXObject*, FXSelector, void*);
+
+        /// @brief called when user press reset button
+        long onCmdResetOption(FXObject*, FXSelector, void*);
+
+    protected:
+        /// @brief FOX needs this
+        InputFilename();
+
+    private:
+        /// @brief get value
+        std::string getValue() const;
+
+        /// @brief open filename button
+        FXButton* myOpenFilenameButton = nullptr;
+
+        /// @brief text field
+        FXTextField* myFilenameTextField = nullptr;
+    };
+};
diff -Nru sumo-1.17.0/src/netedit/dialogs/options/GNEOptionsDialog.h sumo-1.18.0/src/netedit/dialogs/options/GNEOptionsDialog.h
--- sumo-1.17.0/src/netedit/dialogs/options/GNEOptionsDialog.h	1970-01-01 00:00:00.000000000 +0000
+++ sumo-1.18.0/src/netedit/dialogs/options/GNEOptionsDialog.h	2023-06-28 20:02:17.000000000 +0000
@@ -0,0 +1,180 @@
+/****************************************************************************/
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
+// Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License 2.0 which is available at
+// https://www.eclipse.org/legal/epl-2.0/
+// This Source Code 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
+/****************************************************************************/
+/// @file    GNEOptionsDialog.h
+/// @author  Pablo Alvarez Lopez
+/// @date    May 2023
+///
+// A Dialog for setting options (see OptionsCont)
+/****************************************************************************/
+#pragma once
+#include 
+
+#include 
+#include 
+#include 
+#include 
+#include 
+
+#include "GNEOptionsDialogElements.h"
+
+// ===========================================================================
+// class declaration
+// ===========================================================================
+
+class GNEApplicationWindow;
+class OptionsCont;
+
+// ===========================================================================
+// class definitions
+// ===========================================================================
+/**
+ * @class GNEOptionsDialog
+ * @briefA Dialog for setting options (see OptionsCont)
+ */
+class GNEOptionsDialog : public FXDialogBox {
+    /// @brief FOX-declaration
+    FXDECLARE(GNEOptionsDialog)
+
+    /// @brief declare friend class
+    friend class GNEOptionsDialogElements;
+
+public:
+    /**@brief Constructor for options dialogs
+     *
+     * @param[in] GNEApp netedit App
+     * @param[in] optionsContainer edited option container
+     * @param[in] originalOptionsContainer original options container
+     * @param[in] icon windows icon
+     * @param[in] name The title to show
+     * @return pair with int (TRUE, FALSE) depending of execution, and bool for check if options were modified
+     */
+    static std::pair Options(GNEApplicationWindow* GNEApp, GUIIcon icon, OptionsCont& optionsContainer,
+                                        const OptionsCont& originalOptionsContainer, const char* titleName);
+
+    /**@brief Constructor for run dialogs
+     *
+     * @param[in] GNEApp netedit App
+     * @param[in] optionsContainer edited option container
+     * @param[in] originalOptionsContainer original options container
+     * @param[in] icon windows icon
+     * @param[in] name The title to show
+     * @return pair with int (TRUE, FALSE) depending of execution, and bool for check if options were modified
+     */
+    static std::pair Run(GNEApplicationWindow* GNEApp, GUIIcon icon, OptionsCont& optionsContainer,
+                                    const OptionsCont& originalOptionsContainer, const char* titleName);
+
+    /// @brief Destructor
+    ~GNEOptionsDialog();
+
+    /// @brief called when user press cancel button
+    long onCmdCancel(FXObject*, FXSelector, void*);
+
+    /// @brief called when user press reset button
+    long onCmdReset(FXObject*, FXSelector, void*);
+
+    /// @brief called when user press reset button
+    long onCmdRunNetgenerate(FXObject*, FXSelector, void*);
+
+    /// @brief called when user select a topic in the list
+    long onCmdSelectTopic(FXObject*, FXSelector, void*);
+
+    /// @brief called when user searchs
+    long onCmdSearch(FXObject*, FXSelector, void*);
+
+    /// @brief enable/disable show toolTip
+    long onCmdShowToolTipsMenu(FXObject*, FXSelector, void*);
+
+    /// @brief save options
+    long onCmdSaveOptions(FXObject*, FXSelector, void*);
+
+    /// @brief load options
+    long onCmdLoadOptions(FXObject*, FXSelector, void*);
+
+    /// @brief reset default
+    long onCmdResetDefault(FXObject*, FXSelector, void*);
+
+protected:
+    /// @brief FOX needs this
+    GNEOptionsDialog();
+
+    /// @brief pointer to main window parent
+    GNEApplicationWindow* myGNEApp;
+
+    /// @brief refecente to edited Option container
+    OptionsCont& myOptionsContainer;
+
+    /// @brief refecente to original Option container
+    const OptionsCont& myOriginalOptionsContainer;
+
+    /// @brief flag for check if options was modified
+    bool myOptionsModified = false;
+
+private:
+    /// @brief checkable button for show toolTips
+    MFXCheckableButton* myShowToolTipsMenu = nullptr;
+
+    /// @brief Topics elements tree
+    FXTreeList* myTopicsTreeList = nullptr;
+
+    /// @brief root item
+    FXTreeItem* myRootItem = nullptr;
+
+    /// @brief vertical farme for entries
+    FXVerticalFrame* myEntriesFrame = nullptr;
+
+    /// @brief checkbox for enable/disable search by description
+    MFXCheckButtonTooltip* myDescriptionSearchCheckButton = nullptr;
+
+    /// @brief search button
+    MFXTextFieldSearch* mySearchButton = nullptr;
+
+    /// @brief map with topics and their associated FXTreeItem
+    std::map myTreeItemTopics;
+
+    /// @brief Input option entries
+    std::vector myInputOptionEntries;
+
+    /// @brief ignores topics
+    const std::set myIgnoredTopics = {"Configuration"};
+
+    /// @brief ignores entrys
+    const std::set myIgnoredEntries = {"geometry.remove", "edges.join", "geometry.split", "ramps.guess", "ramps.set"};
+
+    /// @brief update visible entries by selected topic
+    bool updateVisibleEntriesByTopic();
+
+    /// @brief update visible entries by search
+    void updateVisibleEntriesBySearch(std::string searchText);
+
+    /// @brief load configuration
+    bool loadConfiguration(const std::string& file);
+
+    /**@brief Constructor
+     *
+     * @param[in] GNEApp netedit App
+     * @param[in] optionsContainer edited option container
+     * @param[in] originalOptionsContainer original options container
+     * @param[in] titleName The title to show
+     * @param[in] icon windows icon
+     * @param[in] runDialog check if this is a run dialog
+     */
+    GNEOptionsDialog(GNEApplicationWindow* GNEApp, GUIIcon icon, OptionsCont& optionsContainer,
+                     const OptionsCont& originalOptionsContainer, const char* titleName, const bool runDialog);
+
+    /// @brief Invalidated copy constructor.
+    GNEOptionsDialog(const GNEOptionsDialog&) = delete;
+
+    /// @brief Invalidated assignment operator.
+    GNEOptionsDialog& operator=(const GNEOptionsDialog&) = delete;
+};
diff -Nru sumo-1.17.0/src/netedit/dialogs/tools/GNENetgenerateDialog.cpp sumo-1.18.0/src/netedit/dialogs/tools/GNENetgenerateDialog.cpp
--- sumo-1.17.0/src/netedit/dialogs/tools/GNENetgenerateDialog.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/dialogs/tools/GNENetgenerateDialog.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/dialogs/tools/GNENetgenerateDialog.h sumo-1.18.0/src/netedit/dialogs/tools/GNENetgenerateDialog.h
--- sumo-1.17.0/src/netedit/dialogs/tools/GNENetgenerateDialog.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/dialogs/tools/GNENetgenerateDialog.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/dialogs/tools/GNEPythonToolDialog.cpp sumo-1.18.0/src/netedit/dialogs/tools/GNEPythonToolDialog.cpp
--- sumo-1.17.0/src/netedit/dialogs/tools/GNEPythonToolDialog.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/dialogs/tools/GNEPythonToolDialog.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -63,17 +63,17 @@
     // create main content frame
     auto verticalContentFrame = new FXVerticalFrame(this, GUIDesignContentsFrame);
     // create options
-    auto horizontalOptionsFrame = new FXHorizontalFrame(verticalContentFrame, GUIDesignHorizontalFrame);
+    auto horizontalOptionsFrame = new FXHorizontalFrame(verticalContentFrame, GUIDesignHorizontalFrameNoPadding);
     // build options
     myShowToolTipsMenu = new MFXCheckableButton(false, horizontalOptionsFrame,
-        GNEApp->getStaticTooltipMenu(), "\tToggle Menu Tooltips\tToggles whether tooltips in the menu shall be shown.",
-        GUIIconSubSys::getIcon(GUIIcon::SHOWTOOLTIPS_MENU), this, MID_SHOWTOOLTIPS_MENU, GUIDesignMFXCheckableButtonSquare);
+            GNEApp->getStaticTooltipMenu(), "\tToggle Menu Tooltips\tToggles whether tooltips in the menu shall be shown.",
+            GUIIconSubSys::getIcon(GUIIcon::SHOWTOOLTIPS_MENU), this, MID_SHOWTOOLTIPS_MENU, GUIDesignMFXCheckableButtonSquare);
     auto saveFile = new MFXButtonTooltip(horizontalOptionsFrame, GNEApp->getStaticTooltipMenu(), TL("Save toolcfg"),
-        GUIIconSubSys::getIcon(GUIIcon::SAVE), this, MID_CHOOSEN_SAVE, GUIDesignButtonConfiguration);
-        saveFile->setTipText(TL("Save file with tool configuration"));
-    auto loadFile = new MFXButtonTooltip(horizontalOptionsFrame, GNEApp->getStaticTooltipMenu(), TL("Load toolcfg") ,
-        GUIIconSubSys::getIcon(GUIIcon::OPEN), this, MID_CHOOSEN_LOAD, GUIDesignButtonConfiguration);
-        loadFile->setTipText(TL("Load file with tool configuration"));
+                                         GUIIconSubSys::getIcon(GUIIcon::SAVE), this, MID_CHOOSEN_SAVE, GUIDesignButtonConfiguration);
+    saveFile->setTipText(TL("Save file with tool configuration"));
+    auto loadFile = new MFXButtonTooltip(horizontalOptionsFrame, GNEApp->getStaticTooltipMenu(), TL("Load toolcfg"),
+                                         GUIIconSubSys::getIcon(GUIIcon::OPEN), this, MID_CHOOSEN_LOAD, GUIDesignButtonConfiguration);
+    loadFile->setTipText(TL("Load file with tool configuration"));
     mySortedCheckButton = new FXCheckButton(horizontalOptionsFrame, TL("Sorted by name"), this, MID_GNE_SET_ATTRIBUTE, GUIDesignCheckButton);
     myGroupedCheckButton = new FXCheckButton(horizontalOptionsFrame, TL("Grouped by categories"), this, MID_GNE_SET_ATTRIBUTE, GUIDesignCheckButton);
     // add separators
@@ -91,11 +91,11 @@
     blueLabel->setTextColor(FXRGB(0, 0, 255));
     new FXHorizontalFrame(horizontalButtonsFrame, GUIDesignAuxiliarHorizontalFrame);
     new FXButton(horizontalButtonsFrame, (TL("Run") + std::string("\t\t") + TL("run python tool")).c_str(),
-        GUIIconSubSys::getIcon(GUIIcon::ACCEPT), this, MID_GNE_BUTTON_RUN, GUIDesignButtonAccept);
+                 GUIIconSubSys::getIcon(GUIIcon::ACCEPT), this, MID_GNE_BUTTON_RUN, GUIDesignButtonAccept);
     new FXButton(horizontalButtonsFrame, (TL("Close") + std::string("\t\t") + TL("close tool dialog")).c_str(),
-        GUIIconSubSys::getIcon(GUIIcon::CANCEL), this, MID_GNE_BUTTON_CANCEL, GUIDesignButtonCancel);
+                 GUIIconSubSys::getIcon(GUIIcon::CANCEL), this, MID_GNE_BUTTON_CANCEL, GUIDesignButtonCancel);
     new FXButton(horizontalButtonsFrame, (TL("Reset") + std::string("\t\t") + TL("reset to default values")).c_str(),
-        GUIIconSubSys::getIcon(GUIIcon::RESET),  this, MID_GNE_BUTTON_RESET,  GUIDesignButtonReset);
+                 GUIIconSubSys::getIcon(GUIIcon::RESET),  this, MID_GNE_BUTTON_RESET,  GUIDesignButtonReset);
     new FXLabel(horizontalButtonsFrame, "", nullptr, GUIDesignLabelFixed(200));
     new FXHorizontalFrame(horizontalButtonsFrame, GUIDesignAuxiliarHorizontalFrame);
 }
@@ -316,6 +316,12 @@
                 myArguments.push_back(new GNEPythonToolDialogElements::RouteArgument(this, argumentFrame, option.first, option.second));
             } else if (option.second->isData()) {
                 myArguments.push_back(new GNEPythonToolDialogElements::DataArgument(this, argumentFrame, option.first, option.second));
+            } else if (option.second->isSumoConfig()) {
+                myArguments.push_back(new GNEPythonToolDialogElements::SumoConfigArgument(this, argumentFrame, option.first, option.second));
+            } else if (option.second->isEdge()) {
+                myArguments.push_back(new GNEPythonToolDialogElements::EdgeArgument(this, argumentFrame, option.first, option.second));
+            } else if (option.second->isEdgeVector()) {
+                myArguments.push_back(new GNEPythonToolDialogElements::EdgeVectorArgument(this, argumentFrame, option.first, option.second));
             } else {
                 myArguments.push_back(new GNEPythonToolDialogElements::StringArgument(this, argumentFrame, option.first, option.second));
             }
diff -Nru sumo-1.17.0/src/netedit/dialogs/tools/GNEPythonToolDialogElements.cpp sumo-1.18.0/src/netedit/dialogs/tools/GNEPythonToolDialogElements.cpp
--- sumo-1.17.0/src/netedit/dialogs/tools/GNEPythonToolDialogElements.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/dialogs/tools/GNEPythonToolDialogElements.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -20,7 +20,10 @@
 
 #include 
 #include 
+#include 
+#include 
 #include 
+#include 
 #include 
 #include 
 
@@ -48,37 +51,50 @@
     FXMAPFUNC(SEL_COMMAND,  MID_GNE_SELECT,  GNEPythonToolDialogElements::FileNameArgument::onCmdOpenFilename)
 };
 
+FXDEFMAP(GNEPythonToolDialogElements::EdgeVectorArgument) EdgeVectorArgumentMap[] = {
+    FXMAPFUNC(SEL_COMMAND,  MID_GNE_USE_CURRENT,    GNEPythonToolDialogElements::EdgeVectorArgument::onCmdUseCurrent),
+    FXMAPFUNC(SEL_UPDATE,   MID_GNE_USE_CURRENT,    GNEPythonToolDialogElements::EdgeVectorArgument::onUpdUseCurrent)
+};
+
 FXDEFMAP(GNEPythonToolDialogElements::NetworkArgument) NetworkArgumentMap[] = {
     FXMAPFUNC(SEL_COMMAND,  MID_GNE_SELECT,         GNEPythonToolDialogElements::NetworkArgument::onCmdOpenFilename),
-    FXMAPFUNC(SEL_COMMAND,  MID_GNE_USE_CURRENT,    GNEPythonToolDialogElements::NetworkArgument::onCmdUseCurrent),
-    FXMAPFUNC(SEL_UPDATE,   MID_GNE_USE_CURRENT,    GNEPythonToolDialogElements::NetworkArgument::onUpdUseCurrent)
+    FXMAPFUNC(SEL_COMMAND,  MID_GNE_USE_CURRENT,    GNEPythonToolDialogElements::NetworkArgument::onCmdUseCurrentNetworkFile),
+    FXMAPFUNC(SEL_UPDATE,   MID_GNE_USE_CURRENT,    GNEPythonToolDialogElements::NetworkArgument::onUpdUseCurrentNetworkFile)
 };
 
 FXDEFMAP(GNEPythonToolDialogElements::AdditionalArgument) AdditionalArgumentMap[] = {
     FXMAPFUNC(SEL_COMMAND,  MID_GNE_SELECT,         GNEPythonToolDialogElements::AdditionalArgument::onCmdOpenFilename),
-    FXMAPFUNC(SEL_COMMAND,  MID_GNE_USE_CURRENT,    GNEPythonToolDialogElements::AdditionalArgument::onCmdUseCurrent),
-    FXMAPFUNC(SEL_UPDATE,   MID_GNE_USE_CURRENT,    GNEPythonToolDialogElements::AdditionalArgument::onUpdUseCurrent)
+    FXMAPFUNC(SEL_COMMAND,  MID_GNE_USE_CURRENT,    GNEPythonToolDialogElements::AdditionalArgument::onCmdUseCurrentAdditionalFile),
+    FXMAPFUNC(SEL_UPDATE,   MID_GNE_USE_CURRENT,    GNEPythonToolDialogElements::AdditionalArgument::onUpdUseCurrentAdditionalFile)
 };
 
 FXDEFMAP(GNEPythonToolDialogElements::RouteArgument) RouteArgumentMap[] = {
     FXMAPFUNC(SEL_COMMAND,  MID_GNE_SELECT,         GNEPythonToolDialogElements::RouteArgument::onCmdOpenFilename),
-    FXMAPFUNC(SEL_COMMAND,  MID_GNE_USE_CURRENT,    GNEPythonToolDialogElements::RouteArgument::onCmdUseCurrent),
-    FXMAPFUNC(SEL_UPDATE,   MID_GNE_USE_CURRENT,    GNEPythonToolDialogElements::RouteArgument::onUpdUseCurrent)
+    FXMAPFUNC(SEL_COMMAND,  MID_GNE_USE_CURRENT,    GNEPythonToolDialogElements::RouteArgument::onCmdUseCurrentRouteFile),
+    FXMAPFUNC(SEL_UPDATE,   MID_GNE_USE_CURRENT,    GNEPythonToolDialogElements::RouteArgument::onUpdUseCurrentRouteFile)
 };
 
 FXDEFMAP(GNEPythonToolDialogElements::DataArgument) DataArgumentMap[] = {
     FXMAPFUNC(SEL_COMMAND,  MID_GNE_SELECT,         GNEPythonToolDialogElements::DataArgument::onCmdOpenFilename),
-    FXMAPFUNC(SEL_COMMAND,  MID_GNE_USE_CURRENT,    GNEPythonToolDialogElements::DataArgument::onCmdUseCurrent),
-    FXMAPFUNC(SEL_UPDATE,   MID_GNE_USE_CURRENT,    GNEPythonToolDialogElements::DataArgument::onUpdUseCurrent)
+    FXMAPFUNC(SEL_COMMAND,  MID_GNE_USE_CURRENT,    GNEPythonToolDialogElements::DataArgument::onCmdUseCurrentDataFile),
+    FXMAPFUNC(SEL_UPDATE,   MID_GNE_USE_CURRENT,    GNEPythonToolDialogElements::DataArgument::onUpdUseCurrentDataFile)
+};
+
+FXDEFMAP(GNEPythonToolDialogElements::SumoConfigArgument) SumoConfigArgumentMap[] = {
+    FXMAPFUNC(SEL_COMMAND,  MID_GNE_SELECT,         GNEPythonToolDialogElements::SumoConfigArgument::onCmdOpenFilename),
+    FXMAPFUNC(SEL_COMMAND,  MID_GNE_USE_CURRENT,    GNEPythonToolDialogElements::SumoConfigArgument::onCmdUseCurrentSumoConfigFile),
+    FXMAPFUNC(SEL_UPDATE,   MID_GNE_USE_CURRENT,    GNEPythonToolDialogElements::SumoConfigArgument::onUpdUseCurrentSumoConfigFile)
 };
 
 // Object implementation
 FXIMPLEMENT_ABSTRACT(GNEPythonToolDialogElements::Argument,     FXHorizontalFrame,                              ArgumentMap,            ARRAYNUMBER(ArgumentMap))
+FXIMPLEMENT(GNEPythonToolDialogElements::EdgeVectorArgument,    GNEPythonToolDialogElements::Argument,          EdgeVectorArgumentMap,  ARRAYNUMBER(EdgeVectorArgumentMap))
 FXIMPLEMENT(GNEPythonToolDialogElements::FileNameArgument,      GNEPythonToolDialogElements::Argument,          FileNameArgumentMap,    ARRAYNUMBER(FileNameArgumentMap))
 FXIMPLEMENT(GNEPythonToolDialogElements::NetworkArgument,       GNEPythonToolDialogElements::FileNameArgument,  NetworkArgumentMap,     ARRAYNUMBER(NetworkArgumentMap))
 FXIMPLEMENT(GNEPythonToolDialogElements::AdditionalArgument,    GNEPythonToolDialogElements::FileNameArgument,  AdditionalArgumentMap,  ARRAYNUMBER(AdditionalArgumentMap))
 FXIMPLEMENT(GNEPythonToolDialogElements::RouteArgument,         GNEPythonToolDialogElements::FileNameArgument,  RouteArgumentMap,       ARRAYNUMBER(RouteArgumentMap))
 FXIMPLEMENT(GNEPythonToolDialogElements::DataArgument,          GNEPythonToolDialogElements::FileNameArgument,  DataArgumentMap,        ARRAYNUMBER(DataArgumentMap))
+FXIMPLEMENT(GNEPythonToolDialogElements::SumoConfigArgument,    GNEPythonToolDialogElements::FileNameArgument,  SumoConfigArgumentMap,  ARRAYNUMBER(SumoConfigArgumentMap))
 
 
 // ===========================================================================
@@ -224,13 +240,15 @@
     Argument(toolDialogParent, argumentFrame, name, option) {
     // check if create current button
     if (useCurrent.size() > 0) {
-        myCurrentButton = new FXButton(myElementsFrame, (std::string("\t\t") + TLF("Use current % file", useCurrent)).c_str(),
-                                       GUIIconSubSys::getIcon(GUIIcon::CURRENT), this, MID_GNE_USE_CURRENT, GUIDesignButtonIcon);
+        myCurrentButton = new MFXButtonTooltip(myElementsFrame, toolDialogParent->myGNEApp->getStaticTooltipMenu(), "",
+                                               GUIIconSubSys::getIcon(GUIIcon::CURRENT), this, MID_GNE_USE_CURRENT, GUIDesignButtonIcon);
+        myCurrentButton->setTipText(TLF("Use current % file", useCurrent).c_str());
         myCurrentButton->create();
     }
     // Create Open button
-    myOpenFilenameButton = new FXButton(myElementsFrame, (std::string("\t\t") + TL("Select filename")).c_str(),
-                                        GUIIconSubSys::getIcon(GUIIcon::OPEN), this, MID_GNE_SELECT, GUIDesignButtonIcon);
+    myOpenFilenameButton = new MFXButtonTooltip(myElementsFrame, toolDialogParent->myGNEApp->getStaticTooltipMenu(), "",
+            GUIIconSubSys::getIcon(GUIIcon::OPEN), this, MID_GNE_SELECT, GUIDesignButtonIcon);
+    myOpenFilenameButton->setTipText(TLF("Select % file", useCurrent).c_str());
     myOpenFilenameButton->create();
     // create text field for filename
     myFilenameTextField = new FXTextField(myElementsFrame, GUIDesignTextFieldNCol, this, MID_GNE_SET_ATTRIBUTE, GUIDesignTextField);
@@ -245,7 +263,85 @@
 }
 
 // ---------------------------------------------------------------------------
-// GNEPythonToolDialogElements::FileNameArgument - methods
+// GNEPythonToolDialogElements::EdgeVectorArgument - methods
+// ---------------------------------------------------------------------------
+
+GNEPythonToolDialogElements::EdgeVectorArgument::EdgeVectorArgument(GNEPythonToolDialog* toolDialogParent, FXVerticalFrame* argumentFrame,
+        const std::string name, Option* option) :
+    Argument(toolDialogParent, argumentFrame, name, option) {
+    myCurrentEdgesButton = new MFXButtonTooltip(myElementsFrame, toolDialogParent->myGNEApp->getStaticTooltipMenu(), "",
+            GUIIconSubSys::getIcon(GUIIcon::EDGE), this, MID_GNE_USE_CURRENT, GUIDesignButtonIcon);
+    myCurrentEdgesButton->setTipText(TL("Use current selected edges"));
+    myCurrentEdgesButton->create();
+    // create text field for string
+    myEdgeVectorTextField = new FXTextField(myElementsFrame, GUIDesignTextFieldNCol, this, MID_GNE_SET_ATTRIBUTE, GUIDesignTextField);
+    myEdgeVectorTextField->create();
+    // set value
+    myEdgeVectorTextField->setText(option->getValueString().c_str());
+}
+
+
+void
+GNEPythonToolDialogElements::EdgeVectorArgument::reset() {
+    myEdgeVectorTextField->setText(myDefaultValue.c_str());
+    myOption->set(myDefaultValue, myDefaultValue, false);
+    myOption->resetDefault();
+}
+
+
+long
+GNEPythonToolDialogElements::EdgeVectorArgument::onCmdSetValue(FXObject*, FXSelector, void*) {
+    myOption->resetWritable();
+    if (myEdgeVectorTextField->getText().empty()) {
+        reset();
+    } else {
+        myOption->set(myEdgeVectorTextField->getText().text(), myEdgeVectorTextField->getText().text(), false);
+    }
+    return 1;
+}
+
+
+long
+GNEPythonToolDialogElements::EdgeVectorArgument::onCmdUseCurrent(FXObject*, FXSelector, void*) {
+    // obtain list of selected edges
+    const auto selectedEdges = myToolDialogParent->getGNEApplicationWindow()->getViewNet()->getNet()->getAttributeCarriers()->getSelectedEdges();
+    // convert list to string
+    std::string selectedEdgesStr;
+    for (const auto& edge : selectedEdges) {
+        selectedEdgesStr.append(edge->getID());
+        if (edge != selectedEdges.back()) {
+            selectedEdgesStr.append(" ");
+        }
+    }
+    myEdgeVectorTextField->setText(selectedEdgesStr.c_str(), TRUE);
+    return 1;
+}
+
+
+long
+GNEPythonToolDialogElements::EdgeVectorArgument::onUpdUseCurrent(FXObject* sender, FXSelector, void*) {
+    // get view net
+    const auto viewNet = myToolDialogParent->getGNEApplicationWindow()->getViewNet();
+    if (viewNet == nullptr) {
+        return sender->handle(this, FXSEL(SEL_COMMAND, ID_DISABLE), nullptr);
+    } else if (viewNet->getNet()->getAttributeCarriers()->getNumberOfSelectedEdges() == 0) {
+        return sender->handle(this, FXSEL(SEL_COMMAND, ID_DISABLE), nullptr);
+    } else {
+        return sender->handle(this, FXSEL(SEL_COMMAND, ID_ENABLE), nullptr);
+    }
+}
+
+
+GNEPythonToolDialogElements::EdgeVectorArgument::EdgeVectorArgument() {}
+
+
+const std::string
+GNEPythonToolDialogElements::EdgeVectorArgument::getValue() const {
+    return myEdgeVectorTextField->getText().text();
+}
+
+// ---------------------------------------------------------------------------
+// GNEPythonToolDialogElements::NetworkArgument - methods
 // ---------------------------------------------------------------------------
 
 GNEPythonToolDialogElements::NetworkArgument::NetworkArgument(GNEPythonToolDialog* toolDialogParent, FXVerticalFrame* argumentFrame,
@@ -267,14 +363,14 @@
 
 
 long
-GNEPythonToolDialogElements::NetworkArgument::onCmdUseCurrent(FXObject*, FXSelector, void*) {
+GNEPythonToolDialogElements::NetworkArgument::onCmdUseCurrentNetworkFile(FXObject*, FXSelector, void*) {
     myFilenameTextField->setText(OptionsCont::getOptions().getString("sumo-net-file").c_str(), TRUE);
     return 1;
 }
 
 
 long
-GNEPythonToolDialogElements::NetworkArgument::onUpdUseCurrent(FXObject* sender, FXSelector, void*) {
+GNEPythonToolDialogElements::NetworkArgument::onUpdUseCurrentNetworkFile(FXObject* sender, FXSelector, void*) {
     if (myToolDialogParent->getGNEApplicationWindow()->getViewNet() == nullptr) {
         return sender->handle(this, FXSEL(SEL_COMMAND, ID_DISABLE), nullptr);
     } else if (OptionsCont::getOptions().getString("sumo-net-file").empty()) {
@@ -288,7 +384,7 @@
 GNEPythonToolDialogElements::NetworkArgument::NetworkArgument() {}
 
 // ---------------------------------------------------------------------------
-// GNEPythonToolDialogElements::FileNameArgument - methods
+// GNEPythonToolDialogElements::AdditionalArgument - methods
 // ---------------------------------------------------------------------------
 
 GNEPythonToolDialogElements::AdditionalArgument::AdditionalArgument(GNEPythonToolDialog* toolDialogParent, FXVerticalFrame* argumentFrame,
@@ -310,14 +406,14 @@
 
 
 long
-GNEPythonToolDialogElements::AdditionalArgument::onCmdUseCurrent(FXObject*, FXSelector, void*) {
+GNEPythonToolDialogElements::AdditionalArgument::onCmdUseCurrentAdditionalFile(FXObject*, FXSelector, void*) {
     myFilenameTextField->setText(OptionsCont::getOptions().getString("additional-files").c_str(), TRUE);
     return 1;
 }
 
 
 long
-GNEPythonToolDialogElements::AdditionalArgument::onUpdUseCurrent(FXObject* sender, FXSelector, void*) {
+GNEPythonToolDialogElements::AdditionalArgument::onUpdUseCurrentAdditionalFile(FXObject* sender, FXSelector, void*) {
     if (myToolDialogParent->getGNEApplicationWindow()->getViewNet() == nullptr) {
         return sender->handle(this, FXSEL(SEL_COMMAND, ID_DISABLE), nullptr);
     } else if (OptionsCont::getOptions().getString("additional-files").empty()) {
@@ -331,7 +427,7 @@
 GNEPythonToolDialogElements::AdditionalArgument::AdditionalArgument() {}
 
 // ---------------------------------------------------------------------------
-// GNEPythonToolDialogElements::FileNameArgument - methods
+// GNEPythonToolDialogElements::RouteArgument - methods
 // ---------------------------------------------------------------------------
 
 GNEPythonToolDialogElements::RouteArgument::RouteArgument(GNEPythonToolDialog* toolDialogParent, FXVerticalFrame* argumentFrame,
@@ -353,14 +449,14 @@
 
 
 long
-GNEPythonToolDialogElements::RouteArgument::onCmdUseCurrent(FXObject*, FXSelector, void*) {
+GNEPythonToolDialogElements::RouteArgument::onCmdUseCurrentRouteFile(FXObject*, FXSelector, void*) {
     myFilenameTextField->setText(OptionsCont::getOptions().getString("route-files").c_str(), TRUE);
     return 1;
 }
 
 
 long
-GNEPythonToolDialogElements::RouteArgument::onUpdUseCurrent(FXObject* sender, FXSelector, void*) {
+GNEPythonToolDialogElements::RouteArgument::onUpdUseCurrentRouteFile(FXObject* sender, FXSelector, void*) {
     if (myToolDialogParent->getGNEApplicationWindow()->getViewNet() == nullptr) {
         return sender->handle(this, FXSEL(SEL_COMMAND, ID_DISABLE), nullptr);
     } else if (OptionsCont::getOptions().getString("route-files").empty()) {
@@ -374,7 +470,7 @@
 GNEPythonToolDialogElements::RouteArgument::RouteArgument() {}
 
 // ---------------------------------------------------------------------------
-// GNEPythonToolDialogElements::FileNameArgument - methods
+// GNEPythonToolDialogElements::DataArgument - methods
 // ---------------------------------------------------------------------------
 
 GNEPythonToolDialogElements::DataArgument::DataArgument(GNEPythonToolDialog* toolDialogParent, FXVerticalFrame* argumentFrame,
@@ -396,14 +492,14 @@
 
 
 long
-GNEPythonToolDialogElements::DataArgument::onCmdUseCurrent(FXObject*, FXSelector, void*) {
+GNEPythonToolDialogElements::DataArgument::onCmdUseCurrentDataFile(FXObject*, FXSelector, void*) {
     myFilenameTextField->setText(OptionsCont::getOptions().getString("data-files").c_str(), TRUE);
     return 1;
 }
 
 
 long
-GNEPythonToolDialogElements::DataArgument::onUpdUseCurrent(FXObject* sender, FXSelector, void*) {
+GNEPythonToolDialogElements::DataArgument::onUpdUseCurrentDataFile(FXObject* sender, FXSelector, void*) {
     if (myToolDialogParent->getGNEApplicationWindow()->getViewNet() == nullptr) {
         return sender->handle(this, FXSEL(SEL_COMMAND, ID_DISABLE), nullptr);
     } else if (OptionsCont::getOptions().getString("data-files").empty()) {
@@ -417,6 +513,88 @@
 GNEPythonToolDialogElements::DataArgument::DataArgument() {}
 
 // ---------------------------------------------------------------------------
+// GNEPythonToolDialogElements::SumoConfigArgument - methods
+// ---------------------------------------------------------------------------
+
+GNEPythonToolDialogElements::SumoConfigArgument::SumoConfigArgument(GNEPythonToolDialog* toolDialogParent, FXVerticalFrame* argumentFrame,
+        const std::string name, Option* option) :
+    FileNameArgument(toolDialogParent, argumentFrame, name, option, TL("sumo config")) {
+}
+
+
+long
+GNEPythonToolDialogElements::SumoConfigArgument::onCmdOpenFilename(FXObject*, FXSelector, void*) {
+    // get sumoConfig file
+    const auto sumoConfigFile = GNEApplicationWindowHelper::openSumoConfigFileDialog(this, (myOption->getSubTopic() == "output"), myOption->getListSeparator() != "");
+    // check that file is valid
+    if (sumoConfigFile.size() > 0) {
+        myFilenameTextField->setText(sumoConfigFile.c_str(), TRUE);
+    }
+    return 1;
+}
+
+
+long
+GNEPythonToolDialogElements::SumoConfigArgument::onCmdUseCurrentSumoConfigFile(FXObject*, FXSelector, void*) {
+    myFilenameTextField->setText(OptionsCont::getOptions().getString("sumocfg-file").c_str(), TRUE);
+    return 1;
+}
+
+
+long
+GNEPythonToolDialogElements::SumoConfigArgument::onUpdUseCurrentSumoConfigFile(FXObject* sender, FXSelector, void*) {
+    if (myToolDialogParent->getGNEApplicationWindow()->getViewNet() == nullptr) {
+        return sender->handle(this, FXSEL(SEL_COMMAND, ID_DISABLE), nullptr);
+    } else if (OptionsCont::getOptions().getString("sumocfg-file").empty()) {
+        return sender->handle(this, FXSEL(SEL_COMMAND, ID_DISABLE), nullptr);
+    } else {
+        return sender->handle(this, FXSEL(SEL_COMMAND, ID_ENABLE), nullptr);
+    }
+}
+
+
+GNEPythonToolDialogElements::SumoConfigArgument::SumoConfigArgument() {}
+
+// ---------------------------------------------------------------------------
+// GNEPythonToolDialogElements::EdgeArgument - methods
+// ---------------------------------------------------------------------------
+
+GNEPythonToolDialogElements::EdgeArgument::EdgeArgument(GNEPythonToolDialog* toolDialogParent, FXVerticalFrame* argumentFrame, const std::string name, Option* option) :
+    Argument(toolDialogParent, argumentFrame, name, option) {
+    // create text field for int
+    myEdgeTextField = new FXTextField(myElementsFrame, GUIDesignTextFieldNCol, this, MID_GNE_SET_ATTRIBUTE, GUIDesignTextField);
+    myEdgeTextField->create();
+    // set value
+    myEdgeTextField->setText(option->getValueString().c_str());
+}
+
+
+void
+GNEPythonToolDialogElements::EdgeArgument::reset() {
+    myEdgeTextField->setText(myDefaultValue.c_str());
+    myOption->set(myDefaultValue, myDefaultValue, false);
+    myOption->resetDefault();
+}
+
+
+long
+GNEPythonToolDialogElements::EdgeArgument::onCmdSetValue(FXObject*, FXSelector, void*) {
+    myOption->resetWritable();
+    if (myEdgeTextField->getText().empty()) {
+        reset();
+    } else {
+        myOption->set(myEdgeTextField->getText().text(), myEdgeTextField->getText().text(), false);
+    }
+    return 1;
+}
+
+
+const std::string
+GNEPythonToolDialogElements::EdgeArgument::getValue() const {
+    return myEdgeTextField->getText().text();
+}
+
+// ---------------------------------------------------------------------------
 // GNEPythonToolDialogElements::StringArgument - methods
 // ---------------------------------------------------------------------------
 
@@ -563,7 +741,7 @@
 
 void
 GNEPythonToolDialogElements::BoolArgument::reset() {
-    if (GNEAttributeCarrier::parse(myDefaultValue)) {
+    if (myDefaultValue == "True") {
         myCheckButton->setCheck(TRUE);
         myCheckButton->setText(TL("true"));
     } else {
@@ -580,10 +758,16 @@
     myOption->resetWritable();
     if (myCheckButton->getCheck() == TRUE) {
         myCheckButton->setText(TL("true"));
-        myOption->set("true", "true", false);
+        myOption->set("True", "True", false);
+        if (myDefaultValue == "True") {
+            myOption->resetDefault();
+        }
     } else {
         myCheckButton->setText(TL("false"));
-        myOption->set("false", "false", false);
+        myOption->set("False", "False", false);
+        if (myDefaultValue == "False") {
+            myOption->resetDefault();
+        }
     }
     return 1;
 }
@@ -592,9 +776,9 @@
 const std::string
 GNEPythonToolDialogElements::BoolArgument::getValue() const {
     if (myCheckButton->getCheck() == TRUE) {
-        return "true";
+        return "True";
     } else {
-        return "false";
+        return "False";
     }
 }
 
diff -Nru sumo-1.17.0/src/netedit/dialogs/tools/GNEPythonToolDialogElements.h sumo-1.18.0/src/netedit/dialogs/tools/GNEPythonToolDialogElements.h
--- sumo-1.17.0/src/netedit/dialogs/tools/GNEPythonToolDialogElements.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/dialogs/tools/GNEPythonToolDialogElements.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -30,6 +30,7 @@
 
 class GNEPythonToolDialog;
 class MFXLabelTooltip;
+class MFXButtonTooltip;
 class Option;
 
 // ===========================================================================
@@ -129,6 +130,51 @@
         Argument& operator=(const Argument&) = delete;
     };
 
+
+    /// @brief edge vector argument
+    class EdgeVectorArgument : public Argument {
+        /// @brief FOX-declaration
+        FXDECLARE(GNEPythonToolDialogElements::EdgeVectorArgument)
+
+    public:
+        /// @brief constructor
+        EdgeVectorArgument(GNEPythonToolDialog* toolDialogParent, FXVerticalFrame* argumentFrame,
+                           const std::string name, Option* option);
+
+        /// @brief reset to default value
+        void reset();
+
+        /// @brief Called when user changes argument value
+        long onCmdSetValue(FXObject*, FXSelector, void*);
+
+        /// @brief Called when user press use seleted edges button
+        long onCmdUseCurrent(FXObject*, FXSelector, void*);
+
+        /// @brief enable or disable use selected edges button
+        long onUpdUseCurrent(FXObject* sender, FXSelector, void*);
+
+    protected:
+        /// @brief FOX need this
+        EdgeVectorArgument();
+
+        /// @brief get value
+        const std::string getValue() const;
+
+        /// @brief edge vectgor textField
+        FXTextField* myEdgeVectorTextField = nullptr;
+
+    private:
+        /// @brief current edges button
+        MFXButtonTooltip* myCurrentEdgesButton = nullptr;
+
+        /// @brief Invalidated copy constructor.
+        EdgeVectorArgument(const EdgeVectorArgument&) = delete;
+
+        /// @brief Invalidated assignment operator.
+        EdgeVectorArgument& operator=(const EdgeVectorArgument&) = delete;
+    };
+
+
     /// @brief filename argument
     class FileNameArgument : public Argument {
         /// @brief FOX-declaration
@@ -164,10 +210,10 @@
 
     private:
         /// @brief current button
-        FXButton* myCurrentButton = nullptr;
+        MFXButtonTooltip* myCurrentButton = nullptr;
 
         /// @brief filename button
-        FXButton* myOpenFilenameButton = nullptr;
+        MFXButtonTooltip* myOpenFilenameButton = nullptr;
 
         /// @brief Invalidated copy constructor.
         FileNameArgument(const FileNameArgument&) = delete;
@@ -190,10 +236,10 @@
         long onCmdOpenFilename(FXObject*, FXSelector, void*);
 
         /// @brief Called when user press use current button
-        long onCmdUseCurrent(FXObject*, FXSelector, void*);
+        long onCmdUseCurrentNetworkFile(FXObject*, FXSelector, void*);
 
         /// @brief enable or disable use current button
-        long onUpdUseCurrent(FXObject* sender, FXSelector, void*);
+        long onUpdUseCurrentNetworkFile(FXObject* sender, FXSelector, void*);
 
     protected:
         /// @brief FOX need this
@@ -207,7 +253,7 @@
         NetworkArgument& operator=(const NetworkArgument&) = delete;
     };
 
-    /// @brief network argument
+    /// @brief additional argument
     class AdditionalArgument : public FileNameArgument {
         /// @brief FOX-declaration
         FXDECLARE(GNEPythonToolDialogElements::AdditionalArgument)
@@ -221,10 +267,10 @@
         long onCmdOpenFilename(FXObject*, FXSelector, void*);
 
         /// @brief Called when user press use current button
-        long onCmdUseCurrent(FXObject*, FXSelector, void*);
+        long onCmdUseCurrentAdditionalFile(FXObject*, FXSelector, void*);
 
         /// @brief enable or disable use current button
-        long onUpdUseCurrent(FXObject* sender, FXSelector, void*);
+        long onUpdUseCurrentAdditionalFile(FXObject* sender, FXSelector, void*);
 
     protected:
         /// @brief FOX need this
@@ -238,7 +284,7 @@
         AdditionalArgument& operator=(const AdditionalArgument&) = delete;
     };
 
-    /// @brief network argument
+    /// @brief route argument
     class RouteArgument : public FileNameArgument {
         /// @brief FOX-declaration
         FXDECLARE(GNEPythonToolDialogElements::RouteArgument)
@@ -252,10 +298,10 @@
         long onCmdOpenFilename(FXObject*, FXSelector, void*);
 
         /// @brief Called when user press use current button
-        long onCmdUseCurrent(FXObject*, FXSelector, void*);
+        long onCmdUseCurrentRouteFile(FXObject*, FXSelector, void*);
 
         /// @brief enable or disable use current button
-        long onUpdUseCurrent(FXObject* sender, FXSelector, void*);
+        long onUpdUseCurrentRouteFile(FXObject* sender, FXSelector, void*);
 
     protected:
         /// @brief FOX need this
@@ -269,7 +315,7 @@
         RouteArgument& operator=(const RouteArgument&) = delete;
     };
 
-    /// @brief network argument
+    /// @brief data argument
     class DataArgument : public FileNameArgument {
         /// @brief FOX-declaration
         FXDECLARE(GNEPythonToolDialogElements::DataArgument)
@@ -283,10 +329,10 @@
         long onCmdOpenFilename(FXObject*, FXSelector, void*);
 
         /// @brief Called when user press use current button
-        long onCmdUseCurrent(FXObject*, FXSelector, void*);
+        long onCmdUseCurrentDataFile(FXObject*, FXSelector, void*);
 
         /// @brief enable or disable use current button
-        long onUpdUseCurrent(FXObject* sender, FXSelector, void*);
+        long onUpdUseCurrentDataFile(FXObject* sender, FXSelector, void*);
 
     protected:
         /// @brief FOX need this
@@ -300,6 +346,68 @@
         DataArgument& operator=(const DataArgument&) = delete;
     };
 
+    /// @brief sumo config argument
+    class SumoConfigArgument : public FileNameArgument {
+        /// @brief FOX-declaration
+        FXDECLARE(GNEPythonToolDialogElements::SumoConfigArgument)
+
+    public:
+        /// @brief constructor
+        SumoConfigArgument(GNEPythonToolDialog* toolDialogParent, FXVerticalFrame* argumentFrame,
+                           const std::string name, Option* option);
+
+        /// @brief Called when user press open filename button
+        long onCmdOpenFilename(FXObject*, FXSelector, void*);
+
+        /// @brief Called when user press use current button
+        long onCmdUseCurrentSumoConfigFile(FXObject*, FXSelector, void*);
+
+        /// @brief enable or disable use current button
+        long onUpdUseCurrentSumoConfigFile(FXObject* sender, FXSelector, void*);
+
+    protected:
+        /// @brief FOX need this
+        SumoConfigArgument();
+
+    private:
+        /// @brief Invalidated copy constructor.
+        SumoConfigArgument(const SumoConfigArgument&) = delete;
+
+        /// @brief Invalidated assignment operator.
+        SumoConfigArgument& operator=(const SumoConfigArgument&) = delete;
+    };
+
+    /// @brief int argument
+    class EdgeArgument : public Argument {
+
+    public:
+        /// @brief constructor
+        EdgeArgument(GNEPythonToolDialog* toolDialogParent, FXVerticalFrame* argumentFrame, const std::string name, Option* option);
+
+        /// @brief reset to default value
+        void reset();
+
+        /// @brief Called when user set int value
+        long onCmdSetValue(FXObject*, FXSelector, void*);
+
+    protected:
+        /// @brief get value
+        const std::string getValue() const;
+
+        /// @brief int textField
+        FXTextField* myEdgeTextField = nullptr;
+
+    private:
+        /// @brief invalid int in string format
+        static const std::string INVALID_INT_STR;
+
+        /// @brief Invalidated copy constructor.
+        EdgeArgument(const EdgeArgument&) = delete;
+
+        /// @brief Invalidated assignment operator.
+        EdgeArgument& operator=(const EdgeArgument&) = delete;
+    };
+
     /// @brief string argument
     class StringArgument : public Argument {
 
diff -Nru sumo-1.17.0/src/netedit/dialogs/tools/GNEPythonToolDialog.h sumo-1.18.0/src/netedit/dialogs/tools/GNEPythonToolDialog.h
--- sumo-1.17.0/src/netedit/dialogs/tools/GNEPythonToolDialog.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/dialogs/tools/GNEPythonToolDialog.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/dialogs/tools/GNERunNetgenerateDialog.cpp sumo-1.18.0/src/netedit/dialogs/tools/GNERunNetgenerateDialog.cpp
--- sumo-1.17.0/src/netedit/dialogs/tools/GNERunNetgenerateDialog.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/dialogs/tools/GNERunNetgenerateDialog.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -120,6 +120,8 @@
     FXDialogBox::show(PLACEMENT_SCREEN);
     // set netgenerate options
     myNetgenerateOptions = netgenerateOptions;
+    // reset error flag
+    myError = false;
     // run tool
     myRunNetgenerate->run(myNetgenerateOptions);
 }
@@ -174,6 +176,7 @@
     myText->appendStyledText("rerun tool\n", 1, TRUE);
     myText->layout();
     myText->update();
+    myError = false;
     // run tool
     myRunNetgenerate->run(myNetgenerateOptions);
     return 1;
@@ -192,8 +195,15 @@
 GNERunNetgenerateDialog::onCmdClose(FXObject*, FXSelector, void*) {
     // close run dialog and call postprocessing
     onCmdCancel(nullptr, 0, nullptr);
+    myText->setText("", 0);
     // call postprocessing dialog
-    return myGNEApp->handle(this, FXSEL(SEL_COMMAND, MID_GNE_POSTPROCESSINGNETGENERATE), nullptr);
+    if (myError) {
+        return 1;
+    } else {
+        // don't run this again
+        myError = true;
+        return myGNEApp->handle(this, FXSEL(SEL_COMMAND, MID_GNE_POSTPROCESSINGNETGENERATE), nullptr);
+    }
 }
 
 
@@ -201,13 +211,15 @@
 GNERunNetgenerateDialog::onCmdCancel(FXObject*, FXSelector, void*) {
     // abort tool
     myRunNetgenerate->abort();
-    // hide dialog
+    // workaround race conditionat that prevents hiding
+    show();
     hide();
     return 1;
 }
 
 long
 GNERunNetgenerateDialog::onThreadEvent(FXObject*, FXSelector, void*) {
+    bool toolFinished = false;
     while (!myEvents.empty()) {
         // get the next event
         GUIEvent* e = myEvents.top();
@@ -216,6 +228,7 @@
         FXint style = -1;
         switch (e->getOwnType()) {
             case GUIEventType::TOOL_ENDED:
+                toolFinished = true;
                 break;
             case GUIEventType::MESSAGE_OCCURRED:
                 style = 1;
@@ -225,6 +238,7 @@
                 break;
             case GUIEventType::ERROR_OCCURRED:
                 style = 3;
+                myError = true;
                 break;
             default:
                 break;
@@ -238,6 +252,16 @@
         delete e;
         updateDialog();
     }
+
+    if (toolFinished) {
+        // check if close dialog immediately after running
+        if (myText->getText().find("Error") != -1) {
+            myError = true;
+        } else if ((myText->getText().find("Success") != -1) && (myText->getText().find("Warning") == -1)) {
+            onCmdClose(nullptr, 0, nullptr);
+        }
+    }
+
     return 1;
 }
 
diff -Nru sumo-1.17.0/src/netedit/dialogs/tools/GNERunNetgenerateDialog.h sumo-1.18.0/src/netedit/dialogs/tools/GNERunNetgenerateDialog.h
--- sumo-1.17.0/src/netedit/dialogs/tools/GNERunNetgenerateDialog.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/dialogs/tools/GNERunNetgenerateDialog.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -122,6 +122,9 @@
     /// @brief io-event with the runner thread
     FXEX::MFXThreadEvent myThreadEvent;
 
+    /// @brief flag to check if there is an error
+    bool myError = false;
+
     /// @brief Invalidated copy constructor.
     GNERunNetgenerateDialog(const GNERunNetgenerateDialog&) = delete;
 
diff -Nru sumo-1.17.0/src/netedit/dialogs/tools/GNERunPythonToolDialog.cpp sumo-1.18.0/src/netedit/dialogs/tools/GNERunPythonToolDialog.cpp
--- sumo-1.17.0/src/netedit/dialogs/tools/GNERunPythonToolDialog.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/dialogs/tools/GNERunPythonToolDialog.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/dialogs/tools/GNERunPythonToolDialog.h sumo-1.18.0/src/netedit/dialogs/tools/GNERunPythonToolDialog.h
--- sumo-1.17.0/src/netedit/dialogs/tools/GNERunPythonToolDialog.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/dialogs/tools/GNERunPythonToolDialog.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/elements/additional/GNEAccess.cpp sumo-1.18.0/src/netedit/elements/additional/GNEAccess.cpp
--- sumo-1.17.0/src/netedit/elements/additional/GNEAccess.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/additional/GNEAccess.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/elements/additional/GNEAccess.h sumo-1.18.0/src/netedit/elements/additional/GNEAccess.h
--- sumo-1.17.0/src/netedit/elements/additional/GNEAccess.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/additional/GNEAccess.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/elements/additional/GNEAdditional.cpp sumo-1.18.0/src/netedit/elements/additional/GNEAdditional.cpp
--- sumo-1.17.0/src/netedit/elements/additional/GNEAdditional.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/additional/GNEAdditional.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -143,14 +143,14 @@
     buildPopupHeader(ret, app);
     // build menu command for center button and copy cursor position to clipboard
     buildCenterPopupEntry(ret);
-    buildPositionCopyEntry(ret, app);
     // build menu commands for names
-    GUIDesigns::buildFXMenuCommand(ret, TL("Copy ") + getTagStr() + TL(" name to clipboard"), nullptr, ret, MID_COPY_NAME);
-    GUIDesigns::buildFXMenuCommand(ret, TL("Copy ") + getTagStr() + TL(" typed name to clipboard"), nullptr, ret, MID_COPY_TYPED_NAME);
+    GUIDesigns::buildFXMenuCommand(ret, TLF("Copy % name to clipboard", getTagStr()), nullptr, ret, MID_COPY_NAME);
+    GUIDesigns::buildFXMenuCommand(ret, TLF("Copy % typed name to clipboard", getTagStr()), nullptr, ret, MID_COPY_TYPED_NAME);
     new FXMenuSeparator(ret);
     // build selection and show parameters menu
     myNet->getViewNet()->buildSelectionACPopupEntry(ret, this);
     buildShowParamsPopupEntry(ret);
+    buildPositionCopyEntry(ret, app);
     // show option to open additional dialog
     if (myTagProperty.hasDialog()) {
         GUIDesigns::buildFXMenuCommand(ret, TL("Open ") + getTagStr() + TL(" Dialog"), getACIcon(), &parent, MID_OPEN_ADDITIONAL_DIALOG);
diff -Nru sumo-1.17.0/src/netedit/elements/additional/GNEAdditional.h sumo-1.18.0/src/netedit/elements/additional/GNEAdditional.h
--- sumo-1.17.0/src/netedit/elements/additional/GNEAdditional.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/additional/GNEAdditional.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/elements/additional/GNEAdditionalHandler.cpp sumo-1.18.0/src/netedit/elements/additional/GNEAdditionalHandler.cpp
--- sumo-1.17.0/src/netedit/elements/additional/GNEAdditionalHandler.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/additional/GNEAdditionalHandler.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -81,14 +81,14 @@
     // check conditions
     if (!SUMOXMLDefinitions::isValidAdditionalID(id)) {
         writeInvalidID(SUMO_TAG_BUS_STOP, id);
-    } else if (checkDuplicatedAdditional(SUMO_TAG_BUS_STOP, id)) {
+    } else if (checkDuplicatedAdditional(SUMO_TAG_BUS_STOP, id) && checkDuplicatedAdditional(SUMO_TAG_TRAIN_STOP, id)) {
         // get netedit parameters
         NeteditParameters neteditParameters(sumoBaseObject);
         // get lane
         GNELane* lane = myNet->getAttributeCarriers()->retrieveLane(laneID, false);
         // check lane
         if (lane == nullptr) {
-            writeErrorInvalidParent(SUMO_TAG_BUS_STOP, SUMO_TAG_LANE);
+            writeErrorInvalidParent(SUMO_TAG_BUS_STOP, id, SUMO_TAG_LANE, laneID);
         } else if (!checkLaneDoublePosition(startPos, endPos, lane->getParentEdge()->getNBEdge()->getFinalLength(), friendlyPosition)) {
             writeErrorInvalidPosition(SUMO_TAG_BUS_STOP, id);
         } else if (personCapacity < 0) {
@@ -125,14 +125,14 @@
     // check conditions
     if (!SUMOXMLDefinitions::isValidAdditionalID(id)) {
         writeInvalidID(SUMO_TAG_TRAIN_STOP, id);
-    } else if (checkDuplicatedAdditional(SUMO_TAG_TRAIN_STOP, id)) {
+    } else if (checkDuplicatedAdditional(SUMO_TAG_TRAIN_STOP, id) && checkDuplicatedAdditional(SUMO_TAG_BUS_STOP, id)) {
         // get netedit parameters
         NeteditParameters neteditParameters(sumoBaseObject);
         // get lane
         GNELane* lane = myNet->getAttributeCarriers()->retrieveLane(laneID, false);
         // check lane
         if (lane == nullptr) {
-            writeErrorInvalidParent(SUMO_TAG_TRAIN_STOP, SUMO_TAG_LANE);
+            writeErrorInvalidParent(SUMO_TAG_TRAIN_STOP, id, SUMO_TAG_LANE, laneID);
         } else if (!checkLaneDoublePosition(startPos, endPos, lane->getParentEdge()->getNBEdge()->getFinalLength(), friendlyPosition)) {
             writeErrorInvalidPosition(SUMO_TAG_TRAIN_STOP, id);
         } else if (personCapacity < 0) {
@@ -175,9 +175,9 @@
     }
     // Check if busStop parent and lane is correct
     if (lane == nullptr) {
-        writeErrorInvalidParent(SUMO_TAG_BUS_STOP, SUMO_TAG_LANE);
+        writeErrorInvalidParent(SUMO_TAG_ACCESS, "", SUMO_TAG_LANE, laneID);
     } else if (busStop == nullptr) {
-        writeErrorInvalidParent(SUMO_TAG_ACCESS, SUMO_TAG_BUS_STOP);
+        writeErrorInvalidParent(SUMO_TAG_ACCESS, "", SUMO_TAG_BUS_STOP, sumoBaseObject->getParentSumoBaseObject()->getStringAttribute(SUMO_ATTR_ID));
     } else if (!checkLanePosition(pos, 0, lane->getParentEdge()->getNBEdge()->getFinalLength(), friendlyPos)) {
         writeErrorInvalidPosition(SUMO_TAG_ACCESS, busStop->getID());
     } else if ((length != -1) && (length < 0)) {
@@ -185,7 +185,7 @@
     } else if (!accessCanBeCreated(busStop, lane->getParentEdge())) {
         WRITE_WARNING(TL("Could not build access in netedit; busStop parent already owns an access in the edge '") + lane->getParentEdge()->getID() + "'");
     } else if (!lane->allowPedestrians()) {
-        WRITE_WARNING(TL("Could not build access in netedit; The lane '") + lane->getID() + TL("' doesn't support pedestrians"));
+        WRITE_WARNING(TLF("Could not build access in netedit; The lane '%' doesn't support pedestrians", lane->getID()));
     } else {
         // build access
         GNEAdditional* access = new GNEAccess(busStop, lane, myNet, pos, length, friendlyPos, parameters);
@@ -219,7 +219,7 @@
         GNELane* lane = myNet->getAttributeCarriers()->retrieveLane(laneID, false);
         // check lane
         if (lane == nullptr) {
-            writeErrorInvalidParent(SUMO_TAG_CONTAINER_STOP, SUMO_TAG_LANE);
+            writeErrorInvalidParent(SUMO_TAG_CONTAINER_STOP, id, SUMO_TAG_LANE, laneID);
         } else if (!checkLaneDoublePosition(startPos, endPos, lane->getParentEdge()->getNBEdge()->getFinalLength(), friendlyPosition)) {
             writeErrorInvalidPosition(SUMO_TAG_CONTAINER_STOP, id);
         } else if (containerCapacity < 0) {
@@ -263,7 +263,7 @@
         GNELane* lane = myNet->getAttributeCarriers()->retrieveLane(laneID, false);
         // check lane
         if (lane == nullptr) {
-            writeErrorInvalidParent(SUMO_TAG_CHARGING_STATION, SUMO_TAG_LANE);
+            writeErrorInvalidParent(SUMO_TAG_CHARGING_STATION, id, SUMO_TAG_LANE, laneID);
         } else if (!checkLaneDoublePosition(startPos, endPos, lane->getParentEdge()->getNBEdge()->getFinalLength(), friendlyPosition)) {
             writeErrorInvalidPosition(SUMO_TAG_CHARGING_STATION, id);
         } else if (chargingPower < 0) {
@@ -296,7 +296,8 @@
 void
 GNEAdditionalHandler::buildParkingArea(const CommonXMLStructure::SumoBaseObject* sumoBaseObject, const std::string& id, const std::string& laneID,
                                        const double startPos, const double endPos, const std::string& departPos, const std::string& name, const bool friendlyPosition,
-                                       const int roadSideCapacity, const bool onRoad, const double width, const double length, const double angle, const Parameterised::Map& parameters) {
+                                       const int roadSideCapacity, const bool onRoad, const double width, const double length, const double angle,
+                                       const bool lefthand, const Parameterised::Map& parameters) {
     // check conditions
     if (!SUMOXMLDefinitions::isValidAdditionalID(id)) {
         writeInvalidID(SUMO_TAG_PARKING_AREA, id);
@@ -309,7 +310,7 @@
         const double departPosDouble = GNEAttributeCarrier::canParse(departPos) ? GNEAttributeCarrier::parse(departPos) : 0;
         // check lane
         if (lane == nullptr) {
-            writeErrorInvalidParent(SUMO_TAG_PARKING_AREA, SUMO_TAG_LANE);
+            writeErrorInvalidParent(SUMO_TAG_PARKING_AREA, id, SUMO_TAG_LANE, laneID);
         } else if (!checkLaneDoublePosition(startPos, endPos, lane->getParentEdge()->getNBEdge()->getFinalLength(), friendlyPosition)) {
             writeErrorInvalidPosition(SUMO_TAG_PARKING_AREA, id);
         } else if (roadSideCapacity < 0) {
@@ -319,12 +320,12 @@
         } else if (length < 0) {
             writeErrorInvalidNegativeValue(SUMO_TAG_PARKING_AREA, id, SUMO_ATTR_LENGTH);
         } else if ((departPosDouble < 0) || (departPosDouble > lane->getParentEdge()->getNBEdge()->getFinalLength())) {
-            writeError(TL("Could not build parking area with ID '") + id + TL("' in netedit; Invalid departPos over lane."));
+            writeError(TLF("Could not build parking area with ID '%' in netedit; Invalid departPos over lane.", id));
         } else {
             // build parkingArea
             GNEAdditional* parkingArea = new GNEParkingArea(id, lane, myNet, startPos, endPos, GNEAttributeCarrier::canParse(departPos) ? departPos : "",
                     name, friendlyPosition, roadSideCapacity, onRoad,
-                    (width == 0) ? SUMO_const_laneWidth : width, length, angle, parameters);
+                    (width == 0) ? SUMO_const_laneWidth : width, length, angle, lefthand, parameters);
             // insert depending of allowUndoRedo
             if (myAllowUndoRedo) {
                 myNet->getViewNet()->getUndoList()->begin(GUIIcon::PARKINGAREA, TL("add parking area '") + id + "'");
@@ -364,7 +365,7 @@
         const double lengthDouble = length.empty() ? 0 : GNEAttributeCarrier::parse(length);
         // check lane
         if (parkingArea == nullptr) {
-            writeErrorInvalidParent(SUMO_TAG_PARKING_SPACE, SUMO_TAG_PARKING_AREA);
+            writeErrorInvalidParent(SUMO_TAG_PARKING_SPACE, "", SUMO_TAG_PARKING_AREA, sumoBaseObject->getParentSumoBaseObject()->getStringAttribute(SUMO_ATTR_ID));
         } else if (widthDouble < 0) {
             writeErrorInvalidNegativeValue(SUMO_TAG_PARKING_SPACE, parkingArea->getID(), SUMO_ATTR_WIDTH);
         } else if (lengthDouble < 0) {
@@ -404,7 +405,7 @@
         GNELane* lane = myNet->getAttributeCarriers()->retrieveLane(laneID, false);
         // check lane
         if (lane == nullptr) {
-            writeErrorInvalidParent(SUMO_TAG_INDUCTION_LOOP, SUMO_TAG_LANE);
+            writeErrorInvalidParent(SUMO_TAG_INDUCTION_LOOP, id, SUMO_TAG_LANE, laneID);
         } else if (!checkLanePosition(position, 0, lane->getParentEdge()->getNBEdge()->getFinalLength(), friendlyPos)) {
             writeErrorInvalidPosition(SUMO_TAG_INDUCTION_LOOP, id);
         } else if (period < 0) {
@@ -449,7 +450,7 @@
         GNELane* lane = myNet->getAttributeCarriers()->retrieveLane(laneID, false);
         // check lane
         if (lane == nullptr) {
-            writeErrorInvalidParent(SUMO_TAG_LANE_AREA_DETECTOR, SUMO_TAG_LANE);
+            writeErrorInvalidParent(SUMO_TAG_LANE_AREA_DETECTOR, id, SUMO_TAG_LANE, laneID);
         } else if (!checkLanePosition(pos, length, lane->getParentEdge()->getNBEdge()->getFinalLength(), friendlyPos)) {
             writeErrorInvalidPosition(SUMO_TAG_LANE_AREA_DETECTOR, id);
         } else if (length < 0) {
@@ -458,7 +459,7 @@
             writeErrorInvalidNegativeValue(SUMO_TAG_LANE_AREA_DETECTOR, id, SUMO_ATTR_PERIOD);
         } else if ((trafficLight.size() > 0) && !(SUMOXMLDefinitions::isValidNetID(trafficLight))) {
             // temporal
-            writeError(TL("Could not build lane area detector with ID '") + id + TL("' in netedit; invalid traffic light ID."));
+            writeError(TLF("Could not build lane area detector with ID '%' in netedit; invalid traffic light ID.", id));
         } else if (timeThreshold < 0) {
             writeErrorInvalidNegativeValue(SUMO_TAG_LANE_AREA_DETECTOR, id, SUMO_ATTR_HALTING_TIME_THRESHOLD);
         } else if (speedThreshold < 0) {
@@ -516,7 +517,7 @@
         if (lanes.size() > 0) {
             // calculate path
             if (!GNEAdditional::areLaneConsecutives(lanes)) {
-                writeError(TL("Could not build lane area detector with ID '") + id + TL("' in netedit; Lanes aren't consecutives."));
+                writeError(TLF("Could not build lane area detector with ID '%' in netedit; Lanes aren't consecutives.", id));
             } else if (!checkMultiLanePosition(
                            pos, lanes.front()->getParentEdge()->getNBEdge()->getFinalLength(),
                            endPos, lanes.back()->getParentEdge()->getNBEdge()->getFinalLength(), friendlyPos)) {
@@ -525,7 +526,7 @@
                 writeErrorInvalidNegativeValue(SUMO_TAG_LANE_AREA_DETECTOR, id, SUMO_ATTR_PERIOD);
             } else if ((trafficLight.size() > 0) && !(SUMOXMLDefinitions::isValidNetID(trafficLight))) {
                 // temporal
-                writeError(TL("Could not build lane area detector with ID '") + id + TL("' in netedit; invalid traffic light ID."));
+                writeError(TLF("Could not build lane area detector with ID '%' in netedit; invalid traffic light ID.", id));
             } else if (timeThreshold < 0) {
                 writeErrorInvalidNegativeValue(SUMO_TAG_LANE_AREA_DETECTOR, id, SUMO_ATTR_HALTING_TIME_THRESHOLD);
             } else if (speedThreshold < 0) {
@@ -612,11 +613,11 @@
     GNEAdditional* E3 = getAdditionalParent(sumoBaseObject, SUMO_TAG_ENTRY_EXIT_DETECTOR);
     // Check if Detector E3 parent and lane is correct
     if (lane == nullptr) {
-        writeErrorInvalidParent(SUMO_TAG_ENTRY, SUMO_TAG_LANE);
+        writeErrorInvalidParent(SUMO_TAG_DET_ENTRY, "", SUMO_TAG_LANE, laneID);
     } else if (E3 == nullptr) {
-        writeErrorInvalidParent(SUMO_TAG_ENTRY, SUMO_TAG_ENTRY_EXIT_DETECTOR);
+        writeErrorInvalidParent(SUMO_TAG_DET_ENTRY, "", SUMO_TAG_ENTRY_EXIT_DETECTOR, sumoBaseObject->getParentSumoBaseObject()->getStringAttribute(SUMO_ATTR_ID));
     } else if (!checkLanePosition(pos, 0, lane->getParentEdge()->getNBEdge()->getFinalLength(), friendlyPos)) {
-        writeErrorInvalidPosition(SUMO_TAG_ENTRY, E3->getID());
+        writeErrorInvalidPosition(SUMO_TAG_DET_ENTRY, E3->getID());
     } else {
         // get netedit parameters
         NeteditParameters neteditParameters(sumoBaseObject);
@@ -647,11 +648,11 @@
     GNEAdditional* E3 = getAdditionalParent(sumoBaseObject, SUMO_TAG_ENTRY_EXIT_DETECTOR);
     // Check if Detector E3 parent and lane is correct
     if (lane == nullptr) {
-        writeErrorInvalidParent(SUMO_TAG_DET_EXIT, SUMO_TAG_LANE);
+        writeErrorInvalidParent(SUMO_TAG_DET_EXIT, "", SUMO_TAG_LANE, laneID);
     } else if (E3 == nullptr) {
-        writeErrorInvalidParent(SUMO_TAG_DET_EXIT, SUMO_TAG_ENTRY_EXIT_DETECTOR);
+        writeErrorInvalidParent(SUMO_TAG_DET_EXIT, "", SUMO_TAG_ENTRY_EXIT_DETECTOR, sumoBaseObject->getParentSumoBaseObject()->getStringAttribute(SUMO_ATTR_ID));
     } else if (!checkLanePosition(pos, 0, lane->getParentEdge()->getNBEdge()->getFinalLength(), friendlyPos)) {
-        writeErrorInvalidPosition(SUMO_TAG_ENTRY, E3->getID());
+        writeErrorInvalidPosition(SUMO_TAG_DET_EXIT, E3->getID());
     } else {
         // get netedit parameters
         NeteditParameters neteditParameters(sumoBaseObject);
@@ -686,7 +687,7 @@
         GNELane* lane = myNet->getAttributeCarriers()->retrieveLane(laneID, false);
         // check lane
         if (lane == nullptr) {
-            writeErrorInvalidParent(SUMO_TAG_INDUCTION_LOOP, SUMO_TAG_LANE);
+            writeErrorInvalidParent(SUMO_TAG_INDUCTION_LOOP, id, SUMO_TAG_LANE, laneID);
         } else if (!SUMOXMLDefinitions::isValidFilename(filename)) {
             writeErrorInvalidFilename(SUMO_TAG_INSTANT_INDUCTION_LOOP, id);
         } else if (!checkLanePosition(pos, 0, lane->getParentEdge()->getNBEdge()->getFinalLength(), friendlyPos)) {
@@ -726,9 +727,9 @@
     } else if (!checkDuplicatedAdditional(SUMO_TAG_CALIBRATOR, id) || !checkDuplicatedAdditional(GNE_TAG_CALIBRATOR_LANE, id)) {
         writeErrorDuplicated(SUMO_TAG_CALIBRATOR, id);
     } else if ((routeprobeID.size() > 0) && (routeProbe == nullptr)) {
-        writeErrorInvalidParent(SUMO_TAG_CALIBRATOR, SUMO_TAG_ROUTEPROBE);
+        writeErrorInvalidParent(SUMO_TAG_CALIBRATOR, id, SUMO_TAG_ROUTEPROBE, routeprobeID);
     } else if (lane == nullptr) {
-        writeErrorInvalidParent(SUMO_TAG_CALIBRATOR, SUMO_TAG_LANE);
+        writeErrorInvalidParent(SUMO_TAG_CALIBRATOR, id, SUMO_TAG_LANE, laneID);
     } else {
         // get netedit parameters
         NeteditParameters neteditParameters(sumoBaseObject);
@@ -781,9 +782,9 @@
     } else if (!checkDuplicatedAdditional(SUMO_TAG_CALIBRATOR, id) || !checkDuplicatedAdditional(GNE_TAG_CALIBRATOR_LANE, id)) {
         writeErrorDuplicated(SUMO_TAG_CALIBRATOR, id);
     } else if ((routeprobeID.size() > 0) && (routeProbe == nullptr)) {
-        writeErrorInvalidParent(SUMO_TAG_CALIBRATOR, SUMO_TAG_ROUTEPROBE);
+        writeErrorInvalidParent(SUMO_TAG_CALIBRATOR, id, SUMO_TAG_ROUTEPROBE, routeprobeID);
     } else if (edge == nullptr) {
-        writeErrorInvalidParent(SUMO_TAG_CALIBRATOR, SUMO_TAG_EDGE);
+        writeErrorInvalidParent(SUMO_TAG_CALIBRATOR, id, SUMO_TAG_EDGE, edgeID);
     } else {
         // get netedit parameters
         NeteditParameters neteditParameters(sumoBaseObject);
@@ -831,11 +832,11 @@
     GNEAdditional* calibrator = myNet->getAttributeCarriers()->retrieveAdditional(sumoBaseObject->getParentSumoBaseObject()->getTag(), sumoBaseObject->getParentSumoBaseObject()->getStringAttribute(SUMO_ATTR_ID), false);
     // check parents
     if (vType == nullptr) {
-        writeErrorInvalidParent(SUMO_TAG_FLOW, SUMO_TAG_VTYPE);
+        writeErrorInvalidParent(SUMO_TAG_FLOW, "", SUMO_TAG_VTYPE, vehicleParameter.vtypeid);
     } else if (route == nullptr) {
-        writeErrorInvalidParent(SUMO_TAG_FLOW, SUMO_TAG_ROUTE);
+        writeErrorInvalidParent(SUMO_TAG_FLOW, "", SUMO_TAG_ROUTE, vehicleParameter.routeid);
     } else if (calibrator == nullptr) {
-        writeErrorInvalidParent(SUMO_TAG_FLOW, SUMO_TAG_CALIBRATOR);
+        writeErrorInvalidParent(SUMO_TAG_FLOW, "", SUMO_TAG_CALIBRATOR, sumoBaseObject->getParentSumoBaseObject()->getStringAttribute(SUMO_ATTR_ID));
     } else {
         // create calibrator flow
         GNEAdditional* flow = new GNECalibratorFlow(calibrator, vType, route, vehicleParameter);
@@ -930,13 +931,13 @@
     GNEAdditional* rerouter = getAdditionalParent(sumoBaseObject, SUMO_TAG_REROUTER);
     // check if rerouter exist
     if (rerouter == nullptr) {
-        writeErrorInvalidParent(SUMO_TAG_INTERVAL, SUMO_TAG_REROUTER);
+        writeErrorInvalidParent(SUMO_TAG_INTERVAL, "", SUMO_TAG_REROUTER, sumoBaseObject->getParentSumoBaseObject()->getStringAttribute(SUMO_ATTR_ID));
     } else if (begin < 0) {
         writeErrorInvalidNegativeValue(SUMO_TAG_INTERVAL, rerouter->getID(), SUMO_ATTR_BEGIN);
     } else if (end < 0) {
         writeErrorInvalidNegativeValue(SUMO_TAG_INTERVAL, rerouter->getID(), SUMO_ATTR_END);
     } else if (end < begin) {
-        writeError(TL("Could not build interval with ID '") + rerouter->getID() + TL("' in netedit; begin is greather than end."));
+        writeError(TLF("Could not build interval with ID '%' in netedit; begin is greather than end.", rerouter->getID()));
     } else {
         // check if new interval will produce a overlapping
         if (checkOverlappingRerouterIntervals(rerouter, begin, end)) {
@@ -953,7 +954,7 @@
                 rerouterInterval->incRef("buildRerouterInterval");
             }
         } else {
-            writeError(TL("Could not build interval with begin '") + toString(begin) + TL("' and '") + toString(end) + TL("' in '") + rerouter->getID() + TL("' due overlapping."));
+            writeError(TLF("Could not build interval with begin '%' and end '%' in '%' due overlapping.", toString(begin), toString(end), rerouter->getID()));
         }
     }
 }
@@ -967,9 +968,9 @@
     GNELane* lane = myNet->getAttributeCarriers()->retrieveLane(closedLaneID, false);
     // check parents
     if (lane == nullptr) {
-        writeErrorInvalidParent(SUMO_TAG_CLOSING_LANE_REROUTE, SUMO_TAG_LANE);
+        writeErrorInvalidParent(SUMO_TAG_CLOSING_LANE_REROUTE, "", SUMO_TAG_LANE, closedLaneID);
     } else if (rerouterInterval == nullptr) {
-        writeErrorInvalidParent(SUMO_TAG_CLOSING_LANE_REROUTE, SUMO_TAG_INTERVAL);
+        writeErrorInvalidParent(SUMO_TAG_CLOSING_LANE_REROUTE, "", SUMO_TAG_INTERVAL, "");
     } else {
         // create closing lane reroute
         GNEAdditional* closingLaneReroute = new GNEClosingLaneReroute(rerouterInterval, lane, permissions);
@@ -995,9 +996,9 @@
     GNEEdge* edge = myNet->getAttributeCarriers()->retrieveEdge(closedEdgeID, false);
     // check parents
     if (edge == nullptr) {
-        writeErrorInvalidParent(SUMO_TAG_CLOSING_REROUTE, SUMO_TAG_EDGE);
+        writeErrorInvalidParent(SUMO_TAG_CLOSING_REROUTE, "", SUMO_TAG_EDGE, closedEdgeID);
     } else if (rerouterInterval == nullptr) {
-        writeErrorInvalidParent(SUMO_TAG_CLOSING_REROUTE, SUMO_TAG_INTERVAL);
+        writeErrorInvalidParent(SUMO_TAG_CLOSING_REROUTE, "", SUMO_TAG_INTERVAL, "");
     } else {
         // create closing reroute
         GNEAdditional* closingLaneReroute = new GNEClosingReroute(rerouterInterval, edge, permissions);
@@ -1022,9 +1023,9 @@
     GNEEdge* edge = myNet->getAttributeCarriers()->retrieveEdge(newEdgeDestinationID, false);
     // check parents
     if (edge == nullptr) {
-        writeErrorInvalidParent(SUMO_TAG_DEST_PROB_REROUTE, SUMO_TAG_EDGE);
+        writeErrorInvalidParent(SUMO_TAG_DEST_PROB_REROUTE, "", SUMO_TAG_EDGE, newEdgeDestinationID);
     } else if (rerouterInterval == nullptr) {
-        writeErrorInvalidParent(SUMO_TAG_DEST_PROB_REROUTE, SUMO_TAG_INTERVAL);
+        writeErrorInvalidParent(SUMO_TAG_DEST_PROB_REROUTE, "", SUMO_TAG_INTERVAL, "");
     } else {
         // create dest probability reroute
         GNEAdditional* destProbReroute = new GNEDestProbReroute(rerouterInterval, edge, probability);
@@ -1049,10 +1050,10 @@
     // get parking area
     GNEAdditional* parkingArea = myNet->getAttributeCarriers()->retrieveAdditional(SUMO_TAG_PARKING_AREA, newParkignAreaID, false);
     // check parents
-    if (rerouterInterval == nullptr) {
-        writeErrorInvalidParent(SUMO_TAG_PARKING_AREA_REROUTE, SUMO_TAG_INTERVAL);
-    } else if (parkingArea == nullptr) {
-        writeErrorInvalidParent(SUMO_TAG_PARKING_AREA_REROUTE, SUMO_TAG_PARKING_AREA);
+    if (parkingArea == nullptr) {
+        writeErrorInvalidParent(SUMO_TAG_PARKING_AREA_REROUTE, "", SUMO_TAG_PARKING_AREA, newParkignAreaID);
+    } else if (rerouterInterval == nullptr) {
+        writeErrorInvalidParent(SUMO_TAG_PARKING_AREA_REROUTE, "", SUMO_TAG_INTERVAL, "");
     } else {
         // create parking area reroute
         GNEAdditional* parkingAreaReroute = new GNEParkingAreaReroute(rerouterInterval, parkingArea, probability, visible);
@@ -1077,10 +1078,10 @@
     // get route parent
     GNEDemandElement* route = myNet->getAttributeCarriers()->retrieveDemandElement(SUMO_TAG_ROUTE, newRouteID, false);
     // check parents
-    if (rerouterInterval == nullptr) {
-        writeErrorInvalidParent(SUMO_TAG_ROUTE_PROB_REROUTE, SUMO_TAG_INTERVAL);
-    } else if (route == nullptr) {
-        writeErrorInvalidParent(SUMO_TAG_ROUTE_PROB_REROUTE, SUMO_TAG_ROUTE);
+    if (route == nullptr) {
+        writeErrorInvalidParent(SUMO_TAG_ROUTE_PROB_REROUTE, "", SUMO_TAG_ROUTE, newRouteID);
+    } else if (rerouterInterval == nullptr) {
+        writeErrorInvalidParent(SUMO_TAG_ROUTE_PROB_REROUTE, "", SUMO_TAG_INTERVAL, "");
     } else {
         // create rout prob reroute
         GNEAdditional* routeProbReroute = new GNERouteProbReroute(rerouterInterval, route, probability);
@@ -1111,7 +1112,7 @@
         GNEEdge* edge = myNet->getAttributeCarriers()->retrieveEdge(edgeID, false);
         // check lane
         if (edge == nullptr) {
-            writeErrorInvalidParent(SUMO_TAG_ROUTEPROBE, SUMO_TAG_EDGE);
+            writeErrorInvalidParent(SUMO_TAG_ROUTEPROBE, id, SUMO_TAG_EDGE, edgeID);
         } else if (period < 0) {
             writeErrorInvalidNegativeValue(SUMO_TAG_ROUTEPROBE, id, SUMO_ATTR_PERIOD);
         } else if (begin < 0) {
@@ -1202,7 +1203,7 @@
     GNEAdditional* VSS = getAdditionalParent(sumoBaseObject, SUMO_TAG_VSS);
     // check lane
     if (VSS == nullptr) {
-        writeErrorInvalidParent(SUMO_TAG_STEP, SUMO_TAG_VSS);
+        writeErrorInvalidParent(SUMO_TAG_STEP, "", SUMO_TAG_VSS, sumoBaseObject->getParentSumoBaseObject()->getStringAttribute(SUMO_ATTR_ID));
     } else if (time < 0) {
         writeErrorInvalidNegativeValue(SUMO_TAG_STEP, VSS->getID(), SUMO_ATTR_BEGIN);
     } else {
@@ -1235,13 +1236,13 @@
         GNEEdge* edge = myNet->getAttributeCarriers()->retrieveEdge(edgeID, false);
         // check lane
         if (edge == nullptr) {
-            writeErrorInvalidParent(SUMO_TAG_VAPORIZER, SUMO_TAG_EDGE);
+            writeErrorInvalidParent(SUMO_TAG_VAPORIZER, "", SUMO_TAG_EDGE, edgeID);
         } else if (beginTime < 0) {
             writeErrorInvalidNegativeValue(SUMO_TAG_VAPORIZER, edge->getID(), SUMO_ATTR_BEGIN);
         } else if (endTime < 0) {
             writeErrorInvalidNegativeValue(SUMO_TAG_VAPORIZER, edge->getID(), SUMO_ATTR_END);
         } else if (endTime < beginTime) {
-            writeError(TL("Could not build Vaporizer with ID '") + edge->getID() + TL("' in netedit; begin is greather than end."));
+            writeError(TLF("Could not build Vaporizer with ID '%' in netedit; begin is greather than end.", edge->getID()));
         } else {
             // build vaporizer
             GNEAdditional* vaporizer = new GNEVaporizer(myNet, edge, beginTime, endTime, name, parameters);
@@ -1302,7 +1303,7 @@
     } else if (!checkDuplicatedAdditional(SUMO_TAG_POLY, id)) {
         writeErrorDuplicated(SUMO_TAG_TAZ, id);
     } else if (TAZShape.size() == 0) {
-        writeError(TL("Could not build TAZ with ID '") + id + TL("' in netedit; Invalid Shape."));
+        writeError(TLF("Could not build TAZ with ID '%' in netedit; Invalid Shape.", id));
     } else {
         // get netedit parameters
         NeteditParameters neteditParameters(sumoBaseObject);
@@ -1358,9 +1359,9 @@
     GNEAdditional* TAZSink = nullptr;
     // check parents
     if (TAZ == nullptr) {
-        writeErrorInvalidParent(SUMO_TAG_SOURCE, SUMO_TAG_TAZ);
+        writeErrorInvalidParent(SUMO_TAG_SOURCE, "", SUMO_TAG_TAZ, sumoBaseObject->getParentSumoBaseObject()->getStringAttribute(SUMO_ATTR_ID));
     } else if (edge == nullptr) {
-        writeErrorInvalidParent(SUMO_TAG_SOURCE, SUMO_TAG_EDGE);
+        writeErrorInvalidParent(SUMO_TAG_SOURCE, "", SUMO_TAG_EDGE, edgeID);
     } else {
         // first check if a TAZSink in the same edge for the same TAZ
         for (const auto& TAZElement : TAZ->getChildAdditionals()) {
@@ -1428,9 +1429,9 @@
     GNEEdge* edge = myNet->getAttributeCarriers()->retrieveEdge(edgeID, false);
     // check parents
     if (TAZ == nullptr) {
-        writeErrorInvalidParent(SUMO_TAG_SINK, SUMO_TAG_TAZ);
+        writeErrorInvalidParent(SUMO_TAG_SINK, "", SUMO_TAG_TAZ, sumoBaseObject->getParentSumoBaseObject()->getStringAttribute(SUMO_ATTR_ID));
     } else if (edge == nullptr) {
-        writeErrorInvalidParent(SUMO_TAG_SINK, SUMO_TAG_EDGE);
+        writeErrorInvalidParent(SUMO_TAG_SINK, "", SUMO_TAG_EDGE, edgeID);
     } else {
         // declare TAZ source
         GNEAdditional* TAZSource = nullptr;
@@ -1540,13 +1541,13 @@
         if (lanes.size() > 0) {
             // calculate path
             if (!GNEAdditional::areLaneConsecutives(lanes)) {
-                writeError(TL("Could not build overhead wire with ID '") + id + TL("' in netedit; Lanes aren't consecutives."));
+                writeError(TLF("Could not build overhead wire with ID '%' in netedit; Lanes aren't consecutives.", id));
             } else if (!checkMultiLanePosition(
                            startPos, lanes.front()->getParentEdge()->getNBEdge()->getFinalLength(),
                            endPos, lanes.back()->getParentEdge()->getNBEdge()->getFinalLength(), friendlyPos)) {
                 writeErrorInvalidPosition(SUMO_TAG_OVERHEAD_WIRE_SECTION, id);
             } else if (tractionSubstation == nullptr) {
-                writeErrorInvalidParent(SUMO_TAG_OVERHEAD_WIRE_SECTION, SUMO_TAG_TRACTION_SUBSTATION);
+                writeErrorInvalidParent(SUMO_TAG_OVERHEAD_WIRE_SECTION, "", SUMO_TAG_TRACTION_SUBSTATION, substationId);
             } else {
                 // build Overhead Wire
                 GNEAdditional* overheadWire = new GNEOverheadWire(id, lanes, tractionSubstation, myNet, startPos, endPos, friendlyPos, forbiddenInnerLanes, parameters);
@@ -1669,7 +1670,7 @@
         GNELane* lane = myNet->getAttributeCarriers()->retrieveLane(laneID, false);
         // check lane
         if (lane == nullptr) {
-            writeErrorInvalidParent(SUMO_TAG_POI, SUMO_TAG_LANE);
+            writeErrorInvalidParent(SUMO_TAG_POI, id, SUMO_TAG_LANE, laneID);
         } else if (!checkLanePosition(posOverLane, 0, lane->getParentEdge()->getNBEdge()->getFinalLength(), friendlyPos)) {
             writeErrorInvalidPosition(SUMO_TAG_POI, id);
         } else {
@@ -1708,7 +1709,7 @@
     } else if (!SUMOXMLDefinitions::isValidFilename(imgFile)) {
         writeErrorInvalidFilename(SUMO_TAG_POI, id);
     } else if (GeoConvHelper::getFinal().getProjString() == "!") {
-        writeError(TL("Could not build POI with ID '") + id + TL("' in netedit; Network requires a geo projection."));
+        writeError(TLF("Could not build POI with ID '%' in netedit", id) + std::string("; ") + TL("Network requires a geo projection."));
     } else if (checkDuplicatedAdditional(SUMO_TAG_POI, id) && checkDuplicatedAdditional(GNE_TAG_POILANE, id) && checkDuplicatedAdditional(GNE_TAG_POIGEO, id)) {
         // get netedit parameters
         NeteditParameters neteditParameters(sumoBaseObject);
@@ -1904,49 +1905,60 @@
 
 void
 GNEAdditionalHandler::writeInvalidID(const SumoXMLTag tag, const std::string& id) {
-    writeError(TL("Could not build ") + toString(tag) + TL(" with ID '") + id + TL("' in netedit; ID contains invalid characters."));
+    writeError(TLF("Could not build % with ID '%' in netedit", toString(tag), id) + std::string("; ") + TL("ID contains invalid characters."));
 }
 
 
 void
 GNEAdditionalHandler::writeErrorInvalidPosition(const SumoXMLTag tag, const std::string& id) {
-    writeError(TL("Could not build ") + toString(tag) + TL(" with ID '") + id + TL("' in netedit; Invalid position over lane."));
+    writeError(TLF("Could not build % with ID '%' in netedit", toString(tag), id) + std::string("; ") + TL("Invalid position over lane."));
 }
 
 
 void
 GNEAdditionalHandler::writeErrorDuplicated(const SumoXMLTag tag, const std::string& id) {
-    writeError(TL("Could not build ") + toString(tag) + TL(" with ID '") + id + TL("' in netedit; declared twice."));
+    writeError(TLF("Could not build % with ID '%' in netedit", toString(tag), id) + std::string("; ") + TL("Declared twice."));
 }
 
 
 void
-GNEAdditionalHandler::writeErrorInvalidParent(const SumoXMLTag tag, const SumoXMLTag parent) {
-    writeError(TL("Could not build ") + toString(tag) + " in netedit; " + toString(parent) + TL(" doesn't exist."));
+GNEAdditionalHandler::writeErrorInvalidParent(const SumoXMLTag tag, const std::string& id, const SumoXMLTag parent, const std::string& parentID) {
+    std::string first, second;
+    if (id.size() > 0) {
+        first = TLF("Could not build % '%' in netedit", toString(tag), id);
+    } else {
+        first = TLF("Could not build % in netedit", toString(tag));
+    }
+    if (parentID.size() > 0) {
+        second = TLF("% '%' doesn't exist.", toString(parent), parentID);
+    } else {
+        second = TLF("% doesn't exist.", toString(parent));
+    }
+    writeError(first + std::string("; ") + second);
 }
 
 
 void
 GNEAdditionalHandler::writeErrorInvalidNegativeValue(const SumoXMLTag tag, const std::string& id, const SumoXMLAttr attribute) {
-    writeError(TL("Could not build ") + toString(tag) + TL(" with ID '") + id + TL("' in netedit; attribute ") + toString(attribute) + TL(" cannot be negative."));
+    writeError(TLF("Could not build % with ID '%' in netedit", toString(tag), id) + std::string("; ") + TLF("Attribute % cannot be negative.", toString(attribute)));
 }
 
 
 void
 GNEAdditionalHandler::writeErrorInvalidVTypes(const SumoXMLTag tag, const std::string& id) {
-    writeError(TL("Could not build ") + toString(tag) + TL(" with ID '") + id + TL("' in netedit; list of VTypes isn't valid."));
+    writeError(TLF("Could not build % with ID '%' in netedit", toString(tag), id) + std::string("; ") + TL("List of VTypes isn't valid."));
 }
 
 
 void
 GNEAdditionalHandler::writeErrorInvalidFilename(const SumoXMLTag tag, const std::string& id) {
-    writeError(TL("Could not build ") + toString(tag) + TL(" with ID '") + id + TL("' in netedit; filename is invalid."));
+    writeError(TLF("Could not build % with ID '%' in netedit", toString(tag), id) + std::string("; ") + TL("Filename is invalid."));
 }
 
 
 void
 GNEAdditionalHandler::writeErrorInvalidLanes(const SumoXMLTag tag, const std::string& id) {
-    writeError(TL("Could not build ") + toString(tag) + TL(" with ID '") + id + TL("' in netedit; list of lanes isn't valid."));
+    writeError(TLF("Could not build % with ID '%' in netedit", toString(tag), id) + std::string("; ") + TL("List of lanes isn't valid."));
 }
 
 
@@ -2001,7 +2013,7 @@
         GNEEdge* edge = myNet->getAttributeCarriers()->retrieveEdge(edgeID, false);
         // empty edges aren't allowed. If edge is empty, write error, clear edges and stop
         if (edge == nullptr) {
-            writeError(TL("Could not build ") + toString(tag) + TL(" in netedit; ") + toString(SUMO_TAG_EDGE) + TL(" doesn't exist."));
+            writeError(TLF("Could not build % in netedit", toString(tag)) + std::string("; ") + TLF("% doesn't exist.", toString(SUMO_TAG_EDGE)));
             edges.clear();
             return edges;
         } else {
@@ -2019,7 +2031,7 @@
         GNELane* lane = myNet->getAttributeCarriers()->retrieveLane(laneID, false);
         // empty lanes aren't allowed. If lane is empty, write error, clear lanes and stop
         if (lane == nullptr) {
-            writeError(TL("Could not build ") + toString(tag) + TL(" in netedit; ") + toString(SUMO_TAG_LANE) + TL(" doesn't exist."));
+            writeError(TLF("Could not build % in netedit", toString(tag)) + std::string("; ") + TLF("% doesn't exist.", toString(SUMO_TAG_LANE)));
             lanes.clear();
             return lanes;
         } else {
diff -Nru sumo-1.17.0/src/netedit/elements/additional/GNEAdditionalHandler.h sumo-1.18.0/src/netedit/elements/additional/GNEAdditionalHandler.h
--- sumo-1.17.0/src/netedit/elements/additional/GNEAdditionalHandler.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/additional/GNEAdditionalHandler.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -150,12 +150,13 @@
      * @param[in] width ParkingArea's width
      * @param[in] length ParkingArea's length
      * @param[in] angle ParkingArea's angle
+     * @param[in] lefthand enable or disable lefthand
      * @param[in] parameters generic parameters
      */
     void buildParkingArea(const CommonXMLStructure::SumoBaseObject* sumoBaseObject, const std::string& id, const std::string& laneID,
                           const double startPos, const double endPos, const std::string& departPos, const std::string& name,
                           const bool friendlyPosition, const int roadSideCapacity, const bool onRoad, const double width,
-                          const double length, const double angle, const Parameterised::Map& parameters);
+                          const double length, const double angle, const bool lefthand, const Parameterised::Map& parameters);
 
     /**@brief Builds a Parking Space
      * @param[in] sumoBaseObject sumo base object used for build
@@ -638,7 +639,7 @@
     void writeErrorDuplicated(const SumoXMLTag tag, const std::string& id);
 
     /// @brief write error "invalid parent element"
-    void writeErrorInvalidParent(const SumoXMLTag tag, const SumoXMLTag parent);
+    void writeErrorInvalidParent(const SumoXMLTag tag, const std::string& id, const SumoXMLTag parent, const std::string& parentID);
 
     /// @brief write error "invalid negative element"
     void writeErrorInvalidNegativeValue(const SumoXMLTag tag, const std::string& id, const SumoXMLAttr attribute);
diff -Nru sumo-1.17.0/src/netedit/elements/additional/GNEBusStop.cpp sumo-1.18.0/src/netedit/elements/additional/GNEBusStop.cpp
--- sumo-1.17.0/src/netedit/elements/additional/GNEBusStop.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/additional/GNEBusStop.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -297,7 +297,16 @@
 GNEBusStop::isValid(SumoXMLAttr key, const std::string& value) {
     switch (key) {
         case SUMO_ATTR_ID:
-            return isValidAdditionalID(value);
+            if (isValidAdditionalID(value)) {
+                // busStops and trainStops share namespace
+                if (myTagProperty.getTag() == SUMO_TAG_BUS_STOP) {
+                    return (myNet->getAttributeCarriers()->retrieveAdditional(SUMO_TAG_TRAIN_STOP, value, false) == nullptr);
+                } else {
+                    return (myNet->getAttributeCarriers()->retrieveAdditional(SUMO_TAG_BUS_STOP, value, false) == nullptr);
+                }
+            } else {
+                return false;
+            }
         case SUMO_ATTR_LANE:
             if (myNet->getAttributeCarriers()->retrieveLane(value, false) != nullptr) {
                 return true;
diff -Nru sumo-1.17.0/src/netedit/elements/additional/GNEBusStop.h sumo-1.18.0/src/netedit/elements/additional/GNEBusStop.h
--- sumo-1.17.0/src/netedit/elements/additional/GNEBusStop.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/additional/GNEBusStop.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/elements/additional/GNECalibrator.cpp sumo-1.18.0/src/netedit/elements/additional/GNECalibrator.cpp
--- sumo-1.17.0/src/netedit/elements/additional/GNECalibrator.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/additional/GNECalibrator.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/elements/additional/GNECalibratorFlow.cpp sumo-1.18.0/src/netedit/elements/additional/GNECalibratorFlow.cpp
--- sumo-1.17.0/src/netedit/elements/additional/GNECalibratorFlow.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/additional/GNECalibratorFlow.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -91,8 +91,7 @@
         // close vehicle tag
         device.closeTag();
     } else {
-        WRITE_WARNING(TL("calibratorFlow of  calibrator '") + getParentAdditionals().front()->getID() +
-                      TL("' cannot be written. Either type or vehsPerHour or speed must be enabled"));
+        WRITE_WARNING(TLF("calibratorFlow of  calibrator '%' cannot be written. Either type or vehsPerHour or speed must be enabled", getParentAdditionals().front()->getID()));
     }
 }
 
diff -Nru sumo-1.17.0/src/netedit/elements/additional/GNECalibratorFlow.h sumo-1.18.0/src/netedit/elements/additional/GNECalibratorFlow.h
--- sumo-1.17.0/src/netedit/elements/additional/GNECalibratorFlow.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/additional/GNECalibratorFlow.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/elements/additional/GNECalibrator.h sumo-1.18.0/src/netedit/elements/additional/GNECalibrator.h
--- sumo-1.17.0/src/netedit/elements/additional/GNECalibrator.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/additional/GNECalibrator.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/elements/additional/GNEChargingStation.cpp sumo-1.18.0/src/netedit/elements/additional/GNEChargingStation.cpp
--- sumo-1.17.0/src/netedit/elements/additional/GNEChargingStation.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/additional/GNEChargingStation.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/elements/additional/GNEChargingStation.h sumo-1.18.0/src/netedit/elements/additional/GNEChargingStation.h
--- sumo-1.17.0/src/netedit/elements/additional/GNEChargingStation.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/additional/GNEChargingStation.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/elements/additional/GNEClosingLaneReroute.cpp sumo-1.18.0/src/netedit/elements/additional/GNEClosingLaneReroute.cpp
--- sumo-1.17.0/src/netedit/elements/additional/GNEClosingLaneReroute.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/additional/GNEClosingLaneReroute.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/elements/additional/GNEClosingLaneReroute.h sumo-1.18.0/src/netedit/elements/additional/GNEClosingLaneReroute.h
--- sumo-1.17.0/src/netedit/elements/additional/GNEClosingLaneReroute.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/additional/GNEClosingLaneReroute.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/elements/additional/GNEClosingReroute.cpp sumo-1.18.0/src/netedit/elements/additional/GNEClosingReroute.cpp
--- sumo-1.17.0/src/netedit/elements/additional/GNEClosingReroute.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/additional/GNEClosingReroute.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/elements/additional/GNEClosingReroute.h sumo-1.18.0/src/netedit/elements/additional/GNEClosingReroute.h
--- sumo-1.17.0/src/netedit/elements/additional/GNEClosingReroute.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/additional/GNEClosingReroute.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/elements/additional/GNEContainerStop.cpp sumo-1.18.0/src/netedit/elements/additional/GNEContainerStop.cpp
--- sumo-1.17.0/src/netedit/elements/additional/GNEContainerStop.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/additional/GNEContainerStop.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/elements/additional/GNEContainerStop.h sumo-1.18.0/src/netedit/elements/additional/GNEContainerStop.h
--- sumo-1.17.0/src/netedit/elements/additional/GNEContainerStop.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/additional/GNEContainerStop.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/elements/additional/GNEDestProbReroute.cpp sumo-1.18.0/src/netedit/elements/additional/GNEDestProbReroute.cpp
--- sumo-1.17.0/src/netedit/elements/additional/GNEDestProbReroute.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/additional/GNEDestProbReroute.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/elements/additional/GNEDestProbReroute.h sumo-1.18.0/src/netedit/elements/additional/GNEDestProbReroute.h
--- sumo-1.17.0/src/netedit/elements/additional/GNEDestProbReroute.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/additional/GNEDestProbReroute.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/elements/additional/GNEDetector.cpp sumo-1.18.0/src/netedit/elements/additional/GNEDetector.cpp
--- sumo-1.17.0/src/netedit/elements/additional/GNEDetector.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/additional/GNEDetector.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/elements/additional/GNEDetector.h sumo-1.18.0/src/netedit/elements/additional/GNEDetector.h
--- sumo-1.17.0/src/netedit/elements/additional/GNEDetector.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/additional/GNEDetector.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/elements/additional/GNEEntryExitDetector.cpp sumo-1.18.0/src/netedit/elements/additional/GNEEntryExitDetector.cpp
--- sumo-1.17.0/src/netedit/elements/additional/GNEEntryExitDetector.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/additional/GNEEntryExitDetector.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/elements/additional/GNEEntryExitDetector.h sumo-1.18.0/src/netedit/elements/additional/GNEEntryExitDetector.h
--- sumo-1.17.0/src/netedit/elements/additional/GNEEntryExitDetector.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/additional/GNEEntryExitDetector.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/elements/additional/GNEInductionLoopDetector.cpp sumo-1.18.0/src/netedit/elements/additional/GNEInductionLoopDetector.cpp
--- sumo-1.17.0/src/netedit/elements/additional/GNEInductionLoopDetector.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/additional/GNEInductionLoopDetector.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/elements/additional/GNEInductionLoopDetector.h sumo-1.18.0/src/netedit/elements/additional/GNEInductionLoopDetector.h
--- sumo-1.17.0/src/netedit/elements/additional/GNEInductionLoopDetector.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/additional/GNEInductionLoopDetector.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/elements/additional/GNEInstantInductionLoopDetector.cpp sumo-1.18.0/src/netedit/elements/additional/GNEInstantInductionLoopDetector.cpp
--- sumo-1.17.0/src/netedit/elements/additional/GNEInstantInductionLoopDetector.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/additional/GNEInstantInductionLoopDetector.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/elements/additional/GNEInstantInductionLoopDetector.h sumo-1.18.0/src/netedit/elements/additional/GNEInstantInductionLoopDetector.h
--- sumo-1.17.0/src/netedit/elements/additional/GNEInstantInductionLoopDetector.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/additional/GNEInstantInductionLoopDetector.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/elements/additional/GNELaneAreaDetector.cpp sumo-1.18.0/src/netedit/elements/additional/GNELaneAreaDetector.cpp
--- sumo-1.17.0/src/netedit/elements/additional/GNELaneAreaDetector.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/additional/GNELaneAreaDetector.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -369,8 +369,8 @@
     // calculate E2Detector width
     const double E2DetectorWidth = s.addSize.getExaggeration(s, lane);
     // check if E2 can be drawn
-    if (s.drawAdditionals(E2DetectorWidth) && myNet->getViewNet()->getDataViewOptions().showAdditionals() &&
-            !myNet->getViewNet()->selectingDetectorsTLSMode()) {
+    if ((myTagProperty.getTag() == GNE_TAG_MULTI_LANE_AREA_DETECTOR) && s.drawAdditionals(E2DetectorWidth) &&
+            myNet->getViewNet()->getDataViewOptions().showAdditionals() && !myNet->getViewNet()->selectingDetectorsTLSMode()) {
         // calculate startPos
         const double geometryDepartPos = getAttributeDouble(SUMO_ATTR_POSITION);
         // get endPos
@@ -479,7 +479,8 @@
     // calculate E2Detector width
     const double E2DetectorWidth = s.addSize.getExaggeration(s, fromLane);
     // check if E2 can be drawn
-    if (s.drawAdditionals(E2DetectorWidth) && myNet->getViewNet()->getDataViewOptions().showAdditionals() && !myNet->getViewNet()->selectingDetectorsTLSMode()) {
+    if ((myTagProperty.getTag() == GNE_TAG_MULTI_LANE_AREA_DETECTOR) && s.drawAdditionals(E2DetectorWidth) &&
+            myNet->getViewNet()->getDataViewOptions().showAdditionals() && !myNet->getViewNet()->selectingDetectorsTLSMode()) {
         // get flag for show only contour
         const bool onlyContour = myNet->getViewNet()->getEditModes().isCurrentSupermodeNetwork() ? myNet->getViewNet()->getNetworkViewOptions().showConnections() : false;
         // Start drawing adding an gl identificator
diff -Nru sumo-1.17.0/src/netedit/elements/additional/GNELaneAreaDetector.h sumo-1.18.0/src/netedit/elements/additional/GNELaneAreaDetector.h
--- sumo-1.17.0/src/netedit/elements/additional/GNELaneAreaDetector.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/additional/GNELaneAreaDetector.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/elements/additional/GNEMultiEntryExitDetector.cpp sumo-1.18.0/src/netedit/elements/additional/GNEMultiEntryExitDetector.cpp
--- sumo-1.17.0/src/netedit/elements/additional/GNEMultiEntryExitDetector.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/additional/GNEMultiEntryExitDetector.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/elements/additional/GNEMultiEntryExitDetector.h sumo-1.18.0/src/netedit/elements/additional/GNEMultiEntryExitDetector.h
--- sumo-1.17.0/src/netedit/elements/additional/GNEMultiEntryExitDetector.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/additional/GNEMultiEntryExitDetector.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/elements/additional/GNEOverheadWire.cpp sumo-1.18.0/src/netedit/elements/additional/GNEOverheadWire.cpp
--- sumo-1.17.0/src/netedit/elements/additional/GNEOverheadWire.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/additional/GNEOverheadWire.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/elements/additional/GNEOverheadWire.h sumo-1.18.0/src/netedit/elements/additional/GNEOverheadWire.h
--- sumo-1.17.0/src/netedit/elements/additional/GNEOverheadWire.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/additional/GNEOverheadWire.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/elements/additional/GNEParkingArea.cpp sumo-1.18.0/src/netedit/elements/additional/GNEParkingArea.cpp
--- sumo-1.17.0/src/netedit/elements/additional/GNEParkingArea.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/additional/GNEParkingArea.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -41,15 +41,17 @@
     myOnRoad(false),
     myWidth(0),
     myLength(0),
-    myAngle(0) {
+    myAngle(0),
+    myLefthand(false) {
     // reset default values
     resetDefaultValues();
 }
 
 
 GNEParkingArea::GNEParkingArea(const std::string& id, GNELane* lane, GNENet* net, const double startPos, const double endPos,
-                               const std::string& departPos, const std::string& name, bool friendlyPosition, int roadSideCapacity, bool onRoad, double width,
-                               const double length, double angle, const Parameterised::Map& parameters) :
+                               const std::string& departPos, const std::string& name, const bool friendlyPosition, const int roadSideCapacity,
+                               const bool onRoad, const double width, const double length, const double angle, const bool lefthand,
+                               const Parameterised::Map& parameters) :
     GNEStoppingPlace(id, net, GLO_PARKING_AREA, SUMO_TAG_PARKING_AREA, GUIIconSubSys::getIcon(GUIIcon::PARKINGAREA),
                      lane, startPos, endPos, name, friendlyPosition, parameters),
     myDepartPos(departPos),
@@ -57,7 +59,8 @@
     myOnRoad(onRoad),
     myWidth(width),
     myLength(length),
-    myAngle(angle) {
+    myAngle(angle),
+    myLefthand(lefthand) {
     // update centering boundary without updating grid
     updateCenteringBoundary(false);
 }
@@ -101,6 +104,9 @@
     if (getAttribute(SUMO_ATTR_DEPARTPOS) != myTagProperty.getDefaultValue(SUMO_ATTR_DEPARTPOS)) {
         device.writeAttr(SUMO_ATTR_DEPARTPOS, myDepartPos);
     }
+    if (getAttribute(SUMO_ATTR_LEFTHAND) != myTagProperty.getDefaultValue(SUMO_ATTR_LEFTHAND)) {
+        device.writeAttr(SUMO_ATTR_LEFTHAND, myLefthand);
+    }
     // write all parking spaces
     for (const auto& space : getChildAdditionals()) {
         if (space->getTagProperty().getTag() == SUMO_TAG_PARKING_SPACE) {
@@ -116,7 +122,7 @@
 void
 GNEParkingArea::updateGeometry() {
     // Get value of option "lefthand"
-    const double offsetSign = OptionsCont::getOptions().getBool("lefthand") ? -1 : 1;
+    const double offsetSign = OptionsCont::getOptions().getBool("lefthand") != myLefthand ? -1 : 1;
     // calculate spaceDim
     const double spaceDim = myRoadSideCapacity > 0 ? (getAttributeDouble(SUMO_ATTR_ENDPOS) - getAttributeDouble(SUMO_ATTR_STARTPOS)) / myRoadSideCapacity * getParentLanes().front()->getLengthGeometryFactor() : 7.5;
     // calculate length
@@ -276,6 +282,8 @@
             return toString(myLength);
         case SUMO_ATTR_ANGLE:
             return toString(myAngle);
+        case SUMO_ATTR_LEFTHAND:
+            return toString(myLefthand);
         case GNE_ATTR_SELECTED:
             return toString(isAttributeCarrierSelected());
         case GNE_ATTR_PARAMETERS:
@@ -335,6 +343,7 @@
         case SUMO_ATTR_WIDTH:
         case SUMO_ATTR_LENGTH:
         case SUMO_ATTR_ANGLE:
+        case SUMO_ATTR_LEFTHAND:
         case GNE_ATTR_SELECTED:
         case GNE_ATTR_PARAMETERS:
         case GNE_ATTR_SHIFTLANEINDEX:
@@ -409,6 +418,8 @@
             }
         case SUMO_ATTR_ANGLE:
             return canParse(value);
+        case SUMO_ATTR_LEFTHAND:
+            return canParse(value);
         case GNE_ATTR_SELECTED:
             return canParse(value);
         case GNE_ATTR_PARAMETERS:
@@ -517,6 +528,10 @@
         case SUMO_ATTR_ANGLE:
             myAngle = parse(value);
             break;
+        case SUMO_ATTR_LEFTHAND:
+            myLefthand = parse(value);
+            updateGeometry();
+            break;
         case GNE_ATTR_SELECTED:
             if (parse(value)) {
                 selectAttributeCarrier();
diff -Nru sumo-1.17.0/src/netedit/elements/additional/GNEParkingArea.h sumo-1.18.0/src/netedit/elements/additional/GNEParkingArea.h
--- sumo-1.17.0/src/netedit/elements/additional/GNEParkingArea.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/additional/GNEParkingArea.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -49,11 +49,13 @@
      * @param[in] width ParkingArea's length
      * @param[in] length ParkingArea's length
      * @param[in] angle ParkingArea's angle
+     * @param[in] lefthand enable or disable lefthand
      * @param[in] parameters generic parameters
      */
-    GNEParkingArea(const std::string& id, GNELane* lane, GNENet* net, const double startPos, const double endPos, const std::string& departPos,
-                   const std::string& name, bool friendlyPosition, int roadSideCapacity, bool onRoad, double width, const double length,
-                   double angle, const Parameterised::Map& parameters);
+    GNEParkingArea(const std::string& id, GNELane* lane, GNENet* net, const double startPos, const double endPos,
+                   const std::string& departPos, const std::string& name, const bool friendlyPosition, const int roadSideCapacity,
+                   const bool onRoad, const double width, const double length, const double angle, const bool lefthand,
+                   const Parameterised::Map& parameters);
 
     /// @brief Destructor
     ~GNEParkingArea();
@@ -155,6 +157,9 @@
     /// @brief Angle of Parking Area
     double myAngle;
 
+    /// @brief lefthand
+    bool myLefthand;
+
     /// @brief vector with GNELotSpaceDefinition
     std::vector myLotSpaceDefinitions;
 
diff -Nru sumo-1.17.0/src/netedit/elements/additional/GNEParkingAreaReroute.cpp sumo-1.18.0/src/netedit/elements/additional/GNEParkingAreaReroute.cpp
--- sumo-1.17.0/src/netedit/elements/additional/GNEParkingAreaReroute.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/additional/GNEParkingAreaReroute.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/elements/additional/GNEParkingAreaReroute.h sumo-1.18.0/src/netedit/elements/additional/GNEParkingAreaReroute.h
--- sumo-1.17.0/src/netedit/elements/additional/GNEParkingAreaReroute.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/additional/GNEParkingAreaReroute.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/elements/additional/GNEParkingSpace.cpp sumo-1.18.0/src/netedit/elements/additional/GNEParkingSpace.cpp
--- sumo-1.17.0/src/netedit/elements/additional/GNEParkingSpace.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/additional/GNEParkingSpace.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/elements/additional/GNEParkingSpace.h sumo-1.18.0/src/netedit/elements/additional/GNEParkingSpace.h
--- sumo-1.17.0/src/netedit/elements/additional/GNEParkingSpace.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/additional/GNEParkingSpace.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/elements/additional/GNEPOI.cpp sumo-1.18.0/src/netedit/elements/additional/GNEPOI.cpp
--- sumo-1.17.0/src/netedit/elements/additional/GNEPOI.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/additional/GNEPOI.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/elements/additional/GNEPOI.h sumo-1.18.0/src/netedit/elements/additional/GNEPOI.h
--- sumo-1.17.0/src/netedit/elements/additional/GNEPOI.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/additional/GNEPOI.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/elements/additional/GNEPoly.cpp sumo-1.18.0/src/netedit/elements/additional/GNEPoly.cpp
--- sumo-1.17.0/src/netedit/elements/additional/GNEPoly.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/additional/GNEPoly.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/elements/additional/GNEPoly.h sumo-1.18.0/src/netedit/elements/additional/GNEPoly.h
--- sumo-1.17.0/src/netedit/elements/additional/GNEPoly.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/additional/GNEPoly.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/elements/additional/GNERerouter.cpp sumo-1.18.0/src/netedit/elements/additional/GNERerouter.cpp
--- sumo-1.17.0/src/netedit/elements/additional/GNERerouter.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/additional/GNERerouter.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/elements/additional/GNERerouter.h sumo-1.18.0/src/netedit/elements/additional/GNERerouter.h
--- sumo-1.17.0/src/netedit/elements/additional/GNERerouter.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/additional/GNERerouter.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/elements/additional/GNERerouterInterval.cpp sumo-1.18.0/src/netedit/elements/additional/GNERerouterInterval.cpp
--- sumo-1.17.0/src/netedit/elements/additional/GNERerouterInterval.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/additional/GNERerouterInterval.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/elements/additional/GNERerouterInterval.h sumo-1.18.0/src/netedit/elements/additional/GNERerouterInterval.h
--- sumo-1.17.0/src/netedit/elements/additional/GNERerouterInterval.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/additional/GNERerouterInterval.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/elements/additional/GNERerouterSymbol.cpp sumo-1.18.0/src/netedit/elements/additional/GNERerouterSymbol.cpp
--- sumo-1.17.0/src/netedit/elements/additional/GNERerouterSymbol.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/additional/GNERerouterSymbol.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/elements/additional/GNERerouterSymbol.h sumo-1.18.0/src/netedit/elements/additional/GNERerouterSymbol.h
--- sumo-1.17.0/src/netedit/elements/additional/GNERerouterSymbol.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/additional/GNERerouterSymbol.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/elements/additional/GNERouteProbe.cpp sumo-1.18.0/src/netedit/elements/additional/GNERouteProbe.cpp
--- sumo-1.17.0/src/netedit/elements/additional/GNERouteProbe.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/additional/GNERouteProbe.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/elements/additional/GNERouteProbe.h sumo-1.18.0/src/netedit/elements/additional/GNERouteProbe.h
--- sumo-1.17.0/src/netedit/elements/additional/GNERouteProbe.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/additional/GNERouteProbe.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/elements/additional/GNERouteProbReroute.cpp sumo-1.18.0/src/netedit/elements/additional/GNERouteProbReroute.cpp
--- sumo-1.17.0/src/netedit/elements/additional/GNERouteProbReroute.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/additional/GNERouteProbReroute.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/elements/additional/GNERouteProbReroute.h sumo-1.18.0/src/netedit/elements/additional/GNERouteProbReroute.h
--- sumo-1.17.0/src/netedit/elements/additional/GNERouteProbReroute.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/additional/GNERouteProbReroute.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/elements/additional/GNEStoppingPlace.cpp sumo-1.18.0/src/netedit/elements/additional/GNEStoppingPlace.cpp
--- sumo-1.17.0/src/netedit/elements/additional/GNEStoppingPlace.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/additional/GNEStoppingPlace.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -232,8 +232,13 @@
 
 void
 GNEStoppingPlace::setStoppingPlaceGeometry(double movingToSide) {
+    if (getParentLanes().empty() || getParentLanes().front() == nullptr) {
+        // may happen during initialization
+        return;
+    }
     // Get value of option "lefthand"
-    const double offsetSign = OptionsCont::getOptions().getBool("lefthand") ? -1 : 1;
+    const bool lefthandAttr = hasAttribute(SUMO_ATTR_LEFTHAND) && parse(getAttribute(SUMO_ATTR_LEFTHAND));
+    const double offsetSign = OptionsCont::getOptions().getBool("lefthand") != lefthandAttr  ? -1 : 1;
 
     // obtain laneShape
     PositionVector laneShape = getParentLanes().front()->getLaneShape();
diff -Nru sumo-1.17.0/src/netedit/elements/additional/GNEStoppingPlace.h sumo-1.18.0/src/netedit/elements/additional/GNEStoppingPlace.h
--- sumo-1.17.0/src/netedit/elements/additional/GNEStoppingPlace.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/additional/GNEStoppingPlace.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/elements/additional/GNETAZ.cpp sumo-1.18.0/src/netedit/elements/additional/GNETAZ.cpp
--- sumo-1.17.0/src/netedit/elements/additional/GNETAZ.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/additional/GNETAZ.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -26,6 +26,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -407,6 +408,10 @@
             const Position p = myAdditionalGeometry.getShape().getPolygonCenter() + Position(0, -0.6 * s.polyType.size / s.scale);
             GLHelper::drawTextSettings(s.polyType, getShapeType(), p, s.scale, s.angle);
         }
+        // draw child demand elements
+        for (const auto& demandElement : getChildDemandElements()) {
+            demandElement->drawGL(s);
+        }
     }
 }
 
@@ -675,13 +680,21 @@
         GUIDottedGeometry::drawDottedContourClosedShape(s, GUIDottedGeometry::DottedContourType::SELECT, myAdditionalGeometry.getShape(), 1);
     }
     // dotted contour for first TAZ
-    if ((myNet->getViewNet()->getViewParent()->getTAZRelDataFrame()->getFirstTAZ() == this)) {
+    if (myNet->getViewNet()->getViewParent()->getTAZRelDataFrame()->getFirstTAZ() == this) {
         GUIDottedGeometry::drawDottedContourClosedShape(s, GUIDottedGeometry::DottedContourType::FROMTAZ, myAdditionalGeometry.getShape(), 1, s.neteditSizeSettings.polylineWidth * TAZExaggeration);
     }
     // dotted contour for second TAZ
-    if ((myNet->getViewNet()->getViewParent()->getTAZRelDataFrame()->getSecondTAZ() == this)) {
+    if (myNet->getViewNet()->getViewParent()->getTAZRelDataFrame()->getSecondTAZ() == this) {
         GUIDottedGeometry::drawDottedContourClosedShape(s, GUIDottedGeometry::DottedContourType::TOTAZ, myAdditionalGeometry.getShape(), 1, s.neteditSizeSettings.polylineWidth * TAZExaggeration);
     }
+    // check if we're selecting TAZs
+    if (myNet->getViewNet()->getEditModes().isCurrentSupermodeDemand() && (myNet->getViewNet()->getEditModes().demandEditMode == DemandEditMode::DEMAND_VEHICLE)) {
+        // check if we're creating a trip or flow over taz
+        const auto templateAC = myNet->getViewNet()->getViewParent()->getVehicleFrame()->getVehicleTagSelector()->getCurrentTemplateAC();
+        if (templateAC && ((templateAC->getTagProperty().getTag() == GNE_TAG_TRIP_TAZS) || (templateAC->getTagProperty().getTag() == GNE_TAG_TRIP_TAZS))) {
+            GUIDottedGeometry::drawDottedContourClosedShape(s, GUIDottedGeometry::DottedContourType::ORANGE, myAdditionalGeometry.getShape(), 1, s.neteditSizeSettings.polylineWidth * TAZExaggeration);
+        }
+    }
     // now check if mouse is over TAZ
     if (TAZRelDataFrame->shown() && (gPostDrawing.markedTAZ == nullptr) && ((TAZRelDataFrame->getFirstTAZ() == nullptr) || (TAZRelDataFrame->getSecondTAZ() == nullptr))) {
         // get dotted contour type
diff -Nru sumo-1.17.0/src/netedit/elements/additional/GNETAZ.h sumo-1.18.0/src/netedit/elements/additional/GNETAZ.h
--- sumo-1.17.0/src/netedit/elements/additional/GNETAZ.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/additional/GNETAZ.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/elements/additional/GNETAZSourceSink.cpp sumo-1.18.0/src/netedit/elements/additional/GNETAZSourceSink.cpp
--- sumo-1.17.0/src/netedit/elements/additional/GNETAZSourceSink.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/additional/GNETAZSourceSink.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -143,8 +143,8 @@
     buildCenterPopupEntry(ret);
     buildPositionCopyEntry(ret, app);
     // buld menu commands for names
-    GUIDesigns::buildFXMenuCommand(ret, TL("Copy ") + getTagStr() + TL(" name to clipboard"), nullptr, ret, MID_COPY_NAME);
-    GUIDesigns::buildFXMenuCommand(ret, TL("Copy ") + getTagStr() + TL(" typed name to clipboard"), nullptr, ret, MID_COPY_TYPED_NAME);
+    GUIDesigns::buildFXMenuCommand(ret, TLF("Copy % name to clipboard", getTagStr()), nullptr, ret, MID_COPY_NAME);
+    GUIDesigns::buildFXMenuCommand(ret, TLF("Copy % typed name to clipboard", getTagStr()), nullptr, ret, MID_COPY_TYPED_NAME);
     new FXMenuSeparator(ret);
     // build selection and show parameters menu
     myNet->getViewNet()->buildSelectionACPopupEntry(ret, this);
diff -Nru sumo-1.17.0/src/netedit/elements/additional/GNETAZSourceSink.h sumo-1.18.0/src/netedit/elements/additional/GNETAZSourceSink.h
--- sumo-1.17.0/src/netedit/elements/additional/GNETAZSourceSink.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/additional/GNETAZSourceSink.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/elements/additional/GNETractionSubstation.cpp sumo-1.18.0/src/netedit/elements/additional/GNETractionSubstation.cpp
--- sumo-1.17.0/src/netedit/elements/additional/GNETractionSubstation.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/additional/GNETractionSubstation.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2021-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/elements/additional/GNETractionSubstation.h sumo-1.18.0/src/netedit/elements/additional/GNETractionSubstation.h
--- sumo-1.17.0/src/netedit/elements/additional/GNETractionSubstation.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/additional/GNETractionSubstation.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2021-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/elements/additional/GNEVaporizer.cpp sumo-1.18.0/src/netedit/elements/additional/GNEVaporizer.cpp
--- sumo-1.17.0/src/netedit/elements/additional/GNEVaporizer.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/additional/GNEVaporizer.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/elements/additional/GNEVaporizer.h sumo-1.18.0/src/netedit/elements/additional/GNEVaporizer.h
--- sumo-1.17.0/src/netedit/elements/additional/GNEVaporizer.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/additional/GNEVaporizer.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/elements/additional/GNEVariableSpeedSign.cpp sumo-1.18.0/src/netedit/elements/additional/GNEVariableSpeedSign.cpp
--- sumo-1.17.0/src/netedit/elements/additional/GNEVariableSpeedSign.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/additional/GNEVariableSpeedSign.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/elements/additional/GNEVariableSpeedSign.h sumo-1.18.0/src/netedit/elements/additional/GNEVariableSpeedSign.h
--- sumo-1.17.0/src/netedit/elements/additional/GNEVariableSpeedSign.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/additional/GNEVariableSpeedSign.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/elements/additional/GNEVariableSpeedSignStep.cpp sumo-1.18.0/src/netedit/elements/additional/GNEVariableSpeedSignStep.cpp
--- sumo-1.17.0/src/netedit/elements/additional/GNEVariableSpeedSignStep.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/additional/GNEVariableSpeedSignStep.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/elements/additional/GNEVariableSpeedSignStep.h sumo-1.18.0/src/netedit/elements/additional/GNEVariableSpeedSignStep.h
--- sumo-1.17.0/src/netedit/elements/additional/GNEVariableSpeedSignStep.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/additional/GNEVariableSpeedSignStep.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/elements/additional/GNEVariableSpeedSignSymbol.cpp sumo-1.18.0/src/netedit/elements/additional/GNEVariableSpeedSignSymbol.cpp
--- sumo-1.17.0/src/netedit/elements/additional/GNEVariableSpeedSignSymbol.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/additional/GNEVariableSpeedSignSymbol.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/elements/additional/GNEVariableSpeedSignSymbol.h sumo-1.18.0/src/netedit/elements/additional/GNEVariableSpeedSignSymbol.h
--- sumo-1.17.0/src/netedit/elements/additional/GNEVariableSpeedSignSymbol.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/additional/GNEVariableSpeedSignSymbol.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/elements/data/GNEDataHandler.cpp sumo-1.18.0/src/netedit/elements/data/GNEDataHandler.cpp
--- sumo-1.17.0/src/netedit/elements/data/GNEDataHandler.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/data/GNEDataHandler.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -204,9 +204,9 @@
             } else if (toTAZ == nullptr) {
                 writeErrorInvalidParent(SUMO_TAG_TAZREL, SUMO_TAG_TAZ, toTAZID);
             } else if ((fromTAZ != toTAZ) && dataInterval->TAZRelExists(fromTAZ, toTAZ)) {
-                writeError(TL("There is already a TAZ rel defined between '") + toTAZID + TL("' and '") + toTAZID + "'.");
+                writeError(TLF("There is already a TAZ rel defined between '%' and '%'.", fromTAZID, toTAZID));
             } else if ((fromTAZ == toTAZ) && dataInterval->TAZRelExists(fromTAZ)) {
-                writeError(TL("There is already a TAZ rel defined in '") + toTAZID + "'.");
+                writeError(TLF("There is already a TAZ rel defined in '%'.", toTAZID));
             } else if (fromTAZ == toTAZ) {
                 GNEGenericData* edgeData = new GNETAZRelData(dataInterval, fromTAZ, parameters);
                 if (myAllowUndoRedo) {
@@ -242,19 +242,19 @@
 
 void
 GNEDataHandler::writeErrorDuplicated(const SumoXMLTag tag, const std::string& id) {
-    writeError(TL("Could not build ") + toString(tag) + TL(" with ID '") + id + TL("' in netedit; declared twice."));
+    writeError(TLF("Could not build % with ID '%' in netedit", toString(tag), id) + std::string("; ") + TL("Declared twice."));
 }
 
 
 void
 GNEDataHandler::writeErrorInvalidParent(const SumoXMLTag tag, const SumoXMLTag parent) {
-    writeError(TL("Could not build ") + toString(tag) + TL(" in netedit; ") + toString(parent) + TL(" doesn't exist."));
+    writeError(TLF("Could not build % in netedit", toString(tag)) + std::string("; ") + TLF("% doesn't exist.", toString(parent)));
 }
 
 
 void
 GNEDataHandler::writeErrorInvalidParent(const SumoXMLTag tag, const SumoXMLTag parent, const std::string& ID) {
-    writeError(TL("Could not build ") + toString(tag) + TL(" in netedit; ") + toString(parent) + TL(" with ID '") + ID + TL("' doesn't exist."));
+    writeError(TLF("Could not build % with ID '%' in netedit", toString(tag), ID) + std::string("; ") + TLF("% doesn't exist.", toString(parent)));
 }
 
 /****************************************************************************/
diff -Nru sumo-1.17.0/src/netedit/elements/data/GNEDataHandler.h sumo-1.18.0/src/netedit/elements/data/GNEDataHandler.h
--- sumo-1.17.0/src/netedit/elements/data/GNEDataHandler.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/data/GNEDataHandler.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/elements/data/GNEDataInterval.cpp sumo-1.18.0/src/netedit/elements/data/GNEDataInterval.cpp
--- sumo-1.17.0/src/netedit/elements/data/GNEDataInterval.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/data/GNEDataInterval.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/elements/data/GNEDataInterval.h sumo-1.18.0/src/netedit/elements/data/GNEDataInterval.h
--- sumo-1.17.0/src/netedit/elements/data/GNEDataInterval.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/data/GNEDataInterval.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/elements/data/GNEDataSet.cpp sumo-1.18.0/src/netedit/elements/data/GNEDataSet.cpp
--- sumo-1.17.0/src/netedit/elements/data/GNEDataSet.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/data/GNEDataSet.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/elements/data/GNEDataSet.h sumo-1.18.0/src/netedit/elements/data/GNEDataSet.h
--- sumo-1.17.0/src/netedit/elements/data/GNEDataSet.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/data/GNEDataSet.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/elements/data/GNEEdgeData.cpp sumo-1.18.0/src/netedit/elements/data/GNEEdgeData.cpp
--- sumo-1.17.0/src/netedit/elements/data/GNEEdgeData.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/data/GNEEdgeData.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/elements/data/GNEEdgeData.h sumo-1.18.0/src/netedit/elements/data/GNEEdgeData.h
--- sumo-1.17.0/src/netedit/elements/data/GNEEdgeData.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/data/GNEEdgeData.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/elements/data/GNEEdgeRelData.cpp sumo-1.18.0/src/netedit/elements/data/GNEEdgeRelData.cpp
--- sumo-1.17.0/src/netedit/elements/data/GNEEdgeRelData.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/data/GNEEdgeRelData.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/elements/data/GNEEdgeRelData.h sumo-1.18.0/src/netedit/elements/data/GNEEdgeRelData.h
--- sumo-1.17.0/src/netedit/elements/data/GNEEdgeRelData.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/data/GNEEdgeRelData.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/elements/data/GNEGenericData.cpp sumo-1.18.0/src/netedit/elements/data/GNEGenericData.cpp
--- sumo-1.17.0/src/netedit/elements/data/GNEGenericData.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/data/GNEGenericData.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -125,15 +125,15 @@
     buildCenterPopupEntry(ret);
     buildPositionCopyEntry(ret, app);
     // buld menu commands for names
-    GUIDesigns::buildFXMenuCommand(ret, TL("Copy ") + getTagStr() + TL(" name to clipboard"), nullptr, ret, MID_COPY_NAME);
-    GUIDesigns::buildFXMenuCommand(ret, TL("Copy ") + getTagStr() + TL(" typed name to clipboard"), nullptr, ret, MID_COPY_TYPED_NAME);
+    GUIDesigns::buildFXMenuCommand(ret, TLF("Copy % name to clipboard", getTagStr()), nullptr, ret, MID_COPY_NAME);
+    GUIDesigns::buildFXMenuCommand(ret, TLF("Copy % name to clipboard", getTagStr()), nullptr, ret, MID_COPY_TYPED_NAME);
     new FXMenuSeparator(ret);
     // build selection and show parameters menu
     myDataIntervalParent->getNet()->getViewNet()->buildSelectionACPopupEntry(ret, this);
     buildShowParamsPopupEntry(ret);
     // show option to open additional dialog
     if (myTagProperty.hasDialog()) {
-        GUIDesigns::buildFXMenuCommand(ret, (TL("Open ") + getTagStr() + TL(" Dialog")).c_str(), getACIcon(), &parent, MID_OPEN_ADDITIONAL_DIALOG);
+        GUIDesigns::buildFXMenuCommand(ret, (TLF("Open % Dialog", getTagStr())).c_str(), getACIcon(), &parent, MID_OPEN_ADDITIONAL_DIALOG);
         new FXMenuSeparator(ret);
     } else {
         GUIDesigns::buildFXMenuCommand(ret, (TL("Cursor position in view: ") + toString(getPositionInView().x()) + "," + toString(getPositionInView().y())).c_str(), nullptr, nullptr, 0);
diff -Nru sumo-1.17.0/src/netedit/elements/data/GNEGenericData.h sumo-1.18.0/src/netedit/elements/data/GNEGenericData.h
--- sumo-1.17.0/src/netedit/elements/data/GNEGenericData.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/data/GNEGenericData.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/elements/data/GNEMeanData.cpp sumo-1.18.0/src/netedit/elements/data/GNEMeanData.cpp
--- sumo-1.17.0/src/netedit/elements/data/GNEMeanData.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/data/GNEMeanData.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/elements/data/GNEMeanData.h sumo-1.18.0/src/netedit/elements/data/GNEMeanData.h
--- sumo-1.17.0/src/netedit/elements/data/GNEMeanData.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/data/GNEMeanData.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/elements/data/GNEMeanDataHandler.cpp sumo-1.18.0/src/netedit/elements/data/GNEMeanDataHandler.cpp
--- sumo-1.17.0/src/netedit/elements/data/GNEMeanDataHandler.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/data/GNEMeanDataHandler.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -61,7 +61,7 @@
     const auto attributes = parseAttributes(SUMO_TAG_MEANDATA_EDGE, writtenAttributes);
     // check if meanData edge exists
     if (myNet->getAttributeCarriers()->retrieveMeanData(SUMO_TAG_MEANDATA_EDGE, ID, false) != nullptr) {
-        writeError(TL("Could not build meanDataEdge; ") + ID + TL(" already exists"));
+        writeError(TL("Could not build meanDataEdge; ") + TLF("% already exists", ID));
     } else if ((edges.size() == edgeIDs.size()) && (attributes.size() == writtenAttributes.size())) {
         GNEMeanData* edgeMeanData = new GNEMeanData(myNet, SUMO_TAG_MEANDATA_EDGE, ID, file, period, begin, end,
                 trackVehicles, attributes,  aggregate, edgeIDs, edgeFile, excludeEmpty,  withInternal,
@@ -90,7 +90,7 @@
     const auto attributes = parseAttributes(SUMO_TAG_MEANDATA_LANE, writtenAttributes);
     // check if meanData edge exists
     if (myNet->getAttributeCarriers()->retrieveMeanData(SUMO_TAG_MEANDATA_LANE, ID, false) != nullptr) {
-        writeError(TL("Could not build meanDataLane; ") + ID + TL(" already exists"));
+        writeError(TL("Could not build meanDataLane; ") + TLF("% already exists", ID));
     } else if ((edges.size() == edgeIDs.size()) && (attributes.size() == writtenAttributes.size())) {
         GNEMeanData* edgeMeanData = new GNEMeanData(myNet, SUMO_TAG_MEANDATA_LANE, ID, file, period, begin, end,
                 trackVehicles, attributes,  aggregate, edgeIDs, edgeFile, excludeEmpty,  withInternal,
@@ -113,7 +113,7 @@
         GNEEdge* edge = myNet->getAttributeCarriers()->retrieveEdge(edgeID, false);
         // empty edges aren't allowed. If edge is empty, write error, clear edges and stop
         if (edge == nullptr) {
-            writeError(TL("Could not build ") + toString(tag) + TL(" in netedit; edge doesn't exist."));
+            writeError(TLF("Could not build % in netedit", toString(tag)) + std::string("; ") + TL("Edge doesn't exist."));
             edges.clear();
             return edges;
         } else {
@@ -129,7 +129,7 @@
     std::vector attrs;
     for (const auto& attrStr : attrStrs) {
         if (SUMOXMLDefinitions::Tags.hasString(attrStr)) {
-            writeError(TL("Could not build ") + toString(tag) + TL(" in netedit; attribute '") + attrStr + TL("' doesn't exist."));
+            writeError(TLF("Could not build % in netedit", toString(tag)) + std::string("; ") + TLF("Attribute '%' doesn't exist.", attrStr));
             attrs.clear();
             return attrs;
         } else {
diff -Nru sumo-1.17.0/src/netedit/elements/data/GNEMeanDataHandler.h sumo-1.18.0/src/netedit/elements/data/GNEMeanDataHandler.h
--- sumo-1.17.0/src/netedit/elements/data/GNEMeanDataHandler.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/data/GNEMeanDataHandler.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/elements/data/GNETAZRelData.cpp sumo-1.18.0/src/netedit/elements/data/GNETAZRelData.cpp
--- sumo-1.17.0/src/netedit/elements/data/GNETAZRelData.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/data/GNETAZRelData.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/elements/data/GNETAZRelData.h sumo-1.18.0/src/netedit/elements/data/GNETAZRelData.h
--- sumo-1.17.0/src/netedit/elements/data/GNETAZRelData.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/data/GNETAZRelData.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/elements/demand/GNEContainer.cpp sumo-1.18.0/src/netedit/elements/demand/GNEContainer.cpp
--- sumo-1.17.0/src/netedit/elements/demand/GNEContainer.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/demand/GNEContainer.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -223,7 +223,7 @@
 void
 GNEContainer::writeDemandElement(OutputDevice& device) const {
     // attribute VType musn't be written if is DEFAULT_PEDTYPE_ID
-    if (getParentDemandElements().at(0)->getID() == DEFAULT_CONTAINERTYPE_ID) {
+    if (getTypeParent()->getID() == DEFAULT_CONTAINERTYPE_ID) {
         // unset VType parameter
         parametersSet &= ~VEHPARS_VTYPE_SET;
         // write container attributes (VType will not be written)
@@ -232,7 +232,7 @@
         parametersSet |= VEHPARS_VTYPE_SET;
     } else {
         // write container attributes, including VType
-        write(device, OptionsCont::getOptions(), myTagProperty.getXMLTag(), getParentDemandElements().at(0)->getID());
+        write(device, OptionsCont::getOptions(), myTagProperty.getXMLTag(), getTypeParent()->getID());
     }
     // write specific flow attributes
     if (myTagProperty.getTag() == SUMO_TAG_CONTAINERFLOW) {
@@ -383,12 +383,12 @@
         // obtain exaggeration (and add the special containerExaggeration)
         const double exaggeration = getExaggeration(s) + s.detailSettings.personExaggeration;
         // obtain width and length
-        const double length = getParentDemandElements().at(0)->getAttributeDouble(SUMO_ATTR_LENGTH);
-        const double width = getParentDemandElements().at(0)->getAttributeDouble(SUMO_ATTR_WIDTH);
+        const double length = getTypeParent()->getAttributeDouble(SUMO_ATTR_LENGTH);
+        const double width = getTypeParent()->getAttributeDouble(SUMO_ATTR_WIDTH);
         // obtain diameter around container (used to calculate distance bewteen cursor and container)
         const double distanceSquared = pow(exaggeration * std::max(length, width), 2);
         // obtain img file
-        const std::string file = getParentDemandElements().at(0)->getAttribute(SUMO_ATTR_IMGFILE);
+        const std::string file = getTypeParent()->getAttribute(SUMO_ATTR_IMGFILE);
         // obtain position
         const Position containerPosition = getAttributePosition(SUMO_ATTR_DEPARTPOS);
         // check if container can be drawn
@@ -430,7 +430,27 @@
             GLHelper::popName();
             // draw stack label
             if (myStackedLabelNumber > 0) {
-                drawStackLabel("container", Position(containerPosition.x() - 2.5, containerPosition.y() - 0.8), -90, 1.3, 5, getExaggeration(s));
+                drawStackLabel(myStackedLabelNumber, "container", Position(containerPosition.x() - 2.5, containerPosition.y() - 0.8), -90, 1.3, 5, getExaggeration(s));
+            } else if (getChildDemandElements().front()->getTagProperty().getTag() == GNE_TAG_STOPCONTAINER_CONTAINERSTOP) {
+                // declare counter for stacked containers over stops
+                int stackedCounter = 0;
+                // get stoppingPlace
+                const auto stoppingPlace = getChildDemandElements().front()->getParentAdditionals().front();
+                // get stacked containers
+                for (const auto& stopContainer : stoppingPlace->getChildDemandElements()) {
+                    if (stopContainer->getTagProperty().getTag() == GNE_TAG_STOPCONTAINER_CONTAINERSTOP) {
+                        // get container parent
+                        const auto containerParent = stopContainer->getParentDemandElements().front();
+                        // check if the stop if the first container plan parent
+                        if (stopContainer->getPreviousChildDemandElement(containerParent) == nullptr) {
+                            stackedCounter++;
+                        }
+                    }
+                }
+                // if we have more than two stacked elements, draw label
+                if (stackedCounter > 1) {
+                    drawStackLabel(stackedCounter, "container", Position(containerPosition.x() - 2.5, containerPosition.y() - 0.8), -90, 1.3, 5, getExaggeration(s));
+                }
             }
             // draw flow label
             if (myTagProperty.isFlow()) {
@@ -515,7 +535,7 @@
         case SUMO_ATTR_ID:
             return getMicrosimID();
         case SUMO_ATTR_TYPE:
-            return getParentDemandElements().at(0)->getID();
+            return getTypeParent()->getID();
         case SUMO_ATTR_COLOR:
             if (wasSet(VEHPARS_COLOR_SET)) {
                 return toString(color);
@@ -641,16 +661,19 @@
     std::string error;
     switch (key) {
         case SUMO_ATTR_ID:
-            // Containers and containerflows share namespace
-            if (SUMOXMLDefinitions::isValidVehicleID(value) &&
-                    (myNet->getAttributeCarriers()->retrieveDemandElement(SUMO_TAG_CONTAINER, value, false) == nullptr) &&
-                    (myNet->getAttributeCarriers()->retrieveDemandElement(SUMO_TAG_CONTAINERFLOW, value, false) == nullptr)) {
+            if (value == getID()) {
                 return true;
+            } else if (SUMOXMLDefinitions::isValidVehicleID(value)) {
+                return (demandElementExist(value, {SUMO_TAG_CONTAINER, SUMO_TAG_CONTAINERFLOW}) == false);
             } else {
                 return false;
             }
         case SUMO_ATTR_TYPE:
-            return SUMOXMLDefinitions::isValidTypeID(value) && (myNet->getAttributeCarriers()->retrieveDemandElement(SUMO_TAG_VTYPE, value, false) != nullptr);
+            if (SUMOXMLDefinitions::isValidVehicleID(value)) {
+                return demandElementExist(value, {SUMO_TAG_VTYPE, SUMO_TAG_VTYPE_DISTRIBUTION});
+            } else {
+                return false;
+            }
         case SUMO_ATTR_COLOR:
             return canParse(value);
         case SUMO_ATTR_DEPARTPOS: {
@@ -819,8 +842,8 @@
 void
 GNEContainer::drawAction_drawAsPoly() const {
     // obtain width and length
-    const double length = getParentDemandElements().at(0)->getAttributeDouble(SUMO_ATTR_LENGTH);
-    const double width = getParentDemandElements().at(0)->getAttributeDouble(SUMO_ATTR_WIDTH);
+    const double length = getTypeParent()->getAttributeDouble(SUMO_ATTR_LENGTH);
+    const double width = getTypeParent()->getAttributeDouble(SUMO_ATTR_WIDTH);
     // draw pedestrian shape
     glScaled(length * 0.2, width * 0.2, 1);
     glBegin(GL_QUADS);
@@ -842,10 +865,10 @@
 
 void
 GNEContainer::drawAction_drawAsImage(const GUIVisualizationSettings& s) const {
-    const std::string& file = getParentDemandElements().at(0)->getAttribute(SUMO_ATTR_IMGFILE);
+    const std::string& file = getTypeParent()->getAttribute(SUMO_ATTR_IMGFILE);
     // obtain width and length
-    const double length = getParentDemandElements().at(0)->getAttributeDouble(SUMO_ATTR_LENGTH);
-    const double width = getParentDemandElements().at(0)->getAttributeDouble(SUMO_ATTR_WIDTH);
+    const double length = getTypeParent()->getAttributeDouble(SUMO_ATTR_LENGTH);
+    const double width = getTypeParent()->getAttributeDouble(SUMO_ATTR_WIDTH);
     if (file != "") {
         // @todo invent an option for controlling whether images should be rotated or not
         //if (getVehicleType().getGuiShape() == SVS_CONTAINER) {
diff -Nru sumo-1.17.0/src/netedit/elements/demand/GNEContainer.h sumo-1.18.0/src/netedit/elements/demand/GNEContainer.h
--- sumo-1.17.0/src/netedit/elements/demand/GNEContainer.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/demand/GNEContainer.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/elements/demand/GNEDemandElement.cpp sumo-1.18.0/src/netedit/elements/demand/GNEDemandElement.cpp
--- sumo-1.17.0/src/netedit/elements/demand/GNEDemandElement.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/demand/GNEDemandElement.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -339,7 +339,7 @@
         // get next person Plan
         const GNEDemandElement* nextPersonPlan = getParentDemandElements().at(0)->getNextChildDemandElement(this);
         // continue depending if is an stop or a person plan
-        if (nextPersonPlan && (nextPersonPlan->getTagProperty().getTag() == GNE_TAG_STOPPERSON_BUSSTOP)) {
+        if (nextPersonPlan && ((nextPersonPlan->getTagProperty().getTag() == GNE_TAG_STOPPERSON_BUSSTOP) || (nextPersonPlan->getTagProperty().getTag() == GNE_TAG_STOPPERSON_TRAINSTOP))) {
             // calculate busStop end
             const double endPos = getParentAdditionals().front()->getAttributeDouble(SUMO_ATTR_ENDPOS);
             // check endPos
@@ -364,7 +364,7 @@
         // get next person Plan
         const GNEDemandElement* nextPersonPlan = getParentDemandElements().at(0)->getNextChildDemandElement(this);
         // continue depending if is an stop or a person plan
-        if (nextPersonPlan && (nextPersonPlan->getTagProperty().getTag() == GNE_TAG_STOPPERSON_BUSSTOP)) {
+        if (nextPersonPlan && ((nextPersonPlan->getTagProperty().getTag() == GNE_TAG_STOPPERSON_BUSSTOP) || (nextPersonPlan->getTagProperty().getTag() == GNE_TAG_STOPPERSON_TRAINSTOP))) {
             // get busStop
             const GNEAdditional* busStop = nextPersonPlan->getParentAdditionals().front();
             // get length
@@ -399,6 +399,48 @@
 }
 
 
+GNEDemandElement*
+GNEDemandElement::getTypeParent() const {
+    if (getParentDemandElements().size() < 1) {
+        throw InvalidArgument("This demand element doesn't have a type parent");
+    } else if (!getParentDemandElements().at(0)->getTagProperty().isType()) {
+        throw InvalidArgument("The first parent isn't a type");
+    } else if (getParentDemandElements().at(0)->getTagProperty().getTag() == SUMO_TAG_VTYPE) {
+        return getParentDemandElements().at(0);
+    } else {
+        // get typeDistribution ID
+        const auto typeDistributionID = getParentDemandElements().at(0)->getID();
+        // obtain all types with the given typeDistribution sorted by ID
+        std::map sortedTypes;
+        for (const auto &type : myNet->getAttributeCarriers()->getDemandElements().at(SUMO_TAG_VTYPE)) {
+            if (type->getAttribute(GNE_ATTR_VTYPE_DISTRIBUTION) == typeDistributionID) {
+                sortedTypes[type->getID()] = type;
+            }
+        }
+        // return first type, or default vType
+        if (sortedTypes.size() > 0) {
+            return sortedTypes.begin()->second;
+        } else if (myNet->getAttributeCarriers()->getDemandElements().size() > 0){
+            return *myNet->getAttributeCarriers()->getDemandElements().at(SUMO_TAG_VTYPE).begin();
+        } else {
+            throw InvalidArgument("no vTypes");
+        }
+    }
+}
+
+
+GNEDemandElement*
+GNEDemandElement::getRouteParent() const {
+    if (getParentDemandElements().size() < 2) {
+        throw InvalidArgument("This demand element doesn't have two parent");
+    } else if (getParentDemandElements().at(1)->getTagProperty().getTag() != SUMO_TAG_ROUTE) {
+        throw InvalidArgument("This demand element doesn't have a route parent");
+    } else {
+        return getParentDemandElements().at(1);
+    }
+}
+
+
 const Position
 GNEDemandElement::getBeginPosition(const double pedestrianDepartPos) const {
     if (myTagProperty.isStopPerson()) {
@@ -921,7 +963,7 @@
 
 
 void
-GNEDemandElement::drawStackLabel(const std::string& element, const Position& position, const double rotation, const double width, const double length, const double exaggeration) const {
+GNEDemandElement::drawStackLabel(const int number, const std::string& element, const Position& position, const double rotation, const double width, const double length, const double exaggeration) const {
     // declare contour width
     const double contourWidth = (0.05 * exaggeration);
     // Push matrix
@@ -938,7 +980,7 @@
     GLHelper::setColor(RGBColor(0, 128, 0));
     GLHelper::drawBoxLine(Position(0, -contourWidth), Position(0, -contourWidth), 0, (length * exaggeration) - (contourWidth * 2), (0.3 * exaggeration) - contourWidth);
     // draw stack label
-    GLHelper::drawText(element + "s stacked: " + toString(myStackedLabelNumber), Position(0, length * exaggeration * -0.5), (.1 * exaggeration), (0.6 * exaggeration), RGBColor::WHITE, 90, 0, -1);
+    GLHelper::drawText(element + "s stacked: " + toString(number), Position(0, length * exaggeration * -0.5), (.1 * exaggeration), (0.6 * exaggeration), RGBColor::WHITE, 90, 0, -1);
     // pop draw matrix
     GLHelper::popMatrix();
 }
@@ -1017,7 +1059,7 @@
 
 
 void
-GNEDemandElement::replaceAdditionalParent(SumoXMLTag tag, const std::string& value) {
+GNEDemandElement::replaceFirstParentAdditional(SumoXMLTag tag, const std::string& value) {
     std::vector parentAdditionals = getParentAdditionals();
     parentAdditionals[0] = myNet->getAttributeCarriers()->retrieveAdditional(tag, value);
     // replace parent additionals
@@ -1026,6 +1068,15 @@
 
 
 void
+GNEDemandElement::replaceLastParentAdditional(SumoXMLTag tag, const std::string& value) {
+    std::vector parentAdditionals = getParentAdditionals();
+    parentAdditionals[(int)parentAdditionals.size() - 1] = myNet->getAttributeCarriers()->retrieveAdditional(tag, value);
+    // replace parent additionals
+    replaceParentElements(this, parentAdditionals);
+}
+
+
+void
 GNEDemandElement::replaceDemandElementParent(SumoXMLTag tag, const std::string& value, const int parentIndex) {
     std::vector parentDemandElements = getParentDemandElements();
     parentDemandElements[parentIndex] = myNet->getAttributeCarriers()->retrieveDemandElement(tag, value);
@@ -1044,6 +1095,18 @@
 }
 
 
+bool
+GNEDemandElement::demandElementExist(const std::string &id, const std::vector tags) const {
+    // check if there is a demand element with the given tags and id
+    for (const auto& tag : tags) {
+        if (myNet->getAttributeCarriers()->retrieveDemandElement(tag, id, false) != nullptr) {
+            return true;
+        }
+    }
+    return false;
+}
+
+
 bool
 GNEDemandElement::checkChildDemandElementRestriction() const {
     // throw exception because this function mus be implemented in child (see GNEE3Detector)
diff -Nru sumo-1.17.0/src/netedit/elements/demand/GNEDemandElement.h sumo-1.18.0/src/netedit/elements/demand/GNEDemandElement.h
--- sumo-1.17.0/src/netedit/elements/demand/GNEDemandElement.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/demand/GNEDemandElement.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -343,6 +343,12 @@
     /// @brief check if a new demand element ID is valid
     bool isValidDemandElementID(const std::string& newID) const;
 
+    /// @brief get type parent (needed because first parent can be either type or typeDistribution)
+    GNEDemandElement* getTypeParent() const;
+
+    /// @brief get route parent (always the second parent demand element)
+    GNEDemandElement* getRouteParent() const;
+
     /// @name Only for person plans
     /// @{
     /// @brief check if person plan can be drawn
@@ -374,7 +380,7 @@
     void drawJunctionLine(const GNEDemandElement* element) const;
 
     /// @brief draw stack label
-    void drawStackLabel(const std::string& element, const Position& position, const double rotation, const double width, const double length, const double exaggeration) const;
+    void drawStackLabel(const int number, const std::string& element, const Position& position, const double rotation, const double width, const double length, const double exaggeration) const;
 
     /// @brief draw flow label
     void drawFlowLabel(const Position& position, const double rotation, const double width, const double length, const double exaggeration) const;
@@ -400,8 +406,11 @@
     /// @brief replace the last parent edge
     void replaceLastParentEdge(const std::string& value);
 
-    /// @brief replace additional parent
-    void replaceAdditionalParent(SumoXMLTag tag, const std::string& value);
+    /// @brief replace the first parent additional
+    void replaceFirstParentAdditional(SumoXMLTag tag, const std::string& value);
+
+    /// @brief replace the last parent additional
+    void replaceLastParentAdditional(SumoXMLTag tag, const std::string& value);
 
     /// @brief replace demand element parent
     void replaceDemandElementParent(SumoXMLTag tag, const std::string& value, const int parentIndex);
@@ -411,6 +420,9 @@
 
     /// @}
 
+    /// @brief check if the given demand element exist
+    bool demandElementExist(const std::string &id, const std::vector tags) const;
+
     /// @brief auxiliar struct used for calculate pathStopIndex
     struct EdgeStopIndex {
 
diff -Nru sumo-1.17.0/src/netedit/elements/demand/GNEPerson.cpp sumo-1.18.0/src/netedit/elements/demand/GNEPerson.cpp
--- sumo-1.17.0/src/netedit/elements/demand/GNEPerson.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/demand/GNEPerson.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -223,7 +223,7 @@
 void
 GNEPerson::writeDemandElement(OutputDevice& device) const {
     // attribute VType musn't be written if is DEFAULT_PEDTYPE_ID
-    if (getParentDemandElements().at(0)->getID() == DEFAULT_PEDTYPE_ID) {
+    if (getTypeParent()->getID() == DEFAULT_PEDTYPE_ID) {
         // unset VType parameter
         parametersSet &= ~VEHPARS_VTYPE_SET;
         // write person attributes (VType will not be written)
@@ -232,7 +232,7 @@
         parametersSet |= VEHPARS_VTYPE_SET;
     } else {
         // write person attributes, including VType
-        write(device, OptionsCont::getOptions(), myTagProperty.getXMLTag(), getParentDemandElements().at(0)->getID());
+        write(device, OptionsCont::getOptions(), myTagProperty.getXMLTag(), getTypeParent()->getID());
     }
     // write specific flow attributes
     if (myTagProperty.getTag() == SUMO_TAG_PERSONFLOW) {
@@ -384,12 +384,12 @@
         // obtain exaggeration (and add the special personExaggeration)
         const double exaggeration = getExaggeration(s) + s.detailSettings.personExaggeration;
         // obtain width and length
-        const double length = getParentDemandElements().at(0)->getAttributeDouble(SUMO_ATTR_LENGTH);
-        const double width = getParentDemandElements().at(0)->getAttributeDouble(SUMO_ATTR_WIDTH);
+        const double length = getTypeParent()->getAttributeDouble(SUMO_ATTR_LENGTH);
+        const double width = getTypeParent()->getAttributeDouble(SUMO_ATTR_WIDTH);
         // obtain diameter around person (used to calculate distance bewteen cursor and person)
         const double distanceSquared = pow(exaggeration * std::max(length, width), 2);
         // obtain img file
-        const std::string file = getParentDemandElements().at(0)->getAttribute(SUMO_ATTR_IMGFILE);
+        const std::string file = getTypeParent()->getAttribute(SUMO_ATTR_IMGFILE);
         // obtain position
         const Position personPosition = getAttributePosition(SUMO_ATTR_DEPARTPOS);
         // check if person can be drawn
@@ -419,7 +419,29 @@
             GLHelper::popMatrix();
             // draw stack label
             if (myStackedLabelNumber > 0) {
-                drawStackLabel("person", Position(personPosition.x() - 2.5, personPosition.y()), -90, 1.3, 5, getExaggeration(s));
+                drawStackLabel(myStackedLabelNumber, "person", Position(personPosition.x() - 2.5, personPosition.y()), -90, 1.3, 5, getExaggeration(s));
+            } else if ((getChildDemandElements().front()->getTagProperty().getTag() == GNE_TAG_STOPPERSON_BUSSTOP) ||
+                       (getChildDemandElements().front()->getTagProperty().getTag() == GNE_TAG_STOPPERSON_TRAINSTOP)) {
+                // declare counter for stacked persons over stops
+                int stackedCounter = 0;
+                // get stoppingPlace
+                const auto stoppingPlace = getChildDemandElements().front()->getParentAdditionals().front();
+                // get stacked persons
+                for (const auto& stopPerson : stoppingPlace->getChildDemandElements()) {
+                    if ((stopPerson->getTagProperty().getTag() == GNE_TAG_STOPPERSON_BUSSTOP) ||
+                            (stopPerson->getTagProperty().getTag() == GNE_TAG_STOPPERSON_TRAINSTOP)) {
+                        // get person parent
+                        const auto personParent = stopPerson->getParentDemandElements().front();
+                        // check if the stop if the first person plan parent
+                        if (stopPerson->getPreviousChildDemandElement(personParent) == nullptr) {
+                            stackedCounter++;
+                        }
+                    }
+                }
+                // if we have more than two stacked elements, draw label
+                if (stackedCounter > 1) {
+                    drawStackLabel(stackedCounter, "person", Position(personPosition.x() - 2.5, personPosition.y()), -90, 1.3, 5, getExaggeration(s));
+                }
             }
             // draw flow label
             if (myTagProperty.isFlow()) {
@@ -512,7 +534,7 @@
         case SUMO_ATTR_ID:
             return getMicrosimID();
         case SUMO_ATTR_TYPE:
-            return getParentDemandElements().at(0)->getID();
+            return getTypeParent()->getID();
         case SUMO_ATTR_COLOR:
             if (wasSet(VEHPARS_COLOR_SET)) {
                 return toString(color);
@@ -652,16 +674,19 @@
     std::string error;
     switch (key) {
         case SUMO_ATTR_ID:
-            // Persons and personflows share namespace
-            if (SUMOXMLDefinitions::isValidVehicleID(value) &&
-                    (myNet->getAttributeCarriers()->retrieveDemandElement(SUMO_TAG_PERSON, value, false) == nullptr) &&
-                    (myNet->getAttributeCarriers()->retrieveDemandElement(SUMO_TAG_PERSONFLOW, value, false) == nullptr)) {
+            if (value == getID()) {
                 return true;
+            } else if (SUMOXMLDefinitions::isValidVehicleID(value)) {
+                return (demandElementExist(value, {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}) == false);
             } else {
                 return false;
             }
         case SUMO_ATTR_TYPE:
-            return SUMOXMLDefinitions::isValidTypeID(value) && (myNet->getAttributeCarriers()->retrieveDemandElement(SUMO_TAG_VTYPE, value, false) != nullptr);
+            if (SUMOXMLDefinitions::isValidVehicleID(value)) {
+                return demandElementExist(value, {SUMO_TAG_VTYPE, SUMO_TAG_VTYPE_DISTRIBUTION});
+            } else {
+                return false;
+            }
         case SUMO_ATTR_COLOR:
             return canParse(value);
         case SUMO_ATTR_DEPARTPOS: {
diff -Nru sumo-1.17.0/src/netedit/elements/demand/GNEPerson.h sumo-1.18.0/src/netedit/elements/demand/GNEPerson.h
--- sumo-1.17.0/src/netedit/elements/demand/GNEPerson.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/demand/GNEPerson.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/elements/demand/GNEPersonTrip.cpp sumo-1.18.0/src/netedit/elements/demand/GNEPersonTrip.cpp
--- sumo-1.17.0/src/netedit/elements/demand/GNEPersonTrip.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/demand/GNEPersonTrip.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -56,11 +56,12 @@
 }
 
 
-GNEPersonTrip::GNEPersonTrip(GNENet* net, GNEDemandElement* personParent, GNEEdge* fromEdge, GNEAdditional* toBusStop,
+GNEPersonTrip::GNEPersonTrip(bool isTrain, GNENet* net, GNEDemandElement* personParent, GNEEdge* fromEdge, GNEAdditional* toStoppingPlace,
                              double arrivalPosition, const std::vector& types, const std::vector& modes,
                              const std::vector& lines) :
-    GNEDemandElement(personParent, net, GLO_PERSONTRIP, GNE_TAG_PERSONTRIP_BUSSTOP, GUIIconSubSys::getIcon(GUIIcon::PERSONTRIP_BUSSTOP),
-                     GNEPathManager::PathElement::Options::DEMAND_ELEMENT, {}, {fromEdge}, {}, {toBusStop}, {personParent}, {}),
+    GNEDemandElement(personParent, net, GLO_PERSONTRIP, isTrain ? GNE_TAG_PERSONTRIP_TRAINSTOP : GNE_TAG_PERSONTRIP_BUSSTOP,
+                     GUIIconSubSys::getIcon(isTrain ? GUIIcon::PERSONTRIP_TRAINSTOP : GUIIcon::PERSONTRIP_BUSSTOP),
+                     GNEPathManager::PathElement::Options::DEMAND_ELEMENT, {}, {fromEdge}, {}, {toStoppingPlace}, {personParent}, {}),
 myArrivalPosition(arrivalPosition),
 myVTypes(types),
 myModes(modes),
@@ -144,14 +145,19 @@
     }
     // write to depending if personplan ends in a busStop, edge or junction
     if (getParentAdditionals().size() > 0) {
-        device.writeAttr(SUMO_ATTR_BUS_STOP, getParentAdditionals().back()->getID());
+        if (getParentAdditionals().back()->getTagProperty().getTag() == SUMO_TAG_BUS_STOP) {
+            device.writeAttr(SUMO_ATTR_BUS_STOP, getParentAdditionals().back()->getID());
+        } else {
+            device.writeAttr(SUMO_ATTR_TRAIN_STOP, getParentAdditionals().back()->getID());
+        }
     } else if (getParentEdges().size() > 0) {
         device.writeAttr(SUMO_ATTR_TO, getParentEdges().back()->getID());
     } else {
         device.writeAttr(SUMO_ATTR_TOJUNCTION, getParentJunctions().back()->getID());
     }
     // avoid write arrival positions in person trip to busStop
-    if ((myTagProperty.getTag() != GNE_TAG_PERSONTRIP_BUSSTOP) && (myArrivalPosition > 0)) {
+    if ((myTagProperty.getTag() != GNE_TAG_RIDE_BUSSTOP) && (myTagProperty.getTag() != GNE_TAG_RIDE_TRAINSTOP) &&
+            (myArrivalPosition > 0)) {
         device.writeAttr(SUMO_ATTR_ARRIVALPOS, myArrivalPosition);
     }
     // write modes
@@ -335,6 +341,7 @@
         case SUMO_ATTR_TO:
             return getParentEdges().back()->getID();
         case GNE_ATTR_TO_BUSSTOP:
+        case GNE_ATTR_TO_TRAINSTOP:
             return getParentAdditionals().back()->getID();
         case SUMO_ATTR_FROMJUNCTION:
             return getParentJunctions().front()->getID();
@@ -346,7 +353,7 @@
         case SUMO_ATTR_VTYPES:
             return joinToString(myVTypes, " ");
         case SUMO_ATTR_ARRIVALPOS:
-            if (myTagProperty.getTag() == GNE_TAG_PERSONTRIP_BUSSTOP) {
+            if ((myTagProperty.getTag() == GNE_TAG_PERSONTRIP_BUSSTOP) || (myTagProperty.getTag() == GNE_TAG_PERSONTRIP_TRAINSTOP)) {
                 return getParentAdditionals().front()->getAttribute(SUMO_ATTR_ENDPOS);
             } else if (myArrivalPosition == -1) {
                 return "";
@@ -452,6 +459,23 @@
             }
             break;
         }
+        case GNE_ATTR_TO_TRAINSTOP: {
+            // get next person plan
+            GNEDemandElement* nextPersonPlan = getParentDemandElements().at(0)->getNextChildDemandElement(this);
+            // continue depending of nextPersonPlan
+            if (nextPersonPlan) {
+                // obtain trainStop
+                const GNEAdditional* trainStop = myNet->getAttributeCarriers()->retrieveAdditional(SUMO_TAG_TRAIN_STOP, value);
+                // change from attribute using edge ID
+                undoList->begin(myTagProperty.getGUIIcon(), "Change from attribute of next personPlan");
+                nextPersonPlan->setAttribute(SUMO_ATTR_FROM, trainStop->getParentLanes().front()->getParentEdge()->getID(), undoList);
+                undoList->changeAttribute(new GNEChange_Attribute(this, key, value));
+                undoList->end();
+            } else {
+                undoList->changeAttribute(new GNEChange_Attribute(this, key, value));
+            }
+            break;
+        }
         default:
             throw InvalidArgument(getTagStr() + " doesn't have an attribute of type '" + toString(key) + "'");
     }
@@ -470,6 +494,8 @@
             return SUMOXMLDefinitions::isValidNetID(value) && (myNet->getAttributeCarriers()->retrieveJunction(value, false) != nullptr);
         case GNE_ATTR_TO_BUSSTOP:
             return (myNet->getAttributeCarriers()->retrieveAdditional(SUMO_TAG_BUS_STOP, value, false) != nullptr);
+        case GNE_ATTR_TO_TRAINSTOP:
+            return (myNet->getAttributeCarriers()->retrieveAdditional(SUMO_TAG_TRAIN_STOP, value, false) != nullptr);
         // specific person plan attributes
         case SUMO_ATTR_MODES: {
             SVCPermissions dummyModeSet;
@@ -536,7 +562,7 @@
         return "personTrip: " + getParentEdges().front()->getID() + " -> " + getParentEdges().back()->getID();
     } else if (myTagProperty.getTag() == GNE_TAG_PERSONTRIP_JUNCTIONS) {
         return "personTrip: " + getParentJunctions().front()->getID() + " -> " + getParentJunctions().back()->getID();
-    } else if (myTagProperty.getTag() == GNE_TAG_PERSONTRIP_BUSSTOP) {
+    } else if ((myTagProperty.getTag() == GNE_TAG_PERSONTRIP_BUSSTOP) || (myTagProperty.getTag() == GNE_TAG_PERSONTRIP_TRAINSTOP)) {
         return "personTrip: " + getParentEdges().front()->getID() + " -> " + getParentAdditionals().front()->getID();
     } else {
         throw ("Invalid personTrip tag");
@@ -570,7 +596,12 @@
             computePathElement();
             break;
         case GNE_ATTR_TO_BUSSTOP:
-            replaceAdditionalParent(SUMO_TAG_BUS_STOP, value);
+            replaceFirstParentAdditional(SUMO_TAG_BUS_STOP, value);
+            // compute person trip
+            computePathElement();
+            break;
+        case GNE_ATTR_TO_TRAINSTOP:
+            replaceFirstParentAdditional(SUMO_TAG_TRAIN_STOP, value);
             // compute person trip
             computePathElement();
             break;
diff -Nru sumo-1.17.0/src/netedit/elements/demand/GNEPersonTrip.h sumo-1.18.0/src/netedit/elements/demand/GNEPersonTrip.h
--- sumo-1.17.0/src/netedit/elements/demand/GNEPersonTrip.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/demand/GNEPersonTrip.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -39,7 +39,7 @@
     GNEPersonTrip(SumoXMLTag tag, GNENet* net);
 
     /**@brief parameter constructor for person edge->edge
-     * @param[in] viewNet view in which this PersonTrip is placed
+     * @param[in] net Network in which this PersonTrip is placed
      * @param[in] personParent person parent
      * @param[in] fromEdge from edge
      * @param[in] toEdge to edge
@@ -52,22 +52,22 @@
                   double arrivalPosition, const std::vector& types, const std::vector& modes,
                   const std::vector& lines);
 
-    /**@brief parameter constructor for person edge->busStop
-     * @param[in] viewNet view in which this PersonTrip is placed
+    /**@brief parameter constructor for person edge->stoppingPlace
+     * @param[in] net Network in which this PersonTrip is placed
      * @param[in] personParent person parent
      * @param[in] fromEdge from edge
-     * @param[in] toBusStop to busStop
+     * @param[in] toStoppingPlace to stoppingPlace
      * @param[in] arrivalPosition arrival position on the destination edge
      * @param[in] types list of possible vehicle types to take
      * @param[in] modes list of possible traffic modes
      * @param[in] lines list of lines
      */
-    GNEPersonTrip(GNENet* net, GNEDemandElement* personParent, GNEEdge* fromEdge, GNEAdditional* toBusStop,
+    GNEPersonTrip(bool isTrain, GNENet* net, GNEDemandElement* personParent, GNEEdge* fromEdge, GNEAdditional* toStoppingPlace,
                   double arrivalPosition, const std::vector& types, const std::vector& modes,
                   const std::vector& lines);
 
     /**@brief parameter constructor for person junction->junction
-     * @param[in] viewNet view in which this PersonTrip is placed
+     * @param[in] net Network in which this PersonTrip is placed
      * @param[in] personParent person parent
      * @param[in] fromJunction from junction
      * @param[in] toJunction to junction
diff -Nru sumo-1.17.0/src/netedit/elements/demand/GNERide.cpp sumo-1.18.0/src/netedit/elements/demand/GNERide.cpp
--- sumo-1.17.0/src/netedit/elements/demand/GNERide.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/demand/GNERide.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -51,11 +51,11 @@
 }
 
 
-GNERide::GNERide(GNENet* net, GNEDemandElement* personParent, GNEEdge* fromEdge, GNEAdditional* toBusStop,
+GNERide::GNERide(bool isTrain, GNENet* net, GNEDemandElement* personParent, GNEEdge* fromEdge, GNEAdditional* toBusStop,
                  double arrivalPosition, const std::vector& lines) :
-    GNEDemandElement(personParent, net, GLO_RIDE, GNE_TAG_RIDE_BUSSTOP, GUIIconSubSys::getIcon(GUIIcon::RIDE_BUSSTOP),
-                     GNEPathManager::PathElement::Options::DEMAND_ELEMENT,
-{}, {fromEdge}, {}, {toBusStop}, {personParent}, {}),
+    GNEDemandElement(personParent, net, GLO_RIDE, isTrain ? GNE_TAG_RIDE_TRAINSTOP : GNE_TAG_RIDE_BUSSTOP,
+                     GUIIconSubSys::getIcon(isTrain ? GUIIcon::RIDE_TRAINSTOP : GUIIcon::RIDE_BUSSTOP),
+                     GNEPathManager::PathElement::Options::DEMAND_ELEMENT, {}, {fromEdge}, {}, {toBusStop}, {personParent}, {}),
 myArrivalPosition(arrivalPosition),
 myLines(lines) {
 }
@@ -118,12 +118,17 @@
     }
     // write to depending if personplan ends in a busStop
     if (getParentAdditionals().size() > 0) {
-        device.writeAttr(SUMO_ATTR_BUS_STOP, getParentAdditionals().back()->getID());
+        if (getParentAdditionals().back()->getTagProperty().getTag() == SUMO_TAG_BUS_STOP) {
+            device.writeAttr(SUMO_ATTR_BUS_STOP, getParentAdditionals().back()->getID());
+        } else {
+            device.writeAttr(SUMO_ATTR_TRAIN_STOP, getParentAdditionals().back()->getID());
+        }
     } else {
         device.writeAttr(SUMO_ATTR_TO, getParentEdges().back()->getID());
     }
     // avoid write arrival positions in ride to busStop
-    if ((myTagProperty.getTag() != GNE_TAG_RIDE_BUSSTOP) && (myArrivalPosition > 0)) {
+    if ((myTagProperty.getTag() != GNE_TAG_RIDE_BUSSTOP) && (myTagProperty.getTag() != GNE_TAG_RIDE_TRAINSTOP) &&
+            (myArrivalPosition > 0)) {
         device.writeAttr(SUMO_ATTR_ARRIVALPOS, myArrivalPosition);
     }
     // write lines
@@ -287,6 +292,7 @@
         case SUMO_ATTR_TO:
             return getParentEdges().back()->getID();
         case GNE_ATTR_TO_BUSSTOP:
+        case GNE_ATTR_TO_TRAINSTOP:
             return getParentAdditionals().back()->getID();
         // specific person plan attributes
         case SUMO_ATTR_LINES:
@@ -384,6 +390,23 @@
             }
             break;
         }
+        case GNE_ATTR_TO_TRAINSTOP: {
+            // get next person plan
+            GNEDemandElement* nextPersonPlan = getParentDemandElements().at(0)->getNextChildDemandElement(this);
+            // continue depending of nextPersonPlan
+            if (nextPersonPlan) {
+                // obtain trainStop
+                const GNEAdditional* trainStop = myNet->getAttributeCarriers()->retrieveAdditional(SUMO_TAG_TRAIN_STOP, value);
+                // change from attribute using edge ID
+                undoList->begin(myTagProperty.getGUIIcon(), "Change from attribute of next personPlan");
+                nextPersonPlan->setAttribute(SUMO_ATTR_FROM, trainStop->getParentLanes().front()->getParentEdge()->getID(), undoList);
+                undoList->changeAttribute(new GNEChange_Attribute(this, key, value));
+                undoList->end();
+            } else {
+                undoList->changeAttribute(new GNEChange_Attribute(this, key, value));
+            }
+            break;
+        }
         default:
             throw InvalidArgument(getTagStr() + " doesn't have an attribute of type '" + toString(key) + "'");
     }
@@ -399,6 +422,8 @@
             return SUMOXMLDefinitions::isValidNetID(value) && (myNet->getAttributeCarriers()->retrieveEdge(value, false) != nullptr);
         case GNE_ATTR_TO_BUSSTOP:
             return (myNet->getAttributeCarriers()->retrieveAdditional(SUMO_TAG_BUS_STOP, value, false) != nullptr);
+        case GNE_ATTR_TO_TRAINSTOP:
+            return (myNet->getAttributeCarriers()->retrieveAdditional(SUMO_TAG_TRAIN_STOP, value, false) != nullptr);
         // specific person plan attributes
         case SUMO_ATTR_LINES:
             return canParse >(value);
@@ -454,7 +479,7 @@
 GNERide::getHierarchyName() const {
     if (myTagProperty.getTag() == GNE_TAG_RIDE_EDGE) {
         return "ride: " + getParentEdges().front()->getID() + " -> " + getParentEdges().back()->getID();
-    } else if (myTagProperty.getTag() == GNE_TAG_RIDE_BUSSTOP) {
+    } else if ((myTagProperty.getTag() == GNE_TAG_RIDE_BUSSTOP) || (myTagProperty.getTag() == GNE_TAG_RIDE_TRAINSTOP)) {
         return "ride: " + getParentEdges().front()->getID() + " -> " + getParentAdditionals().back()->getID();
     } else {
         throw ("Invalid ride tag");
@@ -488,7 +513,12 @@
             computePathElement();
             break;
         case GNE_ATTR_TO_BUSSTOP:
-            replaceAdditionalParent(SUMO_TAG_BUS_STOP, value);
+            replaceFirstParentAdditional(SUMO_TAG_BUS_STOP, value);
+            // compute ride
+            computePathElement();
+            break;
+        case GNE_ATTR_TO_TRAINSTOP:
+            replaceFirstParentAdditional(SUMO_TAG_TRAIN_STOP, value);
             // compute ride
             computePathElement();
             break;
diff -Nru sumo-1.17.0/src/netedit/elements/demand/GNERide.h sumo-1.18.0/src/netedit/elements/demand/GNERide.h
--- sumo-1.17.0/src/netedit/elements/demand/GNERide.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/demand/GNERide.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -40,7 +40,7 @@
     GNERide(SumoXMLTag tag, GNENet* net);
 
     /**@brief parameter constructor for person edge->edge
-     * @param[in] viewNet view in which this Ride is placed
+     * @param[in] net Network in which this Ride is placed
      * @param[in] personParent person parent
      * @param[in] fromEdge from edge
      * @param[in] toEdge to edge
@@ -52,7 +52,7 @@
             double arrivalPosition, const std::vector& lines);
 
     /**@brief parameter constructor for person edge->busStop
-     * @param[in] viewNet view in which this Ride is placed
+     * @param[in] net Network in which this Ride is placed
      * @param[in] personParent person parent
      * @param[in] fromEdge from edge
      * @param[in] toBusStop to busStop
@@ -60,7 +60,7 @@
      * @param[in] types list of possible vehicle types to take
      * @param[in] lines list of lines
      */
-    GNERide(GNENet* net, GNEDemandElement* personParent, GNEEdge* fromEdge, GNEAdditional* toBusStop,
+    GNERide(bool isTrain, GNENet* net, GNEDemandElement* personParent, GNEEdge* fromEdge, GNEAdditional* toBusStop,
             double arrivalPosition, const std::vector& lines);
 
     /// @brief destructor
diff -Nru sumo-1.17.0/src/netedit/elements/demand/GNERoute.cpp sumo-1.18.0/src/netedit/elements/demand/GNERoute.cpp
--- sumo-1.17.0/src/netedit/elements/demand/GNERoute.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/demand/GNERoute.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/elements/demand/GNERoute.h sumo-1.18.0/src/netedit/elements/demand/GNERoute.h
--- sumo-1.17.0/src/netedit/elements/demand/GNERoute.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/demand/GNERoute.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/elements/demand/GNERouteHandler.cpp sumo-1.18.0/src/netedit/elements/demand/GNERouteHandler.cpp
--- sumo-1.17.0/src/netedit/elements/demand/GNERouteHandler.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/demand/GNERouteHandler.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -61,14 +61,12 @@
 
 void
 GNERouteHandler::buildVType(const CommonXMLStructure::SumoBaseObject* sumoBaseObject, const SUMOVTypeParameter& vTypeParameter) {
-    // check vTypeDistribution
-    const bool vTypeDistribution = sumoBaseObject->getParentSumoBaseObject() && (sumoBaseObject->getParentSumoBaseObject()->getTag() == SUMO_TAG_VTYPE_DISTRIBUTION);
     // check if loaded type is a default type
     if (DEFAULT_VTYPES.count(vTypeParameter.id) > 0) {
         // overwrite default vehicle type
         GNEVType::overwriteVType(myNet->getAttributeCarriers()->retrieveDemandElement(SUMO_TAG_VTYPE, vTypeParameter.id, false), vTypeParameter, myNet->getViewNet()->getUndoList());
     } else if (!checkDuplicatedDemandElement(SUMO_TAG_VTYPE, vTypeParameter.id)) {
-        writeError(TL("There is another ") + toString(SUMO_TAG_VTYPE) + TL(" with the same ID='") + vTypeParameter.id + "'.");
+        writeError(TLF("There is another % with the same ID='%'.", toString(SUMO_TAG_VTYPE), vTypeParameter.id));
     } else {
         // create vType/pType using myCurrentVType
         GNEDemandElement* vType = new GNEVType(myNet, vTypeParameter);
@@ -76,16 +74,9 @@
             myNet->getViewNet()->getUndoList()->begin(GUIIcon::VTYPE, TL("add ") + vType->getTagStr() + " '" + vTypeParameter.id + "'");
             overwriteDemandElement();
             myNet->getViewNet()->getUndoList()->add(new GNEChange_DemandElement(vType, true), true);
-            // check if place this vType within a vTypeDistribution
-            if (vTypeDistribution) {
-                vType->setAttribute(GNE_ATTR_VTYPE_DISTRIBUTION, sumoBaseObject->getParentSumoBaseObject()->getStringAttribute(SUMO_ATTR_ID), myNet->getViewNet()->getUndoList());
-            }
             myNet->getViewNet()->getUndoList()->end();
         } else {
             myNet->getAttributeCarriers()->insertDemandElement(vType);
-            if (vTypeDistribution) {
-                vType->setAttribute(GNE_ATTR_VTYPE_DISTRIBUTION, sumoBaseObject->getParentSumoBaseObject()->getStringAttribute(SUMO_ATTR_ID));
-            }
             vType->incRef("buildVType");
         }
     }
@@ -97,25 +88,25 @@
                                         const int deterministic, const std::vector& vTypes) {
     // first check conditions
     if (!checkDuplicatedDemandElement(SUMO_TAG_VTYPE_DISTRIBUTION, id)) {
-        writeError(TL("There is another ") + toString(SUMO_TAG_VTYPE) + TL(" with the same ID='") + id + "'.");
+        writeError(TLF("There is another % with the same ID='%'.", toString(SUMO_TAG_VTYPE)));
     } else if (vTypes.empty() && sumoBaseObject->getSumoBaseObjectChildren().empty()) {
-        writeError(toString(SUMO_TAG_VTYPE_DISTRIBUTION) + TL(" need at least one ") + toString(SUMO_TAG_VTYPE));
+        writeError(TLF("% needs at least one %", toString(SUMO_TAG_VTYPE_DISTRIBUTION), toString(SUMO_TAG_VTYPE)));
     } else {
         bool checkVTypesOK = true;
         // check vTypes
         for (const auto& vType : vTypes) {
             if (myNet->getAttributeCarriers()->retrieveDemandElement(SUMO_TAG_VTYPE, vType, false) == nullptr) {
-                writeError(toString(SUMO_TAG_VTYPE) + TL(" with id '") + vType + TL("' doesn't exist in ") + toString(SUMO_TAG_VTYPE_DISTRIBUTION) + " '" + id + "'");
+                writeError(TLF("% with id '%' doesn't exist in % '%'", toString(SUMO_TAG_VTYPE), vType, toString(SUMO_TAG_VTYPE_DISTRIBUTION), id));
                 checkVTypesOK = false;
             }
         }
         // now check childrens
         for (const auto& child : sumoBaseObject->getSumoBaseObjectChildren()) {
             if (child->hasStringAttribute(SUMO_ATTR_ID) == false) {
-                writeError(TL("Invalid definition for ") + toString(SUMO_TAG_VTYPE) + TL(" in ") + toString(SUMO_TAG_VTYPE_DISTRIBUTION) + " '" + id + "'");
+                writeError(TLF("Invalid definition for % in % '%'", toString(SUMO_TAG_VTYPE), toString(SUMO_TAG_VTYPE_DISTRIBUTION), id));
                 checkVTypesOK = false;
             } else if (myNet->getAttributeCarriers()->retrieveDemandElement(SUMO_TAG_VTYPE, child->getStringAttribute(SUMO_ATTR_ID), false) != nullptr) {
-                writeError(toString(SUMO_TAG_VTYPE) + TL(" with id '") + child->getStringAttribute(SUMO_ATTR_ID) + TL("' cannot be created in ") + toString(SUMO_TAG_VTYPE_DISTRIBUTION) + " '" + id + "'");
+                writeError(TLF("% with id '%' cannot be created in % '%'", toString(SUMO_TAG_VTYPE), child->getStringAttribute(SUMO_ATTR_ID), toString(SUMO_TAG_VTYPE_DISTRIBUTION), id));
                 checkVTypesOK = false;
             }
         }
@@ -126,19 +117,17 @@
                 myNet->getViewNet()->getUndoList()->begin(GUIIcon::VTYPEDISTRIBUTION, TL("add ") + vTypeDistribution->getTagStr() + " '" + id + "'");
                 overwriteDemandElement();
                 myNet->getViewNet()->getUndoList()->add(new GNEChange_DemandElement(vTypeDistribution, true), true);
-                // set this vTypeDistribution as parent of the other vTypes
-                for (const auto& vTypeID : vTypes) {
-                    auto vType = myNet->getAttributeCarriers()->retrieveDemandElement(SUMO_TAG_VTYPE, vTypeID);
-                    vType->setAttribute(GNE_ATTR_VTYPE_DISTRIBUTION, id, myNet->getViewNet()->getUndoList());
+                // iterate over all children and set attribute
+                for (const auto &typeID : vTypes) {
+                    myNet->getAttributeCarriers()->retrieveDemandElement(SUMO_TAG_VTYPE, typeID)->setAttribute(GNE_ATTR_VTYPE_DISTRIBUTION, id, myNet->getViewNet()->getUndoList());
                 }
                 myNet->getViewNet()->getUndoList()->end();
             } else {
                 myNet->getAttributeCarriers()->insertDemandElement(vTypeDistribution);
                 vTypeDistribution->incRef("buildVType");
-                for (const auto& vTypeID : vTypes) {
-                    auto vType = myNet->getAttributeCarriers()->retrieveDemandElement(SUMO_TAG_VTYPE, vTypeID);
-                    vType->setAttribute(GNE_ATTR_VTYPE_DISTRIBUTION, id);
-                }
+
+                /* FALTA */
+
             }
         }
     }
@@ -153,7 +142,7 @@
     const auto edges = parseEdges(SUMO_TAG_ROUTE, edgeIDs);
     // check conditions
     if (!checkDuplicatedDemandElement(SUMO_TAG_ROUTE, id)) {
-        writeError(TL("There is another ") + toString(SUMO_TAG_ROUTE) + TL(" with the same ID='") + id + "'.");
+        writeError(TLF("There is another % with the same ID='%'.", toString(SUMO_TAG_ROUTE), id));
     } else if (edges.size() > 0) {
         // create GNERoute
         GNEDemandElement* route = new GNERoute(myNet, id, vClass, edges, color, repeat, cycleTime, routeParameters);
@@ -186,20 +175,20 @@
     // check if ID is duplicated
     if ((edges.size() > 0) && !isVehicleIdDuplicated(vehicleParameters.id)) {
         // obtain routes and vtypes
-        GNEDemandElement* vType = myNet->getAttributeCarriers()->retrieveDemandElement(SUMO_TAG_VTYPE, vehicleParameters.vtypeid, false);
-        if (vType == nullptr) {
-            if (myNet->getAttributeCarriers()->retrieveDemandElement(SUMO_TAG_VTYPE_DISTRIBUTION, vehicleParameters.vtypeid, false)) {
-                WRITE_WARNING(TL("VType distributions currently unsupported in netedit"));
-            } else {
-                writeError(TL("Invalid vehicle type '") + vehicleParameters.vtypeid + TL("' used in ") + toString(vehicleParameters.tag) + " '" + vehicleParameters.id + "'.");
-            }
+        GNEDemandElement* type = myNet->getAttributeCarriers()->retrieveDemandElement(SUMO_TAG_VTYPE, vehicleParameters.vtypeid, false);
+        // try to parse type distribution
+        if (type == nullptr) {
+            type = myNet->getAttributeCarriers()->retrieveDemandElement(SUMO_TAG_VTYPE_DISTRIBUTION, vehicleParameters.vtypeid, false);
+        }
+        if (type == nullptr) {
+            writeError(TLF("Invalid vehicle type '%' used in % '%'.", vehicleParameters.vtypeid, toString(vehicleParameters.tag), vehicleParameters.id));
         } else if (vehicleParameters.wasSet(VEHPARS_DEPARTLANE_SET) && (vehicleParameters.departLaneProcedure == DepartLaneDefinition::GIVEN) && ((int)edges.front()->getLanes().size() < vehicleParameters.departLane)) {
-            writeError(("Invalid ") + toString(SUMO_ATTR_DEPARTLANE) + TL(" used in ") + toString(vehicleParameters.tag) + " '" + vehicleParameters.id + "'. " + toString(vehicleParameters.departLane) + " is greater than number of lanes");
-        } else if (vehicleParameters.wasSet(VEHPARS_DEPARTSPEED_SET) && (vehicleParameters.departSpeedProcedure == DepartSpeedDefinition::GIVEN) && (vType->getAttributeDouble(SUMO_ATTR_MAXSPEED) < vehicleParameters.departSpeed)) {
-            writeError(("Invalid ") + toString(SUMO_ATTR_DEPARTSPEED) + TL(" used in ") + toString(vehicleParameters.tag) + " '" + vehicleParameters.id + "'. " + toString(vehicleParameters.departSpeed) + " is greater than vType" + toString(SUMO_ATTR_MAXSPEED));
+            writeError(TLF("Invalid % used in % '%'. % is greater than number of lanes", toString(SUMO_ATTR_DEPARTLANE), toString(vehicleParameters.tag), vehicleParameters.id, toString(vehicleParameters.departLane)));
+        } else if (vehicleParameters.wasSet(VEHPARS_DEPARTSPEED_SET) && (vehicleParameters.departSpeedProcedure == DepartSpeedDefinition::GIVEN) && (type->getAttributeDouble(SUMO_ATTR_MAXSPEED) < vehicleParameters.departSpeed)) {
+            writeError(TLF("Invalid % used in % '%'. % is greater than type %", toString(SUMO_ATTR_DEPARTSPEED), toString(vehicleParameters.tag), vehicleParameters.id, toString(vehicleParameters.departSpeed), toString(SUMO_ATTR_MAXSPEED)));
         } else {
             // create vehicle using vehicleParameters
-            GNEDemandElement* vehicle = new GNEVehicle(vehicleTag, myNet, vType, vehicleParameters);
+            GNEDemandElement* vehicle = new GNEVehicle(vehicleTag, myNet, type, vehicleParameters);
             // create embedded route
             GNEDemandElement* route = new GNERoute(myNet, vehicle, edges, color, repeat, cycleTime, routeParameters);
             if (myAllowUndoRedo) {
@@ -211,7 +200,7 @@
             } else {
                 myNet->getAttributeCarriers()->insertDemandElement(vehicle);
                 myNet->getAttributeCarriers()->insertDemandElement(route);
-                vType->addChildElement(vehicle);
+                type->addChildElement(vehicle);
                 vehicle->addChildElement(route);
                 for (const auto& edge : edges) {
                     edge->addChildElement(route);
@@ -238,23 +227,23 @@
     // first check if ID is duplicated
     if (!isVehicleIdDuplicated(vehicleParameters.id)) {
         // obtain routes and vtypes
-        GNEDemandElement* vType = myNet->getAttributeCarriers()->retrieveDemandElement(SUMO_TAG_VTYPE, vehicleParameters.vtypeid, false);
+        GNEDemandElement* type = myNet->getAttributeCarriers()->retrieveDemandElement(SUMO_TAG_VTYPE, vehicleParameters.vtypeid, false);
         GNEDemandElement* route = myNet->getAttributeCarriers()->retrieveDemandElement(SUMO_TAG_ROUTE, vehicleParameters.routeid, false);
-        if (vType == nullptr) {
-            if (myNet->getAttributeCarriers()->retrieveDemandElement(SUMO_TAG_VTYPE_DISTRIBUTION, vehicleParameters.vtypeid, false)) {
-                WRITE_WARNING(TL("VType distributions currently unsupported in netedit"));
-            } else {
-                writeError(TL("Invalid vehicle type '") + vehicleParameters.vtypeid + TL("' used in ") + toString(vehicleParameters.tag) + " '" + vehicleParameters.id + "'.");
-            }
+        // try to parse type distribution
+        if (type == nullptr) {
+            type = myNet->getAttributeCarriers()->retrieveDemandElement(SUMO_TAG_VTYPE_DISTRIBUTION, vehicleParameters.vtypeid, false);
+        }
+        if (type == nullptr) {
+            writeError(TLF("Invalid vehicle type '%' used in % '%'.", vehicleParameters.vtypeid, toString(vehicleParameters.tag), vehicleParameters.id));
         } else if (route == nullptr) {
-            writeError(TL("Invalid route '") + vehicleParameters.routeid + TL("' used in ") + toString(vehicleParameters.tag) + " '" + vehicleParameters.id + "'.");
+            writeError(TLF("Invalid route '%' used in % '%'.", vehicleParameters.routeid, toString(vehicleParameters.tag), vehicleParameters.id));
         } else if (vehicleParameters.wasSet(VEHPARS_DEPARTLANE_SET) && (vehicleParameters.departLaneProcedure == DepartLaneDefinition::GIVEN) && ((int)route->getParentEdges().front()->getLanes().size() < vehicleParameters.departLane)) {
-            writeError(TL("Invalid ") + toString(SUMO_ATTR_DEPARTLANE) + TL(" used in ") + toString(vehicleParameters.tag) + " '" + vehicleParameters.id + "'. " + toString(vehicleParameters.departLane) + " is greater than number of lanes");
-        } else if (vehicleParameters.wasSet(VEHPARS_DEPARTSPEED_SET) && (vehicleParameters.departSpeedProcedure == DepartSpeedDefinition::GIVEN) && (vType->getAttributeDouble(SUMO_ATTR_MAXSPEED) < vehicleParameters.departSpeed)) {
-            writeError(TL("Invalid ") + toString(SUMO_ATTR_DEPARTSPEED) + TL(" used in ") + toString(vehicleParameters.tag) + " '" + vehicleParameters.id + "'. " + toString(vehicleParameters.departSpeed) + " is greater than vType" + toString(SUMO_ATTR_MAXSPEED));
+            writeError(TLF("Invalid % used in % '%'. % is greater than number of lanes", toString(SUMO_ATTR_DEPARTLANE), toString(vehicleParameters.tag), vehicleParameters.id, toString(vehicleParameters.departLane)));
+        } else if (vehicleParameters.wasSet(VEHPARS_DEPARTSPEED_SET) && (vehicleParameters.departSpeedProcedure == DepartSpeedDefinition::GIVEN) && (type->getAttributeDouble(SUMO_ATTR_MAXSPEED) < vehicleParameters.departSpeed)) {
+            writeError(TLF("Invalid % used in % '%'. % is greater than type %", toString(SUMO_ATTR_DEPARTSPEED), toString(vehicleParameters.tag), vehicleParameters.id, toString(vehicleParameters.departSpeed), toString(SUMO_ATTR_MAXSPEED)));
         } else {
             // create vehicle using vehicleParameters
-            GNEDemandElement* vehicle = new GNEVehicle(SUMO_TAG_VEHICLE, myNet, vType, route, vehicleParameters);
+            GNEDemandElement* vehicle = new GNEVehicle(SUMO_TAG_VEHICLE, myNet, type, route, vehicleParameters);
             if (myAllowUndoRedo) {
                 myNet->getViewNet()->getUndoList()->begin(vehicle->getTagProperty().getGUIIcon(), TL("add ") + vehicle->getTagStr() + " '" + vehicleParameters.id + "'");
                 overwriteDemandElement();
@@ -262,8 +251,8 @@
                 myNet->getViewNet()->getUndoList()->end();
             } else {
                 myNet->getAttributeCarriers()->insertDemandElement(vehicle);
-                // set vehicle as child of vType and Route
-                vType->addChildElement(vehicle);
+                // set vehicle as child of type and Route
+                type->addChildElement(vehicle);
                 route->addChildElement(vehicle);
                 vehicle->incRef("buildVehicleOverRoute");
             }
@@ -279,23 +268,23 @@
     // first check if ID is duplicated
     if (!isVehicleIdDuplicated(vehicleParameters.id)) {
         // obtain routes and vtypes
-        GNEDemandElement* vType = myNet->getAttributeCarriers()->retrieveDemandElement(SUMO_TAG_VTYPE, vehicleParameters.vtypeid, false);
+        GNEDemandElement* type = myNet->getAttributeCarriers()->retrieveDemandElement(SUMO_TAG_VTYPE, vehicleParameters.vtypeid, false);
         GNEDemandElement* route = myNet->getAttributeCarriers()->retrieveDemandElement(SUMO_TAG_ROUTE, vehicleParameters.routeid, false);
-        if (vType == nullptr) {
-            if (myNet->getAttributeCarriers()->retrieveDemandElement(SUMO_TAG_VTYPE_DISTRIBUTION, vehicleParameters.vtypeid, false)) {
-                WRITE_WARNING(TL("VType distributions currently unsupported in netedit"));
-            } else {
-                writeError(TL("Invalid vehicle type '") + vehicleParameters.vtypeid + TL("' used in ") + toString(vehicleParameters.tag) + " '" + vehicleParameters.id + "'.");
-            }
+        // try to parse type distribution
+        if (type == nullptr) {
+            type = myNet->getAttributeCarriers()->retrieveDemandElement(SUMO_TAG_VTYPE_DISTRIBUTION, vehicleParameters.vtypeid, false);
+        }
+        if (type == nullptr) {
+            writeError(TLF("Invalid vehicle type '%' used in % '%'.", vehicleParameters.vtypeid, toString(vehicleParameters.tag), vehicleParameters.id));
         } else if (route == nullptr) {
-            writeError(TL("Invalid route '") + vehicleParameters.routeid + TL("' used in ") + toString(vehicleParameters.tag) + " '" + vehicleParameters.id + "'.");
+            writeError(TLF("Invalid route '%' used in % '%'.", vehicleParameters.routeid, toString(vehicleParameters.tag), vehicleParameters.id));
         } else if (vehicleParameters.wasSet(VEHPARS_DEPARTLANE_SET) && (vehicleParameters.departLaneProcedure == DepartLaneDefinition::GIVEN) && ((int)route->getParentEdges().front()->getLanes().size() < vehicleParameters.departLane)) {
-            writeError(TL("Invalid ") + toString(SUMO_ATTR_DEPARTLANE) + TL(" used in ") + toString(vehicleParameters.tag) + " '" + vehicleParameters.id + "'. " + toString(vehicleParameters.departLane) + TL(" is greater than number of lanes"));
-        } else if (vehicleParameters.wasSet(VEHPARS_DEPARTSPEED_SET) && (vehicleParameters.departSpeedProcedure == DepartSpeedDefinition::GIVEN) && (vType->getAttributeDouble(SUMO_ATTR_MAXSPEED) < vehicleParameters.departSpeed)) {
-            writeError(TL("Invalid ") + toString(SUMO_ATTR_DEPARTSPEED) + TL(" used in ") + toString(vehicleParameters.tag) + " '" + vehicleParameters.id + "'. " + toString(vehicleParameters.departSpeed) + TL(" is greater than vType") + toString(SUMO_ATTR_MAXSPEED));
+            writeError(TLF("Invalid % used in % '%'. % is greater than number of lanes", toString(SUMO_ATTR_DEPARTLANE), toString(vehicleParameters.tag), vehicleParameters.id, toString(vehicleParameters.departLane)));
+        } else if (vehicleParameters.wasSet(VEHPARS_DEPARTSPEED_SET) && (vehicleParameters.departSpeedProcedure == DepartSpeedDefinition::GIVEN) && (type->getAttributeDouble(SUMO_ATTR_MAXSPEED) < vehicleParameters.departSpeed)) {
+            writeError(TLF("Invalid % used in % '%'. % is greater than type %", toString(SUMO_ATTR_DEPARTSPEED), toString(vehicleParameters.tag), vehicleParameters.id, toString(vehicleParameters.departSpeed), toString(SUMO_ATTR_MAXSPEED)));
         } else {
             // create flow or trips using vehicleParameters
-            GNEDemandElement* flow = new GNEVehicle(GNE_TAG_FLOW_ROUTE, myNet, vType, route, vehicleParameters);
+            GNEDemandElement* flow = new GNEVehicle(GNE_TAG_FLOW_ROUTE, myNet, type, route, vehicleParameters);
             if (myAllowUndoRedo) {
                 myNet->getViewNet()->getUndoList()->begin(flow->getTagProperty().getGUIIcon(), TL("add ") + flow->getTagStr() + " '" + vehicleParameters.id + "'");
                 overwriteDemandElement();
@@ -303,8 +292,8 @@
                 myNet->getViewNet()->getUndoList()->end();
             } else {
                 myNet->getAttributeCarriers()->insertDemandElement(flow);
-                // set flow as child of vType and Route
-                vType->addChildElement(flow);
+                // set flow as child of type and Route
+                type->addChildElement(flow);
                 route->addChildElement(flow);
                 flow->incRef("buildFlowOverRoute");
             }
@@ -328,20 +317,20 @@
     // check if exist another vehicle with the same ID (note: Vehicles, Flows and Trips share namespace)
     if (fromEdge && toEdge && !isVehicleIdDuplicated(vehicleParameters.id) && isViaAttributeValid(vehicleParameters.via)) {
         // obtain  vtypes
-        GNEDemandElement* vType = myNet->getAttributeCarriers()->retrieveDemandElement(SUMO_TAG_VTYPE, vehicleParameters.vtypeid, false);
-        if (vType == nullptr) {
-            if (myNet->getAttributeCarriers()->retrieveDemandElement(SUMO_TAG_VTYPE_DISTRIBUTION, vehicleParameters.vtypeid, false)) {
-                WRITE_WARNING(TL("VType distributions currently unsupported in netedit"));
-            } else {
-                writeError(TL("Invalid vehicle type '") + vehicleParameters.vtypeid + TL("' used in ") + toString(vehicleParameters.tag) + " '" + vehicleParameters.id + "'.");
-            }
+        GNEDemandElement* type = myNet->getAttributeCarriers()->retrieveDemandElement(SUMO_TAG_VTYPE, vehicleParameters.vtypeid, false);
+        // try to parse type distribution
+        if (type == nullptr) {
+            type = myNet->getAttributeCarriers()->retrieveDemandElement(SUMO_TAG_VTYPE_DISTRIBUTION, vehicleParameters.vtypeid, false);
+        }
+        if (type == nullptr) {
+            writeError(TLF("Invalid vehicle type '%' used in % '%'.", vehicleParameters.vtypeid, toString(vehicleParameters.tag), vehicleParameters.id));
         } else if (vehicleParameters.wasSet(VEHPARS_DEPARTLANE_SET) && ((vehicleParameters.departLaneProcedure == DepartLaneDefinition::GIVEN)) && ((int)fromEdge->getLanes().size() < vehicleParameters.departLane)) {
-            writeError(TL("Invalid ") + toString(SUMO_ATTR_DEPARTLANE) + TL(" used in ") + toString(vehicleParameters.tag) + " '" + vehicleParameters.id + "'. " + toString(vehicleParameters.departLane) + " is greater than number of lanes");
-        } else if (vehicleParameters.wasSet(VEHPARS_DEPARTSPEED_SET) && (vehicleParameters.departSpeedProcedure == DepartSpeedDefinition::GIVEN) && (vType->getAttributeDouble(SUMO_ATTR_MAXSPEED) < vehicleParameters.departSpeed)) {
-            writeError(TL("Invalid ") + toString(SUMO_ATTR_DEPARTSPEED) + TL(" used in ") + toString(vehicleParameters.tag) + " '" + vehicleParameters.id + "'. " + toString(vehicleParameters.departSpeed) + " is greater than vType" + toString(SUMO_ATTR_MAXSPEED));
+            writeError(TLF("Invalid % used in % '%'. % is greater than number of lanes", toString(SUMO_ATTR_DEPARTLANE), toString(vehicleParameters.tag), vehicleParameters.id, toString(vehicleParameters.departLane)));
+        } else if (vehicleParameters.wasSet(VEHPARS_DEPARTSPEED_SET) && (vehicleParameters.departSpeedProcedure == DepartSpeedDefinition::GIVEN) && (type->getAttributeDouble(SUMO_ATTR_MAXSPEED) < vehicleParameters.departSpeed)) {
+            writeError(TLF("Invalid % used in % '%'. % is greater than type %", toString(SUMO_ATTR_DEPARTSPEED), toString(vehicleParameters.tag), vehicleParameters.id, toString(vehicleParameters.departSpeed), toString(SUMO_ATTR_MAXSPEED)));
         } else {
             // create trip or flow using tripParameters
-            GNEDemandElement* trip = new GNEVehicle(SUMO_TAG_TRIP, myNet, vType, fromEdge, toEdge, vehicleParameters);
+            GNEDemandElement* trip = new GNEVehicle(SUMO_TAG_TRIP, myNet, type, fromEdge, toEdge, vehicleParameters);
             if (myAllowUndoRedo) {
                 myNet->getViewNet()->getUndoList()->begin(trip->getTagProperty().getGUIIcon(), TL("add ") + trip->getTagStr() + " '" + vehicleParameters.id + "'");
                 overwriteDemandElement();
@@ -349,8 +338,8 @@
                 myNet->getViewNet()->getUndoList()->end();
             } else {
                 myNet->getAttributeCarriers()->insertDemandElement(trip);
-                // set vehicle as child of vType
-                vType->addChildElement(trip);
+                // set vehicle as child of type
+                type->addChildElement(trip);
                 trip->incRef("buildTrip");
                 // add reference in all edges
                 fromEdge->addChildElement(trip);
@@ -372,20 +361,20 @@
     // check if exist another vehicle with the same ID (note: Vehicles, Flows and Trips share namespace)
     if (fromJunction && toJunction && !isVehicleIdDuplicated(vehicleParameters.id)) {
         // obtain  vtypes
-        GNEDemandElement* vType = myNet->getAttributeCarriers()->retrieveDemandElement(SUMO_TAG_VTYPE, vehicleParameters.vtypeid, false);
-        if (vType == nullptr) {
-            if (myNet->getAttributeCarriers()->retrieveDemandElement(SUMO_TAG_VTYPE_DISTRIBUTION, vehicleParameters.vtypeid, false)) {
-                WRITE_WARNING(TL("VType distributions currently unsupported in netedit"));
-            } else {
-                writeError(TL("Invalid vehicle type '") + vehicleParameters.vtypeid + TL("' used in ") + toString(vehicleParameters.tag) + " '" + vehicleParameters.id + "'.");
-            }
+        GNEDemandElement* type = myNet->getAttributeCarriers()->retrieveDemandElement(SUMO_TAG_VTYPE, vehicleParameters.vtypeid, false);
+        // try to parse type distribution
+        if (type == nullptr) {
+            type = myNet->getAttributeCarriers()->retrieveDemandElement(SUMO_TAG_VTYPE_DISTRIBUTION, vehicleParameters.vtypeid, false);
+        }
+        if (type == nullptr) {
+            writeError(TLF("Invalid vehicle type '%' used in % '%'.", vehicleParameters.vtypeid, toString(vehicleParameters.tag), vehicleParameters.id));
         } else if (vehicleParameters.wasSet(VEHPARS_DEPARTLANE_SET) && ((vehicleParameters.departLaneProcedure == DepartLaneDefinition::GIVEN)) && (vehicleParameters.departLane > 0)) {
-            writeError(TL("Invalid ") + toString(SUMO_ATTR_DEPARTLANE) + TL(" used in ") + toString(vehicleParameters.tag) + " '" + vehicleParameters.id + "'. " + toString(vehicleParameters.departLane) + " is greater than number of lanes");
-        } else if (vehicleParameters.wasSet(VEHPARS_DEPARTSPEED_SET) && (vehicleParameters.departSpeedProcedure == DepartSpeedDefinition::GIVEN) && (vType->getAttributeDouble(SUMO_ATTR_MAXSPEED) < vehicleParameters.departSpeed)) {
-            writeError(TL("Invalid ") + toString(SUMO_ATTR_DEPARTSPEED) + TL(" used in ") + toString(vehicleParameters.tag) + " '" + vehicleParameters.id + "'. " + toString(vehicleParameters.departSpeed) + " is greater than vType" + toString(SUMO_ATTR_MAXSPEED));
+            writeError(TLF("Invalid % used in % '%'. % is greater than number of lanes", toString(SUMO_ATTR_DEPARTLANE), toString(vehicleParameters.tag), vehicleParameters.id, toString(vehicleParameters.departLane)));
+        } else if (vehicleParameters.wasSet(VEHPARS_DEPARTSPEED_SET) && (vehicleParameters.departSpeedProcedure == DepartSpeedDefinition::GIVEN) && (type->getAttributeDouble(SUMO_ATTR_MAXSPEED) < vehicleParameters.departSpeed)) {
+            writeError(TLF("Invalid % used in % '%'. % is greater than type %", toString(SUMO_ATTR_DEPARTSPEED), toString(vehicleParameters.tag), vehicleParameters.id, toString(vehicleParameters.departSpeed), toString(SUMO_ATTR_MAXSPEED)));
         } else {
             // create trip using vehicleParameters
-            GNEDemandElement* flow = new GNEVehicle(GNE_TAG_TRIP_JUNCTIONS, myNet, vType, fromJunction, toJunction, vehicleParameters);
+            GNEDemandElement* flow = new GNEVehicle(GNE_TAG_TRIP_JUNCTIONS, myNet, type, fromJunction, toJunction, vehicleParameters);
             if (myAllowUndoRedo) {
                 myNet->getViewNet()->getUndoList()->begin(flow->getTagProperty().getGUIIcon(), TL("add ") + flow->getTagStr() + " '" + vehicleParameters.id + "'");
                 overwriteDemandElement();
@@ -393,8 +382,8 @@
                 myNet->getViewNet()->getUndoList()->end();
             } else {
                 myNet->getAttributeCarriers()->insertDemandElement(flow);
-                // set vehicle as child of vType
-                vType->addChildElement(flow);
+                // set vehicle as child of type
+                type->addChildElement(flow);
                 flow->incRef("buildFlow");
                 // add reference in all junctions
                 fromJunction->addChildElement(flow);
@@ -406,6 +395,51 @@
     }
 }
 
+
+void
+GNERouteHandler::buildTripTAZs(const CommonXMLStructure::SumoBaseObject* /*sumoBaseObject*/, const SUMOVehicleParameter& vehicleParameters,
+                                    const std::string& fromTAZID, const std::string& toTAZID) {
+    // parse TAZs
+    const auto fromTAZ = parseTAZ(SUMO_TAG_TRIP, fromTAZID);
+    const auto toTAZ = parseTAZ(SUMO_TAG_TRIP, toTAZID);
+    // check if exist another vehicle with the same ID (note: Vehicles, Flows and Trips share namespace)
+    if (fromTAZ && toTAZ && !isVehicleIdDuplicated(vehicleParameters.id)) {
+        // obtain  vtypes
+        GNEDemandElement* type = myNet->getAttributeCarriers()->retrieveDemandElement(SUMO_TAG_VTYPE, vehicleParameters.vtypeid, false);
+        // try to parse type distribution
+        if (type == nullptr) {
+            type = myNet->getAttributeCarriers()->retrieveDemandElement(SUMO_TAG_VTYPE_DISTRIBUTION, vehicleParameters.vtypeid, false);
+        }
+        if (type == nullptr) {
+            writeError(TLF("Invalid vehicle type '%' used in % '%'.", vehicleParameters.vtypeid, toString(vehicleParameters.tag), vehicleParameters.id));
+        } else if (vehicleParameters.wasSet(VEHPARS_DEPARTLANE_SET) && ((vehicleParameters.departLaneProcedure == DepartLaneDefinition::GIVEN)) && (vehicleParameters.departLane > 0)) {
+            writeError(TLF("Invalid % used in % '%'. % is greater than number of lanes", toString(SUMO_ATTR_DEPARTLANE), toString(vehicleParameters.tag), vehicleParameters.id, toString(vehicleParameters.departLane)));
+        } else if (vehicleParameters.wasSet(VEHPARS_DEPARTSPEED_SET) && (vehicleParameters.departSpeedProcedure == DepartSpeedDefinition::GIVEN) && (type->getAttributeDouble(SUMO_ATTR_MAXSPEED) < vehicleParameters.departSpeed)) {
+            writeError(TLF("Invalid % used in % '%'. % is greater than type %", toString(SUMO_ATTR_DEPARTSPEED), toString(vehicleParameters.tag), vehicleParameters.id, toString(vehicleParameters.departSpeed), toString(SUMO_ATTR_MAXSPEED)));
+        } else {
+            // create trip using vehicleParameters
+            GNEDemandElement* flow = new GNEVehicle(GNE_TAG_TRIP_TAZS, myNet, type, fromTAZ, toTAZ, vehicleParameters);
+            if (myAllowUndoRedo) {
+                myNet->getViewNet()->getUndoList()->begin(flow->getTagProperty().getGUIIcon(), TL("add ") + flow->getTagStr() + " '" + vehicleParameters.id + "'");
+                overwriteDemandElement();
+                myNet->getViewNet()->getUndoList()->add(new GNEChange_DemandElement(flow, true), true);
+                myNet->getViewNet()->getUndoList()->end();
+            } else {
+                myNet->getAttributeCarriers()->insertDemandElement(flow);
+                // set vehicle as child of type
+                type->addChildElement(flow);
+                flow->incRef("buildFlow");
+                // add reference in all TAZs
+                fromTAZ->addChildElement(flow);
+                toTAZ->addChildElement(flow);
+            }
+            // compute path
+            flow->computePathElement();
+        }
+    }
+}
+
+
 void
 GNERouteHandler::buildFlow(const CommonXMLStructure::SumoBaseObject* sumoBaseObject, const SUMOVehicleParameter& vehicleParameters,
                            const std::string& fromEdgeID, const std::string& toEdgeID) {
@@ -419,20 +453,20 @@
     // check if exist another vehicle with the same ID (note: Vehicles, Flows and Trips share namespace)
     if (fromEdge && toEdge && !isVehicleIdDuplicated(vehicleParameters.id) && isViaAttributeValid(vehicleParameters.via)) {
         // obtain  vtypes
-        GNEDemandElement* vType = myNet->getAttributeCarriers()->retrieveDemandElement(SUMO_TAG_VTYPE, vehicleParameters.vtypeid, false);
-        if (vType == nullptr) {
-            if (myNet->getAttributeCarriers()->retrieveDemandElement(SUMO_TAG_VTYPE_DISTRIBUTION, vehicleParameters.vtypeid, false)) {
-                WRITE_WARNING(TL("VType distributions currently unsupported in netedit"));
-            } else {
-                writeError(TL("Invalid vehicle type '") + vehicleParameters.vtypeid + TL("' used in ") + toString(vehicleParameters.tag) + " '" + vehicleParameters.id + "'.");
-            }
+        GNEDemandElement* type = myNet->getAttributeCarriers()->retrieveDemandElement(SUMO_TAG_VTYPE, vehicleParameters.vtypeid, false);
+        // try to parse type distribution
+        if (type == nullptr) {
+            type = myNet->getAttributeCarriers()->retrieveDemandElement(SUMO_TAG_VTYPE_DISTRIBUTION, vehicleParameters.vtypeid, false);
+        }
+        if (type == nullptr) {
+            writeError(TLF("Invalid vehicle type '%' used in % '%'.", vehicleParameters.vtypeid, toString(vehicleParameters.tag), vehicleParameters.id));
         } else if (vehicleParameters.wasSet(VEHPARS_DEPARTLANE_SET) && (vehicleParameters.departLaneProcedure == DepartLaneDefinition::GIVEN) && ((int)fromEdge->getLanes().size() < vehicleParameters.departLane)) {
-            writeError(TL("Invalid ") + toString(SUMO_ATTR_DEPARTLANE) + TL(" used in ") + toString(vehicleParameters.tag) + " '" + vehicleParameters.id + "'. " + toString(vehicleParameters.departLane) + " is greater than number of lanes");
-        } else if (vehicleParameters.wasSet(VEHPARS_DEPARTSPEED_SET) && (vehicleParameters.departSpeedProcedure == DepartSpeedDefinition::GIVEN) && (vType->getAttributeDouble(SUMO_ATTR_MAXSPEED) < vehicleParameters.departSpeed)) {
-            writeError(TL("Invalid ") + toString(SUMO_ATTR_DEPARTSPEED) + TL(" used in ") + toString(vehicleParameters.tag) + " '" + vehicleParameters.id + "'. " + toString(vehicleParameters.departSpeed) + " is greater than vType" + toString(SUMO_ATTR_MAXSPEED));
+            writeError(TLF("Invalid % used in % '%'. % is greater than number of lanes", toString(SUMO_ATTR_DEPARTLANE), toString(vehicleParameters.tag), vehicleParameters.id, toString(vehicleParameters.departLane)));
+        } else if (vehicleParameters.wasSet(VEHPARS_DEPARTSPEED_SET) && (vehicleParameters.departSpeedProcedure == DepartSpeedDefinition::GIVEN) && (type->getAttributeDouble(SUMO_ATTR_MAXSPEED) < vehicleParameters.departSpeed)) {
+            writeError(TLF("Invalid % used in % '%'. % is greater than type %", toString(SUMO_ATTR_DEPARTSPEED), toString(vehicleParameters.tag), vehicleParameters.id, toString(vehicleParameters.departSpeed), toString(SUMO_ATTR_MAXSPEED)));
         } else {
             // create trip or flow using tripParameters
-            GNEDemandElement* flow = new GNEVehicle(SUMO_TAG_FLOW, myNet, vType, fromEdge, toEdge, vehicleParameters);
+            GNEDemandElement* flow = new GNEVehicle(SUMO_TAG_FLOW, myNet, type, fromEdge, toEdge, vehicleParameters);
             if (myAllowUndoRedo) {
                 myNet->getViewNet()->getUndoList()->begin(flow->getTagProperty().getGUIIcon(), TL("add ") + flow->getTagStr() + " '" + vehicleParameters.id + "'");
                 overwriteDemandElement();
@@ -440,8 +474,8 @@
                 myNet->getViewNet()->getUndoList()->end();
             } else {
                 myNet->getAttributeCarriers()->insertDemandElement(flow);
-                // set vehicle as child of vType
-                vType->addChildElement(flow);
+                // set vehicle as child of type
+                type->addChildElement(flow);
                 flow->incRef("buildFlow");
                 // add reference in all edges
                 fromEdge->addChildElement(flow);
@@ -463,20 +497,20 @@
     // check if exist another vehicle with the same ID (note: Vehicles, Flows and Trips share namespace)
     if (fromJunction && toJunction && !isVehicleIdDuplicated(vehicleParameters.id)) {
         // obtain  vtypes
-        GNEDemandElement* vType = myNet->getAttributeCarriers()->retrieveDemandElement(SUMO_TAG_VTYPE, vehicleParameters.vtypeid, false);
-        if (vType == nullptr) {
-            if (myNet->getAttributeCarriers()->retrieveDemandElement(SUMO_TAG_VTYPE_DISTRIBUTION, vehicleParameters.vtypeid, false)) {
-                WRITE_WARNING(TL("VType distributions currently unsupported in netedit"));
-            } else {
-                writeError(TL("Invalid vehicle type '") + vehicleParameters.vtypeid + TL("' used in ") + toString(vehicleParameters.tag) + " '" + vehicleParameters.id + "'.");
-            }
+        GNEDemandElement* type = myNet->getAttributeCarriers()->retrieveDemandElement(SUMO_TAG_VTYPE, vehicleParameters.vtypeid, false);
+        // try to parse type distribution
+        if (type == nullptr) {
+            type = myNet->getAttributeCarriers()->retrieveDemandElement(SUMO_TAG_VTYPE_DISTRIBUTION, vehicleParameters.vtypeid, false);
+        }
+        if (type == nullptr) {
+            writeError(TLF("Invalid vehicle type '%' used in % '%'.", vehicleParameters.vtypeid, toString(vehicleParameters.tag), vehicleParameters.id));
         } else if (vehicleParameters.wasSet(VEHPARS_DEPARTLANE_SET) && ((vehicleParameters.departLaneProcedure == DepartLaneDefinition::GIVEN)) && (vehicleParameters.departLane > 0)) {
-            writeError(TL("Invalid ") + toString(SUMO_ATTR_DEPARTLANE) + TL(" used in ") + toString(vehicleParameters.tag) + " '" + vehicleParameters.id + "'. " + toString(vehicleParameters.departLane) + " is greater than number of lanes");
-        } else if (vehicleParameters.wasSet(VEHPARS_DEPARTSPEED_SET) && (vehicleParameters.departSpeedProcedure == DepartSpeedDefinition::GIVEN) && (vType->getAttributeDouble(SUMO_ATTR_MAXSPEED) < vehicleParameters.departSpeed)) {
-            writeError(TL("Invalid ") + toString(SUMO_ATTR_DEPARTSPEED) + TL(" used in ") + toString(vehicleParameters.tag) + " '" + vehicleParameters.id + "'. " + toString(vehicleParameters.departSpeed) + " is greater than vType" + toString(SUMO_ATTR_MAXSPEED));
+            writeError(TLF("Invalid % used in % '%'. % is greater than number of lanes", toString(SUMO_ATTR_DEPARTLANE), toString(vehicleParameters.tag), vehicleParameters.id, toString(vehicleParameters.departLane)));
+        } else if (vehicleParameters.wasSet(VEHPARS_DEPARTSPEED_SET) && (vehicleParameters.departSpeedProcedure == DepartSpeedDefinition::GIVEN) && (type->getAttributeDouble(SUMO_ATTR_MAXSPEED) < vehicleParameters.departSpeed)) {
+            writeError(TLF("Invalid % used in % '%'. % is greater than type %", toString(SUMO_ATTR_DEPARTSPEED), toString(vehicleParameters.tag), vehicleParameters.id, toString(vehicleParameters.departSpeed), toString(SUMO_ATTR_MAXSPEED)));
         } else {
             // create flow using vehicleParameters
-            GNEDemandElement* flow = new GNEVehicle(GNE_TAG_FLOW_JUNCTIONS, myNet, vType, fromJunction, toJunction, vehicleParameters);
+            GNEDemandElement* flow = new GNEVehicle(GNE_TAG_FLOW_JUNCTIONS, myNet, type, fromJunction, toJunction, vehicleParameters);
             if (myAllowUndoRedo) {
                 myNet->getViewNet()->getUndoList()->begin(flow->getTagProperty().getGUIIcon(), TL("add ") + flow->getTagStr() + " '" + vehicleParameters.id + "'");
                 overwriteDemandElement();
@@ -484,8 +518,8 @@
                 myNet->getViewNet()->getUndoList()->end();
             } else {
                 myNet->getAttributeCarriers()->insertDemandElement(flow);
-                // set vehicle as child of vType
-                vType->addChildElement(flow);
+                // set vehicle as child of type
+                type->addChildElement(flow);
                 flow->incRef("buildFlow");
                 // add reference in all junctions
                 fromJunction->addChildElement(flow);
@@ -499,17 +533,61 @@
 
 
 void
+GNERouteHandler::buildFlowTAZs(const CommonXMLStructure::SumoBaseObject* /*sumoBaseObject*/, const SUMOVehicleParameter& vehicleParameters,
+                                    const std::string& fromTAZID, const std::string& toTAZID) {
+    // parse TAZs
+    const auto fromTAZ = parseTAZ(SUMO_TAG_TRIP, fromTAZID);
+    const auto toTAZ = parseTAZ(SUMO_TAG_TRIP, toTAZID);
+    // check if exist another vehicle with the same ID (note: Vehicles, Flows and Trips share namespace)
+    if (fromTAZ && toTAZ && !isVehicleIdDuplicated(vehicleParameters.id)) {
+        // obtain  vtypes
+        GNEDemandElement* type = myNet->getAttributeCarriers()->retrieveDemandElement(SUMO_TAG_VTYPE, vehicleParameters.vtypeid, false);
+        // try to parse type distribution
+        if (type == nullptr) {
+            type = myNet->getAttributeCarriers()->retrieveDemandElement(SUMO_TAG_VTYPE_DISTRIBUTION, vehicleParameters.vtypeid, false);
+        }
+        if (type == nullptr) {
+            writeError(TLF("Invalid vehicle type '%' used in % '%'.", vehicleParameters.vtypeid, toString(vehicleParameters.tag), vehicleParameters.id));
+        } else if (vehicleParameters.wasSet(VEHPARS_DEPARTLANE_SET) && ((vehicleParameters.departLaneProcedure == DepartLaneDefinition::GIVEN)) && (vehicleParameters.departLane > 0)) {
+            writeError(TLF("Invalid % used in % '%'. % is greater than number of lanes", toString(SUMO_ATTR_DEPARTLANE), toString(vehicleParameters.tag), vehicleParameters.id, toString(vehicleParameters.departLane)));
+        } else if (vehicleParameters.wasSet(VEHPARS_DEPARTSPEED_SET) && (vehicleParameters.departSpeedProcedure == DepartSpeedDefinition::GIVEN) && (type->getAttributeDouble(SUMO_ATTR_MAXSPEED) < vehicleParameters.departSpeed)) {
+            writeError(TLF("Invalid % used in % '%'. % is greater than type %", toString(SUMO_ATTR_DEPARTSPEED), toString(vehicleParameters.tag), vehicleParameters.id, toString(vehicleParameters.departSpeed), toString(SUMO_ATTR_MAXSPEED)));
+        } else {
+            // create flow using vehicleParameters
+            GNEDemandElement* flow = new GNEVehicle(GNE_TAG_FLOW_TAZS, myNet, type, fromTAZ, toTAZ, vehicleParameters);
+            if (myAllowUndoRedo) {
+                myNet->getViewNet()->getUndoList()->begin(flow->getTagProperty().getGUIIcon(), TL("add ") + flow->getTagStr() + " '" + vehicleParameters.id + "'");
+                overwriteDemandElement();
+                myNet->getViewNet()->getUndoList()->add(new GNEChange_DemandElement(flow, true), true);
+                myNet->getViewNet()->getUndoList()->end();
+            } else {
+                myNet->getAttributeCarriers()->insertDemandElement(flow);
+                // set vehicle as child of type
+                type->addChildElement(flow);
+                flow->incRef("buildFlow");
+                // add reference in all TAZs
+                fromTAZ->addChildElement(flow);
+                toTAZ->addChildElement(flow);
+            }
+            // compute path
+            flow->computePathElement();
+        }
+    }
+}
+
+
+void
 GNERouteHandler::buildPerson(const CommonXMLStructure::SumoBaseObject* /*sumoBaseObject*/, const SUMOVehicleParameter& personParameters) {
     // first check if ID is duplicated
     if (!isPersonIdDuplicated(personParameters.id)) {
         // obtain type
         GNEDemandElement* type = myNet->getAttributeCarriers()->retrieveDemandElement(SUMO_TAG_VTYPE, personParameters.vtypeid, false);
+        // try to parse type distribution
         if (type == nullptr) {
-            if (myNet->getAttributeCarriers()->retrieveDemandElement(SUMO_TAG_VTYPE_DISTRIBUTION, personParameters.vtypeid, false)) {
-                WRITE_WARNING(TL("VType distributions currently unsupported in netedit"));
-            } else {
-                writeError(TL("Invalid person type '") + personParameters.vtypeid + TL("' used in ") + toString(personParameters.tag) + " '" + personParameters.id + "'.");
-            }
+            type = myNet->getAttributeCarriers()->retrieveDemandElement(SUMO_TAG_VTYPE_DISTRIBUTION, personParameters.vtypeid, false);
+        }
+        if (type == nullptr) {
+            writeError(TLF("Invalid vehicle type '%' used in % '%'.", personParameters.vtypeid, toString(personParameters.tag), personParameters.id));
         } else {
             // create person using personParameters
             GNEDemandElement* person = new GNEPerson(SUMO_TAG_PERSON, myNet, type, personParameters);
@@ -535,12 +613,12 @@
     if (!isPersonIdDuplicated(personFlowParameters.id)) {
         // obtain type
         GNEDemandElement* type = myNet->getAttributeCarriers()->retrieveDemandElement(SUMO_TAG_VTYPE, personFlowParameters.vtypeid, false);
+        // try to parse type distribution
         if (type == nullptr) {
-            if (myNet->getAttributeCarriers()->retrieveDemandElement(SUMO_TAG_VTYPE_DISTRIBUTION, personFlowParameters.vtypeid, false)) {
-                WRITE_WARNING(TL("VType distributions currently unsupported in netedit"));
-            } else {
-                writeError(TL("Invalid personFlow type '") + personFlowParameters.vtypeid + TL("' used in ") + toString(personFlowParameters.tag) + " '" + personFlowParameters.id + "'.");
-            }
+            type = myNet->getAttributeCarriers()->retrieveDemandElement(SUMO_TAG_VTYPE_DISTRIBUTION, personFlowParameters.vtypeid, false);
+        }
+        if (type == nullptr) {
+            writeError(TLF("Invalid vehicle type '%' used in % '%'.", personFlowParameters.vtypeid, toString(personFlowParameters.tag), personFlowParameters.id));
         } else {
             // create personFlow using personFlowParameters
             GNEDemandElement* personFlow = new GNEPerson(SUMO_TAG_PERSONFLOW, myNet, type, personFlowParameters);
@@ -562,8 +640,8 @@
 
 void
 GNERouteHandler::buildPersonTrip(const CommonXMLStructure::SumoBaseObject* sumoBaseObject, const std::string& fromEdgeID, const std::string& toEdgeID,
-                                 const std::string& fromJunctionID, const std::string& toJunctionID, const std::string& toBusStopID, double arrivalPos,
-                                 const std::vector& types, const std::vector& modes, const std::vector& lines) {
+                                 const std::string& fromJunctionID, const std::string& toJunctionID, const std::string& toBusStopID, const std::string& toTrainStopID,
+                                 double arrivalPos, const std::vector& types, const std::vector& modes, const std::vector& lines) {
     // get previous plan edge
     const auto previousEdge = getPreviousPlanEdge(true, sumoBaseObject);
     // parse parents
@@ -573,6 +651,12 @@
     GNEJunction* fromJunction = myNet->getAttributeCarriers()->retrieveJunction(fromJunctionID, false);
     GNEJunction* toJunction = myNet->getAttributeCarriers()->retrieveJunction(toJunctionID, false);
     GNEAdditional* toBusStop = myNet->getAttributeCarriers()->retrieveAdditional(SUMO_TAG_BUS_STOP, toBusStopID, false);
+    GNEAdditional* toTrainStop = myNet->getAttributeCarriers()->retrieveAdditional(SUMO_TAG_TRAIN_STOP, toTrainStopID, false);
+    // chek if we're parsing the train stop as a busStop
+    if ((toBusStop == nullptr) && (toTrainStop == nullptr)) {
+        toBusStop = myNet->getAttributeCarriers()->retrieveAdditional(SUMO_TAG_BUS_STOP, toTrainStopID, false);
+        toTrainStop = myNet->getAttributeCarriers()->retrieveAdditional(SUMO_TAG_TRAIN_STOP, toBusStopID, false);
+    }
     // check from edge
     if ((fromEdge == nullptr) && previousEdge) {
         fromEdge = previousEdge;
@@ -605,7 +689,7 @@
             }
         } else if (fromEdge && toBusStop) {
             // create personTrip from->busStop
-            GNEDemandElement* personTrip = new GNEPersonTrip(myNet, personParent, fromEdge, toBusStop, arrivalPos, types, modes, lines);
+            GNEDemandElement* personTrip = new GNEPersonTrip(false, myNet, personParent, fromEdge, toBusStop, arrivalPos, types, modes, lines);
             if (myAllowUndoRedo) {
                 myNet->getViewNet()->getUndoList()->begin(personTrip->getTagProperty().getGUIIcon(), TL("add ") + personTrip->getTagStr() + " in '" + personParent->getID() + "'");
                 overwriteDemandElement();
@@ -619,6 +703,22 @@
                 toBusStop->addChildElement(personTrip);
                 personTrip->incRef("buildPersonTripFromBusStop");
             }
+        } else if (fromEdge && toTrainStop) {
+            // create personTrip from->trainStop
+            GNEDemandElement* personTrip = new GNEPersonTrip(true, myNet, personParent, fromEdge, toTrainStop, arrivalPos, types, modes, lines);
+            if (myAllowUndoRedo) {
+                myNet->getViewNet()->getUndoList()->begin(personTrip->getTagProperty().getGUIIcon(), TL("add ") + personTrip->getTagStr() + " in '" + personParent->getID() + "'");
+                overwriteDemandElement();
+                myNet->getViewNet()->getUndoList()->add(new GNEChange_DemandElement(personTrip, true), true);
+                myNet->getViewNet()->getUndoList()->end();
+            } else {
+                myNet->getAttributeCarriers()->insertDemandElement(personTrip);
+                // set child references
+                personParent->addChildElement(personTrip);
+                fromEdge->addChildElement(personTrip);
+                toTrainStop->addChildElement(personTrip);
+                personTrip->incRef("buildPersonTripFromTrainStop");
+            }
         } else if (fromJunction && toJunction) {
             // create personTrip from->to (junctions)
             GNEDemandElement* personTrip = new GNEPersonTrip(myNet, personParent, fromJunction, toJunction, arrivalPos, types, modes, lines);
@@ -642,7 +742,7 @@
 
 void
 GNERouteHandler::buildWalk(const CommonXMLStructure::SumoBaseObject* sumoBaseObject, const std::string& fromEdgeID, const std::string& toEdgeID,
-                           const std::string& fromJunctionID, const std::string& toJunctionID, const std::string& toBusStopID,
+                           const std::string& fromJunctionID, const std::string& toJunctionID, const std::string& toBusStopID, const std::string& toTrainStopID,
                            const std::vector& edgeIDs, const std::string& routeID, double arrivalPos) {
     // get previous plan edge
     const auto previousEdge = getPreviousPlanEdge(true, sumoBaseObject);
@@ -653,6 +753,12 @@
     GNEJunction* fromJunction = myNet->getAttributeCarriers()->retrieveJunction(fromJunctionID, false);
     GNEJunction* toJunction = myNet->getAttributeCarriers()->retrieveJunction(toJunctionID, false);
     GNEAdditional* toBusStop = myNet->getAttributeCarriers()->retrieveAdditional(SUMO_TAG_BUS_STOP, toBusStopID, false);
+    GNEAdditional* toTrainStop = myNet->getAttributeCarriers()->retrieveAdditional(SUMO_TAG_TRAIN_STOP, toTrainStopID, false);
+    // chek if we're parsing the train stop as a busStop
+    if ((toBusStop == nullptr) && (toTrainStop == nullptr)) {
+        toBusStop = myNet->getAttributeCarriers()->retrieveAdditional(SUMO_TAG_BUS_STOP, toTrainStopID, false);
+        toTrainStop = myNet->getAttributeCarriers()->retrieveAdditional(SUMO_TAG_TRAIN_STOP, toBusStopID, false);
+    }
     GNEDemandElement* route = myNet->getAttributeCarriers()->retrieveDemandElement(SUMO_TAG_ROUTE, routeID, false);
     std::vector edges = parseEdges(SUMO_TAG_WALK, edgeIDs);
     // avoid consecutive duplicated edges
@@ -721,7 +827,7 @@
             }
         } else if (fromEdge && toBusStop) {
             // create walk from->busStop
-            GNEDemandElement* walk = new GNEWalk(myNet, personParent, fromEdge, toBusStop, arrivalPos);
+            GNEDemandElement* walk = new GNEWalk(false, myNet, personParent, fromEdge, toBusStop, arrivalPos);
             if (myAllowUndoRedo) {
                 myNet->getViewNet()->getUndoList()->begin(walk->getTagProperty().getGUIIcon(), TL("add ") + walk->getTagStr() + " in '" + personParent->getID() + "'");
                 overwriteDemandElement();
@@ -735,6 +841,22 @@
                 toBusStop->addChildElement(walk);
                 walk->incRef("buildWalkFromBusStop");
             }
+        } else if (fromEdge && toTrainStop) {
+            // create walk from->trainStop
+            GNEDemandElement* walk = new GNEWalk(true, myNet, personParent, fromEdge, toTrainStop, arrivalPos);
+            if (myAllowUndoRedo) {
+                myNet->getViewNet()->getUndoList()->begin(walk->getTagProperty().getGUIIcon(), TL("add ") + walk->getTagStr() + " in '" + personParent->getID() + "'");
+                overwriteDemandElement();
+                myNet->getViewNet()->getUndoList()->add(new GNEChange_DemandElement(walk, true), true);
+                myNet->getViewNet()->getUndoList()->end();
+            } else {
+                myNet->getAttributeCarriers()->insertDemandElement(walk);
+                // set child references
+                personParent->addChildElement(walk);
+                fromEdge->addChildElement(walk);
+                toTrainStop->addChildElement(walk);
+                walk->incRef("buildWalkFromTrainStop");
+            }
         } else if (fromJunction && toJunction) {
             // create walk from->to (junction)
             GNEDemandElement* walk = new GNEWalk(myNet, personParent, fromJunction, toJunction, arrivalPos);
@@ -758,7 +880,7 @@
 
 void
 GNERouteHandler::buildRide(const CommonXMLStructure::SumoBaseObject* sumoBaseObject, const std::string& fromEdgeID, const std::string& toEdgeID,
-                           const std::string& toBusStopID, double arrivalPos, const std::vector& lines) {
+                           const std::string& toBusStopID, const std::string& toTrainStopID, double arrivalPos, const std::vector& lines) {
     // get previous plan edge
     const auto previousEdge = getPreviousPlanEdge(true, sumoBaseObject);
     // parse parents
@@ -766,6 +888,12 @@
     GNEEdge* fromEdge = myNet->getAttributeCarriers()->retrieveEdge(fromEdgeID, false);
     GNEEdge* toEdge = myNet->getAttributeCarriers()->retrieveEdge(toEdgeID, false);
     GNEAdditional* toBusStop = myNet->getAttributeCarriers()->retrieveAdditional(SUMO_TAG_BUS_STOP, toBusStopID, false);
+    GNEAdditional* toTrainStop = myNet->getAttributeCarriers()->retrieveAdditional(SUMO_TAG_TRAIN_STOP, toTrainStopID, false);
+    // chek if we're parsing the train stop as a busStop
+    if ((toBusStop == nullptr) && (toTrainStop == nullptr)) {
+        toBusStop = myNet->getAttributeCarriers()->retrieveAdditional(SUMO_TAG_BUS_STOP, toTrainStopID, false);
+        toTrainStop = myNet->getAttributeCarriers()->retrieveAdditional(SUMO_TAG_TRAIN_STOP, toBusStopID, false);
+    }
     // check from edge
     if ((fromEdge == nullptr) && previousEdge) {
         fromEdge = previousEdge;
@@ -790,7 +918,7 @@
             }
         } else if (toBusStop) {
             // create ride from->busStop
-            GNEDemandElement* ride = new GNERide(myNet, personParent, fromEdge, toBusStop, arrivalPos, lines);
+            GNEDemandElement* ride = new GNERide(false, myNet, personParent, fromEdge, toBusStop, arrivalPos, lines);
             if (myAllowUndoRedo) {
                 myNet->getViewNet()->getUndoList()->begin(ride->getTagProperty().getGUIIcon(), TL("add ") + ride->getTagStr() + " in '" + personParent->getID() + "'");
                 overwriteDemandElement();
@@ -804,6 +932,22 @@
                 toBusStop->addChildElement(ride);
                 ride->incRef("buildRideFromBusStop");
             }
+        } else if (toTrainStop) {
+            // create ride from->trainStop
+            GNEDemandElement* ride = new GNERide(true, myNet, personParent, fromEdge, toTrainStop, arrivalPos, lines);
+            if (myAllowUndoRedo) {
+                myNet->getViewNet()->getUndoList()->begin(ride->getTagProperty().getGUIIcon(), TL("add ") + ride->getTagStr() + " in '" + personParent->getID() + "'");
+                overwriteDemandElement();
+                myNet->getViewNet()->getUndoList()->add(new GNEChange_DemandElement(ride, true), true);
+                myNet->getViewNet()->getUndoList()->end();
+            } else {
+                myNet->getAttributeCarriers()->insertDemandElement(ride);
+                // set child references
+                personParent->addChildElement(ride);
+                fromEdge->addChildElement(ride);
+                toTrainStop->addChildElement(ride);
+                ride->incRef("buildRideFromTrainStop");
+            }
         }
     }
 }
@@ -815,12 +959,12 @@
     if (!isContainerIdDuplicated(containerParameters.id)) {
         // obtain type
         GNEDemandElement* type = myNet->getAttributeCarriers()->retrieveDemandElement(SUMO_TAG_VTYPE, containerParameters.vtypeid, false);
+        // try to parse type distribution
         if (type == nullptr) {
-            if (myNet->getAttributeCarriers()->retrieveDemandElement(SUMO_TAG_VTYPE_DISTRIBUTION, containerParameters.vtypeid, false)) {
-                WRITE_WARNING(TL("VType distributions currently unsupported in netedit"));
-            } else {
-                writeError("Invalid container type '" + containerParameters.vtypeid + TL("' used in ") + toString(containerParameters.tag) + " '" + containerParameters.id + "'.");
-            }
+            type = myNet->getAttributeCarriers()->retrieveDemandElement(SUMO_TAG_VTYPE_DISTRIBUTION, containerParameters.vtypeid, false);
+        }
+        if (type == nullptr) {
+            writeError(TLF("Invalid vehicle type '%' used in % '%'.", containerParameters.vtypeid, toString(containerParameters.tag), containerParameters.id));
         } else {
             // create container using containerParameters
             GNEDemandElement* container = new GNEContainer(SUMO_TAG_CONTAINER, myNet, type, containerParameters);
@@ -846,12 +990,12 @@
     if (!isContainerIdDuplicated(containerFlowParameters.id)) {
         // obtain type
         GNEDemandElement* type = myNet->getAttributeCarriers()->retrieveDemandElement(SUMO_TAG_VTYPE, containerFlowParameters.vtypeid, false);
+        // try to parse type distribution
         if (type == nullptr) {
-            if (myNet->getAttributeCarriers()->retrieveDemandElement(SUMO_TAG_VTYPE_DISTRIBUTION, containerFlowParameters.vtypeid, false)) {
-                WRITE_WARNING(TL("VType distributions currently unsupported in netedit"));
-            } else {
-                writeError("Invalid containerFlow type '" + containerFlowParameters.vtypeid + TL("' used in ") + toString(containerFlowParameters.tag) + " '" + containerFlowParameters.id + "'.");
-            }
+            type = myNet->getAttributeCarriers()->retrieveDemandElement(SUMO_TAG_VTYPE_DISTRIBUTION, containerFlowParameters.vtypeid, false);
+        }
+        if (type == nullptr) {
+            writeError(TLF("Invalid vehicle type '%' used in % '%'.", containerFlowParameters.vtypeid, toString(containerFlowParameters.tag), containerFlowParameters.id));
         } else {
             // create containerFlow using containerFlowParameters
             GNEDemandElement* containerFlow = new GNEContainer(SUMO_TAG_CONTAINERFLOW, myNet, type, containerFlowParameters);
@@ -1034,15 +1178,20 @@
         // check conditions
         if (stopParameters.busstop.size() > 0) {
             stoppingPlace = myNet->getAttributeCarriers()->retrieveAdditional(SUMO_TAG_BUS_STOP, stopParameters.busstop, false);
-            stopTagType = waypoint ? GNE_TAG_WAYPOINT_BUSSTOP : SUMO_TAG_STOP_BUSSTOP;
+            stopTagType = waypoint ? GNE_TAG_WAYPOINT_BUSSTOP : GNE_TAG_STOP_BUSSTOP;
+            // check if is a train stop
+            if (stoppingPlace == nullptr) {
+                stoppingPlace = myNet->getAttributeCarriers()->retrieveAdditional(SUMO_TAG_TRAIN_STOP, stopParameters.busstop, false);
+                stopTagType = waypoint ? GNE_TAG_WAYPOINT_TRAINSTOP : GNE_TAG_STOP_TRAINSTOP;
+            }
             // containers cannot stops in busStops
             if (stopParent->getTagProperty().isContainer()) {
-                writeError(TL("Containers don't support stops at busStops"));
+                writeError(TL("Containers don't support stops at busStops or trainStops"));
                 validParentDemandElement = false;
             }
         } else if (stopParameters.containerstop.size() > 0) {
             stoppingPlace = myNet->getAttributeCarriers()->retrieveAdditional(SUMO_TAG_CONTAINER_STOP, stopParameters.containerstop, false);
-            stopTagType = waypoint ? GNE_TAG_WAYPOINT_CONTAINERSTOP : SUMO_TAG_STOP_CONTAINERSTOP;
+            stopTagType = waypoint ? GNE_TAG_WAYPOINT_CONTAINERSTOP : GNE_TAG_STOP_CONTAINERSTOP;
             // persons cannot stops in containerStops
             if (stopParent->getTagProperty().isPerson()) {
                 writeError(TL("Persons don't support stops at containerStops"));
@@ -1050,7 +1199,7 @@
             }
         } else if (stopParameters.chargingStation.size() > 0) {
             stoppingPlace = myNet->getAttributeCarriers()->retrieveAdditional(SUMO_TAG_CHARGING_STATION, stopParameters.chargingStation, false);
-            stopTagType = waypoint ? GNE_TAG_WAYPOINT_CHARGINGSTATION : SUMO_TAG_STOP_CHARGINGSTATION;
+            stopTagType = waypoint ? GNE_TAG_WAYPOINT_CHARGINGSTATION : GNE_TAG_STOP_CHARGINGSTATION;
             // check person and containers
             if (stopParent->getTagProperty().isPerson()) {
                 writeError(TL("Persons don't support stops at chargingStations"));
@@ -1061,7 +1210,7 @@
             }
         } else if (stopParameters.parkingarea.size() > 0) {
             stoppingPlace = myNet->getAttributeCarriers()->retrieveAdditional(SUMO_TAG_PARKING_AREA, stopParameters.parkingarea, false);
-            stopTagType = waypoint ? GNE_TAG_WAYPOINT_PARKINGAREA : SUMO_TAG_STOP_PARKINGAREA;
+            stopTagType = waypoint ? GNE_TAG_WAYPOINT_PARKINGAREA : GNE_TAG_STOP_PARKINGAREA;
             // check person and containers
             if (stopParent->getTagProperty().isPerson()) {
                 writeError(TL("Persons don't support stops at parkingAreas"));
@@ -1072,7 +1221,7 @@
             }
         } else if (stopParameters.lane.size() > 0) {
             lane = myNet->getAttributeCarriers()->retrieveLane(stopParameters.lane, false);
-            stopTagType = waypoint ? GNE_TAG_WAYPOINT_LANE : SUMO_TAG_STOP_LANE;
+            stopTagType = waypoint ? GNE_TAG_WAYPOINT_LANE : GNE_TAG_STOP_LANE;
         } else if (stopParameters.edge.size() > 0) {
             edge = myNet->getAttributeCarriers()->retrieveEdge(stopParameters.edge, false);
             // check vehicles
@@ -1097,7 +1246,11 @@
                 // create stop using stopParameters and stoppingPlace
                 GNEDemandElement* stop = nullptr;
                 if (stopParent->getTagProperty().isPerson()) {
-                    stop = new GNEStop(GNE_TAG_STOPPERSON_BUSSTOP, myNet, stopParent, stoppingPlace, stopParameters);
+                    if (stoppingPlace->getTagProperty().getTag() == SUMO_TAG_BUS_STOP) {
+                        stop = new GNEStop(GNE_TAG_STOPPERSON_BUSSTOP, myNet, stopParent, stoppingPlace, stopParameters);
+                    } else {
+                        stop = new GNEStop(GNE_TAG_STOPPERSON_TRAINSTOP, myNet, stopParent, stoppingPlace, stopParameters);
+                    }
                 } else if (stopParent->getTagProperty().isContainer()) {
                     stop = new GNEStop(GNE_TAG_STOPCONTAINER_CONTAINERSTOP, myNet, stopParent, stoppingPlace, stopParameters);
                 } else {
@@ -1176,7 +1329,7 @@
     // get stop parameters
     SUMOVehicleParameter::Stop stopParameters;
     // fill stops parameters
-    if ((tag == GNE_TAG_STOPPERSON_BUSSTOP) || (tag == GNE_TAG_STOPPERSON_EDGE)) {
+    if ((tag == GNE_TAG_STOPPERSON_BUSSTOP) || (tag == GNE_TAG_STOPPERSON_TRAINSTOP) || (tag == GNE_TAG_STOPPERSON_EDGE)) {
         stopParameters.actType = personPlanObject->getStringAttribute(SUMO_ATTR_ACTTYPE);
         if (personPlanObject->hasTimeAttribute(SUMO_ATTR_DURATION)) {
             stopParameters.duration = personPlanObject->getTimeAttribute(SUMO_ATTR_DURATION);
@@ -1195,6 +1348,7 @@
     GNEJunction* toJunction = (pathCreator->getSelectedJunctions().size() > 0) ? pathCreator->getSelectedJunctions().back() : nullptr;
     // get busStop
     GNEAdditional* toBusStop = pathCreator->getToStoppingPlace(SUMO_TAG_BUS_STOP);
+    GNEAdditional* toTrainStop = pathCreator->getToStoppingPlace(SUMO_TAG_TRAIN_STOP);
     // get path edges
     std::vector edges;
     for (const auto& path : pathCreator->getPath()) {
@@ -1210,7 +1364,7 @@
         case GNE_TAG_PERSONTRIP_EDGE: {
             // check if person trip busStop->edge can be created
             if (fromEdge && toEdge) {
-                buildPersonTrip(personPlanObject, fromEdge->getID(), toEdge->getID(), "", "", "", arrivalPos, types, modes, lines);
+                buildPersonTrip(personPlanObject, fromEdge->getID(), toEdge->getID(), "", "", "", "", arrivalPos, types, modes, lines);
             } else {
                 myNet->getViewNet()->setStatusBarText(TL("A person trip from edge to edge needs two edges edge"));
                 return false;
@@ -1220,17 +1374,27 @@
         case GNE_TAG_PERSONTRIP_BUSSTOP: {
             // check if person trip busStop->busStop can be created
             if (fromEdge && toBusStop) {
-                buildPersonTrip(personPlanObject, fromEdge->getID(), "", "", "", toBusStop->getID(), arrivalPos, types, modes, lines);
+                buildPersonTrip(personPlanObject, fromEdge->getID(), "", "", "", toBusStop->getID(), "", arrivalPos, types, modes, lines);
             } else {
                 myNet->getViewNet()->setStatusBarText(TL("A person trip from edge to busStop needs one edge and one busStop"));
                 return false;
             }
             break;
         }
+        case GNE_TAG_PERSONTRIP_TRAINSTOP: {
+            // check if person trip trainStop->trainStop can be created
+            if (fromEdge && toTrainStop) {
+                buildPersonTrip(personPlanObject, fromEdge->getID(), "", "", "", "", toTrainStop->getID(), arrivalPos, types, modes, lines);
+            } else {
+                myNet->getViewNet()->setStatusBarText(TL("A person trip from edge to trainStop needs one edge and one trainStop"));
+                return false;
+            }
+            break;
+        }
         case GNE_TAG_PERSONTRIP_JUNCTIONS: {
             // check if person trip busStop->junction can be created
             if (fromJunction && toJunction) {
-                buildPersonTrip(personPlanObject, "", "", fromJunction->getID(), toJunction->getID(), "", arrivalPos, types, modes, lines);
+                buildPersonTrip(personPlanObject, "", "", fromJunction->getID(), toJunction->getID(), "", "", arrivalPos, types, modes, lines);
             } else {
                 myNet->getViewNet()->setStatusBarText(TL("A person trip from junction to junction needs two junctions junction"));
                 return false;
@@ -1241,9 +1405,9 @@
         case GNE_TAG_WALK_EDGE: {
             // check if transport busStop->edge can be created
             if (fromEdge && toEdge) {
-                buildWalk(personPlanObject, fromEdge->getID(), toEdge->getID(), "", "", "", {}, "", arrivalPos);
+                buildWalk(personPlanObject, fromEdge->getID(), toEdge->getID(), "", "", "", "", {}, "", arrivalPos);
             } else {
-                myNet->getViewNet()->setStatusBarText(TL("A ride from busStop to edge needs a busStop and an edge"));
+                myNet->getViewNet()->setStatusBarText(TL("A walk to edge needs a busStop and an edge"));
                 return false;
             }
             break;
@@ -1251,9 +1415,19 @@
         case GNE_TAG_WALK_BUSSTOP: {
             // check if transport busStop->busStop can be created
             if (fromEdge && toBusStop) {
-                buildWalk(personPlanObject, fromEdge->getID(), "", "", "", toBusStop->getID(), {}, "", arrivalPos);
+                buildWalk(personPlanObject, fromEdge->getID(), "", "", "", toBusStop->getID(), "", {}, "", arrivalPos);
             } else {
-                myNet->getViewNet()->setStatusBarText(TL("A transport from busStop to busStop needs two busStops"));
+                myNet->getViewNet()->setStatusBarText(TL("A walk to busStop needs two busStops"));
+                return false;
+            }
+            break;
+        }
+        case GNE_TAG_WALK_TRAINSTOP: {
+            // check if transport trainStop->trainStop can be created
+            if (fromEdge && toTrainStop) {
+                buildWalk(personPlanObject, fromEdge->getID(), "", "", "", "", toTrainStop->getID(), {}, "", arrivalPos);
+            } else {
+                myNet->getViewNet()->setStatusBarText(TL("A walk to trainStop needs two trainStops"));
                 return false;
             }
             break;
@@ -1261,9 +1435,9 @@
         case GNE_TAG_WALK_EDGES: {
             // check if transport edges can be created
             if (edges.size() > 0) {
-                buildWalk(personPlanObject, "", "", "", "", "", edges, "", arrivalPos);
+                buildWalk(personPlanObject, "", "", "", "", "", "", edges, "", arrivalPos);
             } else {
-                myNet->getViewNet()->setStatusBarText(TL("A transport with edges attribute needs a list of edges"));
+                myNet->getViewNet()->setStatusBarText(TL("A walk with edges needs a list of edges"));
                 return false;
             }
             break;
@@ -1271,9 +1445,9 @@
         case GNE_TAG_WALK_ROUTE: {
             // check if transport edges can be created
             if (route) {
-                buildWalk(personPlanObject, "", "", "", "", "", {}, route->getID(), arrivalPos);
+                buildWalk(personPlanObject, "", "", "", "", "", "", {}, route->getID(), arrivalPos);
             } else {
-                myNet->getViewNet()->setStatusBarText(TL("A route transport needs a route"));
+                myNet->getViewNet()->setStatusBarText(TL("A route walk needs a route"));
                 return false;
             }
             break;
@@ -1281,7 +1455,7 @@
         case GNE_TAG_WALK_JUNCTIONS: {
             // check if transport busStop->junction can be created
             if (fromJunction && toJunction) {
-                buildWalk(personPlanObject, "", "", fromJunction->getID(), toJunction->getID(), "", {}, "", arrivalPos);
+                buildWalk(personPlanObject, "", "", fromJunction->getID(), toJunction->getID(), "", "", {}, "", arrivalPos);
             } else {
                 myNet->getViewNet()->setStatusBarText(TL("A ride from busStop to junction needs a busStop and an junction"));
                 return false;
@@ -1290,9 +1464,9 @@
         }
         // Rides
         case GNE_TAG_RIDE_EDGE: {
-            // check if ride busStop->edge can be created
+            // check if ride edge->edge can be created
             if (fromEdge && toEdge) {
-                buildRide(personPlanObject, fromEdge->getID(), toEdge->getID(), "", arrivalPos, lines);
+                buildRide(personPlanObject, fromEdge->getID(), toEdge->getID(), "", "", arrivalPos, lines);
             } else {
                 myNet->getViewNet()->setStatusBarText(TL("A ride from edge to edge needs two edges edge"));
                 return false;
@@ -1300,15 +1474,25 @@
             break;
         }
         case GNE_TAG_RIDE_BUSSTOP: {
-            // check if ride busStop->busStop can be created
+            // check if ride edge->busStop can be created
             if (fromEdge && toBusStop) {
-                buildRide(personPlanObject, fromEdge->getID(), "", toBusStop->getID(), arrivalPos, lines);
+                buildRide(personPlanObject, fromEdge->getID(), "", toBusStop->getID(), "", arrivalPos, lines);
             } else {
                 myNet->getViewNet()->setStatusBarText(TL("A ride from edge to busStop needs one edge and one busStop"));
                 return false;
             }
             break;
         }
+        case GNE_TAG_RIDE_TRAINSTOP: {
+            // check if ride edge->trainStop can be created
+            if (fromEdge && toTrainStop) {
+                buildRide(personPlanObject, fromEdge->getID(), "", "", toTrainStop->getID(), arrivalPos, lines);
+            } else {
+                myNet->getViewNet()->setStatusBarText(TL("A ride from edge to trainStop needs one edge and one trainStop"));
+                return false;
+            }
+            break;
+        }
         // stops
         case GNE_TAG_STOPPERSON_EDGE: {
             // check if ride busStop->busStop can be created
@@ -1334,6 +1518,17 @@
             }
             break;
         }
+        case GNE_TAG_STOPPERSON_TRAINSTOP: {
+            // check if ride trainStop->trainStop can be created
+            if (toTrainStop) {
+                stopParameters.busstop = toTrainStop->getID();
+                buildStop(personPlanObject, stopParameters);
+            } else {
+                myNet->getViewNet()->setStatusBarText(TL("A stop has to be placed over a trainStop"));
+                return false;
+            }
+            break;
+        }
         default:
             throw InvalidArgument("Invalid person plan tag");
     }
@@ -1494,10 +1689,11 @@
 bool
 GNERouteHandler::isVehicleIdDuplicated(const std::string& id) {
     // declare vehicle tags vector
-    std::vector vehicleTags = {SUMO_TAG_VEHICLE, GNE_TAG_VEHICLE_WITHROUTE, SUMO_TAG_TRIP, GNE_TAG_FLOW_ROUTE, GNE_TAG_FLOW_WITHROUTE, SUMO_TAG_FLOW};
+    const std::vector vehicleTags = {SUMO_TAG_VEHICLE, GNE_TAG_VEHICLE_WITHROUTE, SUMO_TAG_TRIP, GNE_TAG_TRIP_TAZS,
+        GNE_TAG_FLOW_ROUTE, GNE_TAG_FLOW_WITHROUTE, SUMO_TAG_FLOW, SUMO_TAG_FLOW, SUMO_TAG_FLOW, GNE_TAG_FLOW_JUNCTIONS};
     for (const auto& vehicleTag : vehicleTags) {
         if (!checkDuplicatedDemandElement(vehicleTag, id)) {
-            writeError(TL("There is another ") + toString(vehicleTag) + TL(" with the same ID='") + id + "'.");
+            writeError(TLF("There is another % with the same ID='%'.", toString(vehicleTag), id));
             return true;
         }
     }
@@ -1509,7 +1705,7 @@
 GNERouteHandler::isViaAttributeValid(const std::vector& via) {
     for (const auto& edgeID : via) {
         if (myNet->getAttributeCarriers()->retrieveEdge(edgeID, false) == nullptr) {
-            writeError(TL("Via edge '") + edgeID + TL("' doesn't exist."));
+            writeError(TLF("Via edge '%' doesn't exist.", edgeID));
             return false;
         }
     }
@@ -1521,7 +1717,7 @@
 GNERouteHandler::isPersonIdDuplicated(const std::string& id) {
     for (SumoXMLTag personTag : std::vector({SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW})) {
         if (!checkDuplicatedDemandElement(personTag, id)) {
-            writeError(TL("There is another ") + toString(personTag) + TL(" with the same ID='") + id + "'.");
+            writeError(TLF("There is another % with the same ID='%'.", toString(personTag), id));
             return true;
         }
     }
@@ -1533,7 +1729,7 @@
 GNERouteHandler::isContainerIdDuplicated(const std::string& id) {
     for (SumoXMLTag containerTag : std::vector({SUMO_TAG_CONTAINER, SUMO_TAG_CONTAINERFLOW})) {
         if (!checkDuplicatedDemandElement(containerTag, id)) {
-            writeError(TL("There is another ") + toString(containerTag) + TL(" with the same ID='") + id + "'.");
+            writeError(TLF("There is another % with the same ID='%'.", toString(containerTag), id));
             return true;
         }
     }
@@ -2063,18 +2259,29 @@
     GNEJunction* junction = myNet->getAttributeCarriers()->retrieveJunction(junctionID, false);
     // empty junctions aren't allowed. If junction is empty, write error, clear junctions and stop
     if (junction == nullptr) {
-        writeError("Could not build " + toString(tag) + " in netedit; " +  toString(SUMO_TAG_JUNCTION) + " doesn't exist.");
+        writeError(TLF("Could not build % in netedit", toString(tag)) + std::string("; ") + TLF("% doesn't exist.", toString(SUMO_TAG_JUNCTION)));
     }
     return junction;
 }
 
 
+GNEAdditional*
+GNERouteHandler::parseTAZ(const SumoXMLTag tag, const std::string& TAZID) {
+    GNEAdditional* TAZ = myNet->getAttributeCarriers()->retrieveAdditional(SUMO_TAG_TAZ, TAZID, false);
+    // empty TAZs aren't allowed. If TAZ is empty, write error, clear TAZs and stop
+    if (TAZ == nullptr) {
+        writeError(TLF("Could not build % in netedit", toString(tag)) + std::string("; ") + TLF("% doesn't exist.", toString(SUMO_TAG_TAZ)));
+    }
+    return TAZ;
+}
+
+
 GNEEdge*
 GNERouteHandler::parseEdge(const SumoXMLTag tag, const std::string& edgeID) {
     GNEEdge* edge = myNet->getAttributeCarriers()->retrieveEdge(edgeID, false);
     // empty edges aren't allowed. If edge is empty, write error, clear edges and stop
     if (edge == nullptr) {
-        writeError("Could not build " + toString(tag) + " in netedit; " +  toString(SUMO_TAG_EDGE) + " doesn't exist.");
+        writeError(TLF("Could not build % in netedit", toString(tag)) + std::string("; ") + TLF("% doesn't exist.", toString(SUMO_TAG_EDGE)));
     }
     return edge;
 }
@@ -2087,7 +2294,7 @@
         GNEEdge* edge = myNet->getAttributeCarriers()->retrieveEdge(edgeID, false);
         // empty edges aren't allowed. If edge is empty, write error, clear edges and stop
         if (edge == nullptr) {
-            writeError("Could not build " + toString(tag) + " in netedit; " +  toString(SUMO_TAG_EDGE) + " doesn't exist.");
+            writeError(TLF("Could not build % in netedit", toString(tag)) + std::string("; ") + TLF("% doesn't exist.", toString(SUMO_TAG_EDGE)));
             edges.clear();
             return edges;
         } else {
@@ -2148,11 +2355,12 @@
     }
     // get parent object
     const CommonXMLStructure::SumoBaseObject* parentObject = obj->getParentSumoBaseObject();
-    // check person/container conditions
+    // check person conditions
     if (person && (parentObject->getTag() != SUMO_TAG_PERSON) && (parentObject->getTag() != SUMO_TAG_PERSONFLOW)) {
         // invalid parent
         return nullptr;
     }
+    // check container conditions
     if (!person && (parentObject->getTag() != SUMO_TAG_CONTAINER) && (parentObject->getTag() != SUMO_TAG_CONTAINERFLOW)) {
         // invalid parent
         return nullptr;
@@ -2164,13 +2372,15 @@
     }
     // get last children
     const CommonXMLStructure::SumoBaseObject* previousPlan = *(it - 1);
-    // check conditions
+    // check person conditions
     if (person && (previousPlan->getTag() != SUMO_TAG_WALK) && (previousPlan->getTag() != SUMO_TAG_RIDE) &&
             (previousPlan->getTag() != SUMO_TAG_PERSONTRIP) && (previousPlan->getTag() != SUMO_TAG_STOP)) {
         // invalid last child
         return nullptr;
     }
-    if (!person && (previousPlan->getTag() != SUMO_TAG_TRANSPORT) && (previousPlan->getTag() != SUMO_TAG_TRANSHIP)) {
+    // check container conditions
+    if (!person && (previousPlan->getTag() != SUMO_TAG_TRANSPORT) && (previousPlan->getTag() != SUMO_TAG_TRANSHIP) &&
+            (previousPlan->getTag() != SUMO_TAG_STOP)) {
         // invalid last child
         return nullptr;
     }
diff -Nru sumo-1.17.0/src/netedit/elements/demand/GNERouteHandler.h sumo-1.18.0/src/netedit/elements/demand/GNERouteHandler.h
--- sumo-1.17.0/src/netedit/elements/demand/GNERouteHandler.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/demand/GNERouteHandler.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -96,6 +96,10 @@
     void buildTripJunctions(const CommonXMLStructure::SumoBaseObject* sumoBaseObject, const SUMOVehicleParameter& vehicleParameters,
                             const std::string& fromJunctionID, const std::string& toJunctionID);
 
+    /// @brief build trip over TAZs
+    void buildTripTAZs(const CommonXMLStructure::SumoBaseObject* sumoBaseObject, const SUMOVehicleParameter& vehicleParameters,
+                            const std::string& fromTAZID, const std::string& toTAZID);
+
     /// @brief build flow
     void buildFlow(const CommonXMLStructure::SumoBaseObject* sumoBaseObject, const SUMOVehicleParameter& vehicleParameters,
                    const std::string& fromEdgeID, const std::string& toEdgeIDs);
@@ -104,6 +108,10 @@
     void buildFlowJunctions(const CommonXMLStructure::SumoBaseObject* sumoBaseObject, const SUMOVehicleParameter& vehicleParameters,
                             const std::string& fromJunctionID, const std::string& toJunctionID);
 
+    /// @brief build flow over junctions
+    void buildFlowTAZs(const CommonXMLStructure::SumoBaseObject* sumoBaseObject, const SUMOVehicleParameter& vehicleParameters,
+                            const std::string& fromTAZID, const std::string& toTAZID);
+
     /// @brief build person
     void buildPerson(const CommonXMLStructure::SumoBaseObject* sumoBaseObject, const SUMOVehicleParameter& personParameters);
 
@@ -112,17 +120,17 @@
 
     /// @brief build person trip
     void buildPersonTrip(const CommonXMLStructure::SumoBaseObject* sumoBaseObject, const std::string& fromEdgeID, const std::string& toEdgeID,
-                         const std::string& fromJunctionID, const std::string& toJunctionID, const std::string& toBusStopID, double arrivalPos,
-                         const std::vector& types, const std::vector& modes, const std::vector& lines);
+                         const std::string& fromJunctionID, const std::string& toJunctionID, const std::string& toBusStopID, const std::string& toTrainStopID,
+                         double arrivalPos, const std::vector& types, const std::vector& modes, const std::vector& lines);
 
     /// @brief build walk
     void buildWalk(const CommonXMLStructure::SumoBaseObject* sumoBaseObject, const std::string& fromEdgeID, const std::string& toEdgeID,
-                   const std::string& fromJunctionID, const std::string& toJunctionID, const std::string& toBusStopID,
+                   const std::string& fromJunctionID, const std::string& toJunctionID, const std::string& toBusStopID, const std::string& toTrainStopID,
                    const std::vector& edgeIDs, const std::string& routeID, double arrivalPos);
 
     /// @brief build ride
     void buildRide(const CommonXMLStructure::SumoBaseObject* sumoBaseObject, const std::string& fromEdgeID, const std::string& toEdgeID,
-                   const std::string& toBusStopID, double arrivalPos, const std::vector& lines);
+                   const std::string& toBusStopID, const std::string& toTrainStopID, double arrivalPos, const std::vector& lines);
 
     /// @brief build container
     void buildContainer(const CommonXMLStructure::SumoBaseObject* sumoBaseObject, const SUMOVehicleParameter& containerParameters);
@@ -205,6 +213,9 @@
     /// @brief parse junction
     GNEJunction* parseJunction(const SumoXMLTag tag, const std::string& junctionID);
 
+    /// @brief parse TAZ
+    GNEAdditional* parseTAZ(const SumoXMLTag tag, const std::string& TAZID);
+
     /// @brief parse edge
     GNEEdge* parseEdge(const SumoXMLTag tag, const std::string& edgeID);
 
diff -Nru sumo-1.17.0/src/netedit/elements/demand/GNEStop.cpp sumo-1.18.0/src/netedit/elements/demand/GNEStop.cpp
--- sumo-1.17.0/src/netedit/elements/demand/GNEStop.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/demand/GNEStop.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -46,7 +46,7 @@
     // reset default values
     resetDefaultValues();
     // enable parking for stops in parkin)gAreas
-    if ((tag == SUMO_TAG_STOP_PARKINGAREA) || (tag == GNE_TAG_WAYPOINT_PARKINGAREA)) {
+    if ((tag == GNE_TAG_STOP_PARKINGAREA) || (tag == GNE_TAG_WAYPOINT_PARKINGAREA)) {
         parametersSet |= STOP_PARKING_SET;
     }
     // set parking
@@ -66,7 +66,7 @@
 SUMOVehicleParameter::Stop(stopParameter),
 myCreationIndex(myNet->getAttributeCarriers()->getStopIndex()) {
     // enable parking for stops in parkingAreas
-    if ((tag == SUMO_TAG_STOP_PARKINGAREA) || (tag == GNE_TAG_WAYPOINT_PARKINGAREA)) {
+    if ((tag == GNE_TAG_STOP_PARKINGAREA) || (tag == GNE_TAG_WAYPOINT_PARKINGAREA)) {
         parametersSet |= STOP_PARKING_SET;
     }
     // set parking
@@ -110,7 +110,7 @@
 SUMOVehicleParameter::Stop(stopParameter),
 myCreationIndex(myNet->getAttributeCarriers()->getStopIndex()) {
     // enable parking for stops in parkingAreas
-    if ((tag == SUMO_TAG_STOP_PARKINGAREA) || (tag == GNE_TAG_WAYPOINT_PARKINGAREA)) {
+    if ((tag == GNE_TAG_STOP_PARKINGAREA) || (tag == GNE_TAG_WAYPOINT_PARKINGAREA)) {
         parametersSet |= STOP_PARKING_SET;
     }
     // set flags
@@ -139,7 +139,7 @@
     if ((myTagProperty.getTag() == GNE_TAG_STOPPERSON_EDGE) || (myTagProperty.getTag() == GNE_TAG_STOPCONTAINER_EDGE)) {
         // return move operation for additional placed over shape
         return new GNEMoveOperation(this, getParentEdges().front()->getLanes().front(), endPos, false);
-    } else if ((myTagProperty.getTag() == SUMO_TAG_STOP_LANE) || (myTagProperty.getTag() == GNE_TAG_WAYPOINT_LANE)) {
+    } else if ((myTagProperty.getTag() == GNE_TAG_STOP_LANE) || (myTagProperty.getTag() == GNE_TAG_WAYPOINT_LANE)) {
         // get allow change lane
         const bool allowChangeLane = myNet->getViewNet()->getViewParent()->getMoveFrame()->getCommonModeOptions()->getAllowChangeLane();
         // fist check if we're moving only extremes
@@ -197,6 +197,9 @@
         if (getParentAdditionals().front()->getTagProperty().getTag() == SUMO_TAG_BUS_STOP) {
             device.writeAttr(SUMO_ATTR_BUS_STOP, getParentAdditionals().front()->getID());
         }
+        if (getParentAdditionals().front()->getTagProperty().getTag() == SUMO_TAG_TRAIN_STOP) {
+            device.writeAttr(SUMO_ATTR_TRAIN_STOP, getParentAdditionals().front()->getID());
+        }
         if (getParentAdditionals().front()->getTagProperty().getTag() == SUMO_TAG_CONTAINER_STOP) {
             device.writeAttr(SUMO_ATTR_CONTAINER_STOP, getParentAdditionals().front()->getID());
         }
@@ -230,7 +233,7 @@
         // get lane
         const GNELane* firstLane = getFirstAllowedLane();
         // only Stops placed over lanes can be invalid
-        if (myTagProperty.getTag() != SUMO_TAG_STOP_LANE) {
+        if (myTagProperty.getTag() != GNE_TAG_STOP_LANE) {
             return isPersonPlanValid();
         } else if (friendlyPos) {
             // with friendly position enabled position are "always fixed"
@@ -253,7 +256,7 @@
         return Problem::STOP_DOWNSTREAM;
     } else {
         // only Stops placed over lanes can be invalid
-        if (myTagProperty.getTag() != SUMO_TAG_STOP_LANE) {
+        if (myTagProperty.getTag() != GNE_TAG_STOP_LANE) {
             return Problem::OK;
         } else if (friendlyPos) {
             // with friendly position enabled position are "always fixed"
@@ -285,7 +288,7 @@
 std::string
 GNEStop::getDemandElementProblem() const {
     if (myTagProperty.isStopPerson() || myTagProperty.isStopContainer()) {
-        if (friendlyPos) {
+        if (friendlyPos || (getParentAdditionals().size() > 0)) {
             return getPersonPlanProblem();
         } else {
             // obtain lane length
@@ -492,34 +495,29 @@
 
 void
 GNEStop::drawGL(const GUIVisualizationSettings& s) const {
-    bool drawStop = false;
-    if (getTagProperty().isStopPerson()) {
-        drawStop = drawPersonPlan();
-    } else if (getTagProperty().isStopContainer()) {
-        drawStop = drawContainerPlan();
-    } else {
-        drawStop = canDrawVehicleStop();
-    }
-    // check if stop can be drawn
-    if (drawStop) {
-        // Obtain exaggeration of the draw
-        const double exaggeration = getExaggeration(s);
-        // check if draw an stop for person/containers or for vehicles/routes
-        if (getTagProperty().isStopPerson() || getTagProperty().isStopContainer()) {
+    // Obtain exaggeration of the draw
+    const double exaggeration = getExaggeration(s);
+    // check if draw an stop for person/containers or for vehicles/routes
+    if (getTagProperty().isStopPerson() || getTagProperty().isStopContainer()) {
+        // check if stop can be draw
+        if ((getTagProperty().isStopPerson() && drawPersonPlan()) ||
+                (getTagProperty().isStopContainer() && drawContainerPlan())) {
             // check if draw stopPerson over busStop oder over lane
             if (getParentAdditionals().size() > 0) {
-                drawStopPersonOverBusStop(s, exaggeration);
+                drawStopPersonOverStoppingPlace(s, exaggeration);
             } else {
                 drawStopPersonOverEdge(s, exaggeration);
             }
-            // draw person parent if this stop if their first person plan child
-            if ((getParentDemandElements().size() == 1) && getParentDemandElements().front()->getChildDemandElements().front() == this) {
-                getParentDemandElements().front()->drawGL(s);
-            }
-        } else {
-            // draw vehicle over stop
-            drawVehicleStop(s, exaggeration);
         }
+        // draw person parent if this stop if their first person plan child
+        if ((getParentDemandElements().size() == 1) && getParentDemandElements().front()->getChildDemandElements().front() == this) {
+            getParentDemandElements().front()->drawGL(s);
+        }
+        // Draw name
+        drawName(getCenteringBoundary().getCenter(), s.scale, s.addName);
+    } else if (canDrawVehicleStop()) {
+        // draw vehicle over stop
+        drawVehicleStop(s, exaggeration);
         // Draw name
         drawName(getCenteringBoundary().getCenter(), s.scale, s.addName);
     }
@@ -635,6 +633,7 @@
             return toString(speed);
         // specific of Stops over stoppingPlaces
         case SUMO_ATTR_BUS_STOP:
+        case SUMO_ATTR_TRAIN_STOP:
         case SUMO_ATTR_CONTAINER_STOP:
         case SUMO_ATTR_CHARGING_STATION:
         case SUMO_ATTR_PARKING_AREA:
@@ -680,6 +679,8 @@
         }
         case GNE_ATTR_PATHSTOPINDEX:
             return toString(getPathStopIndex());
+        case GNE_ATTR_PARAMETERS:
+            return getParametersStr();
         default:
             throw InvalidArgument(getTagStr() + " doesn't have an attribute of type '" + toString(key) + "'");
     }
@@ -792,6 +793,7 @@
         //
         case GNE_ATTR_SELECTED:
         case GNE_ATTR_PARENT:
+        case GNE_ATTR_PARAMETERS:
             undoList->changeAttribute(new GNEChange_Attribute(this, key, value));
             break;
         // special case for person plans
@@ -829,6 +831,26 @@
                 undoList->changeAttribute(new GNEChange_Attribute(this, key, value));
             }
             break;
+        case SUMO_ATTR_TRAIN_STOP:
+            if (myTagProperty.isStopPerson()) {
+                // get next person plan
+                GNEDemandElement* nextPersonPlan = getParentDemandElements().at(0)->getNextChildDemandElement(this);
+                // continue depending of nextPersonPlan
+                if (nextPersonPlan) {
+                    // obtain busStop
+                    const GNEAdditional* busStop = myNet->getAttributeCarriers()->retrieveAdditional(SUMO_TAG_TRAIN_STOP, value);
+                    // change from attribute using edge ID
+                    undoList->begin(myTagProperty.getGUIIcon(), "Change from attribute of next personPlan");
+                    nextPersonPlan->setAttribute(SUMO_ATTR_FROM, busStop->getParentLanes().front()->getParentEdge()->getID(), undoList);
+                    undoList->changeAttribute(new GNEChange_Attribute(this, key, value));
+                    undoList->end();
+                } else {
+                    undoList->changeAttribute(new GNEChange_Attribute(this, key, value));
+                }
+            } else {
+                undoList->changeAttribute(new GNEChange_Attribute(this, key, value));
+            }
+            break;
         case SUMO_ATTR_CONTAINER_STOP:
             if (myTagProperty.isStopContainer()) {
                 // get next person plan
@@ -953,6 +975,8 @@
         // specific of Stops over stoppingPlaces
         case SUMO_ATTR_BUS_STOP:
             return (myNet->getAttributeCarriers()->retrieveAdditional(SUMO_TAG_BUS_STOP, value, false) != nullptr);
+        case SUMO_ATTR_TRAIN_STOP:
+            return (myNet->getAttributeCarriers()->retrieveAdditional(SUMO_TAG_TRAIN_STOP, value, false) != nullptr);
         case SUMO_ATTR_CONTAINER_STOP:
             return (myNet->getAttributeCarriers()->retrieveAdditional(SUMO_TAG_CONTAINER_STOP, value, false) != nullptr);
         case SUMO_ATTR_CHARGING_STATION:
@@ -1006,6 +1030,8 @@
             } else {
                 return false;
             }
+        case GNE_ATTR_PARAMETERS:
+            return areParametersValid(value);
         default:
             throw InvalidArgument(getTagStr() + " doesn't have an attribute of type '" + toString(key) + "'");
     }
@@ -1049,6 +1075,7 @@
     switch (key) {
         // Currently stops parents cannot be edited
         case SUMO_ATTR_BUS_STOP:
+        case SUMO_ATTR_TRAIN_STOP:
         case SUMO_ATTR_CONTAINER_STOP:
         case SUMO_ATTR_CHARGING_STATION:
         case SUMO_ATTR_PARKING_AREA:
@@ -1062,7 +1089,7 @@
         case SUMO_ATTR_EXPECTED:
             return (parametersSet & STOP_TRIGGER_SET) != 0;
         case SUMO_ATTR_PARKING:
-            if (myTagProperty.getTag() == SUMO_TAG_STOP_PARKINGAREA) {
+            if (myTagProperty.getTag() == GNE_TAG_STOP_PARKINGAREA) {
                 return false;
             } else if (myTagProperty.getTag() == GNE_TAG_WAYPOINT_PARKINGAREA) {
                 return false;
@@ -1086,6 +1113,8 @@
     if (getParentAdditionals().size() > 0) {
         if (getParentAdditionals().front()->getTagProperty().getTag() == SUMO_TAG_BUS_STOP) {
             return "BusStop: " + getParentAdditionals().front()->getID();
+        } else if (getParentAdditionals().front()->getTagProperty().getTag() == SUMO_TAG_TRAIN_STOP) {
+            return "TrainStop: " + getParentAdditionals().front()->getID();
         } else if (getParentAdditionals().front()->getTagProperty().getTag() == SUMO_TAG_CONTAINER_STOP) {
             return "containerStop: " + getParentAdditionals().front()->getID();
         } else if (getParentAdditionals().front()->getTagProperty().getTag() == SUMO_TAG_CHARGING_STATION) {
@@ -1374,7 +1403,7 @@
 
 
 void
-GNEStop::drawStopPersonOverBusStop(const GUIVisualizationSettings& s, const double exaggeration) const {
+GNEStop::drawStopPersonOverStoppingPlace(const GUIVisualizationSettings& s, const double exaggeration) const {
     // declare stop color
     const RGBColor stopColor = drawUsingSelectColor() ? s.colorSettings.selectedPersonPlanColor : s.colorSettings.stopColor;
     // avoid draw invisible elements
@@ -1388,7 +1417,11 @@
         // set base color
         GLHelper::setColor(stopColor);
         // Draw the area using shape, shapeRotations, shapeLengths and value of exaggeration
-        GUIGeometry::drawGeometry(s, myNet->getViewNet()->getPositionInformation(), myDemandElementGeometry, s.stoppingPlaceSettings.busStopWidth * exaggeration);
+        if (getParentAdditionals().front()->getTagProperty().getTag() == SUMO_TAG_TRAIN_STOP) {
+            GUIGeometry::drawGeometry(s, myNet->getViewNet()->getPositionInformation(), myDemandElementGeometry, s.stoppingPlaceSettings.trainStopWidth * exaggeration);
+        } else {
+            GUIGeometry::drawGeometry(s, myNet->getViewNet()->getPositionInformation(), myDemandElementGeometry, s.stoppingPlaceSettings.busStopWidth * exaggeration);
+        }
         // move to icon position and front
         glTranslated(myDemandElementGeometry.getShape().getLineCenter().x(), myDemandElementGeometry.getShape().getLineCenter().y(), .1);
         // rotate over lane
@@ -1590,19 +1623,23 @@
             break;
         // specific of Stops over stoppingPlaces
         case SUMO_ATTR_BUS_STOP:
-            replaceAdditionalParent(SUMO_TAG_BUS_STOP, value);
+            replaceFirstParentAdditional(SUMO_TAG_BUS_STOP, value);
+            updateGeometry();
+            break;
+        case SUMO_ATTR_TRAIN_STOP:
+            replaceFirstParentAdditional(SUMO_TAG_TRAIN_STOP, value);
             updateGeometry();
             break;
         case SUMO_ATTR_CONTAINER_STOP:
-            replaceAdditionalParent(SUMO_TAG_CONTAINER_STOP, value);
+            replaceFirstParentAdditional(SUMO_TAG_CONTAINER_STOP, value);
             updateGeometry();
             break;
         case SUMO_ATTR_CHARGING_STATION:
-            replaceAdditionalParent(SUMO_TAG_CHARGING_STATION, value);
+            replaceFirstParentAdditional(SUMO_TAG_CHARGING_STATION, value);
             updateGeometry();
             break;
         case SUMO_ATTR_PARKING_AREA:
-            replaceAdditionalParent(SUMO_TAG_PARKING_AREA, value);
+            replaceFirstParentAdditional(SUMO_TAG_PARKING_AREA, value);
             updateGeometry();
             break;
         // specific of Stops over edges
@@ -1652,6 +1689,9 @@
             }
             updateGeometry();
             break;
+        case GNE_ATTR_PARAMETERS:
+            setParametersStr(value);
+            break;
         default:
             throw InvalidArgument(getTagStr() + " doesn't have an attribute of type '" + toString(key) + "'");
     }
diff -Nru sumo-1.17.0/src/netedit/elements/demand/GNEStop.h sumo-1.18.0/src/netedit/elements/demand/GNEStop.h
--- sumo-1.17.0/src/netedit/elements/demand/GNEStop.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/demand/GNEStop.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -244,8 +244,8 @@
     /// @brief draw stopPerson over lane
     void drawStopPersonOverEdge(const GUIVisualizationSettings& s, const double exaggeration) const;
 
-    /// @brief draw stopPerson over busStop
-    void drawStopPersonOverBusStop(const GUIVisualizationSettings& s, const double exaggeration) const;
+    /// @brief draw stopPerson over stoppingPlace
+    void drawStopPersonOverStoppingPlace(const GUIVisualizationSettings& s, const double exaggeration) const;
 
     /// @brief draw index
     bool drawIndex() const;
diff -Nru sumo-1.17.0/src/netedit/elements/demand/GNETranship.cpp sumo-1.18.0/src/netedit/elements/demand/GNETranship.cpp
--- sumo-1.17.0/src/netedit/elements/demand/GNETranship.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/demand/GNETranship.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -563,7 +563,7 @@
             computePathElement();
             break;
         case GNE_ATTR_TO_CONTAINERSTOP:
-            replaceAdditionalParent(SUMO_TAG_CONTAINER_STOP, value);
+            replaceFirstParentAdditional(SUMO_TAG_CONTAINER_STOP, value);
             // compute tranship
             computePathElement();
             break;
diff -Nru sumo-1.17.0/src/netedit/elements/demand/GNETranship.h sumo-1.18.0/src/netedit/elements/demand/GNETranship.h
--- sumo-1.17.0/src/netedit/elements/demand/GNETranship.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/demand/GNETranship.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/elements/demand/GNETransport.cpp sumo-1.18.0/src/netedit/elements/demand/GNETransport.cpp
--- sumo-1.17.0/src/netedit/elements/demand/GNETransport.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/demand/GNETransport.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -474,7 +474,7 @@
             computePathElement();
             break;
         case GNE_ATTR_TO_CONTAINERSTOP:
-            replaceAdditionalParent(SUMO_TAG_CONTAINER_STOP, value);
+            replaceFirstParentAdditional(SUMO_TAG_CONTAINER_STOP, value);
             // compute transport
             computePathElement();
             break;
diff -Nru sumo-1.17.0/src/netedit/elements/demand/GNETransport.h sumo-1.18.0/src/netedit/elements/demand/GNETransport.h
--- sumo-1.17.0/src/netedit/elements/demand/GNETransport.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/demand/GNETransport.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/elements/demand/GNEVehicle.cpp sumo-1.18.0/src/netedit/elements/demand/GNEVehicle.cpp
--- sumo-1.17.0/src/netedit/elements/demand/GNEVehicle.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/demand/GNEVehicle.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -262,7 +262,7 @@
 GNEVehicle::GNEVehicle(SumoXMLTag tag, GNENet* net) :
     GNEDemandElement("", net, GLO_VEHICLE, tag, GUIIconSubSys::getIcon(GUIIcon::VEHICLE),
                      GNEPathManager::PathElement::Options::DEMAND_ELEMENT, {}, {}, {}, {}, {}, {}),
-SUMOVehicleParameter() {
+    SUMOVehicleParameter() {
     // reset default values
     resetDefaultValues();
     // set end and vehPerHours
@@ -275,7 +275,7 @@
     GNEDemandElement(vehicleID, net, (tag == GNE_TAG_FLOW_ROUTE) ? GLO_ROUTEFLOW : GLO_VEHICLE, tag,
                      (tag == GNE_TAG_FLOW_ROUTE) ? GUIIconSubSys::getIcon(GUIIcon::ROUTEFLOW) : GUIIconSubSys::getIcon(GUIIcon::VEHICLE),
                      GNEPathManager::PathElement::Options::DEMAND_ELEMENT, {}, {}, {}, {}, {vehicleType, route}, {}),
-SUMOVehicleParameter() {
+    SUMOVehicleParameter() {
     // SUMOVehicleParameter ID has to be set manually
     id = vehicleID;
     // set manually vtypeID (needed for saving)
@@ -289,7 +289,7 @@
     GNEDemandElement(vehicleParameters.id, net, (tag == GNE_TAG_FLOW_ROUTE) ? GLO_ROUTEFLOW : GLO_VEHICLE, tag,
                      (tag == GNE_TAG_FLOW_ROUTE) ? GUIIconSubSys::getIcon(GUIIcon::ROUTEFLOW) : GUIIconSubSys::getIcon(GUIIcon::VEHICLE),
                      GNEPathManager::PathElement::Options::DEMAND_ELEMENT, {}, {}, {}, {}, {vehicleType, route}, {}),
-SUMOVehicleParameter(vehicleParameters) {
+    SUMOVehicleParameter(vehicleParameters) {
     // SUMOVehicleParameter ID has to be set manually
     id = vehicleParameters.id;
     // set manually vtypeID (needed for saving)
@@ -303,7 +303,7 @@
     GNEDemandElement(vehicleParameters.id, net, (tag == GNE_TAG_VEHICLE_WITHROUTE) ? GLO_VEHICLE : GLO_ROUTEFLOW, tag,
                      (tag == GNE_TAG_FLOW_ROUTE) ? GUIIconSubSys::getIcon(GUIIcon::ROUTEFLOW) : GUIIconSubSys::getIcon(GUIIcon::VEHICLE),
                      GNEPathManager::PathElement::Options::DEMAND_ELEMENT, {}, {}, {}, {}, {vehicleType}, {}),
-SUMOVehicleParameter(vehicleParameters) {
+    SUMOVehicleParameter(vehicleParameters) {
     // SUMOVehicleParameter ID has to be set manually
     id = vehicleParameters.id;
     // reset routeid
@@ -320,7 +320,7 @@
     GNEDemandElement(vehicleID, net, (tag == SUMO_TAG_FLOW) ? GLO_FLOW : GLO_TRIP, tag,
                      (tag == SUMO_TAG_FLOW) ? GUIIconSubSys::getIcon(GUIIcon::FLOW) : GUIIconSubSys::getIcon(GUIIcon::TRIP),
                      GNEPathManager::PathElement::Options::DEMAND_ELEMENT, {}, {fromEdge, toEdge}, {}, {}, {vehicleType}, {}),
-SUMOVehicleParameter() {
+    SUMOVehicleParameter() {
     // adjust default flow attributes
     adjustDefaultFlowAttributes(this);
 }
@@ -331,7 +331,7 @@
     GNEDemandElement(vehicleParameters.id, net, (tag == SUMO_TAG_FLOW) ? GLO_FLOW : GLO_TRIP, tag,
                      (tag == SUMO_TAG_FLOW) ? GUIIconSubSys::getIcon(GUIIcon::FLOW) : GUIIconSubSys::getIcon(GUIIcon::TRIP),
                      GNEPathManager::PathElement::Options::DEMAND_ELEMENT, {}, {fromEdge, toEdge}, {}, {}, {vehicleType}, {}),
-SUMOVehicleParameter(vehicleParameters) {
+    SUMOVehicleParameter(vehicleParameters) {
     // adjust default flow attributes
     adjustDefaultFlowAttributes(this);
 }
@@ -340,10 +340,8 @@
 GNEVehicle::GNEVehicle(SumoXMLTag tag, GNENet* net, const std::string& vehicleID, GNEDemandElement* vehicleType, GNEJunction* fromJunction, GNEJunction* toJunction) :
     GNEDemandElement(vehicleID, net, (tag == GNE_TAG_FLOW_JUNCTIONS) ? GLO_FLOW : GLO_TRIP, tag,
                      (tag == GNE_TAG_FLOW_JUNCTIONS) ? GUIIconSubSys::getIcon(GUIIcon::FLOW_JUNCTIONS) : GUIIconSubSys::getIcon(GUIIcon::TRIP_JUNCTIONS),
-                     GNEPathManager::PathElement::Options::DEMAND_ELEMENT, {
-    fromJunction, toJunction
-}, {}, {}, {}, {vehicleType}, {}),
-SUMOVehicleParameter() {
+                     GNEPathManager::PathElement::Options::DEMAND_ELEMENT, {fromJunction, toJunction}, {}, {}, {}, {vehicleType}, {}),
+    SUMOVehicleParameter() {
     // adjust default flow attributes
     adjustDefaultFlowAttributes(this);
 }
@@ -352,10 +350,23 @@
 GNEVehicle::GNEVehicle(SumoXMLTag tag, GNENet* net, GNEDemandElement* vehicleType, GNEJunction* fromJunction, GNEJunction* toJunction, const SUMOVehicleParameter& vehicleParameters) :
     GNEDemandElement(vehicleParameters.id, net, (tag == GNE_TAG_FLOW_JUNCTIONS) ? GLO_FLOW : GLO_TRIP, tag,
                      (tag == GNE_TAG_FLOW_JUNCTIONS) ? GUIIconSubSys::getIcon(GUIIcon::FLOW_JUNCTIONS) : GUIIconSubSys::getIcon(GUIIcon::TRIP_JUNCTIONS),
-                     GNEPathManager::PathElement::Options::DEMAND_ELEMENT, {
-    fromJunction, toJunction
-}, {}, {}, {}, {vehicleType}, {}),
-SUMOVehicleParameter(vehicleParameters) {
+                     GNEPathManager::PathElement::Options::DEMAND_ELEMENT, {fromJunction, toJunction}, {}, {}, {}, {vehicleType}, {}),
+    SUMOVehicleParameter(vehicleParameters) {
+    // adjust default flow attributes
+    adjustDefaultFlowAttributes(this);
+}
+
+
+GNEVehicle::GNEVehicle(SumoXMLTag tag, GNENet* net, GNEDemandElement* vehicleType, GNEAdditional* fromTAZ, GNEAdditional* toTAZ, const SUMOVehicleParameter& vehicleParameters) :
+    GNEDemandElement(vehicleParameters.id, net, (tag == GNE_TAG_FLOW_TAZS) ? GLO_FLOW : GLO_TRIP, tag,
+                     (tag == GNE_TAG_FLOW_TAZS) ? GUIIconSubSys::getIcon(GUIIcon::FLOW_TAZS) : GUIIconSubSys::getIcon(GUIIcon::TRIP_TAZS),
+                     GNEPathManager::PathElement::Options::DEMAND_ELEMENT, {}, {}, {}, {fromTAZ, toTAZ}, {vehicleType}, {}),
+    SUMOVehicleParameter(vehicleParameters) {
+    // mark taz parameters as set
+    parametersSet |= VEHPARS_FROM_TAZ_SET;
+    parametersSet |= VEHPARS_TO_TAZ_SET;
+    fromTaz = fromTAZ->getID();
+    toTaz = toTAZ->getID();
     // adjust default flow attributes
     adjustDefaultFlowAttributes(this);
 }
@@ -406,7 +417,7 @@
 void
 GNEVehicle::writeDemandElement(OutputDevice& device) const {
     // attribute VType must not be written if is DEFAULT_VTYPE_ID
-    if (getParentDemandElements().at(0)->getID() == DEFAULT_VTYPE_ID) {
+    if (getTypeParent()->getID() == DEFAULT_VTYPE_ID) {
         // unset VType parameter
         parametersSet &= ~VEHPARS_VTYPE_SET;
         // write vehicle attributes (VType will not be written)
@@ -415,12 +426,12 @@
         parametersSet |= VEHPARS_VTYPE_SET;
     } else {
         // write vehicle attributes, including VType
-        write(device, OptionsCont::getOptions(), myTagProperty.getXMLTag(), getParentDemandElements().at(0)->getID());
+        write(device, OptionsCont::getOptions(), myTagProperty.getXMLTag(), getTypeParent()->getID());
     }
     // write specific attribute depending of tag property
     if (myTagProperty.getTag() == SUMO_TAG_VEHICLE || myTagProperty.getTag() == GNE_TAG_FLOW_ROUTE) {
         // write route
-        device.writeAttr(SUMO_ATTR_ROUTE, getParentDemandElements().at(1)->getID());
+        device.writeAttr(SUMO_ATTR_ROUTE, getRouteParent()->getID());
     }
     // write from, to and edge vias
     if ((myTagProperty.getTag() == SUMO_TAG_TRIP) || (myTagProperty.getTag() == SUMO_TAG_FLOW)) {
@@ -432,7 +443,7 @@
             device.writeAttr(SUMO_ATTR_VIA, via);
         }
     }
-    // write fromJunction and toJunction
+    // write from and to junctions
     if ((myTagProperty.getTag() == GNE_TAG_TRIP_JUNCTIONS) || (myTagProperty.getTag() == GNE_TAG_FLOW_JUNCTIONS)) {
         // write manually from/to junctions (it correspond to front and back parent junctions)
         device.writeAttr(SUMO_ATTR_FROMJUNCTION, getParentJunctions().front()->getID());
@@ -486,10 +497,13 @@
 
 GNEDemandElement::Problem
 GNEVehicle::isDemandElementValid() const {
-    // only trips or flows can have problems
-    if ((myTagProperty.getTag() == SUMO_TAG_TRIP) || (myTagProperty.getTag() == SUMO_TAG_FLOW) ||
+    // check conditions
+    if ((myTagProperty.getTag() == GNE_TAG_TRIP_TAZS) || (myTagProperty.getTag() == GNE_TAG_FLOW_TAZS)) {
+        // vehicles and flows over tazs are always valid
+        return Problem::OK;
+    } else if ((myTagProperty.getTag() == SUMO_TAG_TRIP) || (myTagProperty.getTag() == SUMO_TAG_FLOW) ||
             (myTagProperty.getTag() == GNE_TAG_TRIP_JUNCTIONS) || (myTagProperty.getTag() == GNE_TAG_FLOW_JUNCTIONS)) {
-        // check path
+        // check vehicles and flows paths
         if (myNet->getPathManager()->isPathValid(this)) {
             return Problem::OK;
         } else {
@@ -497,14 +511,14 @@
         }
     } else if (getParentDemandElements().size() == 2) {
         // check if exist a valid path using route parent edges
-        if (myNet->getPathManager()->getPathCalculator()->calculateDijkstraPath(getParentDemandElements().at(0)->getVClass(), getParentDemandElements().at(1)->getParentEdges()).size() > 0) {
+        if (myNet->getPathManager()->getPathCalculator()->calculateDijkstraPath(getTypeParent()->getVClass(), getRouteParent()->getParentEdges()).size() > 0) {
             return Problem::OK;
         } else {
             return Problem::INVALID_PATH;
         }
     } else if ((getChildDemandElements().size() > 0) && getChildDemandElements().front()->getTagProperty().isRoute()) {
         // check if exist a valid path using route child edges
-        if (myNet->getPathManager()->getPathCalculator()->calculateDijkstraPath(getParentDemandElements().at(0)->getVClass(), getChildDemandElements().at(0)->getParentEdges()).size() > 0) {
+        if (myNet->getPathManager()->getPathCalculator()->calculateDijkstraPath(getTypeParent()->getVClass(), getChildDemandElements().at(0)->getParentEdges()).size() > 0) {
             return Problem::OK;
         } else {
             return Problem::INVALID_PATH;
@@ -521,7 +535,7 @@
     if ((myTagProperty.getTag() == SUMO_TAG_TRIP) || (myTagProperty.getTag() == SUMO_TAG_FLOW)) {
         // check if exist at least a connection between every edge
         for (int i = 1; i < (int)getParentEdges().size(); i++) {
-            if (myNet->getPathManager()->getPathCalculator()->consecutiveEdgesConnected(getParentDemandElements().at(0)->getVClass(), getParentEdges().at((int)i - 1), getParentEdges().at(i)) == false) {
+            if (myNet->getPathManager()->getPathCalculator()->consecutiveEdgesConnected(getTypeParent()->getVClass(), getParentEdges().at((int)i - 1), getParentEdges().at(i)) == false) {
                 return ("There is no valid path between edges '" + getParentEdges().at((int)i - 1)->getID() + "' and '" + getParentEdges().at(i)->getID() + "'");
             }
         }
@@ -531,10 +545,10 @@
         return ("No path between junction '" + getParentJunctions().front()->getID() + "' and '" + getParentJunctions().back()->getID() + "'");
     } else if (getParentDemandElements().size() == 2) {
         // get route parent edges
-        const std::vector& routeEdges = getParentDemandElements().at(1)->getParentEdges();
+        const std::vector& routeEdges = getRouteParent()->getParentEdges();
         // check if exist at least a connection between every edge
         for (int i = 1; i < (int)routeEdges.size(); i++) {
-            if (myNet->getPathManager()->getPathCalculator()->consecutiveEdgesConnected(getParentDemandElements().at(0)->getVClass(), routeEdges.at((int)i - 1), routeEdges.at(i)) == false) {
+            if (myNet->getPathManager()->getPathCalculator()->consecutiveEdgesConnected(getTypeParent()->getVClass(), routeEdges.at((int)i - 1), routeEdges.at(i)) == false) {
                 return ("There is no valid path between route edges '" + routeEdges.at((int)i - 1)->getID() + "' and '" + routeEdges.at(i)->getID() + "'");
             }
         }
@@ -545,7 +559,7 @@
         const std::vector& routeEdges = getChildDemandElements().at(0)->getParentEdges();
         // check if exist at least a connection between every edge
         for (int i = 1; i < (int)routeEdges.size(); i++) {
-            if (myNet->getPathManager()->getPathCalculator()->consecutiveEdgesConnected(getParentDemandElements().at(0)->getVClass(), routeEdges.at((int)i - 1), routeEdges.at(i)) == false) {
+            if (myNet->getPathManager()->getPathCalculator()->consecutiveEdgesConnected(getTypeParent()->getVClass(), routeEdges.at((int)i - 1), routeEdges.at(i)) == false) {
                 return ("There is no valid path between embedded route edges '" + routeEdges.at((int)i - 1)->getID() + "' and '" + routeEdges.at(i)->getID() + "'");
             }
         }
@@ -559,7 +573,7 @@
 
 void
 GNEVehicle::fixDemandElementProblem() {
-
+    //
 }
 
 
@@ -584,6 +598,13 @@
         const double rot = ((double)atan2((posB.x() - posA.x()), (posA.y() - posB.y())) * (double) -180.0 / (double)M_PI);
         // update Geometry
         myDemandElementGeometry.updateSinglePosGeometry(getParentJunctions().front()->getPositionInView(), rot);
+    } else if (getParentAdditionals().size() > 0) {
+        // calculate rotation between both junctions
+        const Position posA = getParentAdditionals().front()->getPositionInView();
+        const Position posB = getParentAdditionals().back()->getPositionInView();
+        const double rot = ((double)atan2((posB.x() - posA.x()), (posA.y() - posB.y())) * (double) -180.0 / (double)M_PI);
+        // update Geometry
+        myDemandElementGeometry.updateSinglePosGeometry(getParentAdditionals().front()->getPositionInView(), rot);
     } else {
         // get first path lane
         const GNELane* firstPathLane = getFirstPathLane();
@@ -638,7 +659,7 @@
 std::string
 GNEVehicle::getParentName() const {
     if ((myTagProperty.getTag() == SUMO_TAG_VEHICLE) || (myTagProperty.getTag() == GNE_TAG_FLOW_ROUTE)) {
-        return getParentDemandElements().at(1)->getID();
+        return getRouteParent()->getID();
     } else if ((myTagProperty.getTag() == SUMO_TAG_TRIP) || (myTagProperty.getTag() == SUMO_TAG_FLOW)) {
         return getParentEdges().front()->getID();
     } else {
@@ -677,8 +698,8 @@
         // declare common attributes
         const bool drawSpreadVehicles = (myNet->getViewNet()->getNetworkViewOptions().drawSpreadVehicles() || myNet->getViewNet()->getDemandViewOptions().drawSpreadVehicles());
         const double exaggeration = getExaggeration(s);
-        const double width = getParentDemandElements().at(0)->getAttributeDouble(SUMO_ATTR_WIDTH);
-        const double length = getParentDemandElements().at(0)->getAttributeDouble(SUMO_ATTR_LENGTH);
+        const double width = getTypeParent()->getAttributeDouble(SUMO_ATTR_WIDTH);
+        const double length = getTypeParent()->getAttributeDouble(SUMO_ATTR_LENGTH);
         const double vehicleSizeSquared = (width * width) * (length * length) * (exaggeration * exaggeration);
         const auto vehicleColor = setColor(s);
         // obtain Position an rotation (depending of draw spread vehicles)
@@ -706,7 +727,7 @@
                 // Pop last matrix
                 GLHelper::popMatrix();
             } else {
-                SUMOVehicleShape shape = getVehicleShapeID(getParentDemandElements().at(0)->getAttribute(SUMO_ATTR_GUISHAPE));
+                SUMOVehicleShape shape = getVehicleShapeID(getTypeParent()->getAttribute(SUMO_ATTR_GUISHAPE));
                 // push draw matrix
                 GLHelper::pushMatrix();
                 // Start with the drawing of the area translating matrix to origin
@@ -739,7 +760,7 @@
                     }
                     // check if min gap has to be drawn
                     if (s.drawMinGap) {
-                        const double minGap = -1 * getParentDemandElements().at(0)->getAttributeDouble(SUMO_ATTR_MINGAP);
+                        const double minGap = -1 * getTypeParent()->getAttributeDouble(SUMO_ATTR_MINGAP);
                         glColor3d(0., 1., 0.);
                         glBegin(GL_LINES);
                         glVertex2d(0., 0);
@@ -752,7 +773,7 @@
                     glTranslated(0, MIN2(length / 2, double(5)), -getType());
                     glScaled(1 / exaggeration, 1 / upscaleLength, 1);
                     glRotated(vehicleRotation, 0, 0, -1);
-                    drawName(Position(0, 0), s.scale, getParentDemandElements().at(0)->getAttribute(SUMO_ATTR_GUISHAPE) == "pedestrian" ? s.personName : s.vehicleName, s.angle);
+                    drawName(Position(0, 0), s.scale, getTypeParent()->getAttribute(SUMO_ATTR_GUISHAPE) == "pedestrian" ? s.personName : s.vehicleName, s.angle);
                     // draw line
                     if (s.vehicleName.show(this) && line != "") {
                         glTranslated(0, 0.6 * s.vehicleName.scaledSize(s.scale), 0);
@@ -767,7 +788,7 @@
                 }
                 // draw stack label
                 if ((myStackedLabelNumber > 0) && !drawSpreadVehicles) {
-                    drawStackLabel("Vehicle", vehiclePosition, vehicleRotation, width, length, exaggeration);
+                    drawStackLabel(myStackedLabelNumber, "Vehicle", vehiclePosition, vehicleRotation, width, length, exaggeration);
                 }
                 // draw flow label
                 if (myTagProperty.isFlow()) {
@@ -885,7 +906,7 @@
         // calculate width
         const double width = s.vehicleSize.getExaggeration(s, lane) * s.widthSettings.tripWidth;
         // calculate startPos
-        const double geometryDepartPos = (getParentJunctions().size() > 0) ? 0 : getAttributeDouble(SUMO_ATTR_DEPARTPOS) + getParentDemandElements().at(0)->getAttributeDouble(SUMO_ATTR_LENGTH);
+        const double geometryDepartPos = (getParentJunctions().size() > 0) ? 0 : getAttributeDouble(SUMO_ATTR_DEPARTPOS) + getTypeParent()->getAttributeDouble(SUMO_ATTR_LENGTH);
         // get endPos
         const double geometryEndPos = (getParentJunctions().size() > 0) ? lane->getLaneGeometry().getShape().length2D() : getAttributeDouble(SUMO_ATTR_ARRIVALPOS);
         // declare path geometry
@@ -1072,12 +1093,12 @@
     // continue depending of tags
     if ((myTagProperty.getTag() == SUMO_TAG_VEHICLE) || (myTagProperty.getTag() == GNE_TAG_FLOW_ROUTE)) {
         // check departEdge
-        if ((departEdge > 0) && (departEdge < (int)getParentDemandElements().at(1)->getParentEdges().size())) {
+        if ((departEdge > 0) && (departEdge < (int)getRouteParent()->getParentEdges().size())) {
             // use departEdge
-            firstEdge = getParentDemandElements().at(1)->getParentEdges().at(departEdge);
+            firstEdge = getRouteParent()->getParentEdges().at(departEdge);
         } else {
             // use first route edge
-            firstEdge = getParentDemandElements().at(1)->getParentEdges().front();
+            firstEdge = getRouteParent()->getParentEdges().front();
         }
     } else if (myTagProperty.hasEmbeddedRoute()) {
         // check if embedded route exist (due during loading embedded route doesn't exist
@@ -1118,12 +1139,12 @@
     // continue depending of tags
     if ((myTagProperty.getTag() == SUMO_TAG_VEHICLE) || (myTagProperty.getTag() == GNE_TAG_FLOW_ROUTE)) {
         // check arrivalEdge
-        if ((arrivalEdge > 0) && (arrivalEdge < (int)getParentDemandElements().at(1)->getParentEdges().size())) {
+        if ((arrivalEdge > 0) && (arrivalEdge < (int)getRouteParent()->getParentEdges().size())) {
             // use arrival edge
-            lastEdge = getParentDemandElements().at(1)->getParentEdges().at(arrivalEdge);
+            lastEdge = getRouteParent()->getParentEdges().at(arrivalEdge);
         } else {
             // use last route edge
-            lastEdge = getParentDemandElements().at(1)->getParentEdges().back();
+            lastEdge = getRouteParent()->getParentEdges().back();
         }
     } else if (myTagProperty.hasEmbeddedRoute()) {
         // check if embedded route exist (due during loading embedded route doesn't exist)
@@ -1165,7 +1186,7 @@
         case SUMO_ATTR_ID:
             return getMicrosimID();
         case SUMO_ATTR_TYPE:
-            return getParentDemandElements().at(0)->getID();
+            return vtypeid;
         case SUMO_ATTR_COLOR:
             if (wasSet(VEHPARS_COLOR_SET)) {
                 return toString(color);
@@ -1264,7 +1285,7 @@
             }
         case SUMO_ATTR_ROUTE:
             if (getParentDemandElements().size() == 2) {
-                return getParentDemandElements().at(1)->getID();
+                return getRouteParent()->getID();
             } else {
                 return "";
             }
@@ -1292,6 +1313,11 @@
             return getParentJunctions().front()->getID();
         case SUMO_ATTR_TOJUNCTION:
             return getParentJunctions().back()->getID();
+        // Specific of from-to tazs
+        case SUMO_ATTR_FROM_TAZ:
+            return getParentAdditionals().front()->getID();
+        case SUMO_ATTR_TO_TAZ:
+            return getParentAdditionals().back()->getID();
         // Specific of flows
         case SUMO_ATTR_END:
             return time2string(repetitionEnd);
@@ -1353,7 +1379,7 @@
         case SUMO_ATTR_WIDTH:
         case SUMO_ATTR_LENGTH:
         case SUMO_ATTR_MINGAP:
-            return getParentDemandElements().at(0)->getAttributeDouble(key);
+            return getTypeParent()->getAttributeDouble(key);
         default:
             throw InvalidArgument(getTagStr() + " doesn't have a double attribute of type '" + toString(key) + "'");
     }
@@ -1436,6 +1462,9 @@
         // Specific of from-to junctions
         case SUMO_ATTR_FROMJUNCTION:
         case SUMO_ATTR_TOJUNCTION:
+        // Specific of from-to taz
+        case SUMO_ATTR_FROM_TAZ:
+        case SUMO_ATTR_TO_TAZ:
         // Specific of flows
         case SUMO_ATTR_END:
         case SUMO_ATTR_NUMBER:
@@ -1456,22 +1485,26 @@
 
 bool
 GNEVehicle::isValid(SumoXMLAttr key, const std::string& value) {
+    // get ACs
+    const auto ACs = myNet->getAttributeCarriers();
     // declare string error
     std::string error;
     switch (key) {
         case SUMO_ATTR_ID:
-            // Vehicles, Trips and Flows share namespace
-            if (SUMOXMLDefinitions::isValidVehicleID(value) &&
-                    (myNet->getAttributeCarriers()->retrieveDemandElement(SUMO_TAG_VEHICLE, value, false) == nullptr) &&
-                    (myNet->getAttributeCarriers()->retrieveDemandElement(SUMO_TAG_TRIP, value, false) == nullptr) &&
-                    (myNet->getAttributeCarriers()->retrieveDemandElement(GNE_TAG_FLOW_ROUTE, value, false) == nullptr) &&
-                    (myNet->getAttributeCarriers()->retrieveDemandElement(SUMO_TAG_FLOW, value, false) == nullptr)) {
+            if (value == getID()) {
                 return true;
+            } else if (SUMOXMLDefinitions::isValidVehicleID(value)) {
+                return (demandElementExist(value, {SUMO_TAG_VEHICLE, GNE_TAG_VEHICLE_WITHROUTE, SUMO_TAG_TRIP, GNE_TAG_TRIP_TAZS,
+                    GNE_TAG_FLOW_ROUTE, GNE_TAG_FLOW_WITHROUTE, SUMO_TAG_FLOW, SUMO_TAG_FLOW, SUMO_TAG_FLOW, GNE_TAG_FLOW_JUNCTIONS}) == false);
             } else {
                 return false;
             }
         case SUMO_ATTR_TYPE:
-            return SUMOXMLDefinitions::isValidTypeID(value) && (myNet->getAttributeCarriers()->retrieveDemandElement(SUMO_TAG_VTYPE, value, false) != nullptr);
+            if (SUMOXMLDefinitions::isValidVehicleID(value)) {
+                return demandElementExist(value, {SUMO_TAG_VTYPE, SUMO_TAG_VTYPE_DISTRIBUTION});
+            } else {
+                return false;
+            }
         case SUMO_ATTR_COLOR:
             return canParse(value);
         case SUMO_ATTR_DEPARTLANE: {
@@ -1486,6 +1519,8 @@
                     return true;
                 } else if (getParentJunctions().size() > 0) {
                     return (dummyDepartLane == 0);
+                } else if (getParentAdditionals().size() > 0) {
+                    return (dummyDepartLane == 0);
                 } else {
                     return dummyDepartLane < (int)getFirstPathLane()->getParentEdge()->getLanes().size();
                 }
@@ -1511,7 +1546,7 @@
                 } else if (isTemplate()) {
                     return true;
                 } else {
-                    return (dummyDepartSpeed <= getParentDemandElements().at(0)->getAttributeDouble(SUMO_ATTR_MAXSPEED));
+                    return (dummyDepartSpeed <= getTypeParent()->getAttributeDouble(SUMO_ATTR_MAXSPEED));
                 }
             } else {
                 return false;
@@ -1529,6 +1564,8 @@
                     return true;
                 } else if (getParentJunctions().size() > 0) {
                     return (dummyArrivalLane == 0);
+                } else if (getParentAdditionals().size() > 0) {
+                    return (dummyArrivalLane == 0);
                 } else {
                     return dummyArrivalLane < (int)getLastPathLane()->getParentEdge()->getLanes().size();
                 }
@@ -1585,14 +1622,14 @@
         }
         case SUMO_ATTR_ROUTE:
             if (getParentDemandElements().size() == 2) {
-                return SUMOXMLDefinitions::isValidVehicleID(value) && (myNet->getAttributeCarriers()->retrieveDemandElement(SUMO_TAG_ROUTE, value, false) != nullptr);
+                return SUMOXMLDefinitions::isValidVehicleID(value) && (ACs->retrieveDemandElement(SUMO_TAG_ROUTE, value, false) != nullptr);
             } else {
                 return true;
             }
         // Specific of from-to edges
         case SUMO_ATTR_FROM:
         case SUMO_ATTR_TO:
-            return SUMOXMLDefinitions::isValidNetID(value) && (myNet->getAttributeCarriers()->retrieveEdge(value, false) != nullptr);
+            return SUMOXMLDefinitions::isValidNetID(value) && (ACs->retrieveEdge(value, false) != nullptr);
         case SUMO_ATTR_DEPARTEDGE:
         case SUMO_ATTR_ARRIVALEDGE: {
             if (value.empty()) {
@@ -1605,7 +1642,7 @@
                     return false;
                 } else if (myTagProperty.getTag() == SUMO_TAG_VEHICLE || myTagProperty.getTag() == GNE_TAG_FLOW_ROUTE) {
                     // check parent route
-                    return (index < (int)getParentDemandElements().at(1)->getParentEdges().size());
+                    return (index < (int)getRouteParent()->getParentEdges().size());
                 } else {
                     // check embedded route
                     return (index < (int)getChildDemandElements().front()->getParentEdges().size());
@@ -1623,7 +1660,11 @@
         // Specific of from-to junctions
         case SUMO_ATTR_FROMJUNCTION:
         case SUMO_ATTR_TOJUNCTION:
-            return SUMOXMLDefinitions::isValidNetID(value) && (myNet->getAttributeCarriers()->retrieveJunction(value, false) != nullptr);
+            return SUMOXMLDefinitions::isValidNetID(value) && (ACs->retrieveJunction(value, false) != nullptr);
+        // Specific of from-to taz
+        case SUMO_ATTR_FROM_TAZ:
+        case SUMO_ATTR_TO_TAZ:
+            return (ACs->retrieveAdditional(SUMO_TAG_TAZ, value, false) != nullptr);
         // Specific of flows
         case SUMO_ATTR_END:
             if (canParse(value)) {
@@ -1776,18 +1817,18 @@
         switch (c.getActive()) {
             case 0: {
                 // test for emergency vehicle
-                if (getParentDemandElements().at(0)->getAttribute(SUMO_ATTR_GUISHAPE) == "emergency") {
+                if (getTypeParent()->getAttribute(SUMO_ATTR_GUISHAPE) == "emergency") {
                     return RGBColor::WHITE;
                 }
                 // test for firebrigade
-                if (getParentDemandElements().at(0)->getAttribute(SUMO_ATTR_GUISHAPE) == "firebrigade") {
+                if (getTypeParent()->getAttribute(SUMO_ATTR_GUISHAPE) == "firebrigade") {
                     return RGBColor::RED;
                 }
                 // test for police car
-                if (getParentDemandElements().at(0)->getAttribute(SUMO_ATTR_GUISHAPE) == "police") {
+                if (getTypeParent()->getAttribute(SUMO_ATTR_GUISHAPE) == "police") {
                     return RGBColor::BLUE;
                 }
-                if (getParentDemandElements().at(0)->getAttribute(SUMO_ATTR_GUISHAPE) == "scooter") {
+                if (getTypeParent()->getAttribute(SUMO_ATTR_GUISHAPE) == "scooter") {
                     return RGBColor::WHITE;
                 }
                 // check if color was set
@@ -1795,7 +1836,7 @@
                     return color;
                 } else {
                     // take their parent's color)
-                    return getParentDemandElements().at(0)->getColor();
+                    return getTypeParent()->getColor();
                 }
             }
             case 2: {
@@ -1806,22 +1847,22 @@
                 }
             }
             case 3: {
-                if (getParentDemandElements().at(0)->isAttributeEnabled(SUMO_ATTR_COLOR)) {
-                    return getParentDemandElements().at(0)->getColor();
+                if (getTypeParent()->isAttributeEnabled(SUMO_ATTR_COLOR)) {
+                    return getTypeParent()->getColor();
                 } else {
                     return c.getScheme().getColor(0);
                 }
                 break;
             }
             case 4: {
-                if (getParentDemandElements().at(1)->getColor() != RGBColor::DEFAULT_COLOR) {
-                    return getParentDemandElements().at(1)->getColor();
+                if (getRouteParent()->getColor() != RGBColor::DEFAULT_COLOR) {
+                    return getRouteParent()->getColor();
                 } else {
                     return c.getScheme().getColor(0);
                 }
             }
             case 5: {
-                Position p = getParentDemandElements().at(1)->getParentEdges().at(0)->getLanes().at(0)->getLaneShape()[0];
+                Position p = getRouteParent()->getParentEdges().at(0)->getLanes().at(0)->getLaneShape()[0];
                 const Boundary& b = myNet->getBoundary();
                 Position center = b.getCenter();
                 double hue = 180. + atan2(center.x() - p.x(), center.y() - p.y()) * 180. / M_PI;
@@ -1829,7 +1870,7 @@
                 return RGBColor::fromHSV(hue, sat, 1.);
             }
             case 6: {
-                Position p = getParentDemandElements().at(1)->getParentEdges().back()->getLanes().at(0)->getLaneShape()[-1];
+                Position p = getRouteParent()->getParentEdges().back()->getLanes().at(0)->getLaneShape()[-1];
                 const Boundary& b = myNet->getBoundary();
                 Position center = b.getCenter();
                 double hue = 180. + atan2(center.x() - p.x(), center.y() - p.y()) * 180. / M_PI;
@@ -1837,8 +1878,8 @@
                 return RGBColor::fromHSV(hue, sat, 1.);
             }
             case 7: {
-                Position pb = getParentDemandElements().at(1)->getParentEdges().at(0)->getLanes().at(0)->getLaneShape()[0];
-                Position pe = getParentDemandElements().at(1)->getParentEdges().back()->getLanes().at(0)->getLaneShape()[-1];
+                Position pb = getRouteParent()->getParentEdges().at(0)->getLanes().at(0)->getLaneShape()[0];
+                Position pe = getRouteParent()->getParentEdges().back()->getLanes().at(0)->getLaneShape()[-1];
                 const Boundary& b = myNet->getBoundary();
                 double hue = 180. + atan2(pb.x() - pe.x(), pb.y() - pe.y()) * 180. / M_PI;
                 Position minp(b.xmin(), b.ymin());
@@ -1882,7 +1923,11 @@
             break;
         case SUMO_ATTR_TYPE:
             if (getID().size() > 0) {
-                replaceDemandElementParent(SUMO_TAG_VTYPE, value, 0);
+                if (myNet->getAttributeCarriers()->retrieveDemandElement(SUMO_TAG_VTYPE, value, false) != nullptr) {
+                    replaceDemandElementParent(SUMO_TAG_VTYPE, value, 0);
+                } else {
+                    replaceDemandElementParent(SUMO_TAG_VTYPE_DISTRIBUTION, value, 0);
+                }
                 // set manually vtypeID (needed for saving)
                 vtypeid = value;
             }
@@ -2156,6 +2201,27 @@
             updateSpreadStackGeometry = true;
             break;
         }
+        // Specific of from-to TAZs
+        case SUMO_ATTR_FROM_TAZ: {
+            // change first additional
+            replaceFirstParentAdditional(SUMO_TAG_TAZ, value);
+            // set taz manually
+            fromTaz = value;
+            // compute vehicle
+            computePathElement();
+            updateSpreadStackGeometry = true;
+            break;
+        }
+        case SUMO_ATTR_TO_TAZ: {
+            // change last additional
+            replaceLastParentAdditional(SUMO_TAG_TAZ, value);
+            // set taz manually
+            toTaz = value;
+            // compute vehicle
+            computePathElement();
+            updateSpreadStackGeometry = true;
+            break;
+        }
         // Specific of flows
         case SUMO_ATTR_END:
             repetitionEnd = string2time(value);
@@ -2195,8 +2261,8 @@
             getParentEdges().front()->updateVehicleStackLabels();
             getParentEdges().front()->updateVehicleSpreadGeometries();
         } else if (getParentDemandElements().size() == 2) {
-            getParentDemandElements().at(1)->getParentEdges().front()->updateVehicleStackLabels();
-            getParentDemandElements().at(1)->getParentEdges().front()->updateVehicleSpreadGeometries();
+            getRouteParent()->getParentEdges().front()->updateVehicleStackLabels();
+            getRouteParent()->getParentEdges().front()->updateVehicleSpreadGeometries();
         } else if (getChildDemandElements().size() > 0) {
             getChildDemandElements().front()->getParentEdges().front()->updateVehicleStackLabels();
             getChildDemandElements().front()->getParentEdges().front()->updateVehicleSpreadGeometries();
diff -Nru sumo-1.17.0/src/netedit/elements/demand/GNEVehicle.h sumo-1.18.0/src/netedit/elements/demand/GNEVehicle.h
--- sumo-1.17.0/src/netedit/elements/demand/GNEVehicle.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/demand/GNEVehicle.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -168,6 +168,9 @@
     /// @brief parameter constructor for trips and Flows over junctions
     GNEVehicle(SumoXMLTag tag, GNENet* net, GNEDemandElement* vehicleType, GNEJunction* fromJunction, GNEJunction* toJunction, const SUMOVehicleParameter& vehicleParameters);
 
+    /// @brief parameter constructor for trips and Flows over TAZs
+    GNEVehicle(SumoXMLTag tag, GNENet* net, GNEDemandElement* vehicleType, GNEAdditional* fromTAZ, GNEAdditional* toTAZ, const SUMOVehicleParameter& vehicleParameters);
+
     /// @brief destructor
     ~GNEVehicle();
 
diff -Nru sumo-1.17.0/src/netedit/elements/demand/GNEVType.cpp sumo-1.18.0/src/netedit/elements/demand/GNEVType.cpp
--- sumo-1.17.0/src/netedit/elements/demand/GNEVType.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/demand/GNEVType.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -22,6 +22,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 #include "GNEVType.h"
@@ -34,10 +35,10 @@
 
 GNEVType::GNEVType(GNENet* net) :
     GNEDemandElement("", net, GLO_VTYPE, SUMO_TAG_VTYPE, GUIIconSubSys::getIcon(GUIIcon::VTYPE),
-                     GNEPathManager::PathElement::Options::DEMAND_ELEMENT, {}, {}, {}, {}, {}, {}),
-                                SUMOVTypeParameter(""),
-                                myDefaultVehicleType(true),
-myDefaultVehicleTypeModified(false) {
+        GNEPathManager::PathElement::Options::DEMAND_ELEMENT, {}, {}, {}, {}, {}, {}),
+    SUMOVTypeParameter(""),
+    myDefaultVehicleType(true),
+    myDefaultVehicleTypeModified(false) {
     // reset default values
     resetDefaultValues();
     // init Rail Visualization Parameters
@@ -47,10 +48,10 @@
 
 GNEVType::GNEVType(GNENet* net, const std::string& vTypeID, const SUMOVehicleClass& defaultVClass) :
     GNEDemandElement(vTypeID, net, GLO_VTYPE, SUMO_TAG_VTYPE, GUIIconSubSys::getIcon(GUIIcon::VTYPE),
-                     GNEPathManager::PathElement::Options::DEMAND_ELEMENT, {}, {}, {}, {}, {}, {}),
-SUMOVTypeParameter(vTypeID),
-myDefaultVehicleType(true),
-myDefaultVehicleTypeModified(false) {
+        GNEPathManager::PathElement::Options::DEMAND_ELEMENT, {}, {}, {}, {}, {}, {}),
+    SUMOVTypeParameter(vTypeID),
+    myDefaultVehicleType(true),
+    myDefaultVehicleTypeModified(false) {
     // set default vehicle class
     vehicleClass = defaultVClass;
     // init Rail Visualization Parameters
@@ -60,10 +61,10 @@
 
 GNEVType::GNEVType(GNENet* net, const SUMOVTypeParameter& vTypeParameter) :
     GNEDemandElement(vTypeParameter.id, net, GLO_VTYPE, SUMO_TAG_VTYPE, GUIIconSubSys::getIcon(GUIIcon::VTYPE),
-                     GNEPathManager::PathElement::Options::DEMAND_ELEMENT, {}, {}, {}, {}, {}, {}),
-SUMOVTypeParameter(vTypeParameter),
-myDefaultVehicleType(false),
-myDefaultVehicleTypeModified(false) {
+        GNEPathManager::PathElement::Options::DEMAND_ELEMENT, {}, {}, {}, {}, {}, {}),
+    SUMOVTypeParameter(vTypeParameter),
+    myDefaultVehicleType(false),
+    myDefaultVehicleTypeModified(false) {
     // init Rail Visualization Parameters
     initRailVisualizationParameters();
 }
@@ -71,10 +72,10 @@
 
 GNEVType::GNEVType(GNENet* net, const std::string& vTypeID, GNEVType* vTypeOriginal) :
     GNEDemandElement(vTypeID, net, GLO_VTYPE, vTypeOriginal->getTagProperty().getTag(), GUIIconSubSys::getIcon(GUIIcon::VTYPE),
-                     GNEPathManager::PathElement::Options::DEMAND_ELEMENT, {}, {}, {}, {}, {}, {}),
-SUMOVTypeParameter(*vTypeOriginal),
-myDefaultVehicleType(false),
-myDefaultVehicleTypeModified(false) {
+        GNEPathManager::PathElement::Options::DEMAND_ELEMENT, {}, {}, {}, {}, {}, {}),
+    SUMOVTypeParameter(*vTypeOriginal),
+    myDefaultVehicleType(false),
+    myDefaultVehicleTypeModified(false) {
     // change manually the ID (to avoid to use the ID of vTypeOriginal)
     id = vTypeID;
     // init Rail Visualization Parameters
@@ -95,7 +96,7 @@
 GNEVType::writeDemandElement(OutputDevice& device) const {
     // only write default vehicle types if it was modified
     if (myDefaultVehicleType) {
-        if (myDefaultVehicleTypeModified || (getParentDemandElements().size() > 0)) {
+        if (myDefaultVehicleTypeModified) {
             write(device);
         }
     } else {
@@ -214,12 +215,6 @@
     switch (key) {
         case SUMO_ATTR_ID:
             return getMicrosimID();
-        case GNE_ATTR_VTYPE_DISTRIBUTION:
-            if (getParentDemandElements().empty()) {
-                return "";
-            } else {
-                return getParentDemandElements().front()->getID();
-            }
         // CFM Attributes
         case SUMO_ATTR_ACCEL:
         case SUMO_ATTR_DECEL:
@@ -370,7 +365,7 @@
                 return "";
             }
         case SUMO_ATTR_VCLASS:
-            if (wasSet(VTYPEPARS_VEHICLECLASS_SET)) {
+            if (myDefaultVehicleType || wasSet(VTYPEPARS_VEHICLECLASS_SET)) {
                 return toString(vehicleClass);
             } else {
                 return myTagProperty.getDefaultValue(SUMO_ATTR_VCLASS);
@@ -481,6 +476,28 @@
             } else {
                 return myTagProperty.getDefaultValue(SUMO_ATTR_CARRIAGE_GAP);
             }
+        case GNE_ATTR_VTYPE_DISTRIBUTION: {
+            std::string distributionIDs;
+            for (const auto &distribution : myDistributions) {
+                distributionIDs.append(distribution.first + " ");
+            }
+            // remove last space
+            if (distributionIDs.size() > 0) {
+                distributionIDs.pop_back();
+            }
+            return distributionIDs;
+        }
+        case GNE_ATTR_VTYPE_DISTRIBUTION_PROBABILITY: {
+            std::string distributionProbabilities;
+            for (const auto &distribution : myDistributions) {
+                distributionProbabilities.append(toString(distribution.second) + " ");
+            }
+            // remove last space
+            if (distributionProbabilities.size() > 0) {
+                distributionProbabilities.pop_back();
+            }
+            return distributionProbabilities;
+        }
         case GNE_ATTR_SELECTED:
             return toString(isAttributeCarrierSelected());
         case GNE_ATTR_PARAMETERS:
@@ -557,9 +574,6 @@
         case SUMO_ATTR_ID:
             undoList->changeAttribute(new GNEChange_Attribute(this, key, value));
             break;
-        case GNE_ATTR_VTYPE_DISTRIBUTION:
-            editVTypeDistribution(value, undoList);
-            break;
         // CFM Attributes
         case SUMO_ATTR_ACCEL:
         case SUMO_ATTR_DECEL:
@@ -670,6 +684,8 @@
         case SUMO_ATTR_LOCOMOTIVE_LENGTH:
         case SUMO_ATTR_CARRIAGE_GAP:
         case GNE_ATTR_SELECTED:
+        case GNE_ATTR_VTYPE_DISTRIBUTION:
+        case GNE_ATTR_VTYPE_DISTRIBUTION_PROBABILITY:
         case GNE_ATTR_PARAMETERS:
             // if we change the original value of a default vehicle Type, change also flag "myDefaultVehicleType"
             if (myDefaultVehicleType) {
@@ -678,7 +694,7 @@
                 vTypeChangeAttributeForced->forceChange();
                 undoList->changeAttribute(vTypeChangeAttributeForced);
             }
-            vTypeChangeAttributeForced = new GNEChange_Attribute(this, key, value);
+            vTypeChangeAttributeForced = new GNEChange_Attribute(this, key, value); 
             // force change
             vTypeChangeAttributeForced->forceChange();
             undoList->changeAttribute(vTypeChangeAttributeForced);
@@ -703,20 +719,13 @@
     }
     switch (key) {
         case SUMO_ATTR_ID:
-            // Vtypes and PTypes shares namespace
             if (value == getID()) {
                 return true;
-            } else if (SUMOXMLDefinitions::isValidVehicleID(value) && (myNet->getAttributeCarriers()->retrieveDemandElement(SUMO_TAG_VTYPE, value, false) == nullptr)) {
-                return true;
+            } else if (SUMOXMLDefinitions::isValidVehicleID(value)) {
+                return (demandElementExist(value, {SUMO_TAG_VTYPE, SUMO_TAG_VTYPE_DISTRIBUTION}) == false);
             } else {
                 return false;
             }
-        case GNE_ATTR_VTYPE_DISTRIBUTION:
-            if (value.empty()) {
-                return true;
-            } else {
-                return SUMOXMLDefinitions::isValidVehicleID(value);
-            }
         // CFM Attributes
         case SUMO_ATTR_SIGMA:
             return canParse(value) && (parse(value) >= 0) && (parse(value) <= 1);
@@ -903,6 +912,41 @@
             return canParse(value) && (parse(value) >= -1);
         case SUMO_ATTR_CARRIAGE_GAP:
             return canParse(value) && (parse(value) >= 0);
+        case GNE_ATTR_VTYPE_DISTRIBUTION:
+            if (value.empty()) {
+                return true;
+            } else {
+                auto typeDistributionIDs = StringTokenizer(value).getVector();
+                // check every id
+                for (const auto &typeDistributionID : typeDistributionIDs) {
+                    if (myNet->getAttributeCarriers()->retrieveDemandElement(SUMO_TAG_VTYPE_DISTRIBUTION, typeDistributionID, false) == nullptr) {
+                        return false;
+                    }
+                }
+                // all ids OK
+                return true;
+            }
+        case GNE_ATTR_VTYPE_DISTRIBUTION_PROBABILITY: {
+            auto typeDistributionProbs = StringTokenizer(value).getVector();
+            // first check that we have the same number of distributions and probabilities
+            if (typeDistributionProbs.size() != myDistributions.size()) {
+                return false;
+            } else {
+                // check every probability
+                for (const auto &typeDistributionProb : typeDistributionProbs) {
+                    if (canParse(typeDistributionProb)) {
+                        const auto prob = parse(typeDistributionProb);
+                        if ((prob < 0) || (prob > 1)) {
+                            return false;
+                        }
+                    } else {
+                        return false;
+                    }
+                }
+                // all probabilities ok
+                return true;
+            }
+        }
         case GNE_ATTR_SELECTED:
             return canParse(value);
         case GNE_ATTR_PARAMETERS:
@@ -954,6 +998,8 @@
             return wasSet(VTYPEPARS_LOCOMOTIVE_LENGTH_SET);
         case SUMO_ATTR_CARRIAGE_GAP:
             return wasSet(VTYPEPARS_CARRIAGE_GAP_SET);
+        case GNE_ATTR_VTYPE_DISTRIBUTION_PROBABILITY:
+            return (myDistributions.size() > 0);
         default:
             return true;
     }
@@ -1219,7 +1265,10 @@
     if (!newVTypeParameter.getLCParamString(SUMO_ATTR_LCA_EXPERIMENTAL1, "").empty()) {
         vType->setAttribute(SUMO_ATTR_LCA_EXPERIMENTAL1, toString(newVTypeParameter.getLCParam(SUMO_ATTR_LCA_EXPERIMENTAL1, 0)), undoList);
     }
-    //
+    // vType parameters
+    if (newVTypeParameter.wasSet(VTYPEPARS_VEHICLECLASS_SET)) {
+        vType->setAttribute(SUMO_ATTR_VCLASS, toString(newVTypeParameter.vehicleClass), undoList);
+    }
     if (newVTypeParameter.wasSet(VTYPEPARS_LENGTH_SET)) {
         vType->setAttribute(SUMO_ATTR_LENGTH, toString(newVTypeParameter.length), undoList);
     }
@@ -1315,122 +1364,11 @@
     if (parametersStr != vType->getAttribute(GNE_ATTR_PARAMETERS)) {
         vType->setAttribute(GNE_ATTR_PARAMETERS, parametersStr, undoList);
     }
-    if (parametersStr != vType->getAttribute(GNE_ATTR_VTYPE_DISTRIBUTION)) {
-        vType->setAttribute(GNE_ATTR_VTYPE_DISTRIBUTION, parametersStr, undoList);
-    }
     // close undo list
     undoList->end();
 }
 
 // ===========================================================================
-// protected
-// ===========================================================================
-
-void
-GNEVType::editVTypeDistribution(const std::string& vTypeDistributionID, GNEUndoList* undoList) {
-    if (vTypeDistributionID.empty()) {
-        // first check if previosly this vType has a vTypeDistribution
-        if (getParentDemandElements().size() > 0) {
-            // get parent vTypeDistribution
-            GNEDemandElement* vTypeDistribution = getParentDemandElements().front();
-            // check if this is the last vType of the vTypeDistribution
-            if (vTypeDistribution->getChildDemandElements().size() == 1) {
-                // ask if remove vTypeDistribution
-                if (askRemoveVTypeDistribution(vTypeDistribution->getID())) {
-                    undoList->begin(GUIIcon::VTYPEDISTRIBUTION, "remove " + toString(SUMO_TAG_VTYPE_DISTRIBUTION));
-                    // clear attribute
-                    undoList->changeAttribute(new GNEChange_Attribute(this, GNE_ATTR_VTYPE_DISTRIBUTION, ""));
-                    // remove vType Distribution
-                    undoList->add(new GNEChange_DemandElement(vTypeDistribution, false), true);
-                    undoList->end();
-                }
-            } else {
-                // clear attribute
-                undoList->changeAttribute(new GNEChange_Attribute(this, GNE_ATTR_VTYPE_DISTRIBUTION, ""));
-            }
-        }
-    } else {
-        // check if vTypeDistribution exist
-        const auto vTypeDistribution = myNet->getAttributeCarriers()->retrieveDemandElement(SUMO_TAG_VTYPE_DISTRIBUTION, vTypeDistributionID, false);
-        // get current vTypeDistribution parent
-        const auto vTypeDistributionParent = (getParentDemandElements().size() > 0) ? getParentDemandElements().front() : nullptr;
-        if (vTypeDistribution) {
-            // add in vTypeDistribution
-            undoList->changeAttribute(new GNEChange_Attribute(this, GNE_ATTR_VTYPE_DISTRIBUTION, vTypeDistributionID));
-        } else if (vTypeDistributionParent && (vTypeDistributionParent->getChildDemandElements().size() == 1)) {
-            // ask if remove vTypeDistribution
-            if (askRemoveVTypeDistribution(vTypeDistributionParent->getID())) {
-                undoList->begin(GUIIcon::VTYPEDISTRIBUTION, "add/remove " + toString(SUMO_TAG_VTYPE_DISTRIBUTION));
-                // clear attribute
-                undoList->changeAttribute(new GNEChange_Attribute(this, GNE_ATTR_VTYPE_DISTRIBUTION, ""));
-                // remove old vTypeDistribution
-                undoList->add(new GNEChange_DemandElement(vTypeDistributionParent, false), true);
-                // create newTypeDistribution
-                undoList->add(new GNEChange_DemandElement(new GNEVTypeDistribution(myNet, vTypeDistributionID, -1), true), true);
-                // set new vTypeDistribution
-                undoList->changeAttribute(new GNEChange_Attribute(this, GNE_ATTR_VTYPE_DISTRIBUTION, vTypeDistributionID));
-                undoList->end();
-            }
-        } else {
-            undoList->begin(GUIIcon::VTYPEDISTRIBUTION, "add " + toString(SUMO_TAG_VTYPE_DISTRIBUTION));
-            // create newTypeDistribution
-            undoList->add(new GNEChange_DemandElement(new GNEVTypeDistribution(myNet, vTypeDistributionID, -1), true), true);
-            // set new vTypeDistribution
-            undoList->changeAttribute(new GNEChange_Attribute(this, GNE_ATTR_VTYPE_DISTRIBUTION, vTypeDistributionID));
-            undoList->end();
-        }
-    }
-}
-
-
-bool
-GNEVType::askAddVTypeDistribution(const std::string& vTypeDistribution) const {
-    // show warning in gui testing debug mode
-    WRITE_DEBUG("Opening FXMessageBox 'add vTypeDistribution'");
-    // Ask confirmation to user
-    const FXuint answer = FXMessageBox::question(myNet->getViewNet()->getApp(), MBOX_YES_NO,
-                          ("Add " + toString(SUMO_TAG_VTYPE_DISTRIBUTION) + "s").c_str(), "%s",
-                          (toString(SUMO_TAG_VTYPE_DISTRIBUTION) + " '" + vTypeDistribution + "' doesn't exist. Create?").c_str());
-    if (answer == 1) { // 1:yes, 2:no, 4:esc
-        WRITE_DEBUG("Closed FXMessageBox 'add vTypeDistribution' with 'yes'");
-        return true;
-    } else {
-        // write warning if netedit is running in testing mode
-        if (answer == 2) {
-            WRITE_DEBUG("Closed FXMessageBox 'add vTypeDistribution' with 'No'");
-            return false;
-        } else {
-            WRITE_DEBUG("Closed FXMessageBox 'add vTypeDistribution' with 'ESC'");
-            return false;
-        }
-    }
-}
-
-
-bool
-GNEVType::askRemoveVTypeDistribution(const std::string& vTypeDistribution) const {
-    // show warning in gui testing debug mode
-    WRITE_DEBUG("Opening FXMessageBox 'remove vTypeDistribution'");
-    // Ask confirmation to user
-    const FXuint answer = FXMessageBox::question(myNet->getViewNet()->getApp(), MBOX_YES_NO,
-                          ("Remove " + toString(SUMO_TAG_VTYPE_DISTRIBUTION)).c_str(), "%s",
-                          ("Changing attribute will remove " + toString(SUMO_TAG_VTYPE_DISTRIBUTION) + " '" + vTypeDistribution + "'. Continue?").c_str());
-    if (answer == 1) { // 1:yes, 2:no, 4:esc
-        WRITE_DEBUG("Closed FXMessageBox 'remove vTypeDistribution' with 'yes'");
-        return true;
-    } else {
-        // write warning if netedit is running in testing mode
-        if (answer == 2) {
-            WRITE_DEBUG("Closed FXMessageBox 'remove vTypeDistribution' with 'No'");
-            return false;
-        } else {
-            WRITE_DEBUG("Closed FXMessageBox 'remove vTypeDistribution' with 'ESC'");
-            return false;
-        }
-    }
-}
-
-// ===========================================================================
 // private
 // ===========================================================================
 
@@ -1445,9 +1383,6 @@
             // manually change VType parameters ID
             id = value;
             break;
-        case GNE_ATTR_VTYPE_DISTRIBUTION:
-            setVTypeDistributionParent(value);
-            break;
         // CFM Attributes
         case SUMO_ATTR_ACCEL:
         case SUMO_ATTR_DECEL:
@@ -1938,6 +1873,34 @@
                 SUMOVTypeParameter::unsetParameter(toString(key));
             }
             break;
+        case GNE_ATTR_VTYPE_DISTRIBUTION: {
+            // make a copy of distributions
+            const auto copyDistributions = myDistributions;
+            // clear distributions
+            myDistributions.clear();
+            // obtain IDS
+            const auto typeDistributionIDs = StringTokenizer(value).getVector();
+            // iterate over IDs, add into map, and check if previously there is a probability defined
+            for (const auto &typeDistributionID : typeDistributionIDs) {
+                if (copyDistributions.count(typeDistributionID) > 0) {
+                    myDistributions[typeDistributionID] = copyDistributions.at(typeDistributionID);
+                } else {
+                    myDistributions[typeDistributionID] = 1.0;
+                }
+            }
+            break;
+        }
+        case GNE_ATTR_VTYPE_DISTRIBUTION_PROBABILITY: {
+            // obtain probabilities
+            const auto typeDistributionProbs = StringTokenizer(value).getVector();
+            int index = 0;
+            // add every probability to their distribution
+            for (auto &distribution : myDistributions) {
+                distribution.second = parse(typeDistributionProbs.at(index));
+                index++;
+            }
+            break;
+        }
         case GNE_ATTR_SELECTED:
             if (parse(value)) {
                 selectAttributeCarrier();
diff -Nru sumo-1.17.0/src/netedit/elements/demand/GNEVTypeDistribution.cpp sumo-1.18.0/src/netedit/elements/demand/GNEVTypeDistribution.cpp
--- sumo-1.17.0/src/netedit/elements/demand/GNEVTypeDistribution.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/demand/GNEVTypeDistribution.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -20,6 +20,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include "GNEVTypeDistribution.h"
 
@@ -30,7 +31,7 @@
 
 GNEVTypeDistribution::GNEVTypeDistribution(GNENet* net) :
     GNEDemandElement("", net, GLO_VTYPE, SUMO_TAG_VTYPE_DISTRIBUTION, GUIIconSubSys::getIcon(GUIIcon::VTYPEDISTRIBUTION),
-                     GNEPathManager::PathElement::Options::DEMAND_ELEMENT, {}, {}, {}, {}, {}, {}) {
+        GNEPathManager::PathElement::Options::DEMAND_ELEMENT, {}, {}, {}, {}, {}, {}) {
     // reset default values
     resetDefaultValues();
 }
@@ -38,8 +39,8 @@
 
 GNEVTypeDistribution::GNEVTypeDistribution(GNENet* net, const std::string& vTypeID, const int deterministic) :
     GNEDemandElement(vTypeID, net, GLO_VTYPE, SUMO_TAG_VTYPE_DISTRIBUTION,  GUIIconSubSys::getIcon(GUIIcon::VTYPEDISTRIBUTION),
-                     GNEPathManager::PathElement::Options::DEMAND_ELEMENT, {}, {}, {}, {}, {}, {}),
-myDeterministic(deterministic) {
+        GNEPathManager::PathElement::Options::DEMAND_ELEMENT, {}, {}, {}, {}, {}, {}),
+    myDeterministic(deterministic) {
 }
 
 
@@ -54,13 +55,28 @@
 
 void
 GNEVTypeDistribution::writeDemandElement(OutputDevice& device) const {
-    device.openTag(getTagProperty().getTag());
-    device.writeAttr(SUMO_ATTR_ID, getID());
-    // write all vTypes
-    for (const auto& vType : getChildDemandElements()) {
-        vType->writeDemandElement(device);
+    // get vtypes that has this vType distribution
+    std::vector vTypes;
+    std::vector probabilities;
+    for (const auto& vType : myNet->getAttributeCarriers()->getDemandElements().at(SUMO_TAG_VTYPE)) {
+        // get type distributions and probabilities
+        const auto typeDistributionIDs = StringTokenizer(vType->getAttribute(GNE_ATTR_VTYPE_DISTRIBUTION)).getVector();
+        const auto distributionProbabilities = StringTokenizer(vType->getAttribute(GNE_ATTR_VTYPE_DISTRIBUTION_PROBABILITY)).getVector();
+        for (int i = 0; i < (int)typeDistributionIDs.size(); i++) {
+            if (typeDistributionIDs.at(i) == getID()) {
+                vTypes.push_back(vType->getID());
+                probabilities.push_back(distributionProbabilities.at(i));
+            }
+        }
+    }
+    // only save if there is vTypes to save
+    if (vTypes.size() > 0) {
+        device.openTag(getTagProperty().getTag());
+        device.writeAttr(SUMO_ATTR_ID, getID());
+        device.writeAttr(SUMO_ATTR_VTYPES, vTypes);
+        device.writeAttr(SUMO_ATTR_PROBS, probabilities);
+        device.closeTag();
     }
-    device.closeTag();
 }
 
 
@@ -183,7 +199,30 @@
 
 double
 GNEVTypeDistribution::getAttributeDouble(SumoXMLAttr key) const {
-    throw InvalidArgument(getTagStr() + " doesn't have a double attribute of type '" + toString(key) + "'");
+    if (key == GNE_ATTR_ADDITIONALCHILDREN) {
+        double counter = 0;
+        for (const auto& vType : myNet->getAttributeCarriers()->getDemandElements().at(SUMO_TAG_VTYPE)) {
+            // only write if appear in this distribution
+            if (vType->getAttribute(GNE_ATTR_VTYPE_DISTRIBUTION) == getID() && vType->getChildAdditionals().size() > 0) {
+                counter++;
+            }
+        }
+        return counter;
+    } else {
+        // obtain all types with the given typeDistribution sorted by ID
+        std::map sortedTypes;
+        for (const auto &type : myNet->getAttributeCarriers()->getDemandElements().at(SUMO_TAG_VTYPE)) {
+            if (type->getAttribute(GNE_ATTR_VTYPE_DISTRIBUTION) == getID()) {
+                sortedTypes[type->getID()] = type;
+            }
+        }
+        // return first type, or default vType
+        if (sortedTypes.size() > 0) {
+            return sortedTypes.begin()->second->getAttributeDouble(key);
+        } else {
+            return 0;
+        }
+    }
 }
 
 
@@ -213,9 +252,10 @@
 GNEVTypeDistribution::isValid(SumoXMLAttr key, const std::string& value) {
     switch (key) {
         case SUMO_ATTR_ID:
-            // Vtypes and PTypes shares namespace
-            if (SUMOXMLDefinitions::isValidVehicleID(value) && (myNet->getAttributeCarriers()->retrieveDemandElement(SUMO_TAG_VTYPE, value, false) == nullptr)) {
+            if (value == getID()) {
                 return true;
+            } else if (SUMOXMLDefinitions::isValidVehicleID(value)) {
+                return (demandElementExist(value, {SUMO_TAG_VTYPE, SUMO_TAG_VTYPE_DISTRIBUTION}) == false);
             } else {
                 return false;
             }
diff -Nru sumo-1.17.0/src/netedit/elements/demand/GNEVTypeDistribution.h sumo-1.18.0/src/netedit/elements/demand/GNEVTypeDistribution.h
--- sumo-1.17.0/src/netedit/elements/demand/GNEVTypeDistribution.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/demand/GNEVTypeDistribution.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -34,7 +34,7 @@
     GNEVTypeDistribution(GNENet* net);
 
     /// @brief parameter constructor
-    GNEVTypeDistribution(GNENet* net, const std::string& vTypeID, const int deterministic);
+    GNEVTypeDistribution(GNENet* net, const std::string& vTypeID, const int deterministic = -1);
 
     /// @brief destructor
     ~GNEVTypeDistribution();
diff -Nru sumo-1.17.0/src/netedit/elements/demand/GNEVType.h sumo-1.18.0/src/netedit/elements/demand/GNEVType.h
--- sumo-1.17.0/src/netedit/elements/demand/GNEVType.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/demand/GNEVType.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -27,7 +27,9 @@
 // ===========================================================================
 // class definitions
 // ===========================================================================
+
 class GNEVType : public GNEDemandElement, public SUMOVTypeParameter {
+
 public:
     /// @brief default constructor
     GNEVType(GNENet* net);
@@ -195,14 +197,8 @@
     /// @brief flag to check if this default GNEVType was modified
     bool myDefaultVehicleTypeModified;
 
-    /// @brief edit vType distribution
-    void editVTypeDistribution(const std::string& vTypeDistributionID, GNEUndoList* undoList);
-
-    /// @brief ask if add vTypeDistribution
-    bool askAddVTypeDistribution(const std::string& vTypeDistribution) const;
-
-    /// @brief ask if remove vTypeDistribution
-    bool askRemoveVTypeDistribution(const std::string& vTypeDistribution) const;
+    /// @brief vType distributions
+    std::map  myDistributions;
 
 private:
     /// @brief method for setting the attribute and nothing else
diff -Nru sumo-1.17.0/src/netedit/elements/demand/GNEWalk.cpp sumo-1.18.0/src/netedit/elements/demand/GNEWalk.cpp
--- sumo-1.17.0/src/netedit/elements/demand/GNEWalk.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/demand/GNEWalk.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -50,9 +50,9 @@
 }
 
 
-GNEWalk::GNEWalk(GNENet* net, GNEDemandElement* personParent, GNEEdge* fromEdge, GNEAdditional* toBusStop, double arrivalPosition) :
-    GNEDemandElement(personParent, net, GLO_WALK, GNE_TAG_WALK_BUSSTOP, GUIIconSubSys::getIcon(GUIIcon::WALK_BUSSTOP),
-                     GNEPathManager::PathElement::Options::DEMAND_ELEMENT, {}, {fromEdge}, {}, {toBusStop}, {personParent}, {}),
+GNEWalk::GNEWalk(const bool isTrain, GNENet* net, GNEDemandElement* personParent, GNEEdge* fromEdge, GNEAdditional* toAdditional, double arrivalPosition) :
+    GNEDemandElement(personParent, net, GLO_WALK, isTrain ? GNE_TAG_WALK_TRAINSTOP : GNE_TAG_WALK_BUSSTOP, GUIIconSubSys::getIcon(isTrain ? GUIIcon::WALK_TRAINSTOP : GUIIcon::WALK_BUSSTOP),
+                     GNEPathManager::PathElement::Options::DEMAND_ELEMENT, {}, {fromEdge}, {}, {toAdditional}, {personParent}, {}),
 myArrivalPosition(arrivalPosition) {
 }
 
@@ -153,7 +153,11 @@
         }
         // write to depending if personplan ends in a busStop, edge or junction
         if (getParentAdditionals().size() > 0) {
-            device.writeAttr(SUMO_ATTR_BUS_STOP, getParentAdditionals().back()->getID());
+            if (getParentAdditionals().back()->getTagProperty().getTag() == SUMO_TAG_BUS_STOP) {
+                device.writeAttr(SUMO_ATTR_BUS_STOP, getParentAdditionals().back()->getID());
+            } else {
+                device.writeAttr(SUMO_ATTR_TRAIN_STOP, getParentAdditionals().back()->getID());
+            }
         } else if (getParentEdges().size() > 0) {
             device.writeAttr(SUMO_ATTR_TO, getParentEdges().back()->getID());
         } else {
@@ -161,7 +165,8 @@
         }
     }
     // avoid write arrival positions in walk to busStop
-    if (!(myTagProperty.getTag() == GNE_TAG_WALK_BUSSTOP) && (myArrivalPosition > 0)) {
+    if ((myTagProperty.getTag() != GNE_TAG_RIDE_BUSSTOP) && (myTagProperty.getTag() != GNE_TAG_RIDE_TRAINSTOP) &&
+            (myArrivalPosition > 0)) {
         device.writeAttr(SUMO_ATTR_ARRIVALPOS, myArrivalPosition);
     }
     // close tag
@@ -374,6 +379,7 @@
         case SUMO_ATTR_TOJUNCTION:
             return getParentJunctions().back()->getID();
         case GNE_ATTR_TO_BUSSTOP:
+        case GNE_ATTR_TO_TRAINSTOP:
             return getParentAdditionals().back()->getID();
         case SUMO_ATTR_EDGES:
             return parseIDs(getParentEdges());
@@ -486,6 +492,23 @@
             }
             break;
         }
+        case GNE_ATTR_TO_TRAINSTOP: {
+            // get next person plan
+            GNEDemandElement* nextPersonPlan = getParentDemandElements().at(0)->getNextChildDemandElement(this);
+            // continue depending of nextPersonPlan
+            if (nextPersonPlan) {
+                // obtain trainStop
+                const GNEAdditional* trainStop = myNet->getAttributeCarriers()->retrieveAdditional(SUMO_TAG_TRAIN_STOP, value);
+                // change from attribute using edge ID
+                undoList->begin(myTagProperty.getGUIIcon(), "Change from attribute of next personPlan");
+                nextPersonPlan->setAttribute(SUMO_ATTR_FROM, trainStop->getParentLanes().front()->getParentEdge()->getID(), undoList);
+                undoList->changeAttribute(new GNEChange_Attribute(this, key, value));
+                undoList->end();
+            } else {
+                undoList->changeAttribute(new GNEChange_Attribute(this, key, value));
+            }
+            break;
+        }
         case SUMO_ATTR_EDGES: {
             // get next person plan
             GNEDemandElement* nextPersonPlan = getParentDemandElements().at(0)->getNextChildDemandElement(this);
@@ -542,6 +565,8 @@
             return SUMOXMLDefinitions::isValidNetID(value) && (myNet->getAttributeCarriers()->retrieveEdge(value, false) != nullptr);
         case GNE_ATTR_TO_BUSSTOP:
             return (myNet->getAttributeCarriers()->retrieveAdditional(SUMO_TAG_BUS_STOP, value, false) != nullptr);
+        case GNE_ATTR_TO_TRAINSTOP:
+            return (myNet->getAttributeCarriers()->retrieveAdditional(SUMO_TAG_TRAIN_STOP, value, false) != nullptr);
         case SUMO_ATTR_EDGES:
             if (canParse >(myNet, value, false)) {
                 // all edges exist, then check if compounds a valid route
@@ -608,7 +633,7 @@
         return "walk: " + getParentEdges().front()->getID() + " -> " + getParentEdges().back()->getID();
     } else if (myTagProperty.getTag() == GNE_TAG_WALK_JUNCTIONS) {
         return "walk: " + getParentJunctions().front()->getID() + " -> " + getParentJunctions().back()->getID();
-    } else if (myTagProperty.getTag() == GNE_TAG_WALK_BUSSTOP) {
+    } else if ((myTagProperty.getTag() == GNE_TAG_WALK_BUSSTOP) || (myTagProperty.getTag() == GNE_TAG_WALK_TRAINSTOP)) {
         return "walk: " + getParentEdges().front()->getID() + " -> " + getParentAdditionals().back()->getID();
     } else if (myTagProperty.getTag() == GNE_TAG_WALK_EDGES) {
         return "walk: " + getParentEdges().front()->getID() + " ... " + getParentEdges().back()->getID();
@@ -658,7 +683,12 @@
             computePathElement();
             break;
         case GNE_ATTR_TO_BUSSTOP:
-            replaceAdditionalParent(SUMO_TAG_BUS_STOP, value);
+            replaceFirstParentAdditional(SUMO_TAG_BUS_STOP, value);
+            // compute walk
+            computePathElement();
+            break;
+        case GNE_ATTR_TO_TRAINSTOP:
+            replaceFirstParentAdditional(SUMO_TAG_TRAIN_STOP, value);
             // compute walk
             computePathElement();
             break;
diff -Nru sumo-1.17.0/src/netedit/elements/demand/GNEWalk.h sumo-1.18.0/src/netedit/elements/demand/GNEWalk.h
--- sumo-1.17.0/src/netedit/elements/demand/GNEWalk.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/demand/GNEWalk.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -40,7 +40,7 @@
     GNEWalk(SumoXMLTag tag, GNENet* net);
 
     /**@brief parameter constructor for person edge->edge
-     * @param[in] viewNet view in which this Walk is placed
+     * @param[in] net network in which this Walk is placed
      * @param[in] personParent person parent
      * @param[in] fromEdge from edge
      * @param[in] toEdge to edge
@@ -48,17 +48,18 @@
      */
     GNEWalk(GNENet* net, GNEDemandElement* personParent, GNEEdge* fromEdge, GNEEdge* toEdge, double arrivalPosition);
 
-    /**@brief parameter constructor for person edge->busStop
-     * @param[in] viewNet view in which this Walk is placed
+    /**@brief parameter constructor for person edge->busStop or edge->trainStop
+     * @param[in] isTrain check if si tran or busStop
+     * @param[in] net network in which this Walk is placed
      * @param[in] personParent person parent
      * @param[in] fromEdge from edge
      * @param[in] toBusStop to busStop
      * @param[in] arrivalPosition arrival position on the destination edge
      */
-    GNEWalk(GNENet* net, GNEDemandElement* personParent, GNEEdge* fromEdge, GNEAdditional* toBusStop, double arrivalPosition);
+    GNEWalk(const bool isTrain, GNENet* net, GNEDemandElement* personParent, GNEEdge* fromEdge, GNEAdditional* toAdditional, double arrivalPosition);
 
     /**@brief parameter constructor for person edge->edge
-     * @param[in] viewNet view in which this Walk is placed
+     * @param[in] net network in which this Walk is placed
      * @param[in] personParent person parent
      * @param[in] edges list of edges
      * @param[in] arrivalPosition arrival position on the destination edge
@@ -66,7 +67,7 @@
     GNEWalk(GNENet* net, GNEDemandElement* personParent, std::vector edges, double arrivalPosition);
 
     /**@brief parameter constructor for person edge->edge
-     * @param[in] viewNet view in which this Walk is placed
+     * @param[in] net network in which this Walk is placed
      * @param[in] personParent person parent
      * @param[in] route route
      * @param[in] arrivalPosition arrival position on the destination edge
@@ -74,7 +75,7 @@
     GNEWalk(GNENet* net, GNEDemandElement* personParent, GNEDemandElement* route, double arrivalPosition);
 
     /**@brief parameter constructor for person junction->junction
-     * @param[in] viewNet view in which this Walk is placed
+     * @param[in] net network in which this Walk is placed
      * @param[in] personParent person parent
      * @param[in] fromJunction from junction
      * @param[in] toJunction to junction
diff -Nru sumo-1.17.0/src/netedit/elements/GNEAttributeCarrier.cpp sumo-1.18.0/src/netedit/elements/GNEAttributeCarrier.cpp
--- sumo-1.17.0/src/netedit/elements/GNEAttributeCarrier.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/GNEAttributeCarrier.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -572,6 +572,9 @@
                 return "undefined";
             }
         }
+        case GNE_ATTR_VTYPE_DISTRIBUTION_PROBABILITY: {
+            return "no distribution set";
+        }
         default:
             return getAttribute(key);
     }
@@ -1889,6 +1892,12 @@
                                               "0.00");
         myTagProperties[currentTag].addAttribute(attrProperty);
 
+        attrProperty = GNEAttributeProperties(SUMO_ATTR_LEFTHAND,
+                                              GNEAttributeProperties::BOOL | GNEAttributeProperties::DEFAULTVALUE,
+                                              TL("Enable or disable lefthand position"),
+                                              "0");
+        myTagProperties[currentTag].addAttribute(attrProperty);
+
     }
     currentTag = SUMO_TAG_PARKING_SPACE;
     {
@@ -3398,14 +3407,6 @@
                                               GNEAttributeProperties::STRING | GNEAttributeProperties::UNIQUE,
                                               TL("The id of VehicleType distribution"));
         myTagProperties[currentTag].addAttribute(attrProperty);
-
-        /* Disabled until next release
-        attrProperty = GNEAttributeProperties(SUMO_ATTR_DETERMINISTIC,
-                                              GNEAttributeProperties::INT | GNEAttributeProperties::DEFAULTVALUE,
-                                              TL("makes number of assigned cars exact for any multiples of N"),
-                                              "-1");
-        myTagProperties[currentTag].addAttribute(attrProperty);
-        */
     }
     currentTag = SUMO_TAG_VTYPE;
     {
@@ -3418,12 +3419,18 @@
         // set values of attributes
         attrProperty = GNEAttributeProperties(SUMO_ATTR_ID,
                                               GNEAttributeProperties::STRING | GNEAttributeProperties::UNIQUE,
-                                              TL("The id of VehicleType"));
+                                              TL("type ID"));
         myTagProperties[currentTag].addAttribute(attrProperty);
 
         attrProperty = GNEAttributeProperties(GNE_ATTR_VTYPE_DISTRIBUTION,
                                               GNEAttributeProperties::STRING | GNEAttributeProperties::VTYPE,
-                                              TL("Vehicle Type Distribution"));
+                                              TL("Type distribution"));
+        myTagProperties[currentTag].addAttribute(attrProperty);
+
+        attrProperty = GNEAttributeProperties(GNE_ATTR_VTYPE_DISTRIBUTION_PROBABILITY,
+                                              GNEAttributeProperties::FLOAT | GNEAttributeProperties::DEFAULTVALUE | GNEAttributeProperties::PROBABILITY,
+                                              TL("Type distribution probability"),
+                                              "1.0");
         myTagProperties[currentTag].addAttribute(attrProperty);
 
         attrProperty = GNEAttributeProperties(SUMO_ATTR_VCLASS,
@@ -3435,7 +3442,7 @@
 
         attrProperty = GNEAttributeProperties(SUMO_ATTR_COLOR,
                                               GNEAttributeProperties::STRING | GNEAttributeProperties::COLOR | GNEAttributeProperties::DEFAULTVALUE,
-                                              TL("This vehicle type's color"));
+                                              TL("This type's color"));
         myTagProperties[currentTag].addAttribute(attrProperty);
 
         attrProperty = GNEAttributeProperties(SUMO_ATTR_LENGTH,
@@ -3683,6 +3690,46 @@
                                               "0.00");
         myTagProperties[currentTag].addAttribute(attrProperty);
     }
+    currentTag = GNE_TAG_TRIP_TAZS;
+    {
+        // set values of tag
+        myTagProperties[currentTag] = GNETagProperties(currentTag,
+                                      GNETagProperties::DEMANDELEMENT | GNETagProperties::VEHICLE,
+                                      0,
+                                      GUIIcon::TRIP_TAZS, SUMO_TAG_TRIP, {}, FXRGBA(240, 255, 205, 255));
+        myTagProperties[currentTag].setFieldString("trip (from-to TAZs)");
+
+        // set values of attributes
+        attrProperty = GNEAttributeProperties(SUMO_ATTR_ID,
+                                              GNEAttributeProperties::STRING | GNEAttributeProperties::UNIQUE | GNEAttributeProperties::AUTOMATICID,
+                                              TL("The id of trip"));
+        myTagProperties[currentTag].addAttribute(attrProperty);
+
+        attrProperty = GNEAttributeProperties(SUMO_ATTR_TYPE,
+                                              GNEAttributeProperties::STRING | GNEAttributeProperties::DEFAULTVALUE | GNEAttributeProperties::UPDATEGEOMETRY | GNEAttributeProperties::VTYPE,
+                                              TL("The id of the vehicle type to use for this trip"),
+                                              DEFAULT_VTYPE_ID);
+        myTagProperties[currentTag].addAttribute(attrProperty);
+
+        attrProperty = GNEAttributeProperties(SUMO_ATTR_FROM_TAZ,
+                                              GNEAttributeProperties::STRING | GNEAttributeProperties::UNIQUE | GNEAttributeProperties::UPDATEGEOMETRY,
+                                              TL("The name of the TAZ the trip starts at"));
+        myTagProperties[currentTag].addAttribute(attrProperty);
+
+        attrProperty = GNEAttributeProperties(SUMO_ATTR_TO_TAZ,
+                                              GNEAttributeProperties::STRING | GNEAttributeProperties::UNIQUE | GNEAttributeProperties::UPDATEGEOMETRY,
+                                              TL("The name of the TAZ the trip ends at"));
+        myTagProperties[currentTag].addAttribute(attrProperty);
+
+        // add common attributes
+        fillCommonVehicleAttributes(currentTag);
+
+        attrProperty = GNEAttributeProperties(SUMO_ATTR_DEPART,
+                                              GNEAttributeProperties::STRING | GNEAttributeProperties::DEFAULTVALUE,
+                                              TL("The departure time of the (first) trip which is generated using this trip definition"),
+                                              "0.00");
+        myTagProperties[currentTag].addAttribute(attrProperty);
+    }
     currentTag = SUMO_TAG_VEHICLE;
     {
         // set values of tag
@@ -3847,6 +3894,43 @@
         // add flow attributes
         fillCommonFlowAttributes(currentTag, SUMO_ATTR_VEHSPERHOUR);
     }
+    currentTag = GNE_TAG_FLOW_TAZS;
+    {
+        // set values of tag
+        myTagProperties[currentTag] = GNETagProperties(currentTag,
+                                      GNETagProperties::DEMANDELEMENT | GNETagProperties::VEHICLE | GNETagProperties::FLOW,
+                                      0,
+                                      GUIIcon::FLOW_TAZS, SUMO_TAG_FLOW, {}, FXRGBA(240, 255, 205, 255));
+        myTagProperties[currentTag].setFieldString("flow (from-to TAZs)");
+
+        // set values of attributes
+        attrProperty = GNEAttributeProperties(SUMO_ATTR_ID,
+                                              GNEAttributeProperties::STRING | GNEAttributeProperties::UNIQUE | GNEAttributeProperties::AUTOMATICID,
+                                              TL("The id of the flow"));
+        myTagProperties[currentTag].addAttribute(attrProperty);
+
+        attrProperty = GNEAttributeProperties(SUMO_ATTR_TYPE,
+                                              GNEAttributeProperties::STRING | GNEAttributeProperties::DEFAULTVALUE | GNEAttributeProperties::UPDATEGEOMETRY | GNEAttributeProperties::VTYPE,
+                                              TL("The id of the flow type to use for this flow"),
+                                              DEFAULT_VTYPE_ID);
+        myTagProperties[currentTag].addAttribute(attrProperty);
+
+        attrProperty = GNEAttributeProperties(SUMO_ATTR_FROM_TAZ,
+                                              GNEAttributeProperties::STRING | GNEAttributeProperties::UNIQUE | GNEAttributeProperties::UPDATEGEOMETRY,
+                                              TL("The name of the TAZ the flow starts at"));
+        myTagProperties[currentTag].addAttribute(attrProperty);
+
+        attrProperty = GNEAttributeProperties(SUMO_ATTR_TO_TAZ,
+                                              GNEAttributeProperties::STRING | GNEAttributeProperties::UNIQUE | GNEAttributeProperties::UPDATEGEOMETRY,
+                                              TL("The name of the TAZ the flow ends at"));
+        myTagProperties[currentTag].addAttribute(attrProperty);
+
+        // add common attributes
+        fillCommonVehicleAttributes(currentTag);
+
+        // add flow attributes
+        fillCommonFlowAttributes(currentTag, SUMO_ATTR_VEHSPERHOUR);
+    }
     currentTag = GNE_TAG_FLOW_ROUTE;
     {
         // set values of tag
@@ -3927,7 +4011,7 @@
         fillCommonFlowAttributes(currentTag, SUMO_ATTR_VEHSPERHOUR);
     }
     /* currently disabled. See #5259
-    currentTag = SUMO_TAG_TRIP_TAZ;
+    currentTag = GNE_TAG_TRIP_TAZ;
     {
         // set values of tag
         myTagProperties[currentTag] = GNETagProperties(currentTag,
@@ -3944,12 +4028,12 @@
     // declare empty GNEAttributeProperties
     GNEAttributeProperties attrProperty;
     // fill stops ACs
-    SumoXMLTag currentTag = SUMO_TAG_STOP_LANE;
+    SumoXMLTag currentTag = GNE_TAG_STOP_LANE;
     {
         // set values of tag
         myTagProperties[currentTag] = GNETagProperties(currentTag,
                                       GNETagProperties::DEMANDELEMENT | GNETagProperties::STOP,
-                                      GNETagProperties::CHILD | GNETagProperties::MASKSTARTENDPOS | GNETagProperties::NOPARAMETERS,
+                                      GNETagProperties::CHILD | GNETagProperties::MASKSTARTENDPOS,
                                       GUIIcon::STOPELEMENT, SUMO_TAG_STOP, {SUMO_TAG_ROUTE, SUMO_TAG_TRIP, SUMO_TAG_FLOW}, FXRGBA(255, 213, 213, 255));
         // set values of attributes
         attrProperty = GNEAttributeProperties(SUMO_ATTR_LANE,
@@ -3983,12 +4067,12 @@
         // fill common stop attributes
         fillCommonStopAttributes(currentTag, false);
     }
-    currentTag = SUMO_TAG_STOP_BUSSTOP;
+    currentTag = GNE_TAG_STOP_BUSSTOP;
     {
         // set values of tag
         myTagProperties[currentTag] = GNETagProperties(currentTag,
                                       GNETagProperties::DEMANDELEMENT | GNETagProperties::STOP,
-                                      GNETagProperties::CHILD | GNETagProperties::NOPARAMETERS,
+                                      GNETagProperties::CHILD,
                                       GUIIcon::STOPELEMENT, SUMO_TAG_STOP, {SUMO_TAG_ROUTE, SUMO_TAG_TRIP, SUMO_TAG_FLOW}, FXRGBA(255, 213, 213, 255));
         // set values of attributes
         attrProperty = GNEAttributeProperties(SUMO_ATTR_BUS_STOP,
@@ -3999,12 +4083,28 @@
         // fill common stop attributes
         fillCommonStopAttributes(currentTag, false);
     }
-    currentTag = SUMO_TAG_STOP_CONTAINERSTOP;
+    currentTag = GNE_TAG_STOP_TRAINSTOP;
     {
         // set values of tag
         myTagProperties[currentTag] = GNETagProperties(currentTag,
                                       GNETagProperties::DEMANDELEMENT | GNETagProperties::STOP,
-                                      GNETagProperties::CHILD | GNETagProperties::NOPARAMETERS,
+                                      GNETagProperties::CHILD,
+                                      GUIIcon::STOPELEMENT, SUMO_TAG_STOP, {SUMO_TAG_ROUTE, SUMO_TAG_TRIP, SUMO_TAG_FLOW}, FXRGBA(255, 213, 213, 255));
+        // set values of attributes
+        attrProperty = GNEAttributeProperties(SUMO_ATTR_TRAIN_STOP,
+                                              GNEAttributeProperties::STRING | GNEAttributeProperties::LIST | GNEAttributeProperties::UNIQUE | GNEAttributeProperties::UPDATEGEOMETRY,
+                                              TL("TrainStop associated with this stop"));
+        myTagProperties[currentTag].addAttribute(attrProperty);
+
+        // fill common stop attributes
+        fillCommonStopAttributes(currentTag, false);
+    }
+    currentTag = GNE_TAG_STOP_CONTAINERSTOP;
+    {
+        // set values of tag
+        myTagProperties[currentTag] = GNETagProperties(currentTag,
+                                      GNETagProperties::DEMANDELEMENT | GNETagProperties::STOP,
+                                      GNETagProperties::CHILD,
                                       GUIIcon::STOPELEMENT, SUMO_TAG_STOP, {SUMO_TAG_ROUTE, SUMO_TAG_TRIP, SUMO_TAG_FLOW}, FXRGBA(255, 213, 213, 255));
         // set values of attributes
         attrProperty = GNEAttributeProperties(SUMO_ATTR_CONTAINER_STOP,
@@ -4015,12 +4115,12 @@
         // fill common stop attributes
         fillCommonStopAttributes(currentTag, false);
     }
-    currentTag = SUMO_TAG_STOP_CHARGINGSTATION;
+    currentTag = GNE_TAG_STOP_CHARGINGSTATION;
     {
         // set values of tag
         myTagProperties[currentTag] = GNETagProperties(currentTag,
                                       GNETagProperties::DEMANDELEMENT | GNETagProperties::STOP,
-                                      GNETagProperties::CHILD | GNETagProperties::NOPARAMETERS,
+                                      GNETagProperties::CHILD,
                                       GUIIcon::STOPELEMENT, SUMO_TAG_STOP, {SUMO_TAG_ROUTE, SUMO_TAG_TRIP, SUMO_TAG_FLOW}, FXRGBA(255, 213, 213, 255));
         // set values of attributes
         attrProperty = GNEAttributeProperties(SUMO_ATTR_CHARGING_STATION,
@@ -4031,12 +4131,12 @@
         // fill common stop attributes
         fillCommonStopAttributes(currentTag, false);
     }
-    currentTag = SUMO_TAG_STOP_PARKINGAREA;
+    currentTag = GNE_TAG_STOP_PARKINGAREA;
     {
         // set values of tag
         myTagProperties[currentTag] = GNETagProperties(currentTag,
                                       GNETagProperties::DEMANDELEMENT | GNETagProperties::STOP,
-                                      GNETagProperties::CHILD | GNETagProperties::NOPARAMETERS,
+                                      GNETagProperties::CHILD,
                                       GUIIcon::STOPELEMENT, SUMO_TAG_STOP, {SUMO_TAG_ROUTE, SUMO_TAG_TRIP, SUMO_TAG_FLOW}, FXRGBA(255, 213, 213, 255));
         // set values of attributes
         attrProperty = GNEAttributeProperties(SUMO_ATTR_PARKING_AREA,
@@ -4060,7 +4160,7 @@
         // set values of tag
         myTagProperties[currentTag] = GNETagProperties(currentTag,
                                       GNETagProperties::DEMANDELEMENT | GNETagProperties::STOP | GNETagProperties::WAYPOINT,
-                                      GNETagProperties::CHILD | GNETagProperties::MASKSTARTENDPOS | GNETagProperties::NOPARAMETERS,
+                                      GNETagProperties::CHILD | GNETagProperties::MASKSTARTENDPOS,
                                       GUIIcon::WAYPOINT, SUMO_TAG_STOP, {SUMO_TAG_ROUTE, SUMO_TAG_TRIP, SUMO_TAG_FLOW}, FXRGBA(240, 255, 205, 255));
         // set values of attributes
         attrProperty = GNEAttributeProperties(SUMO_ATTR_LANE,
@@ -4099,7 +4199,7 @@
         // set values of tag
         myTagProperties[currentTag] = GNETagProperties(currentTag,
                                       GNETagProperties::DEMANDELEMENT | GNETagProperties::STOP | GNETagProperties::WAYPOINT,
-                                      GNETagProperties::CHILD | GNETagProperties::NOPARAMETERS,
+                                      GNETagProperties::CHILD,
                                       GUIIcon::WAYPOINT, SUMO_TAG_STOP, {SUMO_TAG_ROUTE, SUMO_TAG_TRIP, SUMO_TAG_FLOW}, FXRGBA(240, 255, 205, 255));
         // set values of attributes
         attrProperty = GNEAttributeProperties(SUMO_ATTR_BUS_STOP,
@@ -4110,6 +4210,22 @@
         // fill common waypoint (stop) attributes
         fillCommonStopAttributes(currentTag, true);
     }
+    currentTag = GNE_TAG_WAYPOINT_TRAINSTOP;
+    {
+        // set values of tag
+        myTagProperties[currentTag] = GNETagProperties(currentTag,
+                                      GNETagProperties::DEMANDELEMENT | GNETagProperties::STOP | GNETagProperties::WAYPOINT,
+                                      GNETagProperties::CHILD,
+                                      GUIIcon::WAYPOINT, SUMO_TAG_STOP, {SUMO_TAG_ROUTE, SUMO_TAG_TRIP, SUMO_TAG_FLOW}, FXRGBA(240, 255, 205, 255));
+        // set values of attributes
+        attrProperty = GNEAttributeProperties(SUMO_ATTR_TRAIN_STOP,
+                                              GNEAttributeProperties::STRING | GNEAttributeProperties::LIST | GNEAttributeProperties::UNIQUE | GNEAttributeProperties::UPDATEGEOMETRY,
+                                              TL("TrainWaypoint associated with this waypoint"));
+        myTagProperties[currentTag].addAttribute(attrProperty);
+
+        // fill common waypoint (stop) attributes
+        fillCommonStopAttributes(currentTag, true);
+    }
     currentTag = GNE_TAG_WAYPOINT_CONTAINERSTOP;
     {
         // set values of tag
@@ -4131,7 +4247,7 @@
         // set values of tag
         myTagProperties[currentTag] = GNETagProperties(currentTag,
                                       GNETagProperties::DEMANDELEMENT | GNETagProperties::STOP | GNETagProperties::WAYPOINT,
-                                      GNETagProperties::CHILD | GNETagProperties::NOPARAMETERS,
+                                      GNETagProperties::CHILD,
                                       GUIIcon::WAYPOINT, SUMO_TAG_STOP, {SUMO_TAG_ROUTE, SUMO_TAG_TRIP, SUMO_TAG_FLOW}, FXRGBA(240, 255, 205, 255));
         // set values of attributes
         attrProperty = GNEAttributeProperties(SUMO_ATTR_CHARGING_STATION,
@@ -4572,6 +4688,40 @@
                                               "ANY");
         myTagProperties[currentTag].addAttribute(attrProperty);
     }
+    currentTag = GNE_TAG_PERSONTRIP_TRAINSTOP;
+    {
+        // set values of tag
+        myTagProperties[currentTag] = GNETagProperties(currentTag,
+                                      GNETagProperties::DEMANDELEMENT | GNETagProperties::PERSONPLAN | GNETagProperties::PERSONTRIP,
+                                      GNETagProperties::CHILD | GNETagProperties::NOPARAMETERS,
+                                      GUIIcon::PERSONTRIP_TRAINSTOP, SUMO_TAG_PERSONTRIP, {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(253, 255, 206, 255));
+        // from edge
+        attrProperty = GNEAttributeProperties(SUMO_ATTR_FROM,
+                                              GNEAttributeProperties::STRING | GNEAttributeProperties::UNIQUE | GNEAttributeProperties::UPDATEGEOMETRY,
+                                              TL("The ID of the edge the person trip starts at"));
+        myTagProperties[currentTag].addAttribute(attrProperty);
+        // to trainStop
+        attrProperty = GNEAttributeProperties(GNE_ATTR_TO_TRAINSTOP,
+                                              GNEAttributeProperties::STRING | GNEAttributeProperties::UNIQUE | GNEAttributeProperties::UPDATEGEOMETRY,
+                                              TL("Id of the destination trainStop"));
+        myTagProperties[currentTag].addAttribute(attrProperty);
+        // vTypes
+        attrProperty = GNEAttributeProperties(SUMO_ATTR_VTYPES,
+                                              GNEAttributeProperties::STRING | GNEAttributeProperties::LIST | GNEAttributeProperties::DEFAULTVALUE,
+                                              TL("List of possible vehicle types to take"));
+        myTagProperties[currentTag].addAttribute(attrProperty);
+        // modes
+        attrProperty = GNEAttributeProperties(SUMO_ATTR_MODES,
+                                              GNEAttributeProperties::STRING | GNEAttributeProperties::LIST | GNEAttributeProperties::DEFAULTVALUE,
+                                              TL("List of possible traffic modes. Walking is always possible regardless of this value"));
+        myTagProperties[currentTag].addAttribute(attrProperty);
+        // lines
+        attrProperty = GNEAttributeProperties(SUMO_ATTR_LINES,
+                                              GNEAttributeProperties::STRING | GNEAttributeProperties::LIST | GNEAttributeProperties::DEFAULTVALUE,
+                                              TL("list of vehicle alternatives to take for the person trip"),
+                                              "ANY");
+        myTagProperties[currentTag].addAttribute(attrProperty);
+    }
     currentTag = GNE_TAG_PERSONTRIP_JUNCTIONS;
     {
         // set values of tag
@@ -4656,6 +4806,24 @@
                                               TL("Id of the destination bus stop"));
         myTagProperties[currentTag].addAttribute(attrProperty);
     }
+    currentTag = GNE_TAG_WALK_TRAINSTOP;
+    {
+        // set values of tag
+        myTagProperties[currentTag] = GNETagProperties(currentTag,
+                                      GNETagProperties::DEMANDELEMENT | GNETagProperties::PERSONPLAN | GNETagProperties::WALK,
+                                      GNETagProperties::CHILD | GNETagProperties::NOPARAMETERS,
+                                      GUIIcon::WALK_TRAINSTOP, SUMO_TAG_WALK, { SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW }, FXRGBA(240, 255, 205, 255));
+        // from edge
+        attrProperty = GNEAttributeProperties(SUMO_ATTR_FROM,
+                                              GNEAttributeProperties::STRING | GNEAttributeProperties::UNIQUE | GNEAttributeProperties::UPDATEGEOMETRY,
+                                              TL("The ID of the edge the walk starts at"));
+        myTagProperties[currentTag].addAttribute(attrProperty);
+        // to trainStop
+        attrProperty = GNEAttributeProperties(GNE_ATTR_TO_TRAINSTOP,
+                                              GNEAttributeProperties::STRING | GNEAttributeProperties::UNIQUE | GNEAttributeProperties::UPDATEGEOMETRY,
+                                              TL("Id of the destination train stop"));
+        myTagProperties[currentTag].addAttribute(attrProperty);
+    }
     currentTag = GNE_TAG_WALK_EDGES;
     {
         // set values of tag
@@ -4775,6 +4943,30 @@
                                               "ANY");
         myTagProperties[currentTag].addAttribute(attrProperty);
     }
+    currentTag = GNE_TAG_RIDE_TRAINSTOP;
+    {
+        // set values of tag
+        myTagProperties[currentTag] = GNETagProperties(currentTag,
+                                      GNETagProperties::DEMANDELEMENT | GNETagProperties::PERSONPLAN | GNETagProperties::RIDE,
+                                      GNETagProperties::CHILD | GNETagProperties::NOPARAMETERS,
+                                      GUIIcon::RIDE_TRAINSTOP, SUMO_TAG_RIDE, { SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW }, FXRGBA(210, 233, 255, 255));
+        // from edge
+        attrProperty = GNEAttributeProperties(SUMO_ATTR_FROM,
+                                              GNEAttributeProperties::STRING | GNEAttributeProperties::UNIQUE | GNEAttributeProperties::UPDATEGEOMETRY,
+                                              TL("The ID of the edge the ride starts at"));
+        myTagProperties[currentTag].addAttribute(attrProperty);
+        // to trainStop
+        attrProperty = GNEAttributeProperties(GNE_ATTR_TO_TRAINSTOP,
+                                              GNEAttributeProperties::STRING | GNEAttributeProperties::UNIQUE | GNEAttributeProperties::UPDATEGEOMETRY,
+                                              TL("ID of the destination train stop"));
+        myTagProperties[currentTag].addAttribute(attrProperty);
+        // lines
+        attrProperty = GNEAttributeProperties(SUMO_ATTR_LINES,
+                                              GNEAttributeProperties::STRING | GNEAttributeProperties::LIST | GNEAttributeProperties::DEFAULTVALUE,
+                                              TL("list of vehicle alternatives to take for the ride"),
+                                              "ANY");
+        myTagProperties[currentTag].addAttribute(attrProperty);
+    }
 }
 
 
@@ -4860,6 +5052,38 @@
                                               TL("Activity displayed for stopped person in GUI and output files "));
         myTagProperties[currentTag].addAttribute(attrProperty);
     }
+    currentTag = GNE_TAG_STOPPERSON_TRAINSTOP;
+    {
+        // set values of tag
+        myTagProperties[currentTag] = GNETagProperties(currentTag,
+                                      GNETagProperties::DEMANDELEMENT | GNETagProperties::PERSONPLAN | GNETagProperties::STOPPERSON,
+                                      GNETagProperties::CHILD | GNETagProperties::NOPARAMETERS,
+                                      GUIIcon::STOPELEMENT, SUMO_TAG_STOP, {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(255, 213, 213, 255));
+
+        // set values of attributes
+        attrProperty = GNEAttributeProperties(SUMO_ATTR_TRAIN_STOP,
+                                              GNEAttributeProperties::STRING | GNEAttributeProperties::LIST | GNEAttributeProperties::UNIQUE | GNEAttributeProperties::UPDATEGEOMETRY,
+                                              TL("TrainStop associated with this stop"));
+        myTagProperties[currentTag].addAttribute(attrProperty);
+
+        attrProperty = GNEAttributeProperties(SUMO_ATTR_DURATION,
+                                              GNEAttributeProperties::SUMOTIME | GNEAttributeProperties::POSITIVE | GNEAttributeProperties::ACTIVATABLE | GNEAttributeProperties::DEFAULTVALUE,
+                                              TL("Minimum duration for stopping"),
+                                              "60");
+        attrProperty.setDefaultActivated(true);
+        myTagProperties[currentTag].addAttribute(attrProperty);
+
+        attrProperty = GNEAttributeProperties(SUMO_ATTR_UNTIL,
+                                              GNEAttributeProperties::SUMOTIME | GNEAttributeProperties::POSITIVE | GNEAttributeProperties::ACTIVATABLE | GNEAttributeProperties::DEFAULTVALUE,
+                                              TL("The time step at which the route continues"),
+                                              "0.00");
+        myTagProperties[currentTag].addAttribute(attrProperty);
+
+        attrProperty = GNEAttributeProperties(SUMO_ATTR_ACTTYPE,
+                                              GNEAttributeProperties::STRING | GNEAttributeProperties::DEFAULTVALUE,
+                                              TL("Activity displayed for stopped person in GUI and output files "));
+        myTagProperties[currentTag].addAttribute(attrProperty);
+    }
 }
 
 
@@ -5563,17 +5787,19 @@
                                           "0");
     myTagProperties[currentTag].addAttribute(attrProperty);
 
-    attrProperty = GNEAttributeProperties(SUMO_ATTR_TRIGGERED,
-                                          GNEAttributeProperties::STRING | GNEAttributeProperties::DISCRETE | GNEAttributeProperties::DEFAULTVALUE,
-                                          TL("Whether a person or container or bth may end the stop"),
-                                          "0");
-    attrProperty.setDiscreteValues({"0", "person", "container", "join"}, true);
-    myTagProperties[currentTag].addAttribute(attrProperty);
+    if (!waypoint) {
+        attrProperty = GNEAttributeProperties(SUMO_ATTR_TRIGGERED,
+                                              GNEAttributeProperties::STRING | GNEAttributeProperties::DISCRETE | GNEAttributeProperties::DEFAULTVALUE,
+                                              TL("Whether a person or container or both may end the stop"),
+                                              "0");
+        attrProperty.setDiscreteValues({"0", "person", "container", "join"}, true);
+        myTagProperties[currentTag].addAttribute(attrProperty);
 
-    attrProperty = GNEAttributeProperties(SUMO_ATTR_EXPECTED,
-                                          GNEAttributeProperties::STRING | GNEAttributeProperties::LIST | GNEAttributeProperties::DEFAULTVALUE,
-                                          TL("List of elements that must board the vehicle before it may continue"));
-    myTagProperties[currentTag].addAttribute(attrProperty);
+        attrProperty = GNEAttributeProperties(SUMO_ATTR_EXPECTED,
+                                              GNEAttributeProperties::STRING | GNEAttributeProperties::LIST | GNEAttributeProperties::DEFAULTVALUE,
+                                              TL("List of elements that must board the vehicle before it may continue"));
+        myTagProperties[currentTag].addAttribute(attrProperty);
+    }
 
     attrProperty = GNEAttributeProperties(SUMO_ATTR_PERMITTED,
                                           GNEAttributeProperties::STRING | GNEAttributeProperties::LIST | GNEAttributeProperties::DEFAULTVALUE,
diff -Nru sumo-1.17.0/src/netedit/elements/GNEAttributeCarrier.h sumo-1.18.0/src/netedit/elements/GNEAttributeCarrier.h
--- sumo-1.17.0/src/netedit/elements/GNEAttributeCarrier.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/GNEAttributeCarrier.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/elements/GNEAttributeProperties.cpp sumo-1.18.0/src/netedit/elements/GNEAttributeProperties.cpp
--- sumo-1.17.0/src/netedit/elements/GNEAttributeProperties.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/GNEAttributeProperties.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/elements/GNEAttributeProperties.h sumo-1.18.0/src/netedit/elements/GNEAttributeProperties.h
--- sumo-1.17.0/src/netedit/elements/GNEAttributeProperties.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/GNEAttributeProperties.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/elements/GNECandidateElement.cpp sumo-1.18.0/src/netedit/elements/GNECandidateElement.cpp
--- sumo-1.17.0/src/netedit/elements/GNECandidateElement.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/GNECandidateElement.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/elements/GNECandidateElement.h sumo-1.18.0/src/netedit/elements/GNECandidateElement.h
--- sumo-1.17.0/src/netedit/elements/GNECandidateElement.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/GNECandidateElement.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/elements/GNEGeneralHandler.cpp sumo-1.18.0/src/netedit/elements/GNEGeneralHandler.cpp
--- sumo-1.17.0/src/netedit/elements/GNEGeneralHandler.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/GNEGeneralHandler.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/elements/GNEGeneralHandler.h sumo-1.18.0/src/netedit/elements/GNEGeneralHandler.h
--- sumo-1.17.0/src/netedit/elements/GNEGeneralHandler.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/GNEGeneralHandler.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/elements/GNEHierarchicalContainer.cpp sumo-1.18.0/src/netedit/elements/GNEHierarchicalContainer.cpp
--- sumo-1.17.0/src/netedit/elements/GNEHierarchicalContainer.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/GNEHierarchicalContainer.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/elements/GNEHierarchicalContainer.h sumo-1.18.0/src/netedit/elements/GNEHierarchicalContainer.h
--- sumo-1.17.0/src/netedit/elements/GNEHierarchicalContainer.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/GNEHierarchicalContainer.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/elements/GNEHierarchicalElement.cpp sumo-1.18.0/src/netedit/elements/GNEHierarchicalElement.cpp
--- sumo-1.17.0/src/netedit/elements/GNEHierarchicalElement.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/GNEHierarchicalElement.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/elements/GNEHierarchicalElement.h sumo-1.18.0/src/netedit/elements/GNEHierarchicalElement.h
--- sumo-1.17.0/src/netedit/elements/GNEHierarchicalElement.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/GNEHierarchicalElement.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/elements/GNETagProperties.cpp sumo-1.18.0/src/netedit/elements/GNETagProperties.cpp
--- sumo-1.17.0/src/netedit/elements/GNETagProperties.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/GNETagProperties.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -329,7 +329,7 @@
 
 
 bool
-GNETagProperties::isVehicleType() const {
+GNETagProperties::isType() const {
     return (myTagType & VTYPE) != 0;
 }
 
diff -Nru sumo-1.17.0/src/netedit/elements/GNETagProperties.h sumo-1.18.0/src/netedit/elements/GNETagProperties.h
--- sumo-1.17.0/src/netedit/elements/GNETagProperties.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/GNETagProperties.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -194,8 +194,8 @@
     /// @brief return true if tag correspond to a Wire element
     bool isWireElement() const;
 
-    /// @brief return true if tag correspond to a vehicle type element
-    bool isVehicleType() const;
+    /// @brief return true if tag correspond to a vehicle/person/container type element
+    bool isType() const;
 
     /// @brief return true if tag correspond to a vehicle element
     bool isVehicle() const;
diff -Nru sumo-1.17.0/src/netedit/elements/network/GNEConnection.cpp sumo-1.18.0/src/netedit/elements/network/GNEConnection.cpp
--- sumo-1.17.0/src/netedit/elements/network/GNEConnection.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/network/GNEConnection.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/elements/network/GNEConnection.h sumo-1.18.0/src/netedit/elements/network/GNEConnection.h
--- sumo-1.17.0/src/netedit/elements/network/GNEConnection.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/network/GNEConnection.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/elements/network/GNECrossing.cpp sumo-1.18.0/src/netedit/elements/network/GNECrossing.cpp
--- sumo-1.17.0/src/netedit/elements/network/GNECrossing.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/network/GNECrossing.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/elements/network/GNECrossing.h sumo-1.18.0/src/netedit/elements/network/GNECrossing.h
--- sumo-1.17.0/src/netedit/elements/network/GNECrossing.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/network/GNECrossing.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/elements/network/GNEEdge.cpp sumo-1.18.0/src/netedit/elements/network/GNEEdge.cpp
--- sumo-1.17.0/src/netedit/elements/network/GNEEdge.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/network/GNEEdge.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -1792,21 +1792,24 @@
 GNEEdge::commitMoveShape(const GNEMoveResult& moveResult, GNEUndoList* undoList) {
     // make sure that newShape isn't empty
     if (moveResult.shapeToUpdate.size() > 0) {
-        // get start and end points
-        const Position shapeStart = moveResult.shapeToUpdate.front();
-        const Position shapeEnd = moveResult.shapeToUpdate.back();
         // get innen shape
-        PositionVector innenShape = moveResult.shapeToUpdate;
-        innenShape.pop_front();
-        innenShape.pop_back();
+        PositionVector innenShapeToUpdate = moveResult.shapeToUpdate;
+        innenShapeToUpdate.pop_front();
+        innenShapeToUpdate.pop_back();
         // commit new shape
         undoList->begin(GUIIcon::EDGE, "moving " + toString(SUMO_ATTR_SHAPE) + " of " + getTagStr());
-        // alway update start position
-        undoList->changeAttribute(new GNEChange_Attribute(this, GNE_ATTR_SHAPE_START, toString(shapeStart)));
-        // update shape
-        undoList->changeAttribute(new GNEChange_Attribute(this, SUMO_ATTR_SHAPE, toString(innenShape)));
-        // alway update end position
-        undoList->changeAttribute(new GNEChange_Attribute(this, GNE_ATTR_SHAPE_END, toString(shapeEnd)));
+        // update start position
+        if (std::find(moveResult.geometryPointsToMove.begin(), moveResult.geometryPointsToMove.end(), 0) != moveResult.geometryPointsToMove.end()) {
+            undoList->changeAttribute(new GNEChange_Attribute(this, GNE_ATTR_SHAPE_START, toString(moveResult.shapeToUpdate.front())));
+        }
+        // check if update shape
+        if (innenShapeToUpdate.size() > 0) {
+            undoList->changeAttribute(new GNEChange_Attribute(this, SUMO_ATTR_SHAPE, toString(innenShapeToUpdate)));
+        }
+        // update end position
+        if (std::find(moveResult.geometryPointsToMove.begin(), moveResult.geometryPointsToMove.end(), ((int)moveResult.shapeToUpdate.size() - 1)) != moveResult.geometryPointsToMove.end()) {
+            undoList->changeAttribute(new GNEChange_Attribute(this, GNE_ATTR_SHAPE_END, toString(moveResult.shapeToUpdate.back())));
+        }
         undoList->end();
     }
 }
diff -Nru sumo-1.17.0/src/netedit/elements/network/GNEEdge.h sumo-1.18.0/src/netedit/elements/network/GNEEdge.h
--- sumo-1.17.0/src/netedit/elements/network/GNEEdge.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/network/GNEEdge.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/elements/network/GNEEdgeTemplate.cpp sumo-1.18.0/src/netedit/elements/network/GNEEdgeTemplate.cpp
--- sumo-1.17.0/src/netedit/elements/network/GNEEdgeTemplate.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/network/GNEEdgeTemplate.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/elements/network/GNEEdgeTemplate.h sumo-1.18.0/src/netedit/elements/network/GNEEdgeTemplate.h
--- sumo-1.17.0/src/netedit/elements/network/GNEEdgeTemplate.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/network/GNEEdgeTemplate.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/elements/network/GNEEdgeType.cpp sumo-1.18.0/src/netedit/elements/network/GNEEdgeType.cpp
--- sumo-1.17.0/src/netedit/elements/network/GNEEdgeType.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/network/GNEEdgeType.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/elements/network/GNEEdgeType.h sumo-1.18.0/src/netedit/elements/network/GNEEdgeType.h
--- sumo-1.17.0/src/netedit/elements/network/GNEEdgeType.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/network/GNEEdgeType.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/elements/network/GNEInternalLane.cpp sumo-1.18.0/src/netedit/elements/network/GNEInternalLane.cpp
--- sumo-1.17.0/src/netedit/elements/network/GNEInternalLane.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/network/GNEInternalLane.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/elements/network/GNEInternalLane.h sumo-1.18.0/src/netedit/elements/network/GNEInternalLane.h
--- sumo-1.17.0/src/netedit/elements/network/GNEInternalLane.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/network/GNEInternalLane.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/elements/network/GNEJunction.cpp sumo-1.18.0/src/netedit/elements/network/GNEJunction.cpp
--- sumo-1.17.0/src/netedit/elements/network/GNEJunction.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/network/GNEJunction.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -1101,7 +1101,6 @@
     }
     switch (key) {
         case SUMO_ATTR_ID:
-        case SUMO_ATTR_POSITION:
         case GNE_ATTR_MODIFICATION_STATUS:
         case SUMO_ATTR_SHAPE:
         case SUMO_ATTR_RADIUS:
@@ -1112,9 +1111,30 @@
         case GNE_ATTR_PARAMETERS:
             undoList->add(new GNEChange_Attribute(this, key, value), true);
             break;
+        case SUMO_ATTR_POSITION: {
+            // change Keep Clear attribute in all connections
+            undoList->begin(GUIIcon::JUNCTION, TL("change junction position"));
+            // obtain NBNode position
+            const Position orig = myNBNode->getPosition();
+            // change junction position
+            undoList->add(new GNEChange_Attribute(this, key, value), true);
+            // calculate delta using new position
+            const Position delta = myNBNode->getPosition() - orig;
+            // set new position of adjacent edges
+            for (const auto& edge : myGNEIncomingEdges) {
+                const Position newEnd = edge->getNBEdge()->getGeometry().back() + delta;
+                undoList->add(new GNEChange_Attribute(edge, GNE_ATTR_SHAPE_END, toString(newEnd)), true);
+            }
+            for (const auto& edge : myGNEOutgoingEdges) {
+                const Position newStart = edge->getNBEdge()->getGeometry().front() + delta;
+                undoList->add(new GNEChange_Attribute(edge, GNE_ATTR_SHAPE_START, toString(newStart)), true);
+            }
+            undoList->end();
+            break;
+        }
         case SUMO_ATTR_KEEP_CLEAR:
             // change Keep Clear attribute in all connections
-            undoList->begin(GUIIcon::JUNCTION, "change keepClear for whole junction");
+            undoList->begin(GUIIcon::JUNCTION, TL("change keepClear for whole junction"));
             for (const auto& i : myGNEIncomingEdges) {
                 for (const auto& j : i->getGNEConnections()) {
                     undoList->add(new GNEChange_Attribute(j, key, value), true);
@@ -1723,7 +1743,14 @@
         // set new shape
         myNBNode->setCustomShape(moveResult.shapeToUpdate);
     } else if (moveResult.shapeToUpdate.size() > 0) {
+        // obtain NBNode position
+        const Position orig = myNBNode->getPosition();
+        // move geometry
         moveJunctionGeometry(moveResult.shapeToUpdate.front(), false);
+        // set new position of adjacent edges depending if we're moving a selection
+        for (const auto& NBEdge : getNBNode()->getEdges()) {
+            myNet->getAttributeCarriers()->retrieveEdge(NBEdge->getID())->updateJunctionPosition(this, orig);
+        }
     }
     updateGeometry();
 }
@@ -1747,12 +1774,10 @@
         if (isShapeEdited()) {
             // commit new shape
             undoList->begin(GUIIcon::JUNCTION, "moving " + toString(SUMO_ATTR_SHAPE) + " of " + getTagStr());
-            undoList->changeAttribute(new GNEChange_Attribute(this, SUMO_ATTR_SHAPE, toString(moveResult.shapeToUpdate)));
+            setAttribute(SUMO_ATTR_SHAPE, toString(moveResult.shapeToUpdate), undoList);
             undoList->end();
         } else if (!myNet->getViewNet()->mergeJunctions(this, secondJunction)) {
-            undoList->begin(GUIIcon::JUNCTION, "position of " + getTagStr());
-            undoList->changeAttribute(new GNEChange_Attribute(this, SUMO_ATTR_POSITION, toString(moveResult.shapeToUpdate.front())));
-            undoList->end();
+            setAttribute(SUMO_ATTR_POSITION, toString(moveResult.shapeToUpdate.front()), undoList);
         }
     }
 }
@@ -1843,14 +1868,8 @@
 
 void
 GNEJunction::moveJunctionGeometry(const Position& pos, const bool updateEdgeBoundaries) {
-    // obtain NBNode position
-    const Position orig = myNBNode->getPosition();
     // reinit NBNode
     myNBNode->reinit(pos, myNBNode->getType());
-    // set new position of adjacent edges
-    for (const auto& edge : getNBNode()->getEdges()) {
-        myNet->getAttributeCarriers()->retrieveEdge(edge->getID())->updateJunctionPosition(this, orig);
-    }
     // declare three sets with all affected GNEJunctions, GNEEdges and GNEConnections
     std::set affectedJunctions;
     std::set affectedEdges;
diff -Nru sumo-1.17.0/src/netedit/elements/network/GNEJunction.h sumo-1.18.0/src/netedit/elements/network/GNEJunction.h
--- sumo-1.17.0/src/netedit/elements/network/GNEJunction.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/network/GNEJunction.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/elements/network/GNELane.cpp sumo-1.18.0/src/netedit/elements/network/GNELane.cpp
--- sumo-1.17.0/src/netedit/elements/network/GNELane.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/network/GNELane.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -30,6 +30,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -668,7 +669,7 @@
     buildCenterPopupEntry(ret);
     // build copy names entry
     if (editMode != NetworkEditMode::NETWORK_TLS) {
-        GUIDesigns::buildFXMenuCommand(ret, "Copy parent edge name to clipboard", nullptr, ret, MID_COPY_EDGE_NAME);
+        GUIDesigns::buildFXMenuCommand(ret, TL("Copy parent edge name to clipboard"), nullptr, ret, MID_COPY_EDGE_NAME);
         buildNameCopyPopupEntry(ret);
     }
     // stop if we're in data mode
@@ -677,15 +678,15 @@
     }
     // build lane selection
     if (isAttributeCarrierSelected()) {
-        GUIDesigns::buildFXMenuCommand(ret, "Remove Lane From Selected", GUIIconSubSys::getIcon(GUIIcon::FLAG_MINUS), myNet->getViewNet(), MID_REMOVESELECT);
+        GUIDesigns::buildFXMenuCommand(ret, TL("Remove Lane From Selected"), GUIIconSubSys::getIcon(GUIIcon::FLAG_MINUS), myNet->getViewNet(), MID_REMOVESELECT);
     } else {
-        GUIDesigns::buildFXMenuCommand(ret, "Add Lane To Selected", GUIIconSubSys::getIcon(GUIIcon::FLAG_PLUS), myNet->getViewNet(), MID_ADDSELECT);
+        GUIDesigns::buildFXMenuCommand(ret, TL("Add Lane To Selected"), GUIIconSubSys::getIcon(GUIIcon::FLAG_PLUS), myNet->getViewNet(), MID_ADDSELECT);
     }
     // build edge selection
     if (myParentEdge->isAttributeCarrierSelected()) {
-        GUIDesigns::buildFXMenuCommand(ret, "Remove Edge From Selected", GUIIconSubSys::getIcon(GUIIcon::FLAG_MINUS), myNet->getViewNet(), MID_GNE_REMOVESELECT_EDGE);
+        GUIDesigns::buildFXMenuCommand(ret, TL("Remove Edge From Selected"), GUIIconSubSys::getIcon(GUIIcon::FLAG_MINUS), myNet->getViewNet(), MID_GNE_REMOVESELECT_EDGE);
     } else {
-        GUIDesigns::buildFXMenuCommand(ret, "Add Edge To Selected", GUIIconSubSys::getIcon(GUIIcon::FLAG_PLUS), myNet->getViewNet(), MID_GNE_ADDSELECT_EDGE);
+        GUIDesigns::buildFXMenuCommand(ret, TL("Add Edge To Selected"), GUIIconSubSys::getIcon(GUIIcon::FLAG_PLUS), myNet->getViewNet(), MID_GNE_ADDSELECT_EDGE);
     }
     // stop if we're in data mode
     if (myNet->getViewNet()->getEditModes().isCurrentSupermodeDemand()) {
@@ -702,7 +703,7 @@
     // check if we're in supermode network
     if (myNet->getViewNet()->getEditModes().isCurrentSupermodeNetwork()) {
         // create end point
-        FXMenuCommand* resetEndPoints = GUIDesigns::buildFXMenuCommand(ret, "Reset edge end points", nullptr, &parent, MID_GNE_RESET_GEOMETRYPOINT);
+        FXMenuCommand* resetEndPoints = GUIDesigns::buildFXMenuCommand(ret, TL("Reset edge end points"), nullptr, &parent, MID_GNE_RESET_GEOMETRYPOINT);
         // enable or disable reset end points
         if (myParentEdge->hasCustomEndPoints()) {
             resetEndPoints->enable();
@@ -711,7 +712,7 @@
         }
         // check if we clicked over a geometry point
         if ((editMode == NetworkEditMode::NETWORK_MOVE) && myParentEdge->clickedOverGeometryPoint(mousePosition)) {
-            GUIDesigns::buildFXMenuCommand(ret, "Set custom Geometry Point", nullptr, &parent, MID_GNE_CUSTOM_GEOMETRYPOINT);
+            GUIDesigns::buildFXMenuCommand(ret, TL("Set custom Geometry Point"), nullptr, &parent, MID_GNE_CUSTOM_GEOMETRYPOINT);
         }
         // add separator
         new FXMenuSeparator(ret);
@@ -729,7 +730,7 @@
             buildRechableOperations(parent, ret);
         } else if (editMode == NetworkEditMode::NETWORK_TLS) {
             if (myNet->getViewNet()->getViewParent()->getTLSEditorFrame()->controlsEdge(myParentEdge)) {
-                GUIDesigns::buildFXMenuCommand(ret, "Select state for all links from this edge:", nullptr, nullptr, 0);
+                GUIDesigns::buildFXMenuCommand(ret, TL("Select state for all links from this edge:"), nullptr, nullptr, 0);
                 const std::vector names = GNEInternalLane::LinkStateNames.getStrings();
                 for (auto it : names) {
                     FXuint state = GNEInternalLane::LinkStateNames.get(it);
@@ -739,7 +740,7 @@
                 }
             }
         } else {
-            FXMenuCommand* mc = GUIDesigns::buildFXMenuCommand(ret, "Additional options available in 'Inspect Mode'", nullptr, nullptr, 0);
+            FXMenuCommand* mc = GUIDesigns::buildFXMenuCommand(ret, TL("Additional options available in 'Inspect Mode'"), nullptr, nullptr, 0);
             mc->handle(&parent, FXSEL(SEL_COMMAND, FXWindow::ID_DISABLE), nullptr);
         }
         // build shape positions menu
@@ -754,13 +755,13 @@
             const double angle = firstAnglePos.angleTo2D(secondAnglePos);
 
             // build menu commands
-            GUIDesigns::buildFXMenuCommand(ret, "Shape pos: " + toString(pos), nullptr, nullptr, 0);
-            GUIDesigns::buildFXMenuCommand(ret, "Length pos: " + toString(pos * getLaneParametricLength() / getLaneShapeLength()), nullptr, nullptr, 0);
+            GUIDesigns::buildFXMenuCommand(ret, TL("Shape pos: ") + toString(pos), nullptr, nullptr, 0);
+            GUIDesigns::buildFXMenuCommand(ret, TL("Length pos: ") + toString(pos * getLaneParametricLength() / getLaneShapeLength()), nullptr, nullptr, 0);
             if (myParentEdge->getNBEdge()->getDistance() != 0) {
-                GUIDesigns::buildFXMenuCommand(ret, "Distance: " + toString(myParentEdge->getNBEdge()->getDistancAt(pos)), nullptr, nullptr, 0);
+                GUIDesigns::buildFXMenuCommand(ret, TL("Distance: ") + toString(myParentEdge->getNBEdge()->getDistancAt(pos)), nullptr, nullptr, 0);
             }
-            GUIDesigns::buildFXMenuCommand(ret, "Height: " + toString(firstAnglePos.z()), nullptr, nullptr, 0);
-            GUIDesigns::buildFXMenuCommand(ret, "Angle: " + toString((GeomHelper::naviDegree(angle))), nullptr, nullptr, 0);
+            GUIDesigns::buildFXMenuCommand(ret, TL("Height: ") + toString(firstAnglePos.z()), nullptr, nullptr, 0);
+            GUIDesigns::buildFXMenuCommand(ret, TL("Angle: ") + toString((GeomHelper::naviDegree(angle))), nullptr, nullptr, 0);
         }
     }
     return ret;
@@ -1842,50 +1843,50 @@
     FXMenuPane* edgeOperations = new FXMenuPane(ret);
     ret->insertMenuPaneChild(edgeOperations);
     if (edgeSelSize > 0) {
-        new FXMenuCascade(ret, ("edge operations (" + toString(edgeSelSize) + " selected)").c_str(), nullptr, edgeOperations);
+        new FXMenuCascade(ret, TLF("Edge operations (% selected)", toString(edgeSelSize)).c_str(), nullptr, edgeOperations);
     } else {
-        new FXMenuCascade(ret, "edge operations", nullptr, edgeOperations);
+        new FXMenuCascade(ret, TL("Edge operations"), nullptr, edgeOperations);
     }
     // create menu commands for all edge operations
-    GUIDesigns::buildFXMenuCommand(edgeOperations, "Split edge here", nullptr, &parent, MID_GNE_EDGE_SPLIT);
-    auto splitBothDirections = GUIDesigns::buildFXMenuCommand(edgeOperations, "Split edge in both directions here (no simmetric opposite edge)", nullptr, &parent, MID_GNE_EDGE_SPLIT_BIDI);
+    GUIDesigns::buildFXMenuCommand(edgeOperations, TL("Split edge here"), nullptr, &parent, MID_GNE_EDGE_SPLIT);
+    auto splitBothDirections = GUIDesigns::buildFXMenuCommand(edgeOperations, TL("Split edge in both directions here (no simmetric opposite edge)"), nullptr, &parent, MID_GNE_EDGE_SPLIT_BIDI);
     // check if allow split edge in both directions
     splitBothDirections->disable();
     const auto oppositeEdges = myParentEdge->getOppositeEdges();
     if (oppositeEdges.size() == 0) {
-        splitBothDirections->setText("Split edge in both directions here (no opposite edge)");
+        splitBothDirections->setText(TL("Split edge in both directions here (no opposite edge)"));
     } else {
         for (const auto& oppositeEdge : oppositeEdges) {
             // get reverse inner geometry
             const auto reverseGeometry = oppositeEdge->getNBEdge()->getInnerGeometry().reverse();
             if (reverseGeometry == myParentEdge->getNBEdge()->getInnerGeometry()) {
                 splitBothDirections->enable();
-                splitBothDirections->setText("Split edge in both directions here");
+                splitBothDirections->setText(TL("Split edge in both directions here"));
             }
         }
     }
-    GUIDesigns::buildFXMenuCommand(edgeOperations, "Set geometry endpoint here (shift-click)", nullptr, &parent, MID_GNE_EDGE_EDIT_ENDPOINT);
+    GUIDesigns::buildFXMenuCommand(edgeOperations, TL("Set geometry endpoint here (shift-click)"), nullptr, &parent, MID_GNE_EDGE_EDIT_ENDPOINT);
     // restore geometry points depending of selection status
     if (myParentEdge->isAttributeCarrierSelected()) {
         if (edgeSelSize == 1) {
-            GUIDesigns::buildFXMenuCommand(edgeOperations, "Restore both geometry endpoints", nullptr, &parent, MID_GNE_EDGE_RESET_ENDPOINT);
+            GUIDesigns::buildFXMenuCommand(edgeOperations, TL("Restore both geometry endpoints"), nullptr, &parent, MID_GNE_EDGE_RESET_ENDPOINT);
         } else {
-            GUIDesigns::buildFXMenuCommand(edgeOperations, "Restore geometry endpoints of all selected edges", nullptr, &parent, MID_GNE_EDGE_RESET_ENDPOINT);
+            GUIDesigns::buildFXMenuCommand(edgeOperations, TL("Restore geometry endpoints of all selected edges"), nullptr, &parent, MID_GNE_EDGE_RESET_ENDPOINT);
         }
     } else {
-        GUIDesigns::buildFXMenuCommand(edgeOperations, "Restore geometry endpoint (shift-click)", nullptr, &parent, MID_GNE_EDGE_RESET_ENDPOINT);
+        GUIDesigns::buildFXMenuCommand(edgeOperations, TL("Restore geometry endpoint (shift-click)"), nullptr, &parent, MID_GNE_EDGE_RESET_ENDPOINT);
     }
-    GUIDesigns::buildFXMenuCommand(edgeOperations, "Reverse " + edgeDescPossibleMulti, nullptr, &parent, MID_GNE_EDGE_REVERSE);
-    auto reverse = GUIDesigns::buildFXMenuCommand(edgeOperations, "Add reverse direction for " + edgeDescPossibleMulti, nullptr, &parent, MID_GNE_EDGE_ADD_REVERSE);
+    GUIDesigns::buildFXMenuCommand(edgeOperations, TLF("Reverse %", edgeDescPossibleMulti), nullptr, &parent, MID_GNE_EDGE_REVERSE);
+    auto reverse = GUIDesigns::buildFXMenuCommand(edgeOperations, TLF("Add reverse direction for %", edgeDescPossibleMulti), nullptr, &parent, MID_GNE_EDGE_ADD_REVERSE);
     if (myParentEdge->getReverseEdge() != nullptr) {
         reverse->disable();
     }
-    GUIDesigns::buildFXMenuCommand(edgeOperations, "Add reverse disconnected direction for " + edgeDescPossibleMulti, nullptr, &parent, MID_GNE_EDGE_ADD_REVERSE_DISCONNECTED);
-    GUIDesigns::buildFXMenuCommand(edgeOperations, "Reset lengths for " + edgeDescPossibleMulti, nullptr, &parent, MID_GNE_EDGE_RESET_LENGTH);
-    GUIDesigns::buildFXMenuCommand(edgeOperations, "Straighten " + edgeDescPossibleMulti, nullptr, &parent, MID_GNE_EDGE_STRAIGHTEN);
-    GUIDesigns::buildFXMenuCommand(edgeOperations, "Smooth " + edgeDescPossibleMulti, nullptr, &parent, MID_GNE_EDGE_SMOOTH);
-    GUIDesigns::buildFXMenuCommand(edgeOperations, "Straighten elevation of " + edgeDescPossibleMulti, nullptr, &parent, MID_GNE_EDGE_STRAIGHTEN_ELEVATION);
-    GUIDesigns::buildFXMenuCommand(edgeOperations, "Smooth elevation of " + edgeDescPossibleMulti, nullptr, &parent, MID_GNE_EDGE_SMOOTH_ELEVATION);
+    GUIDesigns::buildFXMenuCommand(edgeOperations, TLF("Add reverse disconnected direction for %", edgeDescPossibleMulti), nullptr, &parent, MID_GNE_EDGE_ADD_REVERSE_DISCONNECTED);
+    GUIDesigns::buildFXMenuCommand(edgeOperations, TLF("Reset lengths for %", edgeDescPossibleMulti), nullptr, &parent, MID_GNE_EDGE_RESET_LENGTH);
+    GUIDesigns::buildFXMenuCommand(edgeOperations, TLF("Straighten %", edgeDescPossibleMulti), nullptr, &parent, MID_GNE_EDGE_STRAIGHTEN);
+    GUIDesigns::buildFXMenuCommand(edgeOperations, TLF("Smooth %", edgeDescPossibleMulti), nullptr, &parent, MID_GNE_EDGE_SMOOTH);
+    GUIDesigns::buildFXMenuCommand(edgeOperations, TLF("Straighten elevation of %", edgeDescPossibleMulti), nullptr, &parent, MID_GNE_EDGE_STRAIGHTEN_ELEVATION);
+    GUIDesigns::buildFXMenuCommand(edgeOperations, TLF("Smooth elevation of %", edgeDescPossibleMulti), nullptr, &parent, MID_GNE_EDGE_SMOOTH_ELEVATION);
 }
 
 
@@ -1932,17 +1933,17 @@
     FXMenuPane* laneOperations = new FXMenuPane(ret);
     ret->insertMenuPaneChild(laneOperations);
     if (numSelectedLanes > 0) {
-        new FXMenuCascade(ret, ("lane operations (" + toString(numSelectedLanes) + " selected)").c_str(), nullptr, laneOperations);
+        new FXMenuCascade(ret, TLF("Lane operations (% selected)", toString(numSelectedLanes)).c_str(), nullptr, laneOperations);
     } else {
-        new FXMenuCascade(ret, "lane operations", nullptr, laneOperations);
+        new FXMenuCascade(ret, TL("Lane operations"), nullptr, laneOperations);
     }
-    GUIDesigns::buildFXMenuCommand(laneOperations, "Duplicate lane", nullptr, &parent, MID_GNE_LANE_DUPLICATE);
-    GUIDesigns::buildFXMenuCommand(laneOperations, "Set custom lane shape", nullptr, &parent, MID_GNE_LANE_EDIT_SHAPE);
-    FXMenuCommand* resetCustomShape = GUIDesigns::buildFXMenuCommand(laneOperations, "reset custom shape", nullptr, &parent, MID_GNE_LANE_RESET_CUSTOMSHAPE);
+    GUIDesigns::buildFXMenuCommand(laneOperations, TL("Duplicate lane"), nullptr, &parent, MID_GNE_LANE_DUPLICATE);
+    GUIDesigns::buildFXMenuCommand(laneOperations, TL("Set custom lane shape"), nullptr, &parent, MID_GNE_LANE_EDIT_SHAPE);
+    FXMenuCommand* resetCustomShape = GUIDesigns::buildFXMenuCommand(laneOperations, TL("Reset custom shape"), nullptr, &parent, MID_GNE_LANE_RESET_CUSTOMSHAPE);
     if (!differentLaneShapes) {
         resetCustomShape->disable();
     }
-    FXMenuCommand* resetOppositeLane = GUIDesigns::buildFXMenuCommand(laneOperations, "reset opposite lane", nullptr, &parent, MID_GNE_LANE_RESET_OPPOSITELANE);
+    FXMenuCommand* resetOppositeLane = GUIDesigns::buildFXMenuCommand(laneOperations, TL("Reset opposite lane"), nullptr, &parent, MID_GNE_LANE_RESET_OPPOSITELANE);
     if (getAttribute(GNE_ATTR_OPPOSITE).empty()) {
         resetOppositeLane->disable();
     }
@@ -1954,34 +1955,34 @@
     FXMenuPane* transformSlanes = new FXMenuPane(laneOperations);
     ret->insertMenuPaneChild(transformSlanes);
     // Create menu comands for all add special lanes
-    FXMenuCommand* addSidewalk = GUIDesigns::buildFXMenuCommand(addSpecialLanes, "Sidewalk", pedestrianIcon, &parent, MID_GNE_LANE_ADD_SIDEWALK);
-    FXMenuCommand* addBikelane = GUIDesigns::buildFXMenuCommand(addSpecialLanes, "Bikelane", bikeIcon, &parent, MID_GNE_LANE_ADD_BIKE);
-    FXMenuCommand* addBuslane = GUIDesigns::buildFXMenuCommand(addSpecialLanes, "Buslane", busIcon, &parent, MID_GNE_LANE_ADD_BUS);
+    FXMenuCommand* addSidewalk = GUIDesigns::buildFXMenuCommand(addSpecialLanes, TL("Sidewalk"), pedestrianIcon, &parent, MID_GNE_LANE_ADD_SIDEWALK);
+    FXMenuCommand* addBikelane = GUIDesigns::buildFXMenuCommand(addSpecialLanes, TL("Bike lane"), bikeIcon, &parent, MID_GNE_LANE_ADD_BIKE);
+    FXMenuCommand* addBuslane = GUIDesigns::buildFXMenuCommand(addSpecialLanes, TL("Bus lane"), busIcon, &parent, MID_GNE_LANE_ADD_BUS);
     // if parent edge is selected, always add greenverge in front
     if (myParentEdge->isAttributeCarrierSelected()) {
-        GUIDesigns::buildFXMenuCommand(addSpecialLanes, "Greenverge", greenVergeIcon, &parent, MID_GNE_LANE_ADD_GREENVERGE_FRONT);
+        GUIDesigns::buildFXMenuCommand(addSpecialLanes, TL("Green verge"), greenVergeIcon, &parent, MID_GNE_LANE_ADD_GREENVERGE_FRONT);
     } else {
-        GUIDesigns::buildFXMenuCommand(addSpecialLanes, "Greenverge (front)", greenVergeIcon, &parent, MID_GNE_LANE_ADD_GREENVERGE_FRONT);
-        GUIDesigns::buildFXMenuCommand(addSpecialLanes, "Greenverge (back)", greenVergeIcon, &parent, MID_GNE_LANE_ADD_GREENVERGE_BACK);
+        GUIDesigns::buildFXMenuCommand(addSpecialLanes, TL("Green verge (front)"), greenVergeIcon, &parent, MID_GNE_LANE_ADD_GREENVERGE_FRONT);
+        GUIDesigns::buildFXMenuCommand(addSpecialLanes, TL("Green verge (back)"), greenVergeIcon, &parent, MID_GNE_LANE_ADD_GREENVERGE_BACK);
     }
     // Create menu comands for all remove special lanes and disable it
-    FXMenuCommand* removeSidewalk = GUIDesigns::buildFXMenuCommand(removeSpecialLanes, "Sidewalk", pedestrianIcon, &parent, MID_GNE_LANE_REMOVE_SIDEWALK);
+    FXMenuCommand* removeSidewalk = GUIDesigns::buildFXMenuCommand(removeSpecialLanes, TL("Sidewalk"), pedestrianIcon, &parent, MID_GNE_LANE_REMOVE_SIDEWALK);
     removeSidewalk->disable();
-    FXMenuCommand* removeBikelane = GUIDesigns::buildFXMenuCommand(removeSpecialLanes, "Bikelane", bikeIcon, &parent, MID_GNE_LANE_REMOVE_BIKE);
+    FXMenuCommand* removeBikelane = GUIDesigns::buildFXMenuCommand(removeSpecialLanes, TL("Bike lane"), bikeIcon, &parent, MID_GNE_LANE_REMOVE_BIKE);
     removeBikelane->disable();
-    FXMenuCommand* removeBuslane = GUIDesigns::buildFXMenuCommand(removeSpecialLanes, "Buslane", busIcon, &parent, MID_GNE_LANE_REMOVE_BUS);
+    FXMenuCommand* removeBuslane = GUIDesigns::buildFXMenuCommand(removeSpecialLanes, TL("Bus lane"), busIcon, &parent, MID_GNE_LANE_REMOVE_BUS);
     removeBuslane->disable();
-    FXMenuCommand* removeGreenVerge = GUIDesigns::buildFXMenuCommand(removeSpecialLanes, "Greenverge", greenVergeIcon, &parent, MID_GNE_LANE_REMOVE_GREENVERGE);
+    FXMenuCommand* removeGreenVerge = GUIDesigns::buildFXMenuCommand(removeSpecialLanes, TL("Green verge"), greenVergeIcon, &parent, MID_GNE_LANE_REMOVE_GREENVERGE);
     removeGreenVerge->disable();
     // Create menu comands for all transform special lanes and disable it
-    FXMenuCommand* transformLaneToSidewalk = GUIDesigns::buildFXMenuCommand(transformSlanes, "Sidewalk", pedestrianIcon, &parent, MID_GNE_LANE_TRANSFORM_SIDEWALK);
-    FXMenuCommand* transformLaneToBikelane = GUIDesigns::buildFXMenuCommand(transformSlanes, "Bikelane", bikeIcon, &parent, MID_GNE_LANE_TRANSFORM_BIKE);
-    FXMenuCommand* transformLaneToBuslane = GUIDesigns::buildFXMenuCommand(transformSlanes, "Buslane", busIcon, &parent, MID_GNE_LANE_TRANSFORM_BUS);
-    FXMenuCommand* transformLaneToGreenVerge = GUIDesigns::buildFXMenuCommand(transformSlanes, "Greenverge", greenVergeIcon, &parent, MID_GNE_LANE_TRANSFORM_GREENVERGE);
+    FXMenuCommand* transformLaneToSidewalk = GUIDesigns::buildFXMenuCommand(transformSlanes, TL("Sidewalk"), pedestrianIcon, &parent, MID_GNE_LANE_TRANSFORM_SIDEWALK);
+    FXMenuCommand* transformLaneToBikelane = GUIDesigns::buildFXMenuCommand(transformSlanes, TL("Bike lane"), bikeIcon, &parent, MID_GNE_LANE_TRANSFORM_BIKE);
+    FXMenuCommand* transformLaneToBuslane = GUIDesigns::buildFXMenuCommand(transformSlanes, TL("Bus lane"), busIcon, &parent, MID_GNE_LANE_TRANSFORM_BUS);
+    FXMenuCommand* transformLaneToGreenVerge = GUIDesigns::buildFXMenuCommand(transformSlanes, TL("Green verge"), greenVergeIcon, &parent, MID_GNE_LANE_TRANSFORM_GREENVERGE);
     // add menuCascade for lane operations
-    new FXMenuCascade(laneOperations, ("add restricted " + toString(SUMO_TAG_LANE)).c_str(), nullptr, addSpecialLanes);
-    FXMenuCascade* cascadeRemoveSpecialLane = new FXMenuCascade(laneOperations, ("remove restricted " + toString(SUMO_TAG_LANE)).c_str(), nullptr, removeSpecialLanes);
-    new FXMenuCascade(laneOperations, ("transform to restricted " + toString(SUMO_TAG_LANE)).c_str(), nullptr, transformSlanes);
+    new FXMenuCascade(laneOperations, TLF("Add restricted %", toString(SUMO_TAG_LANE)).c_str(), nullptr, addSpecialLanes);
+    FXMenuCascade* cascadeRemoveSpecialLane = new FXMenuCascade(laneOperations, TLF("Remove restricted %", toString(SUMO_TAG_LANE)).c_str(), nullptr, removeSpecialLanes);
+    new FXMenuCascade(laneOperations, TLF("Transform to restricted %", toString(SUMO_TAG_LANE)).c_str(), nullptr, transformSlanes);
     // Enable and disable options depending of current transform of the lane
     if (edgeHasSidewalk) {
         transformLaneToSidewalk->disable();
@@ -2022,13 +2023,13 @@
     FXMenuPane* edgeOperations = new FXMenuPane(ret);
     ret->insertMenuPaneChild(edgeOperations);
     if (edgeSelSize > 0) {
-        new FXMenuCascade(ret, ("template operations (" + toString(edgeSelSize) + " selected)").c_str(), nullptr, edgeOperations);
+        new FXMenuCascade(ret, TLF("Template operations (% selected)", toString(edgeSelSize)).c_str(), nullptr, edgeOperations);
     } else {
-        new FXMenuCascade(ret, "template operations", nullptr, edgeOperations);
+        new FXMenuCascade(ret, TL("Template operations"), nullptr, edgeOperations);
     }
     // create menu commands for all edge operations
-    GUIDesigns::buildFXMenuCommand(edgeOperations, "Use edge as template", nullptr, &parent, MID_GNE_EDGE_USEASTEMPLATE);
-    auto applyTemplate = GUIDesigns::buildFXMenuCommand(edgeOperations, "Apply template", nullptr, &parent, MID_GNE_EDGE_APPLYTEMPLATE);
+    GUIDesigns::buildFXMenuCommand(edgeOperations, TL("Use edge as template"), nullptr, &parent, MID_GNE_EDGE_USEASTEMPLATE);
+    auto applyTemplate = GUIDesigns::buildFXMenuCommand(edgeOperations, TL("Apply template"), nullptr, &parent, MID_GNE_EDGE_APPLYTEMPLATE);
     // check if disable apply template
     if (myNet->getViewNet()->getViewParent()->getInspectorFrame()->getTemplateEditor()->getEdgeTemplate() == nullptr) {
         applyTemplate->disable();
@@ -2043,12 +2044,12 @@
     FXMenuPane* reachableByClass = new FXMenuPane(ret);
     ret->insertMenuPaneChild(reachableByClass);
     if (myNet->isNetRecomputed()) {
-        new FXMenuCascade(ret, "Select reachable", GUIIconSubSys::getIcon(GUIIcon::MODEVEHICLE), reachableByClass);
+        new FXMenuCascade(ret, TL("Select reachable"), GUIIconSubSys::getIcon(GUIIcon::MODEVEHICLE), reachableByClass);
         for (const auto& vClass : SumoVehicleClassStrings.getStrings()) {
             GUIDesigns::buildFXMenuCommand(reachableByClass, vClass.c_str(), VClassIcons::getVClassIcon(SumoVehicleClassStrings.get(vClass)), &parent, MID_REACHABILITY);
         }
     } else {
-        FXMenuCommand* menuCommand = GUIDesigns::buildFXMenuCommand(ret, "Select reachable (compute junctions)", nullptr, nullptr, 0);
+        FXMenuCommand* menuCommand = GUIDesigns::buildFXMenuCommand(ret, TL("Select reachable (compute junctions)"), nullptr, nullptr, 0);
         menuCommand->handle(&parent, FXSEL(SEL_COMMAND, FXWindow::ID_DISABLE), nullptr);
     }
 }
diff -Nru sumo-1.17.0/src/netedit/elements/network/GNELane.h sumo-1.18.0/src/netedit/elements/network/GNELane.h
--- sumo-1.17.0/src/netedit/elements/network/GNELane.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/network/GNELane.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/elements/network/GNELaneTemplate.cpp sumo-1.18.0/src/netedit/elements/network/GNELaneTemplate.cpp
--- sumo-1.17.0/src/netedit/elements/network/GNELaneTemplate.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/network/GNELaneTemplate.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/elements/network/GNELaneTemplate.h sumo-1.18.0/src/netedit/elements/network/GNELaneTemplate.h
--- sumo-1.17.0/src/netedit/elements/network/GNELaneTemplate.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/network/GNELaneTemplate.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/elements/network/GNELaneType.cpp sumo-1.18.0/src/netedit/elements/network/GNELaneType.cpp
--- sumo-1.17.0/src/netedit/elements/network/GNELaneType.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/network/GNELaneType.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/elements/network/GNELaneType.h sumo-1.18.0/src/netedit/elements/network/GNELaneType.h
--- sumo-1.17.0/src/netedit/elements/network/GNELaneType.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/network/GNELaneType.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/elements/network/GNENetworkElement.cpp sumo-1.18.0/src/netedit/elements/network/GNENetworkElement.cpp
--- sumo-1.17.0/src/netedit/elements/network/GNENetworkElement.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/network/GNENetworkElement.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/elements/network/GNENetworkElement.h sumo-1.18.0/src/netedit/elements/network/GNENetworkElement.h
--- sumo-1.17.0/src/netedit/elements/network/GNENetworkElement.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/network/GNENetworkElement.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/elements/network/GNEProhibition.cpp sumo-1.18.0/src/netedit/elements/network/GNEProhibition.cpp
--- sumo-1.17.0/src/netedit/elements/network/GNEProhibition.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/network/GNEProhibition.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/elements/network/GNEProhibition.h sumo-1.18.0/src/netedit/elements/network/GNEProhibition.h
--- sumo-1.17.0/src/netedit/elements/network/GNEProhibition.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/network/GNEProhibition.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/elements/network/GNEWalkingArea.cpp sumo-1.18.0/src/netedit/elements/network/GNEWalkingArea.cpp
--- sumo-1.17.0/src/netedit/elements/network/GNEWalkingArea.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/network/GNEWalkingArea.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/elements/network/GNEWalkingArea.h sumo-1.18.0/src/netedit/elements/network/GNEWalkingArea.h
--- sumo-1.17.0/src/netedit/elements/network/GNEWalkingArea.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/elements/network/GNEWalkingArea.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/frames/common/GNEDeleteFrame.cpp sumo-1.18.0/src/netedit/frames/common/GNEDeleteFrame.cpp
--- sumo-1.17.0/src/netedit/frames/common/GNEDeleteFrame.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/frames/common/GNEDeleteFrame.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -304,8 +304,8 @@
 
 long
 GNEDeleteFrame::ProtectElements::onUpdProtectAll(FXObject* sender, FXSelector, void*) {
-    if (myProtectAdditionals->getCheck() && myProtectTAZs->getCheck() && 
-        myProtectDemandElements->getCheck() && myProtectGenericDatas->getCheck()) {
+    if (myProtectAdditionals->getCheck() && myProtectTAZs->getCheck() &&
+            myProtectDemandElements->getCheck() && myProtectGenericDatas->getCheck()) {
         return sender->handle(this, FXSEL(SEL_COMMAND, ID_DISABLE), nullptr);
     } else {
         return sender->handle(this, FXSEL(SEL_COMMAND, ID_ENABLE), nullptr);
@@ -315,8 +315,8 @@
 
 long
 GNEDeleteFrame::ProtectElements::onUpdUnprotectAll(FXObject* sender, FXSelector, void*) {
-    if (!myProtectAdditionals->getCheck() && !myProtectTAZs->getCheck() && 
-        !myProtectDemandElements->getCheck() && !myProtectGenericDatas->getCheck()) {
+    if (!myProtectAdditionals->getCheck() && !myProtectTAZs->getCheck() &&
+            !myProtectDemandElements->getCheck() && !myProtectGenericDatas->getCheck()) {
         return sender->handle(this, FXSEL(SEL_COMMAND, ID_DISABLE), nullptr);
     } else {
         return sender->handle(this, FXSEL(SEL_COMMAND, ID_ENABLE), nullptr);
diff -Nru sumo-1.17.0/src/netedit/frames/common/GNEDeleteFrame.h sumo-1.18.0/src/netedit/frames/common/GNEDeleteFrame.h
--- sumo-1.17.0/src/netedit/frames/common/GNEDeleteFrame.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/frames/common/GNEDeleteFrame.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -96,7 +96,7 @@
 
         /// @brief check if protect generic datas checkbox is enabled
         bool protectGenericDatas() const;
-    
+
         /// @name FOX-callbacks
         /// @{
         /// @brief protect all elements
diff -Nru sumo-1.17.0/src/netedit/frames/common/GNEElementSet.cpp sumo-1.18.0/src/netedit/frames/common/GNEElementSet.cpp
--- sumo-1.17.0/src/netedit/frames/common/GNEElementSet.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/frames/common/GNEElementSet.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/frames/common/GNEElementSet.h sumo-1.18.0/src/netedit/frames/common/GNEElementSet.h
--- sumo-1.17.0/src/netedit/frames/common/GNEElementSet.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/frames/common/GNEElementSet.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/frames/common/GNEInspectorFrame.cpp sumo-1.18.0/src/netedit/frames/common/GNEInspectorFrame.cpp
--- sumo-1.17.0/src/netedit/frames/common/GNEInspectorFrame.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/frames/common/GNEInspectorFrame.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -67,10 +67,7 @@
     FXMAPFUNC(SEL_COMMAND,  MID_HOTKEY_SHIFT_F3_TEMPLATE_CLEAR, GNEInspectorFrame::TemplateEditor::onCmdClearTemplate),
 };
 
-FXDEFMAP(GNEInspectorFrame::ParametersEditor) ParametersEditorMap[] = {
-    FXMAPFUNC(SEL_COMMAND,  MID_GNE_OPEN_PARAMETERS_DIALOG, GNEInspectorFrame::ParametersEditor::onCmdEditParameters),
-    FXMAPFUNC(SEL_COMMAND,  MID_GNE_SET_ATTRIBUTE,          GNEInspectorFrame::ParametersEditor::onCmdSetParameters)
-};
+
 
 FXDEFMAP(GNEInspectorFrame::AdditionalDialog) AdditionalDialogMap[] = {
     FXMAPFUNC(SEL_COMMAND,  MID_OPEN_ADDITIONAL_DIALOG, GNEInspectorFrame::AdditionalDialog::onCmdOpenAdditionalDialog),
@@ -81,7 +78,6 @@
 FXIMPLEMENT(GNEInspectorFrame::NeteditAttributesEditor, MFXGroupBoxModule,  NeteditAttributesEditorMap, ARRAYNUMBER(NeteditAttributesEditorMap))
 FXIMPLEMENT(GNEInspectorFrame::GEOAttributesEditor,     MFXGroupBoxModule,  GEOAttributesEditorMap,     ARRAYNUMBER(GEOAttributesEditorMap))
 FXIMPLEMENT(GNEInspectorFrame::TemplateEditor,          MFXGroupBoxModule,  TemplateEditorMap,          ARRAYNUMBER(TemplateEditorMap))
-FXIMPLEMENT(GNEInspectorFrame::ParametersEditor,        MFXGroupBoxModule,  ParametersEditorMap,        ARRAYNUMBER(ParametersEditorMap))
 FXIMPLEMENT(GNEInspectorFrame::AdditionalDialog,        MFXGroupBoxModule,  AdditionalDialogMap,        ARRAYNUMBER(AdditionalDialogMap))
 
 
@@ -742,165 +738,6 @@
 }
 
 // ---------------------------------------------------------------------------
-// GNEFrameAttributeModules::ParametersEditor - methods
-// ---------------------------------------------------------------------------
-
-GNEInspectorFrame::ParametersEditor::ParametersEditor(GNEInspectorFrame* inspectorFrameParent) :
-    MFXGroupBoxModule(inspectorFrameParent, TL("Parameters")),
-    myInspectorFrameParent(inspectorFrameParent) {
-    // create textfield and buttons
-    myTextFieldParameters = new FXTextField(getCollapsableFrame(), GUIDesignTextFieldNCol, this, MID_GNE_SET_ATTRIBUTE, GUIDesignTextField);
-    myButtonEditParameters = new FXButton(getCollapsableFrame(), TL("Edit parameters"), nullptr, this, MID_GNE_OPEN_PARAMETERS_DIALOG, GUIDesignButton);
-}
-
-
-GNEInspectorFrame::ParametersEditor::~ParametersEditor() {}
-
-
-void
-GNEInspectorFrame::ParametersEditor::showParametersEditor() {
-    // firt check if there is
-    if ((myInspectorFrameParent->getViewNet()->getInspectedAttributeCarriers().size() > 0) &&
-            myInspectorFrameParent->getViewNet()->getInspectedAttributeCarriers().front()->getTagProperty().hasParameters()) {
-        // refresh ParametersEditor
-        refreshParametersEditor();
-        // show groupbox
-        show();
-    } else {
-        hide();
-    }
-}
-
-
-void
-GNEInspectorFrame::ParametersEditor::hideParametersEditor() {
-    // hide groupbox
-    hide();
-}
-
-
-void
-GNEInspectorFrame::ParametersEditor::refreshParametersEditor() {
-    // get front AC
-    const GNEAttributeCarrier* frontAC = myInspectorFrameParent->getViewNet()->getInspectedAttributeCarriers().size() > 0 ? myInspectorFrameParent->getViewNet()->getInspectedAttributeCarriers().front() : nullptr;
-    // continue depending of frontAC
-    if (frontAC && frontAC->getTagProperty().hasParameters()) {
-        // check if we're editing a single or a multiple AC
-        if (myInspectorFrameParent->getViewNet()->getInspectedAttributeCarriers().size() == 1) {
-            // set text field parameters
-            myTextFieldParameters->setText(frontAC->getAttribute(GNE_ATTR_PARAMETERS).c_str());
-        } else if (myInspectorFrameParent->getViewNet()->getInspectedAttributeCarriers().size() > 0) {
-            // check if parameters of all inspected ACs are different
-            std::string parameters = frontAC->getAttribute(GNE_ATTR_PARAMETERS);
-            for (const auto& AC : myInspectorFrameParent->getViewNet()->getInspectedAttributeCarriers()) {
-                if (parameters != AC->getAttribute(GNE_ATTR_PARAMETERS)) {
-                    parameters = "different parameters";
-                }
-            }
-            // set text field
-            myTextFieldParameters->setText(parameters.c_str());
-        }
-        // reset color
-        myTextFieldParameters->setTextColor(FXRGB(0, 0, 0));
-        // disable myTextFieldParameters if Tag correspond to an network element but we're in demand mode (or vice versa), disable all elements
-        if (GNEFrameAttributeModules::isSupermodeValid(myInspectorFrameParent->myViewNet, frontAC)) {
-            myTextFieldParameters->enable();
-            myButtonEditParameters->enable();
-        } else {
-            myTextFieldParameters->disable();
-            myButtonEditParameters->disable();
-        }
-    }
-}
-
-
-GNEInspectorFrame*
-GNEInspectorFrame::ParametersEditor::getInspectorFrameParent() const {
-    return myInspectorFrameParent;
-}
-
-
-long
-GNEInspectorFrame::ParametersEditor::onCmdEditParameters(FXObject*, FXSelector, void*) {
-    // get front AC
-    const GNEAttributeCarrier* frontAC = myInspectorFrameParent->getViewNet()->getInspectedAttributeCarriers().size() > 0 ? myInspectorFrameParent->getViewNet()->getInspectedAttributeCarriers().front() : nullptr;
-    // continue depending of frontAC
-    if (frontAC && frontAC->getTagProperty().hasParameters()) {
-        if (myInspectorFrameParent->getViewNet()->getInspectedAttributeCarriers().size() > 1) {
-            // write debug information
-            WRITE_DEBUG("Open multiple parameters dialog");
-            // open multiple parameters dialog
-            if (GNEMultipleParametersDialog(this).execute()) {
-                // write debug information
-                WRITE_DEBUG("Close multiple parameters dialog");
-                // update frame parent after attribute successfully set
-                myInspectorFrameParent->attributeUpdated(GNE_ATTR_PARAMETERS);
-                // Refresh parameter EditorInspector
-                refreshParametersEditor();
-            } else {
-                // write debug information
-                WRITE_DEBUG("Cancel multiple parameters dialog");
-            }
-        } else {
-            // write debug information
-            WRITE_DEBUG("Open single parameters dialog");
-            if (GNESingleParametersDialog(this).execute()) {
-                // write debug information
-                WRITE_DEBUG("Close single parameters dialog");
-                // update frame parent after attribute successfully set
-                myInspectorFrameParent->attributeUpdated(GNE_ATTR_PARAMETERS);
-                // Refresh parameter EditorInspector
-                refreshParametersEditor();
-            } else {
-                // write debug information
-                WRITE_DEBUG("Cancel single parameters dialog");
-            }
-        }
-    }
-    return 1;
-}
-
-
-long
-GNEInspectorFrame::ParametersEditor::onCmdSetParameters(FXObject*, FXSelector, void*) {
-    const auto& ACs = myInspectorFrameParent->myAttributesEditor->getFrameParent()->getViewNet()->getInspectedAttributeCarriers();
-    // get front AC
-    GNEAttributeCarrier* frontAC = ACs.size() > 0 ? ACs.front() : nullptr;
-    // continue depending of frontAC
-    if (frontAC && frontAC->getTagProperty().hasParameters()) {
-        // check if current given string is valid
-        if (frontAC->isValid(GNE_ATTR_PARAMETERS, myTextFieldParameters->getText().text())) {
-            // parsed parameters ok, then set text field black and continue
-            myTextFieldParameters->setTextColor(FXRGB(0, 0, 0));
-            myTextFieldParameters->killFocus();
-            // check inspected parameters
-            if (ACs.size() == 1) {
-                // begin undo list
-                myInspectorFrameParent->myViewNet->getUndoList()->begin(frontAC->getTagProperty().getGUIIcon(), "change parameters");
-                // set parameters
-                frontAC->setACParameters(myTextFieldParameters->getText().text(), myInspectorFrameParent->myViewNet->getUndoList());
-                // end undo list
-                myInspectorFrameParent->myViewNet->getUndoList()->end();
-            } else if (ACs.size() > 0) {
-                // begin undo list
-                myInspectorFrameParent->myViewNet->getUndoList()->begin(frontAC->getTagProperty().getGUIIcon(), "change multiple parameters");
-                // set parameters in all ACs
-                for (const auto& inspectedAC : ACs) {
-                    inspectedAC->setACParameters(myTextFieldParameters->getText().text(), myInspectorFrameParent->myViewNet->getUndoList());
-                }
-                // end undo list
-                myInspectorFrameParent->myViewNet->getUndoList()->end();
-            }
-            // update frame parent after attribute successfully set
-            myInspectorFrameParent->attributeUpdated(GNE_ATTR_PARAMETERS);
-        } else {
-            myTextFieldParameters->setTextColor(FXRGB(255, 0, 0));
-        }
-    }
-    return 1;
-}
-
-// ---------------------------------------------------------------------------
 // GNEInspectorFrame::AdditionalDialog - methods
 // ---------------------------------------------------------------------------
 
@@ -1007,7 +844,7 @@
     myGEOAttributesEditor = new GEOAttributesEditor(this);
 
     // create parameters Editor modul
-    myParametersEditor = new ParametersEditor(this);
+    myParametersEditor = new GNEFrameAttributeModules::ParametersEditor(this);
 
     // create additional dialog
     myAdditionalDialog = new AdditionalDialog(this);
@@ -1227,7 +1064,7 @@
         getFrameHeaderLabel()->setText(headerString.c_str());
 
         // Show attributes editor
-        myAttributesEditor->showAttributeEditorModule(true, false);
+        myAttributesEditor->showAttributeEditorModule(true);
 
         // show netedit attributes editor if  we're inspecting elements with Netedit Attributes
         myNeteditAttributesEditor->showNeteditAttributesEditor();
diff -Nru sumo-1.17.0/src/netedit/frames/common/GNEInspectorFrame.h sumo-1.18.0/src/netedit/frames/common/GNEInspectorFrame.h
--- sumo-1.17.0/src/netedit/frames/common/GNEInspectorFrame.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/frames/common/GNEInspectorFrame.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -41,6 +41,9 @@
     /// @brief FOX-declaration
     FXDECLARE(GNEInspectorFrame)
 
+    /// @brief declare friend class
+    friend class GNEFrameAttributeModules::ParametersEditor;
+
 public:
     // ===========================================================================
     // class NeteditAttributesEditor
@@ -260,57 +263,6 @@
     };
 
     // ===========================================================================
-    // class ParametersEditor
-    // ===========================================================================
-
-    class ParametersEditor : public MFXGroupBoxModule {
-        /// @brief FOX-declaration
-        FXDECLARE(GNEInspectorFrame::ParametersEditor)
-
-    public:
-        /// @brief constructor
-        ParametersEditor(GNEInspectorFrame* inspectorFrameParent);
-
-        /// @brief destructor
-        ~ParametersEditor();
-
-        /// @brief show netedit attributes EditorInspector
-        void showParametersEditor();
-
-        /// @brief hide netedit attributes EditorInspector
-        void hideParametersEditor();
-
-        /// @brief refresh netedit attributes
-        void refreshParametersEditor();
-
-        /// @brief get inspector frame parent
-        GNEInspectorFrame* getInspectorFrameParent() const;
-
-        /// @name FOX-callbacks
-        /// @{
-        /// @brief Called when user clicks over add parameter
-        long onCmdEditParameters(FXObject*, FXSelector, void*);
-
-        /// @brief Called when user udpate the parameter text field
-        long onCmdSetParameters(FXObject*, FXSelector, void*);
-        /// @}
-
-    protected:
-        /// @brief FOX need this
-        FOX_CONSTRUCTOR(ParametersEditor)
-
-    private:
-        /// @brief current GNEInspectorFrame parent
-        GNEInspectorFrame* myInspectorFrameParent;
-
-        /// @brief text field for write parameters
-        FXTextField* myTextFieldParameters;
-
-        /// @brief button for edit parameters using specific dialog
-        FXButton* myButtonEditParameters;
-    };
-
-    // ===========================================================================
     // class AdditionalDialog
     // ===========================================================================
 
@@ -452,7 +404,7 @@
     GEOAttributesEditor* myGEOAttributesEditor;
 
     /// @brief Parameters editor inspector
-    ParametersEditor* myParametersEditor;
+    GNEFrameAttributeModules::ParametersEditor* myParametersEditor;
 
     /// @brief Additional dialog
     AdditionalDialog* myAdditionalDialog;
diff -Nru sumo-1.17.0/src/netedit/frames/common/GNEMatchAttribute.cpp sumo-1.18.0/src/netedit/frames/common/GNEMatchAttribute.cpp
--- sumo-1.17.0/src/netedit/frames/common/GNEMatchAttribute.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/frames/common/GNEMatchAttribute.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/frames/common/GNEMatchAttribute.h sumo-1.18.0/src/netedit/frames/common/GNEMatchAttribute.h
--- sumo-1.17.0/src/netedit/frames/common/GNEMatchAttribute.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/frames/common/GNEMatchAttribute.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/frames/common/GNEMatchGenericDataAttribute.cpp sumo-1.18.0/src/netedit/frames/common/GNEMatchGenericDataAttribute.cpp
--- sumo-1.17.0/src/netedit/frames/common/GNEMatchGenericDataAttribute.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/frames/common/GNEMatchGenericDataAttribute.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/frames/common/GNEMatchGenericDataAttribute.h sumo-1.18.0/src/netedit/frames/common/GNEMatchGenericDataAttribute.h
--- sumo-1.17.0/src/netedit/frames/common/GNEMatchGenericDataAttribute.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/frames/common/GNEMatchGenericDataAttribute.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/frames/common/GNEMoveFrame.cpp sumo-1.18.0/src/netedit/frames/common/GNEMoveFrame.cpp
--- sumo-1.17.0/src/netedit/frames/common/GNEMoveFrame.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/frames/common/GNEMoveFrame.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -23,6 +23,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 
@@ -297,9 +298,8 @@
 
 
 long
-GNEMoveFrame::ChangeZInSelection::onCmdChangeZValue(FXObject*, FXSelector, void*) {
-    // just call onCmdApplyZ
-    return onCmdApplyZ(nullptr, 0, nullptr);
+GNEMoveFrame::ChangeZInSelection::onCmdChangeZValue(FXObject* /*obj*/, FXSelector /*sel*/, void*) {
+    return 1;
 }
 
 
@@ -613,17 +613,7 @@
 GNEMoveFrame::Information::Information(GNEMoveFrame* moveFrameParent) :
     MFXGroupBoxModule(moveFrameParent, TL("Information")) {
     // create info label
-    std::ostringstream information;
-    // add label for shift+click
-    information
-            << TL("-Click over edge to") << "\n"
-            << TL(" create or edit") << "\n"
-            << TL(" geometry point.") << "\n"
-            << TL("-Shift+click over edge") << "\n"
-            << TL(" to edit start or end") << "\n"
-            << TL(" geometry point.");
-    // create label
-    new FXLabel(getCollapsableFrame(), information.str().c_str(), 0, GUIDesignLabelFrameInformation);
+    new MFXDynamicLabel(getCollapsableFrame(), (std::string("- ") + TL("Click over edge to create or edit geometry point.") + std::string("\n- ") + TL("Shift+click over edge to edit start or end geometry point.")).c_str(), 0, GUIDesignLabelFrameInformation);
     // create source label
     FXLabel* sourceLabel = new FXLabel(getCollapsableFrame(), TL("-Move geometry point"), 0, GUIDesignLabel(JUSTIFY_LEFT));
     sourceLabel->setBackColor(MFXUtils::getFXColor(RGBColor::ORANGE));
diff -Nru sumo-1.17.0/src/netedit/frames/common/GNEMoveFrame.h sumo-1.18.0/src/netedit/frames/common/GNEMoveFrame.h
--- sumo-1.17.0/src/netedit/frames/common/GNEMoveFrame.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/frames/common/GNEMoveFrame.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/frames/common/GNESelectorFrame.cpp sumo-1.18.0/src/netedit/frames/common/GNESelectorFrame.cpp
--- sumo-1.17.0/src/netedit/frames/common/GNESelectorFrame.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/frames/common/GNESelectorFrame.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -25,6 +25,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -789,22 +790,40 @@
                 routeFlow->setAttribute(GNE_ATTR_SELECTED, "true", undoList);
             }
         }
-        for (const auto& routeFlow : demandElements.at(GNE_TAG_TRIP_JUNCTIONS)) {
+        for (const auto& tripJunction : demandElements.at(GNE_TAG_TRIP_JUNCTIONS)) {
             if (onlyCount) {
                 return true;
-            } else if (onlyUnselect || routeFlow->isAttributeCarrierSelected()) {
-                routeFlow->setAttribute(GNE_ATTR_SELECTED, "false", undoList);
+            } else if (onlyUnselect || tripJunction->isAttributeCarrierSelected()) {
+                tripJunction->setAttribute(GNE_ATTR_SELECTED, "false", undoList);
             } else {
-                routeFlow->setAttribute(GNE_ATTR_SELECTED, "true", undoList);
+                tripJunction->setAttribute(GNE_ATTR_SELECTED, "true", undoList);
             }
         }
-        for (const auto& routeFlow : demandElements.at(GNE_TAG_FLOW_JUNCTIONS)) {
+        for (const auto& tripTAZ : demandElements.at(GNE_TAG_TRIP_TAZS)) {
             if (onlyCount) {
                 return true;
-            } else if (onlyUnselect || routeFlow->isAttributeCarrierSelected()) {
-                routeFlow->setAttribute(GNE_ATTR_SELECTED, "false", undoList);
+            } else if (onlyUnselect || tripTAZ->isAttributeCarrierSelected()) {
+                tripTAZ->setAttribute(GNE_ATTR_SELECTED, "false", undoList);
             } else {
-                routeFlow->setAttribute(GNE_ATTR_SELECTED, "true", undoList);
+                tripTAZ->setAttribute(GNE_ATTR_SELECTED, "true", undoList);
+            }
+        }
+        for (const auto& flowjunction : demandElements.at(GNE_TAG_FLOW_JUNCTIONS)) {
+            if (onlyCount) {
+                return true;
+            } else if (onlyUnselect || flowjunction->isAttributeCarrierSelected()) {
+                flowjunction->setAttribute(GNE_ATTR_SELECTED, "false", undoList);
+            } else {
+                flowjunction->setAttribute(GNE_ATTR_SELECTED, "true", undoList);
+            }
+        }
+        for (const auto& flowTAZ : demandElements.at(GNE_TAG_FLOW_TAZS)) {
+            if (onlyCount) {
+                return true;
+            } else if (onlyUnselect || flowTAZ->isAttributeCarrierSelected()) {
+                flowTAZ->setAttribute(GNE_ATTR_SELECTED, "false", undoList);
+            } else {
+                flowTAZ->setAttribute(GNE_ATTR_SELECTED, "true", undoList);
             }
         }
     } else if (onlyCount) {
@@ -1024,7 +1043,7 @@
         for (const auto& demandElementTag : demandElements) {
             for (const auto& demandElement : demandElementTag.second) {
                 // avoid vTypes
-                if (!demandElement->getTagProperty().isVehicleType()) {
+                if (!demandElement->getTagProperty().isType()) {
                     // iterate over every child
                     for (const auto& stop : demandElement->getChildDemandElements()) {
                         if (stop->getTagProperty().isStop() || stop->getTagProperty().isStopPerson() || stop->getTagProperty().isStopContainer()) {
@@ -1404,7 +1423,7 @@
 GNESelectorFrame::Information::Information(GNESelectorFrame* selectorFrameParent) :
     MFXGroupBoxModule(selectorFrameParent, TL("Information")) {
     // Create Selection Hint
-    new FXLabel(getCollapsableFrame(), " - Hold  for \n   rectangle selection.\n - Press  to\n   delete selected objects.", nullptr, GUIDesignLabelFrameInformation);
+    new MFXDynamicLabel(getCollapsableFrame(), (std::string("- ") + "Hold  for rectangle selection." + std::string("\n- ") + "Press  to delete selected objects.").c_str(), nullptr, GUIDesignLabelFrameInformation);
 }
 
 
diff -Nru sumo-1.17.0/src/netedit/frames/common/GNESelectorFrame.h sumo-1.18.0/src/netedit/frames/common/GNESelectorFrame.h
--- sumo-1.17.0/src/netedit/frames/common/GNESelectorFrame.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/frames/common/GNESelectorFrame.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/frames/data/GNEEdgeDataFrame.cpp sumo-1.18.0/src/netedit/frames/data/GNEEdgeDataFrame.cpp
--- sumo-1.17.0/src/netedit/frames/data/GNEEdgeDataFrame.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/frames/data/GNEEdgeDataFrame.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/frames/data/GNEEdgeDataFrame.h sumo-1.18.0/src/netedit/frames/data/GNEEdgeDataFrame.h
--- sumo-1.17.0/src/netedit/frames/data/GNEEdgeDataFrame.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/frames/data/GNEEdgeDataFrame.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/frames/data/GNEEdgeRelDataFrame.cpp sumo-1.18.0/src/netedit/frames/data/GNEEdgeRelDataFrame.cpp
--- sumo-1.17.0/src/netedit/frames/data/GNEEdgeRelDataFrame.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/frames/data/GNEEdgeRelDataFrame.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/frames/data/GNEEdgeRelDataFrame.h sumo-1.18.0/src/netedit/frames/data/GNEEdgeRelDataFrame.h
--- sumo-1.17.0/src/netedit/frames/data/GNEEdgeRelDataFrame.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/frames/data/GNEEdgeRelDataFrame.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/frames/data/GNEGenericDataFrame.cpp sumo-1.18.0/src/netedit/frames/data/GNEGenericDataFrame.cpp
--- sumo-1.17.0/src/netedit/frames/data/GNEGenericDataFrame.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/frames/data/GNEGenericDataFrame.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -218,8 +218,9 @@
     // create interval button
     myCreateIntervalButton = new FXButton(getCollapsableFrame(), TL("create interval"), GUIIconSubSys::getIcon(GUIIcon::DATAINTERVAL), this, MID_GNE_CREATE, GUIDesignButton);
     myCreateIntervalButton->hide();
-    // Create three list
-    myIntervalsTreelist = new FXTreeList(getCollapsableFrame(), this, MID_GNE_DATAINTERVAL_SELECTED, GUIDesignTreeListFrame);
+    // Create tree list with fixed height
+    myIntervalsTreelist = new FXTreeList(getCollapsableFrame(), this, MID_GNE_DATAINTERVAL_SELECTED, GUIDesignTreeListFixedHeight);
+    myIntervalsTreelist->setHeight(200);
     // refresh interval selector
     refreshIntervalSelector();
     // IntervalSelector is always shown
diff -Nru sumo-1.17.0/src/netedit/frames/data/GNEGenericDataFrame.h sumo-1.18.0/src/netedit/frames/data/GNEGenericDataFrame.h
--- sumo-1.17.0/src/netedit/frames/data/GNEGenericDataFrame.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/frames/data/GNEGenericDataFrame.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/frames/data/GNEMeanDataFrame.cpp sumo-1.18.0/src/netedit/frames/data/GNEMeanDataFrame.cpp
--- sumo-1.17.0/src/netedit/frames/data/GNEMeanDataFrame.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/frames/data/GNEMeanDataFrame.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -387,7 +387,7 @@
         if (myCurrentMeanData) {
             // set myCurrentMeanData as inspected element (needed for attribute editor)
             myMeanDataFrameParent->getViewNet()->setInspectedAttributeCarriers({myCurrentMeanData});
-            myMeanDataFrameParent->myMeanDataAttributesEditor->showAttributeEditorModule(false, true);
+            myMeanDataFrameParent->myMeanDataAttributesEditor->showAttributeEditorModule(false);
         } else {
             // set myCurrentMeanData as inspected element (needed for attribute editor)
             myMeanDataFrameParent->getViewNet()->setInspectedAttributeCarriers({});
@@ -421,7 +421,7 @@
             // set myCurrentMeanData as inspected element
             myMeanDataFrameParent->getViewNet()->setInspectedAttributeCarriers({myCurrentMeanData});
             // show modules if selected item is valid
-            myMeanDataFrameParent->myMeanDataAttributesEditor->showAttributeEditorModule(false, true);
+            myMeanDataFrameParent->myMeanDataAttributesEditor->showAttributeEditorModule(false);
             // Write Warning in console if we're in testing mode
             WRITE_DEBUG(("Selected item '" + myMeanDataComboBox->getText() + "' in MeanDataSelector").text());
             // update viewNet
diff -Nru sumo-1.17.0/src/netedit/frames/data/GNEMeanDataFrame.h sumo-1.18.0/src/netedit/frames/data/GNEMeanDataFrame.h
--- sumo-1.17.0/src/netedit/frames/data/GNEMeanDataFrame.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/frames/data/GNEMeanDataFrame.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/frames/data/GNETAZRelDataFrame.cpp sumo-1.18.0/src/netedit/frames/data/GNETAZRelDataFrame.cpp
--- sumo-1.17.0/src/netedit/frames/data/GNETAZRelDataFrame.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/frames/data/GNETAZRelDataFrame.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/frames/data/GNETAZRelDataFrame.h sumo-1.18.0/src/netedit/frames/data/GNETAZRelDataFrame.h
--- sumo-1.17.0/src/netedit/frames/data/GNETAZRelDataFrame.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/frames/data/GNETAZRelDataFrame.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/frames/demand/CMakeLists.txt sumo-1.18.0/src/netedit/frames/demand/CMakeLists.txt
--- sumo-1.17.0/src/netedit/frames/demand/CMakeLists.txt	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/frames/demand/CMakeLists.txt	2023-06-28 20:02:17.000000000 +0000
@@ -15,6 +15,8 @@
    GNEVehicleFrame.cpp
    GNETypeFrame.h
    GNETypeFrame.cpp
+   GNETypeDistributionFrame.h
+   GNETypeDistributionFrame.cpp
    )
 
 add_library(netedit_frames_demand STATIC ${netedit_frames_demand_SRCS})
diff -Nru sumo-1.17.0/src/netedit/frames/demand/GNEContainerFrame.cpp sumo-1.18.0/src/netedit/frames/demand/GNEContainerFrame.cpp
--- sumo-1.17.0/src/netedit/frames/demand/GNEContainerFrame.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/frames/demand/GNEContainerFrame.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -133,7 +133,7 @@
     } else if (clickedACTag == SUMO_TAG_CONTAINER_STOP) {
         return myPathCreator->addStoppingPlace(objectsUnderCursor.getAdditionalFront(), mouseButtonKeyPressed.shiftKeyPressed(), mouseButtonKeyPressed.controlKeyPressed());
     } else if (clickedACTag == SUMO_TAG_JUNCTION) {
-        return myPathCreator->addJunction(objectsUnderCursor.getJunctionFront(), mouseButtonKeyPressed.shiftKeyPressed(), mouseButtonKeyPressed.controlKeyPressed());
+        return myPathCreator->addJunction(objectsUnderCursor.getJunctionFront());
     } else {
         return false;
     }
@@ -145,6 +145,12 @@
     return myPathCreator;
 }
 
+
+DemandElementSelector*
+GNEContainerFrame::getTypeSelector() const {
+    return myTypeSelector;
+}
+
 // ===========================================================================
 // protected
 // ===========================================================================
diff -Nru sumo-1.17.0/src/netedit/frames/demand/GNEContainerFrame.h sumo-1.18.0/src/netedit/frames/demand/GNEContainerFrame.h
--- sumo-1.17.0/src/netedit/frames/demand/GNEContainerFrame.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/frames/demand/GNEContainerFrame.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -63,6 +63,9 @@
     /// @brief get GNEPathCreator modul
     GNEPathCreator* getPathCreator() const;
 
+    /// @brief get Type selectors
+    DemandElementSelector* getTypeSelector() const;
+
 protected:
     /// @brief Tag selected in GNETagSelector
     void tagSelected();
diff -Nru sumo-1.17.0/src/netedit/frames/demand/GNEContainerPlanFrame.cpp sumo-1.18.0/src/netedit/frames/demand/GNEContainerPlanFrame.cpp
--- sumo-1.17.0/src/netedit/frames/demand/GNEContainerPlanFrame.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/frames/demand/GNEContainerPlanFrame.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -142,6 +142,18 @@
     return myPathCreator;
 }
 
+
+GNEElementTree*
+GNEContainerPlanFrame::getContainerHierarchy() const {
+    return myContainerHierarchy;
+}
+
+
+DemandElementSelector*
+GNEContainerPlanFrame::getContainerSelector() const {
+    return myContainerSelector;
+}
+
 // ===========================================================================
 // protected
 // ===========================================================================
@@ -164,7 +176,7 @@
             myPathLegend->showPathLegendModule();
             // check if add previous edge
             if (!myContainerPlanTagSelector->getCurrentTemplateAC()->getTagProperty().isStopContainer()) {
-                myPathCreator->addEdge(previousEdge, false, false);
+                myPathCreator->addEdge(previousEdge, true, true);
             }
         } else {
             // set path creator mode
diff -Nru sumo-1.17.0/src/netedit/frames/demand/GNEContainerPlanFrame.h sumo-1.18.0/src/netedit/frames/demand/GNEContainerPlanFrame.h
--- sumo-1.17.0/src/netedit/frames/demand/GNEContainerPlanFrame.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/frames/demand/GNEContainerPlanFrame.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -62,6 +62,12 @@
     /// @brief get path creator modul
     GNEPathCreator* getPathCreator() const;
 
+    /// @brief get container Hierarchy
+    GNEElementTree* getContainerHierarchy() const;
+
+    /// @brief get container selectors
+    DemandElementSelector* getContainerSelector() const;
+
 protected:
     /// @brief Tag selected in GNETagSelector
     void tagSelected();
diff -Nru sumo-1.17.0/src/netedit/frames/demand/GNEPersonFrame.cpp sumo-1.18.0/src/netedit/frames/demand/GNEPersonFrame.cpp
--- sumo-1.17.0/src/netedit/frames/demand/GNEPersonFrame.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/frames/demand/GNEPersonFrame.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -130,12 +130,12 @@
     // add elements to path creator
     if (clickedACTag == SUMO_TAG_LANE) {
         return myPathCreator->addEdge(objectsUnderCursor.getEdgeFront(), mouseButtonKeyPressed.shiftKeyPressed(), mouseButtonKeyPressed.controlKeyPressed());
-    } else if (clickedACTag == SUMO_TAG_BUS_STOP) {
+    } else if ((clickedACTag == SUMO_TAG_BUS_STOP) || (clickedACTag == SUMO_TAG_TRAIN_STOP)) {
         return myPathCreator->addStoppingPlace(objectsUnderCursor.getAdditionalFront(), mouseButtonKeyPressed.shiftKeyPressed(), mouseButtonKeyPressed.controlKeyPressed());
     } else if (clickedACTag == SUMO_TAG_ROUTE) {
         return myPathCreator->addRoute(objectsUnderCursor.getDemandElementFront(), mouseButtonKeyPressed.shiftKeyPressed(), mouseButtonKeyPressed.controlKeyPressed());
     } else if (clickedACTag == SUMO_TAG_JUNCTION) {
-        return myPathCreator->addJunction(objectsUnderCursor.getJunctionFront(), mouseButtonKeyPressed.shiftKeyPressed(), mouseButtonKeyPressed.controlKeyPressed());
+        return myPathCreator->addJunction(objectsUnderCursor.getJunctionFront());
     } else {
         return false;
     }
@@ -147,6 +147,12 @@
     return myPathCreator;
 }
 
+
+DemandElementSelector*
+GNEPersonFrame::getTypeSelector() const {
+    return myTypeSelector;
+}
+
 // ===========================================================================
 // protected
 // ===========================================================================
diff -Nru sumo-1.17.0/src/netedit/frames/demand/GNEPersonFrame.h sumo-1.18.0/src/netedit/frames/demand/GNEPersonFrame.h
--- sumo-1.17.0/src/netedit/frames/demand/GNEPersonFrame.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/frames/demand/GNEPersonFrame.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -63,6 +63,9 @@
     /// @brief get GNEPathCreator module
     GNEPathCreator* getPathCreator() const;
 
+    /// @brief get Type selectors
+    DemandElementSelector* getTypeSelector() const;
+
 protected:
     /// @brief Tag selected in GNETagSelector
     void tagSelected();
diff -Nru sumo-1.17.0/src/netedit/frames/demand/GNEPersonPlanFrame.cpp sumo-1.18.0/src/netedit/frames/demand/GNEPersonPlanFrame.cpp
--- sumo-1.17.0/src/netedit/frames/demand/GNEPersonPlanFrame.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/frames/demand/GNEPersonPlanFrame.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -151,6 +151,8 @@
     // declare flags for requirements
     const bool requireBusStop = ((personPlanTag == GNE_TAG_PERSONTRIP_BUSSTOP) || (personPlanTag == GNE_TAG_WALK_BUSSTOP) ||
                                  (personPlanTag == GNE_TAG_RIDE_BUSSTOP) || (personPlanTag == GNE_TAG_STOPPERSON_BUSSTOP));
+    const bool requireTrainStop = ((personPlanTag == GNE_TAG_PERSONTRIP_TRAINSTOP) || (personPlanTag == GNE_TAG_WALK_TRAINSTOP) ||
+                                   (personPlanTag == GNE_TAG_RIDE_TRAINSTOP) || (personPlanTag == GNE_TAG_STOPPERSON_TRAINSTOP));
     const bool requireEdge = ((personPlanTag == GNE_TAG_PERSONTRIP_EDGE) || (personPlanTag == GNE_TAG_WALK_EDGE) ||
                               (personPlanTag == GNE_TAG_RIDE_EDGE) || (personPlanTag == GNE_TAG_WALK_EDGES) ||
                               (personPlanTag == GNE_TAG_STOPPERSON_EDGE));
@@ -160,10 +162,12 @@
         return myPathCreator->addRoute(objectsUnderCursor.getDemandElementFront(), mouseButtonKeyPressed.shiftKeyPressed(), mouseButtonKeyPressed.controlKeyPressed());
     } else if (requireBusStop && objectsUnderCursor.getAdditionalFront() && (objectsUnderCursor.getAdditionalFront()->getTagProperty().getTag() == SUMO_TAG_BUS_STOP)) {
         return myPathCreator->addStoppingPlace(objectsUnderCursor.getAdditionalFront(), mouseButtonKeyPressed.shiftKeyPressed(), mouseButtonKeyPressed.controlKeyPressed());
+    } else if (requireTrainStop && objectsUnderCursor.getAdditionalFront() && (objectsUnderCursor.getAdditionalFront()->getTagProperty().getTag() == SUMO_TAG_TRAIN_STOP)) {
+        return myPathCreator->addStoppingPlace(objectsUnderCursor.getAdditionalFront(), mouseButtonKeyPressed.shiftKeyPressed(), mouseButtonKeyPressed.controlKeyPressed());
     } else if (requireEdge && objectsUnderCursor.getEdgeFront()) {
         return myPathCreator->addEdge(objectsUnderCursor.getEdgeFront(), mouseButtonKeyPressed.shiftKeyPressed(), mouseButtonKeyPressed.controlKeyPressed());
     } else if (requireJunction && objectsUnderCursor.getJunctionFront()) {
-        return myPathCreator->addJunction(objectsUnderCursor.getJunctionFront(), mouseButtonKeyPressed.shiftKeyPressed(), mouseButtonKeyPressed.controlKeyPressed());
+        return myPathCreator->addJunction(objectsUnderCursor.getJunctionFront());
     } else {
         return false;
     }
@@ -187,6 +191,12 @@
     return myPersonHierarchy;
 }
 
+
+DemandElementSelector*
+GNEPersonPlanFrame::getPersonSelector() const {
+    return myPersonSelector;
+}
+
 // ===========================================================================
 // protected
 // ===========================================================================
@@ -215,9 +225,9 @@
             myPathLegend->showPathLegendModule();
             // add previous edge or junction
             if (myPersonPlanTagSelector->getCurrentTemplateAC()->getTagProperty().hasAttribute(SUMO_ATTR_FROMJUNCTION)) {
-                myPathCreator->addJunction(previousEdge->getToJunction(), false, false);
+                myPathCreator->addJunction(previousEdge->getToJunction());
             } else if (!myPersonPlanTagSelector->getCurrentTemplateAC()->getTagProperty().isStopPerson()) {
-                myPathCreator->addEdge(previousEdge, false, false);
+                myPathCreator->addEdge(previousEdge, true, true);
             }
         } else {
             // set path creator mode
diff -Nru sumo-1.17.0/src/netedit/frames/demand/GNEPersonPlanFrame.h sumo-1.18.0/src/netedit/frames/demand/GNEPersonPlanFrame.h
--- sumo-1.17.0/src/netedit/frames/demand/GNEPersonPlanFrame.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/frames/demand/GNEPersonPlanFrame.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -70,6 +70,9 @@
     /// @brief get Person Hierarchy
     GNEElementTree* getPersonHierarchy() const;
 
+    /// @brief get person selectors
+    DemandElementSelector* getPersonSelector() const;
+
 protected:
     /// @brief Tag selected in GNETagSelector
     void tagSelected();
diff -Nru sumo-1.17.0/src/netedit/frames/demand/GNERouteFrame.cpp sumo-1.18.0/src/netedit/frames/demand/GNERouteFrame.cpp
--- sumo-1.17.0/src/netedit/frames/demand/GNERouteFrame.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/frames/demand/GNERouteFrame.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/frames/demand/GNERouteFrame.h sumo-1.18.0/src/netedit/frames/demand/GNERouteFrame.h
--- sumo-1.17.0/src/netedit/frames/demand/GNERouteFrame.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/frames/demand/GNERouteFrame.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/frames/demand/GNEStopFrame.cpp sumo-1.18.0/src/netedit/frames/demand/GNEStopFrame.cpp
--- sumo-1.17.0/src/netedit/frames/demand/GNEStopFrame.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/frames/demand/GNEStopFrame.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -36,7 +36,7 @@
 GNEStopFrame::HelpCreation::HelpCreation(GNEStopFrame* StopFrameParent) :
     MFXGroupBoxModule(StopFrameParent, TL("Help")),
     myStopFrameParent(StopFrameParent) {
-    myInformationLabel = new FXLabel(getCollapsableFrame(), "", 0, GUIDesignLabelFrameInformation);
+    myInformationLabel = new MFXDynamicLabel(getCollapsableFrame(), "", 0, GUIDesignLabelFrameInformation);
 }
 
 
@@ -65,45 +65,45 @@
     // set text depending of selected Stop type
     if (myStopFrameParent->myStopTagSelector->getCurrentTemplateAC()) {
         switch (myStopFrameParent->myStopTagSelector->getCurrentTemplateAC()->getTagProperty().getTag()) {
-            case SUMO_TAG_STOP_BUSSTOP:
+            case GNE_TAG_STOP_BUSSTOP:
             case GNE_TAG_WAYPOINT_BUSSTOP:
                 information
-                        << TL("- Shift+Click to select parent\n")
-                        << TL("- Click over a bus stop to\n")
-                        << TL("  create a stop.");
+                        << "- " << TL("Shift+Click to select parent") << "\n"
+                        << "- " << TL("Click over a bus stop to create a stop.");
                 break;
-            case SUMO_TAG_STOP_CONTAINERSTOP:
+            case GNE_TAG_STOP_TRAINSTOP:
+            case GNE_TAG_WAYPOINT_TRAINSTOP:
+                information
+                        << "- " << TL("Shift+Click to select parent") << "\n"
+                        << "- " << TL("Click over a train stop to create a stop.");
+                break;
+            case GNE_TAG_STOP_CONTAINERSTOP:
             case GNE_TAG_WAYPOINT_CONTAINERSTOP:
                 information
-                        << TL("- Shift+Click to select parent\n")
-                        << TL("- Click over a container stop\n")
-                        << TL("  to create a stop.");
+                        << "- " << TL("Shift+Click to select parent") << "\n"
+                        << "- " << TL("Click over a container stop  to create a stop.");
                 break;
-            case SUMO_TAG_STOP_CHARGINGSTATION:
+            case GNE_TAG_STOP_CHARGINGSTATION:
             case GNE_TAG_WAYPOINT_CHARGINGSTATION:
                 information
-                        << TL("- Shift+Click to select parent\n")
-                        << TL("- Click over a charging station\n")
-                        << TL("  to create a stop.");
+                        << "- " << TL("Shift+Click to select parent") << "\n"
+                        << "- " << TL("Click over a charging station to create a stop.");
                 break;
-            case SUMO_TAG_STOP_PARKINGAREA:
+            case GNE_TAG_STOP_PARKINGAREA:
             case GNE_TAG_WAYPOINT_PARKINGAREA:
                 information
-                        << TL("- Shift+Click to select parent\n")
-                        << TL("- Click over a parking area\n")
-                        << TL("  to create a stop.");
+                        << "- " << TL("Shift+Click to select parent") << "\n"
+                        << "- " << TL("Click over a parking area to create a stop.");
                 break;
-            case SUMO_TAG_STOP_LANE:
+            case GNE_TAG_STOP_LANE:
             case GNE_TAG_WAYPOINT_LANE:
                 information
-                        << TL("- Shift+Click to select parent\n")
-                        << TL("- Click over a lane to create\n")
-                        << TL("  a stop.");
+                        << "- " << TL("Shift+Click to select parent") << "\n"
+                        << "- " << TL("Click over a lane to create a stop.");
                 break;
             default:
                 information
-                        << TL("- No stop parents in current\n")
-                        << TL("  network.");
+                        << "- " << TL("No stop parents in current network.");
                 break;
         }
     }
@@ -124,7 +124,7 @@
     myStopParentSelector = new DemandElementSelector(this, {GNETagProperties::TagType::VEHICLE, GNETagProperties::TagType::ROUTE});
 
     // Create item Selector module for Stops
-    myStopTagSelector = new GNETagSelector(this, GNETagProperties::TagType::STOP, SUMO_TAG_STOP_LANE);
+    myStopTagSelector = new GNETagSelector(this, GNETagProperties::TagType::STOP, GNE_TAG_STOP_LANE);
 
     // Create Stop parameters
     myStopAttributes = new GNEAttributesCreator(this);
@@ -236,7 +236,7 @@
     if (stopTag == SUMO_TAG_NOTHING) {
         WRITE_WARNING(TL("Current selected Stop type isn't valid."));
         return false;
-    } else if ((stopTag == SUMO_TAG_STOP_LANE) || (stopTag == GNE_TAG_WAYPOINT_LANE)) {
+    } else if ((stopTag == GNE_TAG_STOP_LANE) || (stopTag == GNE_TAG_WAYPOINT_LANE)) {
         if (lane) {
             stop.lane = lane->getID();
             if ((stopTag == GNE_TAG_WAYPOINT_LANE) && (stop.speed == 0)) {
@@ -255,7 +255,7 @@
         }
     } else if (stoppingPlace) {
         if (stoppingPlace->getTagProperty().getTag() == SUMO_TAG_BUS_STOP) {
-            if ((stopTag != SUMO_TAG_STOP_BUSSTOP) && (stopTag != GNE_TAG_WAYPOINT_BUSSTOP) && (stopTag != GNE_TAG_STOPPERSON_BUSSTOP)) {
+            if ((stopTag != GNE_TAG_STOP_BUSSTOP) && (stopTag != GNE_TAG_WAYPOINT_BUSSTOP) && (stopTag != GNE_TAG_STOPPERSON_BUSSTOP)) {
                 WRITE_WARNING("Invalid clicked stopping place to create a stop placed in a " + stoppingPlace->getTagProperty().getTagStr());
                 return false;
             } else {
@@ -266,8 +266,20 @@
                 stop.startPos = 0;
                 stop.endPos = 0;
             }
+        } else if (stoppingPlace->getTagProperty().getTag() == SUMO_TAG_TRAIN_STOP) {
+            if ((stopTag != GNE_TAG_STOP_TRAINSTOP) && (stopTag != GNE_TAG_WAYPOINT_TRAINSTOP)) {
+                WRITE_WARNING("Invalid clicked stopping place to create a stop placed in a " + stoppingPlace->getTagProperty().getTagStr());
+                return false;
+            } else {
+                stop.busstop = stoppingPlace->getID();
+                if ((stopTag == GNE_TAG_WAYPOINT_TRAINSTOP) && (stop.speed == 0)) {
+                    stop.speed = stoppingPlace->getParentLanes().front()->getSpeed();
+                }
+                stop.startPos = 0;
+                stop.endPos = 0;
+            }
         } else if (stoppingPlace->getTagProperty().getTag() == SUMO_TAG_CONTAINER_STOP) {
-            if ((stopTag != SUMO_TAG_STOP_CONTAINERSTOP) && (stopTag != GNE_TAG_WAYPOINT_CONTAINERSTOP)) {
+            if ((stopTag != GNE_TAG_STOP_CONTAINERSTOP) && (stopTag != GNE_TAG_WAYPOINT_CONTAINERSTOP)) {
                 WRITE_WARNING("Invalid clicked stopping place to create a stop placed in a " + stoppingPlace->getTagProperty().getTagStr());
                 return false;
             } else {
@@ -279,7 +291,7 @@
                 stop.endPos = 0;
             }
         } else if (stoppingPlace->getTagProperty().getTag() == SUMO_TAG_CHARGING_STATION) {
-            if ((stopTag != SUMO_TAG_STOP_CHARGINGSTATION) && (stopTag != GNE_TAG_WAYPOINT_CHARGINGSTATION)) {
+            if ((stopTag != GNE_TAG_STOP_CHARGINGSTATION) && (stopTag != GNE_TAG_WAYPOINT_CHARGINGSTATION)) {
                 WRITE_WARNING("Invalid clicked stopping place to create a stop placed in a " + stoppingPlace->getTagProperty().getTagStr());
                 return false;
             } else {
@@ -291,7 +303,7 @@
                 stop.endPos = 0;
             }
         } else if (stoppingPlace->getTagProperty().getTag() == SUMO_TAG_PARKING_AREA) {
-            if ((stopTag != SUMO_TAG_STOP_PARKINGAREA) && (stopTag != GNE_TAG_WAYPOINT_PARKINGAREA)) {
+            if ((stopTag != GNE_TAG_STOP_PARKINGAREA) && (stopTag != GNE_TAG_WAYPOINT_PARKINGAREA)) {
                 WRITE_WARNING("Invalid clicked stopping place to create a stop placed in a " + stoppingPlace->getTagProperty().getTagStr());
                 return false;
             } else {
@@ -304,16 +316,20 @@
             }
         }
     } else {
-        if ((stopTag == SUMO_TAG_STOP_BUSSTOP) || (stopTag == GNE_TAG_WAYPOINT_BUSSTOP)) {
-            WRITE_WARNING("Click over a " + toString(SUMO_TAG_STOP_BUSSTOP) + " to create a stop placed in a " + toString(SUMO_TAG_STOP_BUSSTOP));
-        } else if ((stopTag == SUMO_TAG_STOP_CONTAINERSTOP) || (stopTag == GNE_TAG_WAYPOINT_CONTAINERSTOP)) {
+        if ((stopTag == GNE_TAG_STOP_BUSSTOP) || (stopTag == GNE_TAG_WAYPOINT_BUSSTOP)) {
+            WRITE_WARNING("Click over a " + toString(GNE_TAG_STOP_BUSSTOP) + " to create a stop placed in a " + toString(GNE_TAG_STOP_BUSSTOP));
+        } else if ((stopTag == GNE_TAG_STOP_TRAINSTOP) || (stopTag == GNE_TAG_WAYPOINT_TRAINSTOP)) {
+            WRITE_WARNING("Click over a " + toString(GNE_TAG_STOP_TRAINSTOP) + " to create a stop placed in a " + toString(GNE_TAG_STOP_TRAINSTOP));
+        } else if ((stopTag == GNE_TAG_STOP_CONTAINERSTOP) || (stopTag == GNE_TAG_WAYPOINT_CONTAINERSTOP)) {
             WRITE_WARNING("Click over a " + toString(SUMO_TAG_CONTAINER_STOP) + " to create a stop placed in a " + toString(SUMO_TAG_CONTAINER_STOP));
-        } else if ((stopTag == SUMO_TAG_STOP_CHARGINGSTATION) || (stopTag == GNE_TAG_WAYPOINT_CHARGINGSTATION)) {
+        } else if ((stopTag == GNE_TAG_STOP_CHARGINGSTATION) || (stopTag == GNE_TAG_WAYPOINT_CHARGINGSTATION)) {
             WRITE_WARNING("Click over a " + toString(SUMO_TAG_CHARGING_STATION) + " to create a stop placed in a " + toString(SUMO_TAG_CHARGING_STATION));
-        } else if ((stopTag == SUMO_TAG_STOP_PARKINGAREA) || (stopTag == GNE_TAG_WAYPOINT_PARKINGAREA)) {
+        } else if ((stopTag == GNE_TAG_STOP_PARKINGAREA) || (stopTag == GNE_TAG_WAYPOINT_PARKINGAREA)) {
             WRITE_WARNING("Click over a " + toString(SUMO_TAG_PARKING_AREA) + " to create a stop placed in a " + toString(SUMO_TAG_PARKING_AREA));
         } else if (stopTag == GNE_TAG_STOPPERSON_BUSSTOP) {
-            WRITE_WARNING("Click over a " + toString(SUMO_TAG_STOP_BUSSTOP) + " to create a person stop placed in a " + toString(SUMO_TAG_STOP_BUSSTOP));
+            WRITE_WARNING("Click over a " + toString(GNE_TAG_STOP_BUSSTOP) + " to create a person stop placed in a " + toString(GNE_TAG_STOP_BUSSTOP));
+        } else if (stopTag == GNE_TAG_STOPPERSON_TRAINSTOP) {
+            WRITE_WARNING("Click over a " + toString(GNE_TAG_STOP_TRAINSTOP) + " to create a person stop placed in a " + toString(GNE_TAG_STOP_TRAINSTOP));
         }
         return false;
     }
diff -Nru sumo-1.17.0/src/netedit/frames/demand/GNEStopFrame.h sumo-1.18.0/src/netedit/frames/demand/GNEStopFrame.h
--- sumo-1.17.0/src/netedit/frames/demand/GNEStopFrame.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/frames/demand/GNEStopFrame.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -22,6 +22,7 @@
 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -66,7 +67,7 @@
         GNEStopFrame* myStopFrameParent;
 
         /// @brief Label with creation information
-        FXLabel* myInformationLabel;
+        MFXDynamicLabel* myInformationLabel;
     };
 
     /**@brief Constructor
diff -Nru sumo-1.17.0/src/netedit/frames/demand/GNETypeDistributionFrame.cpp sumo-1.18.0/src/netedit/frames/demand/GNETypeDistributionFrame.cpp
--- sumo-1.17.0/src/netedit/frames/demand/GNETypeDistributionFrame.cpp	1970-01-01 00:00:00.000000000 +0000
+++ sumo-1.18.0/src/netedit/frames/demand/GNETypeDistributionFrame.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -0,0 +1,488 @@
+/****************************************************************************/
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
+// Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License 2.0 which is available at
+// https://www.eclipse.org/legal/epl-2.0/
+// This Source Code 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
+/****************************************************************************/
+/// @file    GNETypeDistributionFrame.cpp
+/// @author  Pablo Alvarez Lopez
+/// @date    Jun 2023
+///
+// The Widget for edit type distribution elements
+/****************************************************************************/
+#include 
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+#include "GNETypeDistributionFrame.h"
+
+
+// ===========================================================================
+// FOX callback mapping
+// ===========================================================================
+
+FXDEFMAP(GNETypeDistributionFrame::TypeDistributionEditor) typeEditorMap[] = {
+    FXMAPFUNC(SEL_COMMAND,  MID_GNE_CREATE,    GNETypeDistributionFrame::TypeDistributionEditor::onCmdCreateType),
+    FXMAPFUNC(SEL_COMMAND,  MID_GNE_DELETE,    GNETypeDistributionFrame::TypeDistributionEditor::onCmdDeleteType),
+    FXMAPFUNC(SEL_UPDATE,   MID_GNE_DELETE,    GNETypeDistributionFrame::TypeDistributionEditor::onUpdDeleteType),
+};
+
+FXDEFMAP(GNETypeDistributionFrame::TypeDistributionSelector) typeSelectorMap[] = {
+    FXMAPFUNC(SEL_COMMAND,  MID_GNE_SET_TYPE,   GNETypeDistributionFrame::TypeDistributionSelector::onCmdSelectTypeDistribution),
+    FXMAPFUNC(SEL_UPDATE,   MID_GNE_SET_TYPE,   GNETypeDistributionFrame::TypeDistributionSelector::onCmdUpdateTypeDistribution)
+};
+
+FXDEFMAP(GNETypeDistributionFrame::TypeAttributesEditorRow) TypeAttributesEditorRowMap[] = {
+    FXMAPFUNC(SEL_COMMAND,  MID_GNE_SET_ATTRIBUTE,          GNETypeDistributionFrame::TypeAttributesEditorRow::onCmdSetAttribute)
+};
+
+FXDEFMAP(GNETypeDistributionFrame::TypeAttributesEditor) TypeAttributesEditorMap[] = {
+    FXMAPFUNC(SEL_COMMAND,  MID_HELP,   GNETypeDistributionFrame::TypeAttributesEditor::onCmdTypeAttributesEditorHelp)
+};
+
+// Object implementation
+FXIMPLEMENT(GNETypeDistributionFrame::TypeDistributionEditor,   MFXGroupBoxModule,  typeEditorMap,              ARRAYNUMBER(typeEditorMap))
+FXIMPLEMENT(GNETypeDistributionFrame::TypeDistributionSelector, MFXGroupBoxModule,  typeSelectorMap,            ARRAYNUMBER(typeSelectorMap))
+FXIMPLEMENT(GNETypeDistributionFrame::TypeAttributesEditorRow,  FXHorizontalFrame,  TypeAttributesEditorRowMap, ARRAYNUMBER(TypeAttributesEditorRowMap))
+FXIMPLEMENT(GNETypeDistributionFrame::TypeAttributesEditor,     MFXGroupBoxModule,  TypeAttributesEditorMap,    ARRAYNUMBER(TypeAttributesEditorMap))
+
+
+// ===========================================================================
+// method definitions
+// ===========================================================================
+
+// ---------------------------------------------------------------------------
+// GNETypeFrame::TypeDistributionEditor - methods
+// ---------------------------------------------------------------------------
+
+GNETypeDistributionFrame::TypeDistributionEditor::TypeDistributionEditor(GNETypeDistributionFrame* typeDistributionFrameParent) :
+    MFXGroupBoxModule(typeDistributionFrameParent, TL("Type Editor")),
+    myTypeDistributionFrameParent(typeDistributionFrameParent) {
+    // Create new vehicle type
+    myCreateTypeButton = new FXButton(getCollapsableFrame(), TL("Create type distribution"), GUIIconSubSys::getIcon(GUIIcon::VTYPEDISTRIBUTION), this, MID_GNE_CREATE, GUIDesignButton);
+    // Create delete/reset vehicle type
+    myDeleteTypeButton = new FXButton(getCollapsableFrame(), TL("Delete type distribution"), GUIIconSubSys::getIcon(GUIIcon::MODEDELETE), this, MID_GNE_DELETE, GUIDesignButton);
+    // show type editor
+    show();
+}
+
+
+GNETypeDistributionFrame::TypeDistributionEditor::~TypeDistributionEditor() {}
+
+
+long
+GNETypeDistributionFrame::TypeDistributionEditor::onCmdCreateType(FXObject*, FXSelector, void*) {
+    auto viewNet = myTypeDistributionFrameParent->myViewNet;
+    // obtain a new valid Type ID
+    const std::string typeDistributionID = viewNet->getNet()->getAttributeCarriers()->generateDemandElementID(SUMO_TAG_VTYPE_DISTRIBUTION);
+    // create new vehicle type
+    GNEDemandElement* type = new GNEVTypeDistribution(viewNet->getNet(), typeDistributionID);
+    // add it using undoList (to allow undo-redo)
+    viewNet->getUndoList()->begin(GUIIcon::VTYPEDISTRIBUTION, "create vehicle type distribution");
+    viewNet->getUndoList()->add(new GNEChange_DemandElement(type, true), true);
+    viewNet->getUndoList()->end();
+    return 1;
+}
+
+
+long
+GNETypeDistributionFrame::TypeDistributionEditor::onCmdDeleteType(FXObject*, FXSelector, void*) {
+    auto viewNet = myTypeDistributionFrameParent->myViewNet;
+    // begin undo list operation
+    viewNet->getUndoList()->begin(GUIIcon::VTYPE, "delete vehicle type distribution");
+    // remove vehicle type (and all of their children)
+    viewNet->getNet()->deleteDemandElement(myTypeDistributionFrameParent->myTypeDistributionSelector->getCurrentTypeDistribution(), viewNet->getUndoList());
+    // end undo list operation
+    viewNet->getUndoList()->end();
+    return 1;
+}
+
+
+long
+GNETypeDistributionFrame::TypeDistributionEditor::onUpdDeleteType(FXObject* sender, FXSelector, void*) {
+    // first check if selected VType is valid
+    if (myTypeDistributionFrameParent->myTypeDistributionSelector->getCurrentTypeDistribution()) {
+        return sender->handle(this, FXSEL(SEL_COMMAND, ID_ENABLE), nullptr);
+    } else {
+        return sender->handle(this, FXSEL(SEL_COMMAND, ID_DISABLE), nullptr);
+    }
+}
+
+// ---------------------------------------------------------------------------
+// GNETypeFrame::TypeDistributionSelector - methods
+// ---------------------------------------------------------------------------
+
+GNETypeDistributionFrame::TypeDistributionSelector::TypeDistributionSelector(GNETypeDistributionFrame* typeFrameParent) :
+    MFXGroupBoxModule(typeFrameParent, TL("Current Type")),
+    myTypeDistributionFrameParent(typeFrameParent) {
+    // Create FXComboBox
+    myTypeComboBox = new FXComboBox(getCollapsableFrame(), GUIDesignComboBoxNCol, this, MID_GNE_SET_TYPE, GUIDesignComboBox);
+    // add default Types (always first)
+    for (const auto& vType : myTypeDistributionFrameParent->getViewNet()->getNet()->getAttributeCarriers()->getDemandElements().at(SUMO_TAG_VTYPE_DISTRIBUTION)) {
+        myTypeComboBox->appendItem(vType->getID().c_str(), vType->getACIcon());
+    }
+    // Set visible items
+    if (myTypeComboBox->getNumItems() <= 20) {
+        myTypeComboBox->setNumVisible((int)myTypeComboBox->getNumItems());
+    } else {
+        myTypeComboBox->setNumVisible(20);
+    }
+    // TypeDistributionSelector is always shown
+    show();
+}
+
+
+GNETypeDistributionFrame::TypeDistributionSelector::~TypeDistributionSelector() {}
+
+
+GNEDemandElement*
+GNETypeDistributionFrame::TypeDistributionSelector::getCurrentTypeDistribution() const {
+    return myTypeDistributionFrameParent->getViewNet()->getNet()->getAttributeCarriers()->retrieveDemandElement(SUMO_TAG_VTYPE_DISTRIBUTION, myCurrentTypeDistribution, false);
+}
+
+
+void
+GNETypeDistributionFrame::TypeDistributionSelector::setCurrentTypeDistribution(const GNEDemandElement* vTypeDistribution) {
+    myCurrentTypeDistribution = vTypeDistribution->getID();
+    refreshTypeDistributionSelector();
+}
+
+
+void
+GNETypeDistributionFrame::TypeDistributionSelector::refreshTypeDistributionSelector() {
+    // get ACs
+    const auto& ACs = myTypeDistributionFrameParent->getViewNet()->getNet()->getAttributeCarriers();
+    // clear items
+    myTypeComboBox->clearItems();
+    // fill myTypeMatchBox with list of type distributions sorted by ID
+    std::map typeDistributions;
+    for (const auto& vTypeDistribution : ACs->getDemandElements().at(SUMO_TAG_VTYPE_DISTRIBUTION)) {
+        typeDistributions[vTypeDistribution->getID()] = vTypeDistribution;
+    }
+    for (const auto& vTypeDistribution : typeDistributions) {
+        myTypeComboBox->appendItem(vTypeDistribution.first.c_str(), vTypeDistribution.second->getACIcon());
+    }
+    // Set visible items
+    if (myTypeComboBox->getNumItems() <= 20) {
+        myTypeComboBox->setNumVisible((int)myTypeComboBox->getNumItems());
+    } else {
+        myTypeComboBox->setNumVisible(20);
+    }
+    // check current type
+    bool validCurrentTypeDistribution = false;
+    for (int i = 0; i < (int)myTypeComboBox->getNumItems(); i++) {
+        if (myTypeComboBox->getItem(i).text() == myCurrentTypeDistribution) {
+            myTypeComboBox->setCurrentItem(i);
+            validCurrentTypeDistribution = true;
+        }
+    }
+    // Check that give vType type is valid
+    GNEDemandElement* vTypeDistribution = nullptr;
+    if (validCurrentTypeDistribution) {
+        vTypeDistribution = ACs->retrieveDemandElement(SUMO_TAG_VTYPE_DISTRIBUTION, myCurrentTypeDistribution);
+    } else {
+        vTypeDistribution = ACs->retrieveFirstDemandElement(SUMO_TAG_VTYPE_DISTRIBUTION);
+    }
+    // Check that give vType type is valid
+    if (vTypeDistribution) {
+        myCurrentTypeDistribution = vTypeDistribution->getID();
+        // set myCurrentType as inspected element
+        myTypeDistributionFrameParent->getViewNet()->setInspectedAttributeCarriers({vTypeDistribution});
+        // show modules
+        myTypeDistributionFrameParent->myTypeTypeAttributesEditor->showAttributeEditorModule();
+    } else {
+        myCurrentTypeDistribution.clear();
+        // set myCurrentType as inspected element
+        myTypeDistributionFrameParent->getViewNet()->setInspectedAttributeCarriers({});
+        // hide modules
+        myTypeDistributionFrameParent->myTypeTypeAttributesEditor->hideTypeAttributesEditorModule();
+    }
+}
+
+
+long
+GNETypeDistributionFrame::TypeDistributionSelector::onCmdSelectTypeDistribution(FXObject*, FXSelector, void*) {
+    const auto viewNet = myTypeDistributionFrameParent->getViewNet();
+    const auto& vTypeDistributions = viewNet->getNet()->getAttributeCarriers()->getDemandElements().at(SUMO_TAG_VTYPE_DISTRIBUTION);
+    // Check if value of myTypeMatchBox correspond of an allowed additional tags
+    for (const auto& vTypeDistribution : vTypeDistributions) {
+        if (vTypeDistribution->getID() == myTypeComboBox->getText().text()) {
+            // set pointer
+            myCurrentTypeDistribution = vTypeDistribution->getID();
+            // set color of myTypeMatchBox to black (valid)
+            myTypeComboBox->setTextColor(FXRGB(0, 0, 0));
+            // set myCurrentType as inspected element
+            viewNet->setInspectedAttributeCarriers({vTypeDistribution});
+            // show modules if selected item is valid
+            myTypeDistributionFrameParent->myTypeTypeAttributesEditor->showAttributeEditorModule();
+            // Write Warning in console if we're in testing mode
+            WRITE_DEBUG(("Selected item '" + myTypeComboBox->getText() + "' in TypeDistributionSelector").text());
+            // update viewNet
+            viewNet->updateViewNet();
+            return 1;
+        }
+    }
+    myCurrentTypeDistribution.clear();
+    // hide all modules if selected item isn't valid
+    myTypeDistributionFrameParent->myTypeTypeAttributesEditor->hideTypeAttributesEditorModule();
+    // set color of myTypeMatchBox to red (invalid)
+    myTypeComboBox->setTextColor(FXRGB(255, 0, 0));
+    // Write Warning in console if we're in testing mode
+    WRITE_DEBUG("Selected invalid item in TypeDistributionSelector");
+    // update viewNet
+    viewNet->updateViewNet();
+    return 1;
+}
+
+
+long
+GNETypeDistributionFrame::TypeDistributionSelector::onCmdUpdateTypeDistribution(FXObject* sender, FXSelector, void*) {
+    const auto& demandElements = myTypeDistributionFrameParent->getViewNet()->getNet()->getAttributeCarriers()->getDemandElements();
+    if (demandElements.at(SUMO_TAG_VTYPE_DISTRIBUTION).size() > 0) {
+        return sender->handle(this, FXSEL(SEL_COMMAND, ID_ENABLE), nullptr);
+    } else {
+        return sender->handle(this, FXSEL(SEL_COMMAND, ID_DISABLE), nullptr);
+    }
+}
+
+// ---------------------------------------------------------------------------
+// GNETypeDistributionFrame::TypeAttributesEditorRow - methods
+// ---------------------------------------------------------------------------
+
+GNETypeDistributionFrame::TypeAttributesEditorRow::TypeAttributesEditorRow(GNETypeDistributionFrame::TypeAttributesEditor* attributeEditorParent,
+        const GNEAttributeProperties& ACAttr, const std::string& value) :
+    FXHorizontalFrame(attributeEditorParent->getCollapsableFrame(), GUIDesignAuxiliarHorizontalFrame),
+    myTypeAttributesEditorParent(attributeEditorParent),
+    myACAttr(ACAttr) {
+    // Create and hide label
+    myAttributeLabel = new MFXLabelTooltip(this,
+        attributeEditorParent->getTypeDistributionFrameParent()->getViewNet()->getViewParent()->getGNEAppWindows()->getStaticTooltipMenu(),
+        "attributeLabel", nullptr, GUIDesignLabelThickedFixed(100));
+    // Create and hide MFXTextFieldTooltip for string attributes
+    myValueTextField = new MFXTextFieldTooltip(this,
+        attributeEditorParent->getTypeDistributionFrameParent()->getViewNet()->getViewParent()->getGNEAppWindows()->getStaticTooltipMenu(),
+        GUIDesignTextFieldNCol, this, MID_GNE_SET_ATTRIBUTE, GUIDesignTextField);
+    // only create if parent was created
+    if (getParent()->id()) {
+        // create TypeAttributesEditorRow
+        FXHorizontalFrame::create();
+        // Show attribute Label
+        myAttributeLabel->setText(myACAttr.getAttrStr().c_str());
+        myAttributeLabel->setTipText(myACAttr.getDefinition().c_str());
+        // In any other case (String, list, etc.), show value as String
+        myValueTextField->setText(value.c_str());
+        myValueTextField->setTextColor(FXRGB(0, 0, 0));
+        myValueTextField->killFocus();
+        // Show TypeAttributesEditorRow
+        show();
+    }
+}
+
+
+void
+GNETypeDistributionFrame::TypeAttributesEditorRow::destroy() {
+    // only destroy if parent was created
+    if (getParent()->id()) {
+        FXHorizontalFrame::destroy();
+    }
+}
+
+
+void
+GNETypeDistributionFrame::TypeAttributesEditorRow::refreshTypeAttributesEditorRow(const std::string& value) {
+    // set last valid value and restore color if onlyValid is disabled
+    myValueTextField->setText(value.c_str());
+    // set blue color if is an computed value
+    myValueTextField->setTextColor(FXRGB(0, 0, 0));
+    myValueTextField->killFocus();
+}
+
+
+bool
+GNETypeDistributionFrame::TypeAttributesEditorRow::isTypeAttributesEditorRowValid() const {
+    return (myValueTextField->getTextColor() == FXRGB(0, 0, 0));
+}
+
+
+long
+GNETypeDistributionFrame::TypeAttributesEditorRow::onCmdSetAttribute(FXObject*, FXSelector, void*) {
+    // Declare changed value
+    std::string newVal;
+    // Check if default value must be set
+    if (myValueTextField->getText().empty() && myACAttr.hasDefaultValue()) {
+        newVal = myACAttr.getDefaultValue();
+        myValueTextField->setText(newVal.c_str());
+    } else {
+        // obtain value of myValueTextField
+        newVal = myValueTextField->getText().text();
+    }
+    // get current distribution
+    auto currentDistribution = myTypeAttributesEditorParent->getTypeDistributionFrameParent()->getTypeDistributionSelector()->getCurrentTypeDistribution();
+    // continue if we have a distribution to edit
+    if (currentDistribution) {
+        // Check if attribute must be changed
+        if (currentDistribution->isValid(myACAttr.getAttr(), newVal)) {
+            // set attribute
+            currentDistribution->setAttribute(myACAttr.getAttr(), myACAttr.getDefaultValue(), myTypeAttributesEditorParent->getTypeDistributionFrameParent()->getViewNet()->getUndoList());
+            // update text field
+            myValueTextField->setTextColor(FXRGB(0, 0, 0));
+            myValueTextField->setBackColor(FXRGB(255, 255, 255));
+            myValueTextField->killFocus();
+            // in this case, we need to refresh the other values (For example, allow/Disallow objects)
+            myTypeAttributesEditorParent->refreshAttributeEditor();
+            // update frame parent after attribute successfully set
+            myTypeAttributesEditorParent->getTypeDistributionFrameParent()->attributeUpdated(myACAttr.getAttr());
+        } else {
+            myValueTextField->setTextColor(FXRGB(255, 0, 0));
+            if (newVal.empty()) {
+                myValueTextField->setBackColor(FXRGBA(255, 213, 213, 255));
+            }
+            // Write Warning in console if we're in testing mode
+            WRITE_DEBUG(TL("Value '") + newVal + TL("' for attribute ") + myACAttr.getAttrStr() + TL(" of ") + myACAttr.getTagPropertyParent().getTagStr() + TL(" isn't valid"));
+        }
+    }
+    return 1;
+}
+
+
+GNETypeDistributionFrame::TypeAttributesEditorRow::TypeAttributesEditorRow() :
+    myTypeAttributesEditorParent(nullptr) {
+}
+
+// ---------------------------------------------------------------------------
+// GNETypeDistributionFrame::TypeAttributesEditor - methods
+// ---------------------------------------------------------------------------
+
+GNETypeDistributionFrame::TypeAttributesEditor::TypeAttributesEditor(GNETypeDistributionFrame* typeDistributionFrameParent) :
+    MFXGroupBoxModule(typeDistributionFrameParent, TL("Internal attributes")),
+    myTypeDistributionFrameParent(typeDistributionFrameParent) {
+    // resize myTypeAttributesEditorRows
+    myTypeAttributesEditorRows.resize(GNEAttributeCarrier::MAXNUMBEROFATTRIBUTES, nullptr);
+    // Create help button
+    myHelpButton = new FXButton(getCollapsableFrame(), TL("Help"), nullptr, this, MID_HELP, GUIDesignButtonRectangular);
+}
+
+
+void
+GNETypeDistributionFrame::TypeAttributesEditor::showAttributeEditorModule() {
+    // first remove all rows
+    for (auto& row : myTypeAttributesEditorRows) {
+        // destroy and delete all rows
+        if (row != nullptr) {
+            row->destroy();
+            delete row;
+            row = nullptr;
+        }
+    }
+    // get current distribution
+    auto currentDistribution = myTypeDistributionFrameParent->getTypeDistributionSelector()->getCurrentTypeDistribution();
+    // continue if we have a distribution to edit
+    if (currentDistribution) {
+        // Iterate over attributes
+        for (const auto& attrProperty : currentDistribution->getTagProperty()) {
+            // create attribute editor row
+            myTypeAttributesEditorRows[attrProperty.getPositionListed()] = new TypeAttributesEditorRow(this,
+                attrProperty, currentDistribution->getAttribute(attrProperty.getAttr()));
+        }
+        // show TypeAttributesEditor
+        show();
+    }
+    // reparent help button (to place it at bottom)
+    myHelpButton->reparent(this);
+}
+
+
+void
+GNETypeDistributionFrame::TypeAttributesEditor::hideTypeAttributesEditorModule() {
+    // hide also TypeAttributesEditor
+    hide();
+}
+
+
+void
+GNETypeDistributionFrame::TypeAttributesEditor::refreshAttributeEditor() {
+    // get current distribution
+    auto currentDistribution = myTypeDistributionFrameParent->getTypeDistributionSelector()->getCurrentTypeDistribution();
+    // continue if we have a distribution to edit
+    if (currentDistribution) {
+        // Iterate over inspected attribute carriers
+        for (const auto& attrProperty : currentDistribution->getTagProperty()) {
+            // Refresh attributes
+            myTypeAttributesEditorRows[attrProperty.getPositionListed()]->refreshTypeAttributesEditorRow(currentDistribution->getAttribute(attrProperty.getAttr()));
+        }
+    }
+}
+
+
+GNETypeDistributionFrame*
+GNETypeDistributionFrame::TypeAttributesEditor::getTypeDistributionFrameParent() const {
+    return myTypeDistributionFrameParent;
+}
+
+
+long
+GNETypeDistributionFrame::TypeAttributesEditor::onCmdTypeAttributesEditorHelp(FXObject*, FXSelector, void*) {
+    // open Help attributes dialog
+    myTypeDistributionFrameParent->openHelpAttributesDialog(myTypeDistributionFrameParent->getTypeDistributionSelector()->getCurrentTypeDistribution());
+    return 1;
+}
+
+// ---------------------------------------------------------------------------
+// GNETypeDistributionFrame - methods
+// ---------------------------------------------------------------------------
+
+GNETypeDistributionFrame::GNETypeDistributionFrame(GNEViewParent* viewParent, GNEViewNet* viewNet) :
+    GNEFrame(viewParent, viewNet, "Type Distributions") {
+
+    // create type editor
+    myTypeDistributionEditor = new TypeDistributionEditor(this);
+
+    // create type selector
+    myTypeDistributionSelector = new TypeDistributionSelector(this);
+
+    // Create vehicle type attributes editor
+    myTypeTypeAttributesEditor = new GNETypeDistributionFrame::TypeAttributesEditor(this);
+}
+
+
+GNETypeDistributionFrame::~GNETypeDistributionFrame() {}
+
+
+void
+GNETypeDistributionFrame::show() {
+    // refresh type selector
+    myTypeDistributionSelector->refreshTypeDistributionSelector();
+    // show frame
+    GNEFrame::show();
+}
+
+
+GNETypeDistributionFrame::TypeDistributionSelector*
+GNETypeDistributionFrame::getTypeDistributionSelector() const {
+    return myTypeDistributionSelector;
+}
+
+
+void
+GNETypeDistributionFrame::attributeUpdated(SumoXMLAttr /*attribute*/) {
+
+}
+
+/****************************************************************************/
diff -Nru sumo-1.17.0/src/netedit/frames/demand/GNETypeDistributionFrame.h sumo-1.18.0/src/netedit/frames/demand/GNETypeDistributionFrame.h
--- sumo-1.17.0/src/netedit/frames/demand/GNETypeDistributionFrame.h	1970-01-01 00:00:00.000000000 +0000
+++ sumo-1.18.0/src/netedit/frames/demand/GNETypeDistributionFrame.h	2023-06-28 20:02:17.000000000 +0000
@@ -0,0 +1,255 @@
+/****************************************************************************/
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
+// Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License 2.0 which is available at
+// https://www.eclipse.org/legal/epl-2.0/
+// This Source Code 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
+/****************************************************************************/
+/// @file    GNETypeDistributionFrame.h
+/// @author  Pablo Alvarez Lopez
+/// @date    Jun 2023
+///
+// The Widget for edit type distribution elements
+/****************************************************************************/
+#pragma once
+#include 
+
+#include 
+
+// ===========================================================================
+// class definitions
+// ===========================================================================
+/**
+ * @class GNETypeDistributionFrame
+ */
+class GNETypeDistributionFrame : public GNEFrame {
+
+public:
+    // ===========================================================================
+    // class declaration
+    // ===========================================================================
+
+    class TypeAttributesEditor;
+
+    // ===========================================================================
+    // class TypeDistributionEditor
+    // ===========================================================================
+
+    class TypeDistributionEditor : public MFXGroupBoxModule {
+        /// @brief FOX-declaration
+        FXDECLARE(GNETypeDistributionFrame::TypeDistributionEditor)
+
+    public:
+        /// @brief constructor
+        TypeDistributionEditor(GNETypeDistributionFrame* typeDistributionFrameParent);
+
+        /// @brief destructor
+        ~TypeDistributionEditor();
+
+        /// @name FOX-callbacks
+        /// @{
+
+        /// @brief Called when "create type distribution" button is clicked
+        long onCmdCreateType(FXObject*, FXSelector, void*);
+
+        /// @brief Called when "Delete type distribution" button is clicked
+        long onCmdDeleteType(FXObject*, FXSelector, void*);
+
+        /// @brief Called when "Delete type distribution" button is updated
+        long onUpdDeleteType(FXObject* sender, FXSelector, void*);
+
+        /// @}
+
+    protected:
+        /// @brief FOX needs this
+        FOX_CONSTRUCTOR(TypeDistributionEditor)
+
+    private:
+        /// @brief pointer to type distribution frame parent
+        GNETypeDistributionFrame* myTypeDistributionFrameParent;
+
+        /// @brief "create vehicle type" button
+        FXButton* myCreateTypeButton = nullptr;
+
+        /// @brief "delete vehicle type" button
+        FXButton* myDeleteTypeButton = nullptr;
+    };
+
+    // ===========================================================================
+    // class TypeDistributionSelector
+    // ===========================================================================
+
+    class TypeDistributionSelector : public MFXGroupBoxModule {
+        /// @brief FOX-declaration
+        FXDECLARE(GNETypeDistributionFrame::TypeDistributionSelector)
+
+    public:
+        /// @brief constructor
+        TypeDistributionSelector(GNETypeDistributionFrame* typeFrameParent);
+
+        /// @brief destructor
+        ~TypeDistributionSelector();
+
+        /// @brief get current Vehicle Type distribution
+        GNEDemandElement* getCurrentTypeDistribution() const;
+
+        /// @brief set current vehicle type distribution
+        void setCurrentTypeDistribution(const GNEDemandElement* vTypeDistribution);
+
+        /// @brief refresh modul
+        void refreshTypeDistributionSelector();
+
+        /// @name FOX-callbacks
+        /// @{
+
+        /// @brief Called when the user select type distribution in ComboBox
+        long onCmdSelectTypeDistribution(FXObject*, FXSelector, void*);
+
+        /// @brief update type distribution comboBox
+        long onCmdUpdateTypeDistribution(FXObject* sender, FXSelector, void*);
+
+        /// @}
+
+    protected:
+        FOX_CONSTRUCTOR(TypeDistributionSelector)
+
+    private:
+        /// @brief pointer to Frame Parent
+        GNETypeDistributionFrame* myTypeDistributionFrameParent;
+
+        /// @brief comboBox with the list of type distributions
+        FXComboBox* myTypeComboBox = nullptr;
+
+        /// @brief current type distribution
+        std::string myCurrentTypeDistribution;
+    };
+
+    // ===========================================================================
+    // class TypeAttributesEditorRow
+    // ===========================================================================
+
+    class TypeAttributesEditorRow : protected FXHorizontalFrame {
+        /// @brief FOX-declaration
+        FXDECLARE(GNETypeDistributionFrame::TypeAttributesEditorRow)
+
+    public:
+        /// @brief constructor
+        TypeAttributesEditorRow(TypeAttributesEditor* attributeEditorParent, const GNEAttributeProperties& ACAttr, const std::string& value);
+
+        /// @brief destroy GNEAttributesCreatorRow (but don't delete)
+        void destroy();
+
+        /// @brief refresh current row
+        void refreshTypeAttributesEditorRow(const std::string& value);
+
+        /// @brief check if current attribute of TextField/ComboBox is valid
+        bool isTypeAttributesEditorRowValid() const;
+
+        /// @name FOX-callbacks
+        /// @{
+
+        /// @brief try to set new attribute value
+        long onCmdSetAttribute(FXObject*, FXSelector, void*);
+
+        /// @}
+
+    protected:
+        /// @brief default constructor
+        TypeAttributesEditorRow();
+
+    private:
+        /// @brief pointer to TypeAttributesEditor parent
+        TypeAttributesEditor* myTypeAttributesEditorParent;
+
+        /// @brief current AC Attribute
+        const GNEAttributeProperties myACAttr;
+
+        /// @brief pointer to attribute label
+        MFXLabelTooltip* myAttributeLabel = nullptr;
+
+        /// @brief textField to modify the value of string attributes
+        MFXTextFieldTooltip* myValueTextField = nullptr;
+    };
+
+    // ===========================================================================
+    // class TypeAttributesEditor
+    // ===========================================================================
+
+    class TypeAttributesEditor : public MFXGroupBoxModule {
+        /// @brief FOX-declaration
+        FXDECLARE(GNETypeDistributionFrame::TypeAttributesEditor)
+
+    public:
+        /// @brief constructor
+        TypeAttributesEditor(GNETypeDistributionFrame* typeDistributionFrameParent);
+
+        /// @brief show attributes of multiple ACs
+        void showAttributeEditorModule();
+
+        /// @brief hide attribute editor
+        void hideTypeAttributesEditorModule();
+
+        /// @brief refresh attribute editor (only the valid values will be refresh)
+        void refreshAttributeEditor();
+
+        /// @brief pointer to GNEFrame parent
+        GNETypeDistributionFrame* getTypeDistributionFrameParent() const;
+
+        /// @name FOX-callbacks
+        /// @{
+
+        /// @brief Called when user press the help button
+        long onCmdTypeAttributesEditorHelp(FXObject*, FXSelector, void*);
+
+        /// @}
+
+    protected:
+        /// @brief fox need this
+        FOX_CONSTRUCTOR(TypeAttributesEditor)
+
+    private:
+        /// @brief pointer to type distribution frame parent
+        GNETypeDistributionFrame* myTypeDistributionFrameParent;
+
+        /// @brief list of Attribute editor rows
+        std::vector myTypeAttributesEditorRows;
+
+        /// @brief button for help
+        FXButton* myHelpButton = nullptr;
+    };
+
+    /**@brief Constructor
+     * @brief viewParent GNEViewParent in which this GNEFrame is placed
+     * @brief viewNet viewNet that uses this GNEFrame
+     */
+    GNETypeDistributionFrame(GNEViewParent* viewParent, GNEViewNet* viewNet);
+
+    /// @brief Destructor
+    ~GNETypeDistributionFrame();
+
+    /// @brief show Frame
+    void show();
+
+    /// @brief get type distribution selector
+    TypeDistributionSelector* getTypeDistributionSelector() const;
+
+protected:
+    /// @brief function called after set a valid attribute in AttributeCreator/AttributeEditor/ParametersEditor/...
+    void attributeUpdated(SumoXMLAttr attribute);
+
+private:
+    /// @brief type editor
+    TypeDistributionEditor* myTypeDistributionEditor = nullptr;
+
+    /// @brief type distribution selector
+    TypeDistributionSelector* myTypeDistributionSelector = nullptr;
+
+    /// @brief editor for vehicle type attributes
+    TypeAttributesEditor* myTypeTypeAttributesEditor = nullptr;
+};
diff -Nru sumo-1.17.0/src/netedit/frames/demand/GNETypeFrame.cpp sumo-1.18.0/src/netedit/frames/demand/GNETypeFrame.cpp
--- sumo-1.17.0/src/netedit/frames/demand/GNETypeFrame.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/frames/demand/GNETypeFrame.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -46,15 +46,9 @@
     FXMAPFUNC(SEL_COMMAND,  MID_GNE_COPY,      GNETypeFrame::TypeEditor::onCmdCopyType)
 };
 
-FXDEFMAP(GNETypeFrame::VTypeDistributions) VTypeDistributionsMap[] = {
-    FXMAPFUNC(SEL_COMMAND,  MID_GNE_SET_ATTRIBUTE_DIALOG,   GNETypeFrame::VTypeDistributions::onCmdOpenDialog)
-};
-
 // Object implementation
 FXIMPLEMENT(GNETypeFrame::TypeSelector,         MFXGroupBoxModule,  typeSelectorMap,        ARRAYNUMBER(typeSelectorMap))
 FXIMPLEMENT(GNETypeFrame::TypeEditor,           MFXGroupBoxModule,  typeEditorMap,          ARRAYNUMBER(typeEditorMap))
-FXIMPLEMENT(GNETypeFrame::VTypeDistributions,   MFXGroupBoxModule,  VTypeDistributionsMap,  ARRAYNUMBER(VTypeDistributionsMap))
-
 
 // ===========================================================================
 // method definitions
@@ -163,9 +157,9 @@
     // set myCurrentType as inspected element
     myTypeFrameParent->getViewNet()->setInspectedAttributeCarriers({myCurrentType});
     // show modules
-    myTypeFrameParent->myTypeAttributesEditor->showAttributeEditorModule(false, true);
+    myTypeFrameParent->myTypeAttributesEditor->showAttributeEditorModule(false);
     myTypeFrameParent->myAttributesEditorExtended->showAttributesEditorExtendedModule();
-    myTypeFrameParent->myVTypeDistributions->showVTypeDistributionsModule();
+    myTypeFrameParent->myParametersEditor->refreshParametersEditor();
 }
 
 
@@ -191,9 +185,9 @@
             // set myCurrentType as inspected element
             myTypeFrameParent->getViewNet()->setInspectedAttributeCarriers({myCurrentType});
             // show modules if selected item is valid
-            myTypeFrameParent->myTypeAttributesEditor->showAttributeEditorModule(false, true);
+            myTypeFrameParent->myTypeAttributesEditor->showAttributeEditorModule(false);
             myTypeFrameParent->myAttributesEditorExtended->showAttributesEditorExtendedModule();
-            myTypeFrameParent->myVTypeDistributions->showVTypeDistributionsModule();
+            myTypeFrameParent->myParametersEditor->refreshParametersEditor();
             // Write Warning in console if we're in testing mode
             WRITE_DEBUG(("Selected item '" + myTypeComboBox->getText() + "' in TypeSelector").text());
             // update viewNet
@@ -207,7 +201,6 @@
     // hide all modules if selected item isn't valid
     myTypeFrameParent->myTypeAttributesEditor->hideAttributesEditorModule();
     myTypeFrameParent->myAttributesEditorExtended->hideAttributesEditorExtendedModule();
-    myTypeFrameParent->myVTypeDistributions->hideVTypeDistributionsModule();
     // set color of myTypeMatchBox to red (invalid)
     myTypeComboBox->setTextColor(FXRGB(255, 0, 0));
     // Write Warning in console if we're in testing mode
@@ -293,8 +286,6 @@
     myTypeFrameParent->myViewNet->getUndoList()->end();
     // set created vehicle type in selector
     myTypeFrameParent->myTypeSelector->setCurrentType(type);
-    // refresh Type Editor Module
-    myTypeFrameParent->myTypeEditor->refreshTypeEditorModule();
     return 1;
 }
 
@@ -327,12 +318,8 @@
         myTypeFrameParent->myViewNet->getUndoList()->add(new GNEChange_DemandElement(typeCopy, true), true);
         // end undo list operation
         myTypeFrameParent->myViewNet->getUndoList()->end();
-        // refresh Type Selector (to show the new VType)
-        myTypeFrameParent->myTypeSelector->refreshTypeSelector();
         // set created vehicle type in selector
         myTypeFrameParent->myTypeSelector->setCurrentType(typeCopy);
-        // refresh Type Editor Module
-        myTypeFrameParent->myTypeEditor->refreshTypeEditorModule();
     }
     return 1;
 }
@@ -413,56 +400,6 @@
 }
 
 // ---------------------------------------------------------------------------
-// GNEFrameAttributeModules::VTypeDistributions - methods
-// ---------------------------------------------------------------------------
-
-GNETypeFrame::VTypeDistributions::VTypeDistributions(GNETypeFrame* typeFrameParent) :
-    MFXGroupBoxModule(typeFrameParent, TL("VType Distributions")),
-    myTypeFrameParent(typeFrameParent) {
-    // Create open dialog button
-    new FXButton(getCollapsableFrame(), TL("Show VType Distributions"), nullptr, this, MID_GNE_SET_ATTRIBUTE_DIALOG, GUIDesignButton);
-    // create vType distribution dialog
-    myVTypeDistributionsDialog = new GNEVTypeDistributionsDialog(typeFrameParent);
-}
-
-
-GNETypeFrame::VTypeDistributions::~VTypeDistributions() {}
-
-
-GNETypeFrame*
-GNETypeFrame::VTypeDistributions::getTypeFrameParent() const {
-    return myTypeFrameParent;
-}
-
-
-void
-GNETypeFrame::VTypeDistributions::showVTypeDistributionsModule() {
-    show();
-}
-
-
-void
-GNETypeFrame::VTypeDistributions::hideVTypeDistributionsModule() {
-    // always close dialog
-    myVTypeDistributionsDialog->close();
-    hide();
-}
-
-
-GNEVTypeDistributionsDialog*
-GNETypeFrame::VTypeDistributions::getVTypeDistributionsDialog() const {
-    return myVTypeDistributionsDialog;
-}
-
-
-long
-GNETypeFrame::VTypeDistributions::onCmdOpenDialog(FXObject*, FXSelector, void*) {
-    // open VTypeDistributions Dialog
-    myVTypeDistributionsDialog->openDialog();
-    return 1;
-}
-
-// ---------------------------------------------------------------------------
 // GNETypeFrame - methods
 // ---------------------------------------------------------------------------
 
@@ -481,8 +418,8 @@
     // create module for open extended attributes dialog
     myAttributesEditorExtended = new GNEFrameAttributeModules::AttributesEditorExtended(this);
 
-    // create module for open vType distribution dialog
-    myVTypeDistributions = new VTypeDistributions(this);
+    /// create module for edit parameteres
+    myParametersEditor = new GNEFrameAttributeModules::ParametersEditor(this);
 
     // set "VTYPE_DEFAULT" as default vehicle Type
     myTypeSelector->setCurrentType(myViewNet->getNet()->getAttributeCarriers()->retrieveDemandElement(SUMO_TAG_VTYPE, DEFAULT_VTYPE_ID));
@@ -499,9 +436,8 @@
     // set myCurrentType as inspected element
     myTypeAttributesEditor->getFrameParent()->getViewNet()->setInspectedAttributeCarriers({myTypeSelector->getCurrentType()});
     // show modules
-    myTypeAttributesEditor->showAttributeEditorModule(false, true);
+    myTypeAttributesEditor->showAttributeEditorModule(false);
     myAttributesEditorExtended->showAttributesEditorExtendedModule();
-    myVTypeDistributions->showVTypeDistributionsModule();
     // show frame
     GNEFrame::show();
 }
@@ -530,7 +466,7 @@
         // set myCurrentType as inspected element
         myTypeAttributesEditor->getFrameParent()->getViewNet()->setInspectedAttributeCarriers({myTypeSelector->getCurrentType()});
         // call "showAttributeEditorModule" to refresh attribute list
-        myTypeAttributesEditor->showAttributeEditorModule(false, true);
+        myTypeAttributesEditor->showAttributeEditorModule(false);
     }
 }
 
diff -Nru sumo-1.17.0/src/netedit/frames/demand/GNETypeFrame.h sumo-1.18.0/src/netedit/frames/demand/GNETypeFrame.h
--- sumo-1.17.0/src/netedit/frames/demand/GNETypeFrame.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/frames/demand/GNETypeFrame.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -67,8 +67,10 @@
 
         /// @name FOX-callbacks
         /// @{
+
         /// @brief Called when the user select another element in ComboBox
         long onCmdSelectItem(FXObject*, FXSelector, void*);
+
         /// @}
 
     protected:
@@ -144,51 +146,6 @@
         FXButton* myCopyTypeButton;
     };
 
-    // ===========================================================================
-    // class VTypeDistributions
-    // ===========================================================================
-
-    class VTypeDistributions  : public MFXGroupBoxModule {
-        /// @brief FOX-declaration
-        FXDECLARE(GNETypeFrame::VTypeDistributions)
-
-    public:
-        /// @brief constructor
-        VTypeDistributions(GNETypeFrame* typeFrameParent);
-
-        /// @brief destructor
-        ~VTypeDistributions();
-
-        /// @brief get pointer to type frame Parent
-        GNETypeFrame* getTypeFrameParent() const;
-
-        /// @brief show VTypeDistributions  modul
-        void showVTypeDistributionsModule();
-
-        /// @brief hide group box
-        void hideVTypeDistributionsModule();
-
-        /// @brief get vType distribution dialog
-        GNEVTypeDistributionsDialog* getVTypeDistributionsDialog() const;
-
-        /// @name FOX-callbacks
-        /// @{
-        /// @brief Called when open dialog button is clicked
-        long onCmdOpenDialog(FXObject*, FXSelector, void*);
-        /// @}
-
-    protected:
-        /// @brief FOX need this
-        FOX_CONSTRUCTOR(VTypeDistributions)
-
-    private:
-        /// @brief pointer to type frame Parent
-        GNETypeFrame* myTypeFrameParent = nullptr;
-
-        /// @brief VType distribution dialog
-        GNEVTypeDistributionsDialog* myVTypeDistributionsDialog = nullptr;
-    };
-
     /**@brief Constructor
      * @brief viewParent GNEViewParent in which this GNEFrame is placed
      * @brief viewNet viewNet that uses this GNEFrame
@@ -224,6 +181,6 @@
     /// @brief modul for open extended attributes dialog
     GNEFrameAttributeModules::AttributesEditorExtended* myAttributesEditorExtended = nullptr;
 
-    /// @brief modul for open vType distributions dialog
-    VTypeDistributions* myVTypeDistributions = nullptr;
+    /// @brief Parameters editor inspector
+    GNEFrameAttributeModules::ParametersEditor* myParametersEditor;
 };
diff -Nru sumo-1.17.0/src/netedit/frames/demand/GNEVehicleFrame.cpp sumo-1.18.0/src/netedit/frames/demand/GNEVehicleFrame.cpp
--- sumo-1.17.0/src/netedit/frames/demand/GNEVehicleFrame.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/frames/demand/GNEVehicleFrame.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -21,10 +21,11 @@
 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
-
+#include 
 #include "GNEVehicleFrame.h"
 
 // ===========================================================================
@@ -38,7 +39,7 @@
 GNEVehicleFrame::HelpCreation::HelpCreation(GNEVehicleFrame* vehicleFrameParent) :
     MFXGroupBoxModule(vehicleFrameParent, TL("Help")),
     myVehicleFrameParent(vehicleFrameParent) {
-    myInformationLabel = new FXLabel(getCollapsableFrame(), "", 0, GUIDesignLabelFrameInformation);
+    myInformationLabel = new MFXDynamicLabel(getCollapsableFrame(), "", 0, GUIDesignLabelFrameInformation);
 }
 
 
@@ -68,46 +69,44 @@
         // vehicles
         case SUMO_TAG_VEHICLE:
             information
-                    << TL("- Click over a route to\n")
-                    << TL("  create a vehicle.");
+                    << "- " << TL("Click over a route to create a vehicle.");
             break;
         case SUMO_TAG_TRIP:
             information
-                    << TL("- Select two edges to\n")
-                    << TL("  create a Trip.");
+                    << "- " << TL("Select two edges to create a trip.");
             break;
         case GNE_TAG_VEHICLE_WITHROUTE:
             information
-                    << TL("- Select two edges to\n")
-                    << TL("  create a vehicle with\n")
-                    << TL("  embedded route.");
+                    << "- " << TL("Select two edges to create a vehicle with embedded route.");
             break;
         case GNE_TAG_TRIP_JUNCTIONS:
             information
-                    << TL("- Select two junctions\n")
-                    << TL("  to create a Trip.");
+                    << "- " << TL("Select two junctions to create a trip.");
+            break;
+        case GNE_TAG_TRIP_TAZS:
+            information
+                    << "- " << TL("Select two TAZS to create a trip.");
             break;
         // flows
         case GNE_TAG_FLOW_ROUTE:
             information
-                    << TL("- Click over a route to\n")
-                    << TL("  create a routeFlow.");
+                    << "- " << TL("Click over a route to create a routeFlow.");
             break;
         case SUMO_TAG_FLOW:
             information
-                    << TL("- Select two edges to\n")
-                    << TL("  create a flow.");
+                    << "- " << TL("Select two edges to create a flow.");
             break;
         case GNE_TAG_FLOW_WITHROUTE:
             information
-                    << TL("- Select two edges to\n")
-                    << TL("  create a flow with\n")
-                    << TL("  embedded route.");
+                    << "- " << TL("Select two edges to create a flow with embedded route.");
             break;
         case GNE_TAG_FLOW_JUNCTIONS:
             information
-                    << TL("- Select two junctions\n")
-                    << TL("  to create a flow.");
+                    << "- " << TL("Select two junctions to create a flow.");
+            break;
+        case GNE_TAG_FLOW_TAZS:
+            information
+                    << "- " << TL("Select two TAZs to create a flow.");
             break;
         default:
             break;
@@ -186,6 +185,7 @@
     SumoXMLTag vehicleTag = myVehicleTagSelector->getCurrentTemplateAC()->getTagProperty().getTag();
     const bool addEdge = ((vehicleTag == SUMO_TAG_TRIP) || (vehicleTag == GNE_TAG_VEHICLE_WITHROUTE) || (vehicleTag == SUMO_TAG_FLOW) || (vehicleTag == GNE_TAG_FLOW_WITHROUTE));
     const bool addJunction = ((vehicleTag == GNE_TAG_TRIP_JUNCTIONS) || (vehicleTag == GNE_TAG_FLOW_JUNCTIONS));
+    const bool addTAZ = ((vehicleTag == GNE_TAG_TRIP_TAZS) || (vehicleTag == GNE_TAG_FLOW_TAZS));
     // first check that current selected vehicle is valid
     if (vehicleTag == SUMO_TAG_NOTHING) {
         myViewNet->setStatusBarText(TL("Current selected vehicle isn't valid."));
@@ -217,7 +217,10 @@
         return myPathCreator->addEdge(objectsUnderCursor.getEdgeFront(), mouseButtonKeyPressed.shiftKeyPressed(), mouseButtonKeyPressed.controlKeyPressed());
     } else if (addJunction && objectsUnderCursor.getJunctionFront()) {
         // add clicked junction in GNEPathCreator
-        return myPathCreator->addJunction(objectsUnderCursor.getJunctionFront(), mouseButtonKeyPressed.shiftKeyPressed(), mouseButtonKeyPressed.controlKeyPressed());
+        return myPathCreator->addJunction(objectsUnderCursor.getJunctionFront());
+    } else if (addTAZ && objectsUnderCursor.getTAZFront()) {
+        // add clicked TAZ in GNEPathCreator
+        return myPathCreator->addTAZ(objectsUnderCursor.getTAZFront());
     } else {
         return false;
     }
@@ -230,6 +233,12 @@
 }
 
 
+DemandElementSelector*
+GNEVehicleFrame::getTypeSelector() const {
+    return myTypeSelector;
+}
+
+
 GNEPathCreator*
 GNEVehicleFrame::getPathCreator() const {
     return myPathCreator;
@@ -250,7 +259,9 @@
         if ((myVehicleTagSelector->getCurrentTemplateAC()->getTagProperty().getTag() != SUMO_TAG_VEHICLE) &&
                 (myVehicleTagSelector->getCurrentTemplateAC()->getTagProperty().getTag() != GNE_TAG_FLOW_ROUTE) &&
                 (myVehicleTagSelector->getCurrentTemplateAC()->getTagProperty().getTag() != GNE_TAG_TRIP_JUNCTIONS) &&
-                (myVehicleTagSelector->getCurrentTemplateAC()->getTagProperty().getTag() != GNE_TAG_FLOW_JUNCTIONS)) {
+                (myVehicleTagSelector->getCurrentTemplateAC()->getTagProperty().getTag() != GNE_TAG_TRIP_TAZS) &&
+                (myVehicleTagSelector->getCurrentTemplateAC()->getTagProperty().getTag() != GNE_TAG_FLOW_JUNCTIONS) &&
+                (myVehicleTagSelector->getCurrentTemplateAC()->getTagProperty().getTag() != GNE_TAG_FLOW_TAZS)) {
             myPathLegend->showPathLegendModule();
         } else {
             myPathLegend->hidePathLegendModule();
@@ -317,191 +328,234 @@
             // build vehicle using last route
             return buildVehicleOverRoute(vehicleTag, myViewNet->getLastCreatedRoute());
         } else {
-            // check number of edges
-            if ((myPathCreator->getSelectedEdges().size() > 0) || (myPathCreator->getSelectedJunctions().size() > 0)) {
-                // extract via attribute
-                std::vector viaEdges;
-                for (int i = 1; i < ((int)myPathCreator->getSelectedEdges().size() - 1); i++) {
-                    viaEdges.push_back(myPathCreator->getSelectedEdges().at(i)->getID());
-                }
-                // continue depending of tag
-                if (vehicleTag == SUMO_TAG_TRIP) {
-                    // set tag
-                    myVehicleBaseObject->setTag(SUMO_TAG_TRIP);
-                    // Add parameter departure
-                    if (!myVehicleBaseObject->hasStringAttribute(SUMO_ATTR_DEPART) || myVehicleBaseObject->getStringAttribute(SUMO_ATTR_DEPART).empty()) {
-                        myVehicleBaseObject->addStringAttribute(SUMO_ATTR_DEPART, "0");
-                    }
-                    // declare SUMOSAXAttributesImpl_Cached to convert valuesMap into SUMOSAXAttributes
-                    SUMOSAXAttributesImpl_Cached SUMOSAXAttrs(myVehicleBaseObject->getAllAttributes(), getPredefinedTagsMML(), toString(vehicleTag));
-                    // obtain trip parameters
-                    SUMOVehicleParameter* tripParameters = SUMOVehicleParserHelper::parseVehicleAttributes(vehicleTag, SUMOSAXAttrs, false);
-                    // check trip parameters
-                    if (tripParameters) {
-                        myVehicleBaseObject->setVehicleParameter(tripParameters);
-                        myVehicleBaseObject->addStringAttribute(SUMO_ATTR_FROM, myPathCreator->getSelectedEdges().front()->getID());
-                        myVehicleBaseObject->addStringAttribute(SUMO_ATTR_TO, myPathCreator->getSelectedEdges().back()->getID());
-                        myVehicleBaseObject->addStringListAttribute(SUMO_ATTR_VIA, viaEdges);
-                        // parse vehicle
-                        myRouteHandler.parseSumoBaseObject(myVehicleBaseObject);
-                        // delete tripParameters and base object
-                        delete tripParameters;
-                    }
-                } else if (vehicleTag == GNE_TAG_VEHICLE_WITHROUTE) {
-                    // set tag
-                    myVehicleBaseObject->setTag(SUMO_TAG_VEHICLE);
-                    // Add parameter departure
-                    if (!myVehicleBaseObject->hasStringAttribute(SUMO_ATTR_DEPART) || myVehicleBaseObject->getStringAttribute(SUMO_ATTR_DEPART).empty()) {
-                        myVehicleBaseObject->addStringAttribute(SUMO_ATTR_DEPART, "0");
-                    }
-                    // get route edges
-                    std::vector routeEdges;
-                    for (const auto& subPath : myPathCreator->getPath()) {
-                        for (const auto& edge : subPath.getSubPath()) {
-                            routeEdges.push_back(edge->getID());
-                        }
-                    }
-                    // avoid consecutive duplicated edges
-                    routeEdges.erase(std::unique(routeEdges.begin(), routeEdges.end()), routeEdges.end());
-                    // declare SUMOSAXAttributesImpl_Cached to convert valuesMap into SUMOSAXAttributes
-                    SUMOSAXAttributesImpl_Cached SUMOSAXAttrs(myVehicleBaseObject->getAllAttributes(), getPredefinedTagsMML(), toString(vehicleTag));
-                    // obtain vehicle parameters
-                    SUMOVehicleParameter* vehicleParameters = SUMOVehicleParserHelper::parseVehicleAttributes(vehicleTag, SUMOSAXAttrs, false);
-                    // continue depending of vehicleParameters
-                    if (vehicleParameters) {
-                        myVehicleBaseObject->setVehicleParameter(vehicleParameters);
-                        // create route base object
-                        CommonXMLStructure::SumoBaseObject* embeddedRouteObject = new CommonXMLStructure::SumoBaseObject(myVehicleBaseObject);
-                        embeddedRouteObject->setTag(SUMO_TAG_ROUTE);
-                        embeddedRouteObject->addStringAttribute(SUMO_ATTR_ID, "");
-                        embeddedRouteObject->addStringListAttribute(SUMO_ATTR_EDGES, routeEdges);
-                        embeddedRouteObject->addColorAttribute(SUMO_ATTR_COLOR, RGBColor::INVISIBLE),
-                                            embeddedRouteObject->addIntAttribute(SUMO_ATTR_REPEAT, 0),
-                                            embeddedRouteObject->addTimeAttribute(SUMO_ATTR_CYCLETIME, 0),
-                                            // parse route
-                                            myRouteHandler.parseSumoBaseObject(embeddedRouteObject);
-                        // delete vehicleParamters
-                        delete vehicleParameters;
-                    }
-                } else if (vehicleTag == SUMO_TAG_FLOW) {
-                    // set tag
-                    myVehicleBaseObject->setTag(SUMO_TAG_FLOW);
-                    // set begin and end attributes
-                    if (!myVehicleBaseObject->hasStringAttribute(SUMO_ATTR_BEGIN) || myVehicleBaseObject->getStringAttribute(SUMO_ATTR_BEGIN).empty()) {
-                        myVehicleBaseObject->addStringAttribute(SUMO_ATTR_BEGIN, "0");
-                    }
-                    // adjust poisson value
-                    if (myVehicleBaseObject->hasDoubleAttribute(GNE_ATTR_POISSON)) {
-                        myVehicleBaseObject->addStringAttribute(SUMO_ATTR_PERIOD, "exp(" + toString(myVehicleBaseObject->getDoubleAttribute(GNE_ATTR_POISSON)) + ")");
-                    }
-                    // declare SUMOSAXAttributesImpl_Cached to convert valuesMap into SUMOSAXAttributes
-                    SUMOSAXAttributesImpl_Cached SUMOSAXAttrs(myVehicleBaseObject->getAllAttributes(), getPredefinedTagsMML(), toString(vehicleTag));
-                    // obtain flow parameters
-                    SUMOVehicleParameter* flowParameters = SUMOVehicleParserHelper::parseFlowAttributes(vehicleTag, SUMOSAXAttrs, false, true, 0, SUMOTime_MAX);
-                    // check flowParameters
-                    if (flowParameters) {
-                        myVehicleBaseObject->setVehicleParameter(flowParameters);
-                        myVehicleBaseObject->addStringAttribute(SUMO_ATTR_FROM, myPathCreator->getSelectedEdges().front()->getID());
-                        myVehicleBaseObject->addStringAttribute(SUMO_ATTR_TO, myPathCreator->getSelectedEdges().back()->getID());
-                        myVehicleBaseObject->addStringListAttribute(SUMO_ATTR_VIA, viaEdges);
-                        // parse vehicle
-                        myRouteHandler.parseSumoBaseObject(myVehicleBaseObject);
-                        // delete flowParameters and base object
-                        delete flowParameters;
-                    }
-                } else if (vehicleTag == GNE_TAG_FLOW_WITHROUTE) {
-                    // set tag
-                    myVehicleBaseObject->setTag(SUMO_TAG_FLOW);
-                    // set begin and end attributes
-                    if (!myVehicleBaseObject->hasStringAttribute(SUMO_ATTR_BEGIN) || myVehicleBaseObject->getStringAttribute(SUMO_ATTR_BEGIN).empty()) {
-                        myVehicleBaseObject->addStringAttribute(SUMO_ATTR_BEGIN, "0");
-                    }
-                    // adjust poisson value
-                    if (myVehicleBaseObject->hasDoubleAttribute(GNE_ATTR_POISSON)) {
-                        myVehicleBaseObject->addStringAttribute(SUMO_ATTR_PERIOD, "exp(" + toString(myVehicleBaseObject->getDoubleAttribute(GNE_ATTR_POISSON)) + ")");
-                    }
-                    // get route edges
-                    std::vector routeEdges;
-                    for (const auto& subPath : myPathCreator->getPath()) {
-                        for (const auto& edge : subPath.getSubPath()) {
-                            routeEdges.push_back(edge->getID());
-                        }
-                    }
-                    // avoid consecutive duplicated edges
-                    routeEdges.erase(std::unique(routeEdges.begin(), routeEdges.end()), routeEdges.end());
-                    // declare SUMOSAXAttributesImpl_Cached to convert valuesMap into SUMOSAXAttributes
-                    SUMOSAXAttributesImpl_Cached SUMOSAXAttrs(myVehicleBaseObject->getAllAttributes(), getPredefinedTagsMML(), toString(vehicleTag));
-                    // obtain flow parameters
-                    SUMOVehicleParameter* flowParameters = SUMOVehicleParserHelper::parseFlowAttributes(vehicleTag, SUMOSAXAttrs, false, true, 0, SUMOTime_MAX);
-                    // continue depending of vehicleParameters
-                    if (flowParameters) {
-                        myVehicleBaseObject->setVehicleParameter(flowParameters);
-                        // create under base object
-                        CommonXMLStructure::SumoBaseObject* embeddedRouteObject = new CommonXMLStructure::SumoBaseObject(myVehicleBaseObject);
-                        embeddedRouteObject->setTag(SUMO_TAG_ROUTE);
-                        embeddedRouteObject->addStringAttribute(SUMO_ATTR_ID, "");
-                        embeddedRouteObject->addStringListAttribute(SUMO_ATTR_EDGES, routeEdges);
-                        embeddedRouteObject->addColorAttribute(SUMO_ATTR_COLOR, RGBColor::INVISIBLE),
-                                            embeddedRouteObject->addIntAttribute(SUMO_ATTR_REPEAT, 0),
-                                            embeddedRouteObject->addTimeAttribute(SUMO_ATTR_CYCLETIME, 0),
-                                            // parse route
-                                            myRouteHandler.parseSumoBaseObject(embeddedRouteObject);
-                        // delete vehicleParamters
-                        delete flowParameters;
-                    }
-                } else if (vehicleTag == GNE_TAG_TRIP_JUNCTIONS) {
-                    // set tag
-                    myVehicleBaseObject->setTag(SUMO_TAG_TRIP);
-                    // Add parameter departure
-                    if (!myVehicleBaseObject->hasStringAttribute(SUMO_ATTR_DEPART) || myVehicleBaseObject->getStringAttribute(SUMO_ATTR_DEPART).empty()) {
-                        myVehicleBaseObject->addStringAttribute(SUMO_ATTR_DEPART, "0");
-                    }
-                    // declare SUMOSAXAttributesImpl_Cached to convert valuesMap into SUMOSAXAttributes
-                    SUMOSAXAttributesImpl_Cached SUMOSAXAttrs(myVehicleBaseObject->getAllAttributes(), getPredefinedTagsMML(), toString(vehicleTag));
-                    // obtain trip parameters
-                    SUMOVehicleParameter* tripParameters = SUMOVehicleParserHelper::parseVehicleAttributes(vehicleTag, SUMOSAXAttrs, false);
-                    // check trip parameters
-                    if (tripParameters) {
-                        myVehicleBaseObject->setVehicleParameter(tripParameters);
-                        myVehicleBaseObject->addStringAttribute(SUMO_ATTR_FROMJUNCTION, myPathCreator->getSelectedJunctions().front()->getID());
-                        myVehicleBaseObject->addStringAttribute(SUMO_ATTR_TOJUNCTION, myPathCreator->getSelectedJunctions().back()->getID());
-                        // parse vehicle
-                        myRouteHandler.parseSumoBaseObject(myVehicleBaseObject);
-                        // delete tripParameters and base object
-                        delete tripParameters;
-                    }
-                } else if (vehicleTag == GNE_TAG_FLOW_JUNCTIONS) {
-                    // set tag
-                    myVehicleBaseObject->setTag(SUMO_TAG_FLOW);
-                    // set begin and end attributes
-                    if (!myVehicleBaseObject->hasStringAttribute(SUMO_ATTR_BEGIN) || myVehicleBaseObject->getStringAttribute(SUMO_ATTR_BEGIN).empty()) {
-                        myVehicleBaseObject->addStringAttribute(SUMO_ATTR_BEGIN, "0");
-                    }
-                    // adjust poisson value
-                    if (myVehicleBaseObject->hasDoubleAttribute(GNE_ATTR_POISSON)) {
-                        myVehicleBaseObject->addStringAttribute(SUMO_ATTR_PERIOD, "exp(" + toString(myVehicleBaseObject->getDoubleAttribute(GNE_ATTR_POISSON)) + ")");
+            // extract via attribute
+            std::vector viaEdges;
+            for (int i = 1; i < ((int)myPathCreator->getSelectedEdges().size() - 1); i++) {
+                viaEdges.push_back(myPathCreator->getSelectedEdges().at(i)->getID());
+            }
+            // continue depending of tag
+            if ((vehicleTag == SUMO_TAG_TRIP) && (myPathCreator->getSelectedEdges().size() > 0)) {
+                // set tag
+                myVehicleBaseObject->setTag(SUMO_TAG_TRIP);
+                // Add parameter departure
+                if (!myVehicleBaseObject->hasStringAttribute(SUMO_ATTR_DEPART) || myVehicleBaseObject->getStringAttribute(SUMO_ATTR_DEPART).empty()) {
+                    myVehicleBaseObject->addStringAttribute(SUMO_ATTR_DEPART, "0");
+                }
+                // declare SUMOSAXAttributesImpl_Cached to convert valuesMap into SUMOSAXAttributes
+                SUMOSAXAttributesImpl_Cached SUMOSAXAttrs(myVehicleBaseObject->getAllAttributes(), getPredefinedTagsMML(), toString(vehicleTag));
+                // obtain trip parameters
+                SUMOVehicleParameter* tripParameters = SUMOVehicleParserHelper::parseVehicleAttributes(vehicleTag, SUMOSAXAttrs, false);
+                // check trip parameters
+                if (tripParameters) {
+                    myVehicleBaseObject->setVehicleParameter(tripParameters);
+                    myVehicleBaseObject->addStringAttribute(SUMO_ATTR_FROM, myPathCreator->getSelectedEdges().front()->getID());
+                    myVehicleBaseObject->addStringAttribute(SUMO_ATTR_TO, myPathCreator->getSelectedEdges().back()->getID());
+                    myVehicleBaseObject->addStringListAttribute(SUMO_ATTR_VIA, viaEdges);
+                    // parse vehicle
+                    myRouteHandler.parseSumoBaseObject(myVehicleBaseObject);
+                    // delete tripParameters and base object
+                    delete tripParameters;
+                }
+            } else if ((vehicleTag == GNE_TAG_VEHICLE_WITHROUTE) && (myPathCreator->getPath().size() > 0)) {
+                // set tag
+                myVehicleBaseObject->setTag(SUMO_TAG_VEHICLE);
+                // Add parameter departure
+                if (!myVehicleBaseObject->hasStringAttribute(SUMO_ATTR_DEPART) || myVehicleBaseObject->getStringAttribute(SUMO_ATTR_DEPART).empty()) {
+                    myVehicleBaseObject->addStringAttribute(SUMO_ATTR_DEPART, "0");
+                }
+                // get route edges
+                std::vector routeEdges;
+                for (const auto& subPath : myPathCreator->getPath()) {
+                    for (const auto& edge : subPath.getSubPath()) {
+                        routeEdges.push_back(edge->getID());
                     }
-                    // declare SUMOSAXAttributesImpl_Cached to convert valuesMap into SUMOSAXAttributes
-                    SUMOSAXAttributesImpl_Cached SUMOSAXAttrs(myVehicleBaseObject->getAllAttributes(), getPredefinedTagsMML(), toString(vehicleTag));
-                    // obtain flow parameters
-                    SUMOVehicleParameter* flowParameters = SUMOVehicleParserHelper::parseFlowAttributes(vehicleTag, SUMOSAXAttrs, false, true, 0, SUMOTime_MAX);
-                    // check flowParameters
-                    if (flowParameters) {
-                        myVehicleBaseObject->setVehicleParameter(flowParameters);
-                        myVehicleBaseObject->addStringAttribute(SUMO_ATTR_FROMJUNCTION, myPathCreator->getSelectedJunctions().front()->getID());
-                        myVehicleBaseObject->addStringAttribute(SUMO_ATTR_TOJUNCTION, myPathCreator->getSelectedJunctions().back()->getID());
-                        // parse vehicle
-                        myRouteHandler.parseSumoBaseObject(myVehicleBaseObject);
-                        // delete flowParameters and base object
-                        delete flowParameters;
+                }
+                // avoid consecutive duplicated edges
+                routeEdges.erase(std::unique(routeEdges.begin(), routeEdges.end()), routeEdges.end());
+                // declare SUMOSAXAttributesImpl_Cached to convert valuesMap into SUMOSAXAttributes
+                SUMOSAXAttributesImpl_Cached SUMOSAXAttrs(myVehicleBaseObject->getAllAttributes(), getPredefinedTagsMML(), toString(vehicleTag));
+                // obtain vehicle parameters
+                SUMOVehicleParameter* vehicleParameters = SUMOVehicleParserHelper::parseVehicleAttributes(vehicleTag, SUMOSAXAttrs, false);
+                // continue depending of vehicleParameters
+                if (vehicleParameters) {
+                    myVehicleBaseObject->setVehicleParameter(vehicleParameters);
+                    // create route base object
+                    CommonXMLStructure::SumoBaseObject* embeddedRouteObject = new CommonXMLStructure::SumoBaseObject(myVehicleBaseObject);
+                    embeddedRouteObject->setTag(SUMO_TAG_ROUTE);
+                    embeddedRouteObject->addStringAttribute(SUMO_ATTR_ID, "");
+                    embeddedRouteObject->addStringListAttribute(SUMO_ATTR_EDGES, routeEdges);
+                    embeddedRouteObject->addColorAttribute(SUMO_ATTR_COLOR, RGBColor::INVISIBLE),
+                                        embeddedRouteObject->addIntAttribute(SUMO_ATTR_REPEAT, 0),
+                                        embeddedRouteObject->addTimeAttribute(SUMO_ATTR_CYCLETIME, 0),
+                                        // parse route
+                                        myRouteHandler.parseSumoBaseObject(embeddedRouteObject);
+                    // delete vehicleParamters
+                    delete vehicleParameters;
+                }
+            } else if ((vehicleTag == SUMO_TAG_FLOW) && (myPathCreator->getSelectedEdges().size() > 0)) {
+                // set tag
+                myVehicleBaseObject->setTag(SUMO_TAG_FLOW);
+                // set begin and end attributes
+                if (!myVehicleBaseObject->hasStringAttribute(SUMO_ATTR_BEGIN) || myVehicleBaseObject->getStringAttribute(SUMO_ATTR_BEGIN).empty()) {
+                    myVehicleBaseObject->addStringAttribute(SUMO_ATTR_BEGIN, "0");
+                }
+                // adjust poisson value
+                if (myVehicleBaseObject->hasDoubleAttribute(GNE_ATTR_POISSON)) {
+                    myVehicleBaseObject->addStringAttribute(SUMO_ATTR_PERIOD, "exp(" + toString(myVehicleBaseObject->getDoubleAttribute(GNE_ATTR_POISSON)) + ")");
+                }
+                // declare SUMOSAXAttributesImpl_Cached to convert valuesMap into SUMOSAXAttributes
+                SUMOSAXAttributesImpl_Cached SUMOSAXAttrs(myVehicleBaseObject->getAllAttributes(), getPredefinedTagsMML(), toString(vehicleTag));
+                // obtain flow parameters
+                SUMOVehicleParameter* flowParameters = SUMOVehicleParserHelper::parseFlowAttributes(vehicleTag, SUMOSAXAttrs, false, true, 0, SUMOTime_MAX);
+                // check flowParameters
+                if (flowParameters) {
+                    myVehicleBaseObject->setVehicleParameter(flowParameters);
+                    myVehicleBaseObject->addStringAttribute(SUMO_ATTR_FROM, myPathCreator->getSelectedEdges().front()->getID());
+                    myVehicleBaseObject->addStringAttribute(SUMO_ATTR_TO, myPathCreator->getSelectedEdges().back()->getID());
+                    myVehicleBaseObject->addStringListAttribute(SUMO_ATTR_VIA, viaEdges);
+                    // parse vehicle
+                    myRouteHandler.parseSumoBaseObject(myVehicleBaseObject);
+                    // delete flowParameters and base object
+                    delete flowParameters;
+                }
+            } else if ((vehicleTag == GNE_TAG_FLOW_WITHROUTE) && (myPathCreator->getPath().size() > 0)) {
+                // set tag
+                myVehicleBaseObject->setTag(SUMO_TAG_FLOW);
+                // set begin and end attributes
+                if (!myVehicleBaseObject->hasStringAttribute(SUMO_ATTR_BEGIN) || myVehicleBaseObject->getStringAttribute(SUMO_ATTR_BEGIN).empty()) {
+                    myVehicleBaseObject->addStringAttribute(SUMO_ATTR_BEGIN, "0");
+                }
+                // adjust poisson value
+                if (myVehicleBaseObject->hasDoubleAttribute(GNE_ATTR_POISSON)) {
+                    myVehicleBaseObject->addStringAttribute(SUMO_ATTR_PERIOD, "exp(" + toString(myVehicleBaseObject->getDoubleAttribute(GNE_ATTR_POISSON)) + ")");
+                }
+                // get route edges
+                std::vector routeEdges;
+                for (const auto& subPath : myPathCreator->getPath()) {
+                    for (const auto& edge : subPath.getSubPath()) {
+                        routeEdges.push_back(edge->getID());
                     }
                 }
-                // abort path creation
-                myPathCreator->abortPathCreation();
-                // refresh myVehicleAttributes
-                myVehicleAttributes->refreshAttributesCreator();
-                return true;
+                // avoid consecutive duplicated edges
+                routeEdges.erase(std::unique(routeEdges.begin(), routeEdges.end()), routeEdges.end());
+                // declare SUMOSAXAttributesImpl_Cached to convert valuesMap into SUMOSAXAttributes
+                SUMOSAXAttributesImpl_Cached SUMOSAXAttrs(myVehicleBaseObject->getAllAttributes(), getPredefinedTagsMML(), toString(vehicleTag));
+                // obtain flow parameters
+                SUMOVehicleParameter* flowParameters = SUMOVehicleParserHelper::parseFlowAttributes(vehicleTag, SUMOSAXAttrs, false, true, 0, SUMOTime_MAX);
+                // continue depending of vehicleParameters
+                if (flowParameters) {
+                    myVehicleBaseObject->setVehicleParameter(flowParameters);
+                    // create under base object
+                    CommonXMLStructure::SumoBaseObject* embeddedRouteObject = new CommonXMLStructure::SumoBaseObject(myVehicleBaseObject);
+                    embeddedRouteObject->setTag(SUMO_TAG_ROUTE);
+                    embeddedRouteObject->addStringAttribute(SUMO_ATTR_ID, "");
+                    embeddedRouteObject->addStringListAttribute(SUMO_ATTR_EDGES, routeEdges);
+                    embeddedRouteObject->addColorAttribute(SUMO_ATTR_COLOR, RGBColor::INVISIBLE),
+                                        embeddedRouteObject->addIntAttribute(SUMO_ATTR_REPEAT, 0),
+                                        embeddedRouteObject->addTimeAttribute(SUMO_ATTR_CYCLETIME, 0),
+                                        // parse route
+                                        myRouteHandler.parseSumoBaseObject(embeddedRouteObject);
+                    // delete vehicleParamters
+                    delete flowParameters;
+                }
+            } else if ((vehicleTag == GNE_TAG_TRIP_JUNCTIONS) && (myPathCreator->getSelectedJunctions().size() > 0)) {
+                // set tag
+                myVehicleBaseObject->setTag(SUMO_TAG_TRIP);
+                // Add parameter departure
+                if (!myVehicleBaseObject->hasStringAttribute(SUMO_ATTR_DEPART) || myVehicleBaseObject->getStringAttribute(SUMO_ATTR_DEPART).empty()) {
+                    myVehicleBaseObject->addStringAttribute(SUMO_ATTR_DEPART, "0");
+                }
+                // declare SUMOSAXAttributesImpl_Cached to convert valuesMap into SUMOSAXAttributes
+                SUMOSAXAttributesImpl_Cached SUMOSAXAttrs(myVehicleBaseObject->getAllAttributes(), getPredefinedTagsMML(), toString(vehicleTag));
+                // obtain trip parameters
+                SUMOVehicleParameter* tripParameters = SUMOVehicleParserHelper::parseVehicleAttributes(vehicleTag, SUMOSAXAttrs, false);
+                // check trip parameters
+                if (tripParameters) {
+                    myVehicleBaseObject->setVehicleParameter(tripParameters);
+                    myVehicleBaseObject->addStringAttribute(SUMO_ATTR_FROMJUNCTION, myPathCreator->getSelectedJunctions().front()->getID());
+                    myVehicleBaseObject->addStringAttribute(SUMO_ATTR_TOJUNCTION, myPathCreator->getSelectedJunctions().back()->getID());
+                    // parse vehicle
+                    myRouteHandler.parseSumoBaseObject(myVehicleBaseObject);
+                    // delete tripParameters and base object
+                    delete tripParameters;
+                }
+            } else if ((vehicleTag == GNE_TAG_TRIP_TAZS) && (myPathCreator->getSelectedTAZs().size() > 0)) {
+                // set tag
+                myVehicleBaseObject->setTag(SUMO_TAG_TRIP);
+                // Add parameter departure
+                if (!myVehicleBaseObject->hasStringAttribute(SUMO_ATTR_DEPART) || myVehicleBaseObject->getStringAttribute(SUMO_ATTR_DEPART).empty()) {
+                    myVehicleBaseObject->addStringAttribute(SUMO_ATTR_DEPART, "0");
+                }
+                // declare SUMOSAXAttributesImpl_Cached to convert valuesMap into SUMOSAXAttributes
+                SUMOSAXAttributesImpl_Cached SUMOSAXAttrs(myVehicleBaseObject->getAllAttributes(), getPredefinedTagsMML(), toString(vehicleTag));
+                // obtain trip parameters
+                SUMOVehicleParameter* tripParameters = SUMOVehicleParserHelper::parseVehicleAttributes(vehicleTag, SUMOSAXAttrs, false);
+                // check trip parameters
+                if (tripParameters) {
+                    myVehicleBaseObject->setVehicleParameter(tripParameters);
+                    myVehicleBaseObject->addStringAttribute(SUMO_ATTR_FROM_TAZ, myPathCreator->getSelectedTAZs().front()->getID());
+                    myVehicleBaseObject->addStringAttribute(SUMO_ATTR_TO_TAZ, myPathCreator->getSelectedTAZs().back()->getID());
+                    // parse vehicle
+                    myRouteHandler.parseSumoBaseObject(myVehicleBaseObject);
+                    // delete tripParameters and base object
+                    delete tripParameters;
+                }
+            } else if ((vehicleTag == GNE_TAG_FLOW_JUNCTIONS) && (myPathCreator->getSelectedJunctions().size() > 0)) {
+                // set tag
+                myVehicleBaseObject->setTag(SUMO_TAG_FLOW);
+                // set begin and end attributes
+                if (!myVehicleBaseObject->hasStringAttribute(SUMO_ATTR_BEGIN) || myVehicleBaseObject->getStringAttribute(SUMO_ATTR_BEGIN).empty()) {
+                    myVehicleBaseObject->addStringAttribute(SUMO_ATTR_BEGIN, "0");
+                }
+                // adjust poisson value
+                if (myVehicleBaseObject->hasDoubleAttribute(GNE_ATTR_POISSON)) {
+                    myVehicleBaseObject->addStringAttribute(SUMO_ATTR_PERIOD, "exp(" + toString(myVehicleBaseObject->getDoubleAttribute(GNE_ATTR_POISSON)) + ")");
+                }
+                // declare SUMOSAXAttributesImpl_Cached to convert valuesMap into SUMOSAXAttributes
+                SUMOSAXAttributesImpl_Cached SUMOSAXAttrs(myVehicleBaseObject->getAllAttributes(), getPredefinedTagsMML(), toString(vehicleTag));
+                // obtain flow parameters
+                SUMOVehicleParameter* flowParameters = SUMOVehicleParserHelper::parseFlowAttributes(vehicleTag, SUMOSAXAttrs, false, true, 0, SUMOTime_MAX);
+                // check flowParameters
+                if (flowParameters) {
+                    myVehicleBaseObject->setVehicleParameter(flowParameters);
+                    myVehicleBaseObject->addStringAttribute(SUMO_ATTR_FROMJUNCTION, myPathCreator->getSelectedJunctions().front()->getID());
+                    myVehicleBaseObject->addStringAttribute(SUMO_ATTR_TOJUNCTION, myPathCreator->getSelectedJunctions().back()->getID());
+                    // parse vehicle
+                    myRouteHandler.parseSumoBaseObject(myVehicleBaseObject);
+                    // delete flowParameters and base object
+                    delete flowParameters;
+                }
+            } else if ((vehicleTag == GNE_TAG_FLOW_TAZS) && (myPathCreator->getSelectedTAZs().size() > 0)) {
+                // set tag
+                myVehicleBaseObject->setTag(SUMO_TAG_FLOW);
+                // set begin and end attributes
+                if (!myVehicleBaseObject->hasStringAttribute(SUMO_ATTR_BEGIN) || myVehicleBaseObject->getStringAttribute(SUMO_ATTR_BEGIN).empty()) {
+                    myVehicleBaseObject->addStringAttribute(SUMO_ATTR_BEGIN, "0");
+                }
+                // adjust poisson value
+                if (myVehicleBaseObject->hasDoubleAttribute(GNE_ATTR_POISSON)) {
+                    myVehicleBaseObject->addStringAttribute(SUMO_ATTR_PERIOD, "exp(" + toString(myVehicleBaseObject->getDoubleAttribute(GNE_ATTR_POISSON)) + ")");
+                }
+                // declare SUMOSAXAttributesImpl_Cached to convert valuesMap into SUMOSAXAttributes
+                SUMOSAXAttributesImpl_Cached SUMOSAXAttrs(myVehicleBaseObject->getAllAttributes(), getPredefinedTagsMML(), toString(vehicleTag));
+                // obtain flow parameters
+                SUMOVehicleParameter* flowParameters = SUMOVehicleParserHelper::parseFlowAttributes(vehicleTag, SUMOSAXAttrs, false, true, 0, SUMOTime_MAX);
+                // check flowParameters
+                if (flowParameters) {
+                    myVehicleBaseObject->setVehicleParameter(flowParameters);
+                    myVehicleBaseObject->addStringAttribute(SUMO_ATTR_FROM_TAZ, myPathCreator->getSelectedTAZs().front()->getID());
+                    myVehicleBaseObject->addStringAttribute(SUMO_ATTR_TO_TAZ, myPathCreator->getSelectedTAZs().back()->getID());
+                    // parse vehicle
+                    myRouteHandler.parseSumoBaseObject(myVehicleBaseObject);
+                    // delete flowParameters and base object
+                    delete flowParameters;
+                }
             }
+            // abort path creation
+            myPathCreator->abortPathCreation();
+            // refresh myVehicleAttributes
+            myVehicleAttributes->refreshAttributesCreator();
+            return true;
         }
     }
     return false;
diff -Nru sumo-1.17.0/src/netedit/frames/demand/GNEVehicleFrame.h sumo-1.18.0/src/netedit/frames/demand/GNEVehicleFrame.h
--- sumo-1.17.0/src/netedit/frames/demand/GNEVehicleFrame.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/frames/demand/GNEVehicleFrame.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -26,7 +26,7 @@
 #include 
 #include 
 #include 
-
+class MFXDynamicLabel;
 
 // ===========================================================================
 // class definitions
@@ -65,7 +65,7 @@
         GNEVehicleFrame* myVehicleFrameParent;
 
         /// @brief Label with creation information
-        FXLabel* myInformationLabel;
+        MFXDynamicLabel* myInformationLabel;
     };
 
     /**@brief Constructor
@@ -93,6 +93,9 @@
     /// @brief get vehicle tag selector (needed for transform vehicles)
     GNETagSelector* getVehicleTagSelector() const;
 
+    /// @brief getVehicle Type selectors
+    DemandElementSelector* getTypeSelector() const;
+
     /// @brief get GNEPathCreator module
     GNEPathCreator* getPathCreator() const;
 
diff -Nru sumo-1.17.0/src/netedit/frames/GNEAttributesCreator.cpp sumo-1.18.0/src/netedit/frames/GNEAttributesCreator.cpp
--- sumo-1.17.0/src/netedit/frames/GNEAttributesCreator.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/frames/GNEAttributesCreator.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -18,6 +18,7 @@
 // Attribute creator
 /****************************************************************************/
 
+#include 
 #include 
 #include 
 #include 
diff -Nru sumo-1.17.0/src/netedit/frames/GNEAttributesCreator.h sumo-1.18.0/src/netedit/frames/GNEAttributesCreator.h
--- sumo-1.17.0/src/netedit/frames/GNEAttributesCreator.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/frames/GNEAttributesCreator.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/frames/GNEAttributesCreatorRow.cpp sumo-1.18.0/src/netedit/frames/GNEAttributesCreatorRow.cpp
--- sumo-1.17.0/src/netedit/frames/GNEAttributesCreatorRow.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/frames/GNEAttributesCreatorRow.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -19,6 +19,7 @@
 /****************************************************************************/
 #include 
 
+#include 
 #include 
 #include 
 #include 
diff -Nru sumo-1.17.0/src/netedit/frames/GNEAttributesCreatorRow.h sumo-1.18.0/src/netedit/frames/GNEAttributesCreatorRow.h
--- sumo-1.17.0/src/netedit/frames/GNEAttributesCreatorRow.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/frames/GNEAttributesCreatorRow.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/frames/GNEConsecutiveSelector.cpp sumo-1.18.0/src/netedit/frames/GNEConsecutiveSelector.cpp
--- sumo-1.17.0/src/netedit/frames/GNEConsecutiveSelector.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/frames/GNEConsecutiveSelector.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/frames/GNEConsecutiveSelector.h sumo-1.18.0/src/netedit/frames/GNEConsecutiveSelector.h
--- sumo-1.17.0/src/netedit/frames/GNEConsecutiveSelector.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/frames/GNEConsecutiveSelector.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/frames/GNEDemandSelector.cpp sumo-1.18.0/src/netedit/frames/GNEDemandSelector.cpp
--- sumo-1.17.0/src/netedit/frames/GNEDemandSelector.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/frames/GNEDemandSelector.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -264,12 +264,16 @@
             return lastPersonPlan->getParentEdges().back();
         // person trips
         case GNE_TAG_PERSONTRIP_BUSSTOP:
+        case GNE_TAG_PERSONTRIP_TRAINSTOP:
         // person trips
         case GNE_TAG_RIDE_BUSSTOP:
+        case GNE_TAG_RIDE_TRAINSTOP:
         // walks
         case GNE_TAG_WALK_BUSSTOP:
+        case GNE_TAG_WALK_TRAINSTOP:
         // stops
         case GNE_TAG_STOPPERSON_BUSSTOP:
+        case GNE_TAG_STOPPERSON_TRAINSTOP:
             return lastPersonPlan->getParentAdditionals().back()->getParentLanes().front()->getParentEdge();
         // route walks
         case GNE_TAG_WALK_ROUTE:
diff -Nru sumo-1.17.0/src/netedit/frames/GNEDemandSelector.h sumo-1.18.0/src/netedit/frames/GNEDemandSelector.h
--- sumo-1.17.0/src/netedit/frames/GNEDemandSelector.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/frames/GNEDemandSelector.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/frames/GNEDrawingShape.cpp sumo-1.18.0/src/netedit/frames/GNEDrawingShape.cpp
--- sumo-1.17.0/src/netedit/frames/GNEDrawingShape.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/frames/GNEDrawingShape.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -20,6 +20,7 @@
 #include 
 
 #include 
+#include 
 #include 
 #include 
 
@@ -55,15 +56,11 @@
     // create information label
     std::ostringstream information;
     information
-            << TL("- 'Start drawing' or ENTER") << "\n"
-            << TL("  to create shape.") << "\n"
-            << TL("- 'Stop drawing' or ENTER to") << "\n"
-            << TL("  finish shape creation.") << "\n"
-            << TL("- 'Abort drawing' or ESC to") << "\n"
-            << TL("  abort shape creation.") << "\n"
-            << TL("- 'Shift + Click' to remove") << "\n"
-            << TL("  last inserted point.");
-    myInformationLabel = new FXLabel(getCollapsableFrame(), information.str().c_str(), 0, GUIDesignLabelFrameInformation);
+            << "- " << TL("'Start drawing' or ENTER to create a shape.") << "\n"
+            << "- " << TL("'Stop drawing' or ENTER to finish shape creation.") << "\n"
+            << "- " << TL("'Abort drawing' or ESC to abort shape creation.") << "\n"
+            << "- " << TL("'Shift + Click' to remove the last inserted point.");
+    myInformationLabel = new MFXDynamicLabel(getCollapsableFrame(), information.str().c_str(), 0, GUIDesignLabelFrameInformation);
     // disable stop and abort functions as init
     myStopDrawingButton->disable();
     myAbortDrawingButton->disable();
diff -Nru sumo-1.17.0/src/netedit/frames/GNEDrawingShape.h sumo-1.18.0/src/netedit/frames/GNEDrawingShape.h
--- sumo-1.17.0/src/netedit/frames/GNEDrawingShape.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/frames/GNEDrawingShape.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/frames/GNEE2DetectorLegendModule.cpp sumo-1.18.0/src/netedit/frames/GNEE2DetectorLegendModule.cpp
--- sumo-1.17.0/src/netedit/frames/GNEE2DetectorLegendModule.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/frames/GNEE2DetectorLegendModule.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/frames/GNEE2DetectorLegendModule.h sumo-1.18.0/src/netedit/frames/GNEE2DetectorLegendModule.h
--- sumo-1.17.0/src/netedit/frames/GNEE2DetectorLegendModule.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/frames/GNEE2DetectorLegendModule.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/frames/GNEElementTree.cpp sumo-1.18.0/src/netedit/frames/GNEElementTree.cpp
--- sumo-1.17.0/src/netedit/frames/GNEElementTree.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/frames/GNEElementTree.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -73,8 +73,8 @@
     myClickedDataSet(nullptr),
     myClickedDataInterval(nullptr),
     myClickedGenericData(nullptr) {
-    // Create tree list
-    myTreeListDynamic = new MFXTreeListDynamic(getCollapsableFrame(), this, MID_GNE_ACHIERARCHY_SHOWCHILDMENU, GUIDesignTreeListDinamic);
+    // Create tree list with fixed height
+    myTreeListDynamic = new MFXTreeListDynamic(getCollapsableFrame(), this, MID_GNE_ACHIERARCHY_SHOWCHILDMENU, GUIDesignTreeListFixedHeight);
     hide();
 }
 
@@ -315,7 +315,7 @@
         // create center menu command
         FXMenuCommand* centerMenuCommand = GUIDesigns::buildFXMenuCommand(pane, TL("Center"), GUIIconSubSys::getIcon(GUIIcon::RECENTERVIEW), this, MID_GNE_CENTER);
         // disable Centering for Vehicle Types, data sets and data intervals
-        if (myClickedAC->getTagProperty().isVehicleType() || (myClickedAC->getTagProperty().getTag() == SUMO_TAG_DATASET) ||
+        if (myClickedAC->getTagProperty().isType() || (myClickedAC->getTagProperty().getTag() == SUMO_TAG_DATASET) ||
                 (myClickedAC->getTagProperty().getTag() == SUMO_TAG_DATAINTERVAL)) {
             centerMenuCommand->disable();
         }
diff -Nru sumo-1.17.0/src/netedit/frames/GNEElementTree.h sumo-1.18.0/src/netedit/frames/GNEElementTree.h
--- sumo-1.17.0/src/netedit/frames/GNEElementTree.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/frames/GNEElementTree.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/frames/GNEFlowEditor.cpp sumo-1.18.0/src/netedit/frames/GNEFlowEditor.cpp
--- sumo-1.17.0/src/netedit/frames/GNEFlowEditor.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/frames/GNEFlowEditor.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -19,6 +19,7 @@
 /****************************************************************************/
 #include 
 
+#include 
 #include 
 #include 
 #include 
diff -Nru sumo-1.17.0/src/netedit/frames/GNEFlowEditor.h sumo-1.18.0/src/netedit/frames/GNEFlowEditor.h
--- sumo-1.17.0/src/netedit/frames/GNEFlowEditor.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/frames/GNEFlowEditor.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/frames/GNEFrameAttributeModules.cpp sumo-1.18.0/src/netedit/frames/GNEFrameAttributeModules.cpp
--- sumo-1.17.0/src/netedit/frames/GNEFrameAttributeModules.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/frames/GNEFrameAttributeModules.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -19,6 +19,7 @@
 /****************************************************************************/
 #include 
 
+#include 
 #include 
 #include 
 #include 
@@ -27,6 +28,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -60,11 +62,17 @@
     FXMAPFUNC(SEL_COMMAND,  MID_GNE_SET_ATTRIBUTE,          GNEFrameAttributeModules::GenericDataAttributes::onCmdSetParameters)
 };
 
+FXDEFMAP(GNEFrameAttributeModules::ParametersEditor) ParametersEditorMap[] = {
+    FXMAPFUNC(SEL_COMMAND,  MID_GNE_OPEN_PARAMETERS_DIALOG, GNEFrameAttributeModules::ParametersEditor::onCmdEditParameters),
+    FXMAPFUNC(SEL_COMMAND,  MID_GNE_SET_ATTRIBUTE,          GNEFrameAttributeModules::ParametersEditor::onCmdSetParameters)
+};
+
 // Object implementation
-FXIMPLEMENT(GNEFrameAttributeModules::AttributesEditorRow,          FXHorizontalFrame,       AttributesEditorRowMap,        ARRAYNUMBER(AttributesEditorRowMap))
-FXIMPLEMENT(GNEFrameAttributeModules::AttributesEditor,             MFXGroupBoxModule,       AttributesEditorMap,           ARRAYNUMBER(AttributesEditorMap))
-FXIMPLEMENT(GNEFrameAttributeModules::AttributesEditorExtended,     MFXGroupBoxModule,       AttributesEditorExtendedMap,   ARRAYNUMBER(AttributesEditorExtendedMap))
-FXIMPLEMENT(GNEFrameAttributeModules::GenericDataAttributes,        MFXGroupBoxModule,       GenericDataAttributesMap,      ARRAYNUMBER(GenericDataAttributesMap))
+FXIMPLEMENT(GNEFrameAttributeModules::AttributesEditorRow,          FXHorizontalFrame,      AttributesEditorRowMap,         ARRAYNUMBER(AttributesEditorRowMap))
+FXIMPLEMENT(GNEFrameAttributeModules::AttributesEditor,             MFXGroupBoxModule,      AttributesEditorMap,            ARRAYNUMBER(AttributesEditorMap))
+FXIMPLEMENT(GNEFrameAttributeModules::AttributesEditorExtended,     MFXGroupBoxModule,      AttributesEditorExtendedMap,    ARRAYNUMBER(AttributesEditorExtendedMap))
+FXIMPLEMENT(GNEFrameAttributeModules::GenericDataAttributes,        MFXGroupBoxModule,      GenericDataAttributesMap,       ARRAYNUMBER(GenericDataAttributesMap))
+FXIMPLEMENT(GNEFrameAttributeModules::ParametersEditor,             MFXGroupBoxModule,      ParametersEditorMap,            ARRAYNUMBER(ParametersEditorMap))
 
 
 // ===========================================================================
@@ -294,11 +302,14 @@
                 myValueChoicesComboBox->show();
             }
         } else if (ACParent && myACAttr.isVType() && (myACAttr.getAttr() == SUMO_ATTR_TYPE)) {
-            // fill comboBox with vTypes
+            // fill comboBox with vTypes and vType distributions
             myValueChoicesComboBox->clearItems();
             for (const auto& vType : ACParent->getNet()->getAttributeCarriers()->getDemandElements().at(SUMO_TAG_VTYPE)) {
                 myValueChoicesComboBox->appendIconItem(vType->getID().c_str(), vType->getACIcon());
             }
+            for (const auto& vType : ACParent->getNet()->getAttributeCarriers()->getDemandElements().at(SUMO_TAG_VTYPE_DISTRIBUTION)) {
+                myValueChoicesComboBox->appendIconItem(vType->getID().c_str(), vType->getACIcon());
+            }
             // show only 10 vtypes
             myValueChoicesComboBox->setNumVisible(myValueChoicesComboBox->getNumItems() < 10 ? myValueChoicesComboBox->getNumItems() : 10);
             const int itemIndex = myValueChoicesComboBox->findItem(value.c_str());
@@ -384,6 +395,9 @@
         for (const auto& vType : ACParent->getNet()->getAttributeCarriers()->getDemandElements().at(SUMO_TAG_VTYPE)) {
             myValueChoicesComboBox->appendIconItem(vType->getID().c_str(), vType->getACIcon());
         }
+        for (const auto& vType : ACParent->getNet()->getAttributeCarriers()->getDemandElements().at(SUMO_TAG_VTYPE_DISTRIBUTION)) {
+            myValueChoicesComboBox->appendIconItem(vType->getID().c_str(), vType->getACIcon());
+        }
         // show only 10 vtypes
         myValueChoicesComboBox->setNumVisible(myValueChoicesComboBox->getNumItems() < 10 ? myValueChoicesComboBox->getNumItems() : 10);
         myValueChoicesComboBox->setCurrentItem(myValueChoicesComboBox->findItem(value.c_str()));
@@ -628,8 +642,6 @@
                 myValueTextField->setTextColor(FXRGB(0, 0, 0));
                 myValueTextField->setBackColor(FXRGB(255, 255, 255));
                 myValueTextField->killFocus();
-                // in this case, we need to refresh the other values (For example, allow/Disallow objects)
-                myAttributesEditorParent->refreshAttributeEditor(false, false);
             } else if (myACAttr.isDiscrete()) {
                 myValueChoicesComboBox->setTextColor(FXRGB(0, 0, 0));
                 myValueChoicesComboBox->setBackColor(FXRGB(255, 255, 255));
@@ -639,6 +651,8 @@
                 myValueTextField->setBackColor(FXRGB(255, 255, 255));
                 myValueTextField->killFocus();
             }
+            // in this case, we need to refresh the other values (For example, allow/Disallow objects)
+            myAttributesEditorParent->refreshAttributeEditor(false, false);
             // update frame parent after attribute successfully set
             myAttributesEditorParent->getFrameParent()->attributeUpdated(myACAttr.getAttr());
         }
@@ -750,7 +764,7 @@
 
 
 void
-GNEFrameAttributeModules::AttributesEditor::showAttributeEditorModule(bool includeExtended, bool forceAttributeEnabled) {
+GNEFrameAttributeModules::AttributesEditor::showAttributeEditorModule(bool includeExtended) {
     myIncludeExtended = includeExtended;
     // first remove all rows
     for (auto& row : myAttributesEditorRows) {
@@ -807,6 +821,14 @@
                 if (attributeEnabled == false) {
                     value = ACs.front()->getAlternativeValueForDisabledAttributes(attrProperty.getAttr());
                 }
+                // for types, the following attributes must be always enabled
+                if (ACs.front()->getTagProperty().isType() &&
+                        ((attrProperty.getAttr() == SUMO_ATTR_LENGTH) ||
+                         (attrProperty.getAttr() == SUMO_ATTR_MINGAP) ||
+                         (attrProperty.getAttr() == SUMO_ATTR_MAXSPEED) ||
+                         (attrProperty.getAttr() == SUMO_ATTR_DESIRED_MAXSPEED))) {
+                    attributeEnabled = true;
+                }
                 // extra check for Triggered and container Triggered
                 if (ACs.front()->getTagProperty().isStop() || ACs.front()->getTagProperty().isStopPerson()) {
                     if ((attrProperty.getAttr() == SUMO_ATTR_EXPECTED) && (ACs.front()->isAttributeEnabled(SUMO_ATTR_TRIGGERED) == false)) {
@@ -815,19 +837,16 @@
                         attributeEnabled = false;
                     }
                 }
-                // if forceAttributeEnabled is enabled, force attributeEnabled (except for ID)
-                if (forceAttributeEnabled && (attrProperty.getAttr() != SUMO_ATTR_ID)) {
-                    attributeEnabled = true;
-                }
                 // check if this attribute is computed
                 const bool computed = (ACs.size() > 1) ? false : ACs.front()->isAttributeComputed(attrProperty.getAttr());
                 // if is a Vtype, obtain icon
                 GNEAttributeCarrier* ACParent = nullptr;
                 if ((ACs.size() == 1) && attrProperty.isVType()) {
                     if (attrProperty.getAttr() == SUMO_ATTR_TYPE) {
-                        ACParent = myFrameParent->getViewNet()->getNet()->getAttributeCarriers()->retrieveDemandElement(SUMO_TAG_VTYPE, ACs.front()->getAttribute(SUMO_ATTR_TYPE));
-                    } else if (ACs.front()->getAttribute(GNE_ATTR_VTYPE_DISTRIBUTION).size() > 0) {
-                        ACParent = myFrameParent->getViewNet()->getNet()->getAttributeCarriers()->retrieveDemandElement(SUMO_TAG_VTYPE_DISTRIBUTION, ACs.front()->getAttribute(GNE_ATTR_VTYPE_DISTRIBUTION));
+                        ACParent = myFrameParent->getViewNet()->getNet()->getAttributeCarriers()->retrieveDemandElement(SUMO_TAG_VTYPE, ACs.front()->getAttribute(SUMO_ATTR_TYPE), false);
+                        if (ACParent == nullptr) {
+                            ACParent = myFrameParent->getViewNet()->getNet()->getAttributeCarriers()->retrieveDemandElement(SUMO_TAG_VTYPE_DISTRIBUTION, ACs.front()->getAttribute(SUMO_ATTR_TYPE), false);
+                        }
                     }
                 }
                 // create attribute editor row
@@ -901,6 +920,14 @@
                 std::string value = oss.str();
                 // declare a flag for enabled attributes
                 bool attributeEnabled = ACs.front()->isAttributeEnabled(attrProperty.getAttr());
+                // for types, the following attributes must be always enabled
+                if (ACs.front()->getTagProperty().isType() &&
+                        ((attrProperty.getAttr() == SUMO_ATTR_LENGTH) ||
+                         (attrProperty.getAttr() == SUMO_ATTR_MINGAP) ||
+                         (attrProperty.getAttr() == SUMO_ATTR_MAXSPEED) ||
+                         (attrProperty.getAttr() == SUMO_ATTR_DESIRED_MAXSPEED))) {
+                    attributeEnabled = true;
+                }
                 // overwrite value if attribute is disabled (used by LinkIndex)
                 if (attributeEnabled == false) {
                     value = ACs.front()->getAlternativeValueForDisabledAttributes(attrProperty.getAttr());
@@ -920,11 +947,14 @@
                     myAttributesEditorRows[attrProperty.getPositionListed()]->refreshAttributesEditorRow(value, true, attributeEnabled, computed, nullptr);
                 } else if ((attrProperty.getAttr()  == SUMO_ATTR_POSITION) && forceRefreshPosition) {
                     myAttributesEditorRows[attrProperty.getPositionListed()]->refreshAttributesEditorRow(value, true, attributeEnabled, computed, nullptr);
-                } else if (attrProperty.getAttr()  == SUMO_ATTR_TYPE && (attrProperty.getTagPropertyParent().isVehicle() || attrProperty.getTagPropertyParent().isPerson() ||
+                } else if (attrProperty.isVType() && (attrProperty.getTagPropertyParent().isVehicle() || attrProperty.getTagPropertyParent().isPerson() ||
                            attrProperty.getTagPropertyParent().isContainer())) {
-                    // update vType parent
-                    auto vTypeParent = myFrameParent->getViewNet()->getNet()->getAttributeCarriers()->retrieveDemandElement(SUMO_TAG_VTYPE, ACs.front()->getAttribute(SUMO_ATTR_TYPE), false);
-                    myAttributesEditorRows[attrProperty.getPositionListed()]->refreshAttributesEditorRow(value, false, attributeEnabled, computed, vTypeParent);
+                    // get type/distribution parent
+                    auto typeParent = myFrameParent->getViewNet()->getNet()->getAttributeCarriers()->retrieveDemandElement(SUMO_TAG_VTYPE, ACs.front()->getAttribute(SUMO_ATTR_TYPE), false);
+                    if (typeParent == nullptr) {
+                        typeParent = myFrameParent->getViewNet()->getNet()->getAttributeCarriers()->retrieveDemandElement(SUMO_TAG_VTYPE_DISTRIBUTION, ACs.front()->getAttribute(SUMO_ATTR_TYPE), false);
+                    }
+                    myAttributesEditorRows[attrProperty.getPositionListed()]->refreshAttributesEditorRow(value, false, attributeEnabled, computed, typeParent);
                 } else {
                     // Refresh attributes maintain invalid values
                     myAttributesEditorRows[attrProperty.getPositionListed()]->refreshAttributesEditorRow(value, false, attributeEnabled, computed, nullptr);
@@ -1138,6 +1168,264 @@
     }
     return 1;
 }
+
+// ---------------------------------------------------------------------------
+// GNEFrameAttributeModules::ParametersEditor - methods
+// ---------------------------------------------------------------------------
+
+GNEFrameAttributeModules::ParametersEditor::ParametersEditor(GNEInspectorFrame* inspectorFrameParent) :
+    MFXGroupBoxModule(inspectorFrameParent, TL("Parameters")),
+    myInspectorFrameParent(inspectorFrameParent) {
+    // create textfield and buttons
+    myTextFieldParameters = new FXTextField(getCollapsableFrame(), GUIDesignTextFieldNCol, this, MID_GNE_SET_ATTRIBUTE, GUIDesignTextField);
+    myButtonEditParameters = new FXButton(getCollapsableFrame(), TL("Edit parameters"), nullptr, this, MID_GNE_OPEN_PARAMETERS_DIALOG, GUIDesignButton);
+}
+
+
+GNEFrameAttributeModules::ParametersEditor::ParametersEditor(GNETypeFrame* typeFrameParent) :
+    MFXGroupBoxModule(typeFrameParent, TL("Parameters")),
+    myTypeFrameParent(typeFrameParent) {
+    // create textfield and buttons
+    myTextFieldParameters = new FXTextField(getCollapsableFrame(), GUIDesignTextFieldNCol, this, MID_GNE_SET_ATTRIBUTE, GUIDesignTextField);
+    myButtonEditParameters = new FXButton(getCollapsableFrame(), TL("Edit parameters"), nullptr, this, MID_GNE_OPEN_PARAMETERS_DIALOG, GUIDesignButton);
+}
+
+
+GNEFrameAttributeModules::ParametersEditor::~ParametersEditor() {}
+
+
+GNEViewNet*
+GNEFrameAttributeModules::ParametersEditor::getViewNet() const {
+    return myInspectorFrameParent ? myInspectorFrameParent->getViewNet() : myTypeFrameParent->getViewNet();
+}
+
+
+void
+GNEFrameAttributeModules::ParametersEditor::showParametersEditor() {
+    if (myInspectorFrameParent) {
+        // get inspected ACs
+        const auto& inspectedACs = myInspectorFrameParent->getViewNet()->getInspectedAttributeCarriers();
+        if ((inspectedACs.size() > 0) && inspectedACs.front()->getTagProperty().hasParameters()) {
+            // refresh ParametersEditor
+            refreshParametersEditor();
+            // show groupbox
+            show();
+        } else {
+            hideParametersEditor();
+        }
+    } else if (myTypeFrameParent) {
+        if (myTypeFrameParent->getTypeSelector()->getCurrentType() != nullptr) {
+            /// refresh ParametersEditor
+            refreshParametersEditor();
+            // show groupbox
+            show();
+        } else {
+            hideParametersEditor();
+        }
+    } else {
+        hideParametersEditor();
+    }
+}
+
+
+void
+GNEFrameAttributeModules::ParametersEditor::hideParametersEditor() {
+    // hide groupbox
+    hide();
+}
+
+
+void
+GNEFrameAttributeModules::ParametersEditor::refreshParametersEditor() {
+    if (myInspectorFrameParent) {
+        // get inspected ACs
+        const auto& inspectedACs = myInspectorFrameParent->getViewNet()->getInspectedAttributeCarriers();
+        // get front AC
+        const GNEAttributeCarrier* frontAC = inspectedACs.size() > 0 ? inspectedACs.front() : nullptr;
+        // continue depending of frontAC
+        if (frontAC && frontAC->getTagProperty().hasParameters()) {
+            // check if we're editing a single or a multiple AC
+            if (inspectedACs.size() == 1) {
+                // set text field parameters
+                myTextFieldParameters->setText(frontAC->getAttribute(GNE_ATTR_PARAMETERS).c_str());
+            } else if (inspectedACs.size() > 0) {
+                // check if parameters of all inspected ACs are different
+                std::string parameters = frontAC->getAttribute(GNE_ATTR_PARAMETERS);
+                for (const auto& AC : inspectedACs) {
+                    if (parameters != AC->getAttribute(GNE_ATTR_PARAMETERS)) {
+                        parameters = "different parameters";
+                    }
+                }
+                // set text field
+                myTextFieldParameters->setText(parameters.c_str());
+            }
+            // reset color
+            myTextFieldParameters->setTextColor(FXRGB(0, 0, 0));
+            // disable myTextFieldParameters if Tag correspond to an network element but we're in demand mode (or vice versa), disable all elements
+            if (GNEFrameAttributeModules::isSupermodeValid(myInspectorFrameParent->getViewNet(), frontAC)) {
+                myTextFieldParameters->enable();
+                myButtonEditParameters->enable();
+            } else {
+                myTextFieldParameters->disable();
+                myButtonEditParameters->disable();
+            }
+        }
+    } else if (myTypeFrameParent) {
+        // get type
+        GNEDemandElement* type = myTypeFrameParent->getTypeSelector()->getCurrentType();
+        // continue depending of frontAC
+        if (type) {
+            // set text field parameters
+            myTextFieldParameters->setText(type->getAttribute(GNE_ATTR_PARAMETERS).c_str());
+            // reset color
+            myTextFieldParameters->setTextColor(FXRGB(0, 0, 0));
+            // disable myTextFieldParameters if Tag correspond to an network element but we're in demand mode (or vice versa), disable all elements
+            if (GNEFrameAttributeModules::isSupermodeValid(myTypeFrameParent->getViewNet(), type)) {
+                myTextFieldParameters->enable();
+                myButtonEditParameters->enable();
+            } else {
+                myTextFieldParameters->disable();
+                myButtonEditParameters->disable();
+            }
+        }
+    }
+}
+
+
+GNEInspectorFrame*
+GNEFrameAttributeModules::ParametersEditor::getInspectorFrameParent() const {
+    return myInspectorFrameParent;
+}
+
+
+GNETypeFrame*
+GNEFrameAttributeModules::ParametersEditor::getTypeFrameParent() const {
+    return myTypeFrameParent;
+}
+
+
+long
+GNEFrameAttributeModules::ParametersEditor::onCmdEditParameters(FXObject*, FXSelector, void*) {
+    if (myInspectorFrameParent) {
+        // get inspected ACs
+        const auto& inspectedACs = myInspectorFrameParent->getViewNet()->getInspectedAttributeCarriers();
+        // get front AC
+        const GNEAttributeCarrier* frontAC = inspectedACs.size() > 0 ? inspectedACs.front() : nullptr;
+        // continue depending of frontAC
+        if (frontAC && frontAC->getTagProperty().hasParameters()) {
+            if (inspectedACs.size() > 1) {
+                // write debug information
+                WRITE_DEBUG("Open multiple parameters dialog");
+                // open multiple parameters dialog
+                if (GNEMultipleParametersDialog(this).execute()) {
+                    // write debug information
+                    WRITE_DEBUG("Close multiple parameters dialog");
+                    // update frame parent after attribute successfully set
+                    myInspectorFrameParent->attributeUpdated(GNE_ATTR_PARAMETERS);
+                    // Refresh parameter EditorInspector
+                    refreshParametersEditor();
+                } else {
+                    // write debug information
+                    WRITE_DEBUG("Cancel multiple parameters dialog");
+                }
+            } else {
+                // write debug information
+                WRITE_DEBUG("Open single parameters dialog");
+                if (GNESingleParametersDialog(this).execute()) {
+                    // write debug information
+                    WRITE_DEBUG("Close single parameters dialog");
+                    // update frame parent after attribute successfully set
+                    myInspectorFrameParent->attributeUpdated(GNE_ATTR_PARAMETERS);
+                    // Refresh parameter EditorInspector
+                    refreshParametersEditor();
+                } else {
+                    // write debug information
+                    WRITE_DEBUG("Cancel single parameters dialog");
+                }
+            }
+        }
+    } else if (myTypeFrameParent) {
+        // get type
+        GNEDemandElement* type = myTypeFrameParent->getTypeSelector()->getCurrentType();
+        // continue depending of type
+        if (type) {
+            // write debug information
+            WRITE_DEBUG("Open single parameters dialog");
+            if (GNESingleParametersDialog(this).execute()) {
+                // write debug information
+                WRITE_DEBUG("Close single parameters dialog");
+                // Refresh parameter EditorInspector
+                refreshParametersEditor();
+            } else {
+                // write debug information
+                WRITE_DEBUG("Cancel single parameters dialog");
+            }
+        }
+    }
+    return 1;
+}
+
+
+long
+GNEFrameAttributeModules::ParametersEditor::onCmdSetParameters(FXObject*, FXSelector, void*) {
+    if (myInspectorFrameParent) {
+        const auto& inspectedACs = myInspectorFrameParent->getAttributesEditor()->getFrameParent()->getViewNet()->getInspectedAttributeCarriers();
+        // get front AC
+        GNEAttributeCarrier* frontAC = inspectedACs.size() > 0 ? inspectedACs.front() : nullptr;
+        // continue depending of frontAC
+        if (frontAC && frontAC->getTagProperty().hasParameters()) {
+            // check if current given string is valid
+            if (frontAC->isValid(GNE_ATTR_PARAMETERS, myTextFieldParameters->getText().text())) {
+                // parsed parameters ok, then set text field black and continue
+                myTextFieldParameters->setTextColor(FXRGB(0, 0, 0));
+                myTextFieldParameters->killFocus();
+                // check inspected parameters
+                if (inspectedACs.size() == 1) {
+                    // begin undo list
+                    myInspectorFrameParent->getViewNet()->getUndoList()->begin(frontAC->getTagProperty().getGUIIcon(), "change parameters");
+                    // set parameters
+                    frontAC->setACParameters(myTextFieldParameters->getText().text(), myInspectorFrameParent->getViewNet()->getUndoList());
+                    // end undo list
+                    myInspectorFrameParent->getViewNet()->getUndoList()->end();
+                } else if (inspectedACs.size() > 0) {
+                    // begin undo list
+                    myInspectorFrameParent->getViewNet()->getUndoList()->begin(frontAC->getTagProperty().getGUIIcon(), "change multiple parameters");
+                    // set parameters in all ACs
+                    for (const auto& inspectedAC : inspectedACs) {
+                        inspectedAC->setACParameters(myTextFieldParameters->getText().text(), myInspectorFrameParent->getViewNet()->getUndoList());
+                    }
+                    // end undo list
+                    myInspectorFrameParent->getViewNet()->getUndoList()->end();
+                }
+                // update frame parent after attribute successfully set
+                myInspectorFrameParent->attributeUpdated(GNE_ATTR_PARAMETERS);
+            } else {
+                myTextFieldParameters->setTextColor(FXRGB(255, 0, 0));
+            }
+        }
+    } else if (myTypeFrameParent) {
+        // get type
+        GNEDemandElement* type = myTypeFrameParent->getTypeSelector()->getCurrentType();
+        // continue depending of frontAC
+        if (type) {
+            // check if current given string is valid
+            if (type->isValid(GNE_ATTR_PARAMETERS, myTextFieldParameters->getText().text())) {
+                // parsed parameters ok, then set text field black and continue
+                myTextFieldParameters->setTextColor(FXRGB(0, 0, 0));
+                myTextFieldParameters->killFocus();
+                // begin undo list
+                myTypeFrameParent->getViewNet()->getUndoList()->begin(type->getTagProperty().getGUIIcon(), "change parameters");
+                // set parameters
+                type->setACParameters(myTextFieldParameters->getText().text(), myTypeFrameParent->getViewNet()->getUndoList());
+                // end undo list
+                myTypeFrameParent->getViewNet()->getUndoList()->end();
+            } else {
+                myTextFieldParameters->setTextColor(FXRGB(255, 0, 0));
+            }
+        }
+    }
+    return 1;
+}
 
 
 bool
diff -Nru sumo-1.17.0/src/netedit/frames/GNEFrameAttributeModules.h sumo-1.18.0/src/netedit/frames/GNEFrameAttributeModules.h
--- sumo-1.17.0/src/netedit/frames/GNEFrameAttributeModules.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/frames/GNEFrameAttributeModules.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -36,6 +36,8 @@
 class GNEFrame;
 class GNEViewParent;
 class GNEFlowEditor;
+class GNEInspectorFrame;
+class GNETypeFrame;
 
 // ===========================================================================
 // class definitions
@@ -147,7 +149,7 @@
         AttributesEditor(GNEFrame* inspectorFrameParent);
 
         /// @brief show attributes of multiple ACs
-        void showAttributeEditorModule(bool includeExtended, bool forceAttributeEnabled);
+        void showAttributeEditorModule(bool includeExtended);
 
         /// @brief hide attribute editor
         void hideAttributesEditorModule();
@@ -283,6 +285,69 @@
 
         /// @brief text field for write parameters
         FXTextField* myTextFieldParameters = nullptr;
+
+        /// @brief button for edit parameters using specific dialog
+        FXButton* myButtonEditParameters = nullptr;
+    };
+
+    // ===========================================================================
+    // class ParametersEditor
+    // ===========================================================================
+
+    class ParametersEditor : public MFXGroupBoxModule {
+        /// @brief FOX-declaration
+        FXDECLARE(GNEFrameAttributeModules::ParametersEditor)
+
+    public:
+        /// @brief constructor for inspector frame
+        ParametersEditor(GNEInspectorFrame* inspectorFrameParent);
+
+        /// @brief constructor for type frame
+        ParametersEditor(GNETypeFrame* typeFrameParent);
+
+        /// @brief destructor
+        ~ParametersEditor();
+
+        /// @get viewNet
+        GNEViewNet* getViewNet() const;
+
+        /// @brief show netedit attributes EditorInspector
+        void showParametersEditor();
+
+        /// @brief hide netedit attributes EditorInspector
+        void hideParametersEditor();
+
+        /// @brief refresh netedit attributes
+        void refreshParametersEditor();
+
+        /// @brief get inspector frame parent
+        GNEInspectorFrame* getInspectorFrameParent() const;
+
+        /// @brief get type frame parent
+        GNETypeFrame* getTypeFrameParent() const;
+
+        /// @name FOX-callbacks
+        /// @{
+        /// @brief Called when user clicks over add parameter
+        long onCmdEditParameters(FXObject*, FXSelector, void*);
+
+        /// @brief Called when user udpate the parameter text field
+        long onCmdSetParameters(FXObject*, FXSelector, void*);
+        /// @}
+
+    protected:
+        /// @brief FOX need this
+        FOX_CONSTRUCTOR(ParametersEditor)
+
+    private:
+        /// @brief inspector frame parent
+        GNEInspectorFrame* myInspectorFrameParent = nullptr;
+
+        /// @brief type frame parent
+        GNETypeFrame* myTypeFrameParent = nullptr;
+
+        /// @brief text field for write parameters
+        FXTextField* myTextFieldParameters = nullptr;
 
         /// @brief button for edit parameters using specific dialog
         FXButton* myButtonEditParameters = nullptr;
diff -Nru sumo-1.17.0/src/netedit/frames/GNEFrame.cpp sumo-1.18.0/src/netedit/frames/GNEFrame.cpp
--- sumo-1.17.0/src/netedit/frames/GNEFrame.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/frames/GNEFrame.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/frames/GNEFrame.h sumo-1.18.0/src/netedit/frames/GNEFrame.h
--- sumo-1.17.0/src/netedit/frames/GNEFrame.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/frames/GNEFrame.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/frames/GNENeteditAttributes.cpp sumo-1.18.0/src/netedit/frames/GNENeteditAttributes.cpp
--- sumo-1.17.0/src/netedit/frames/GNENeteditAttributes.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/frames/GNENeteditAttributes.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -19,6 +19,7 @@
 /****************************************************************************/
 #include 
 
+#include 
 #include 
 #include 
 #include 
diff -Nru sumo-1.17.0/src/netedit/frames/GNENeteditAttributes.h sumo-1.18.0/src/netedit/frames/GNENeteditAttributes.h
--- sumo-1.17.0/src/netedit/frames/GNENeteditAttributes.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/frames/GNENeteditAttributes.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/frames/GNENetworkSelector.cpp sumo-1.18.0/src/netedit/frames/GNENetworkSelector.cpp
--- sumo-1.17.0/src/netedit/frames/GNENetworkSelector.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/frames/GNENetworkSelector.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/frames/GNENetworkSelector.h sumo-1.18.0/src/netedit/frames/GNENetworkSelector.h
--- sumo-1.17.0/src/netedit/frames/GNENetworkSelector.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/frames/GNENetworkSelector.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/frames/GNEOverlappedInspection.cpp sumo-1.18.0/src/netedit/frames/GNEOverlappedInspection.cpp
--- sumo-1.17.0/src/netedit/frames/GNEOverlappedInspection.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/frames/GNEOverlappedInspection.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/frames/GNEOverlappedInspection.h sumo-1.18.0/src/netedit/frames/GNEOverlappedInspection.h
--- sumo-1.17.0/src/netedit/frames/GNEOverlappedInspection.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/frames/GNEOverlappedInspection.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/frames/GNEPathCreator.cpp sumo-1.18.0/src/netedit/frames/GNEPathCreator.cpp
--- sumo-1.17.0/src/netedit/frames/GNEPathCreator.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/frames/GNEPathCreator.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -23,7 +23,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 #include 
 #include 
 #include 
@@ -149,7 +149,7 @@
     myToStoppingPlace(nullptr),
     myRoute(nullptr) {
     // create label for route info
-    myInfoRouteLabel = new FXLabel(getCollapsableFrame(), TL("No edges selected"), 0, GUIDesignLabelThick(JUSTIFY_LEFT));
+    myInfoRouteLabel = new FXLabel(getCollapsableFrame(), TL("No edges selected"), 0, GUIDesignLabelFrameInformation);
     // create button for use last route
     myUseLastRoute = new FXButton(getCollapsableFrame(), TL("Use last route"), GUIIconSubSys::getIcon(GUIIcon::ROUTE), this, MID_GNE_PATHCREATOR_USELASTROUTE, GUIDesignButton);
     myUseLastRoute->disable();
@@ -254,6 +254,12 @@
             myCreationMode |= END_JUNCTION;
             myCreationMode |= ONLY_FROMTO;
             break;
+        case GNE_TAG_TRIP_TAZS:
+        case GNE_TAG_FLOW_TAZS:
+            myCreationMode |= START_TAZ;
+            myCreationMode |= END_TAZ;
+            myCreationMode |= ONLY_FROMTO;
+            break;
         // edges
         case GNE_TAG_WALK_EDGES:
         case GNE_TAG_TRANSHIP_EDGES:
@@ -281,6 +287,15 @@
             myCreationMode |= START_EDGE;
             myCreationMode |= END_BUSSTOP;
             break;
+        // edge->trainStop
+        case GNE_TAG_PERSONTRIP_TRAINSTOP:
+        case GNE_TAG_RIDE_TRAINSTOP:
+        case GNE_TAG_WALK_TRAINSTOP:
+            myCreationMode |= SHOW_CANDIDATE_EDGES;
+            myCreationMode |= ONLY_FROMTO;
+            myCreationMode |= START_EDGE;
+            myCreationMode |= END_TRAINSTOP;
+            break;
         // edge->containerStop
         case GNE_TAG_TRANSPORT_CONTAINERSTOP:
         case GNE_TAG_TRANSHIP_CONTAINERSTOP:
@@ -302,6 +317,10 @@
             myCreationMode |= STOP;
             myCreationMode |= END_BUSSTOP;
             break;
+        case GNE_TAG_STOPPERSON_TRAINSTOP:
+            myCreationMode |= STOP;
+            myCreationMode |= END_TRAINSTOP;
+            break;
         case GNE_TAG_STOPCONTAINER_CONTAINERSTOP:
             myCreationMode |= STOP;
             myCreationMode |= END_CONTAINERSTOP;
@@ -361,7 +380,7 @@
 
 
 bool
-GNEPathCreator::addJunction(GNEJunction* junction, const bool /* shiftKeyPressed */, const bool /* controlKeyPressed */) {
+GNEPathCreator::addJunction(GNEJunction* junction) {
     // check if junctions are allowed
     if (((myCreationMode & START_JUNCTION) == 0) && ((myCreationMode & END_JUNCTION) == 0)) {
         return false;
@@ -408,6 +427,49 @@
 
 
 bool
+GNEPathCreator::addTAZ(GNETAZ* TAZ) {
+    // check if TAZs are allowed
+    if (((myCreationMode & START_TAZ) == 0) && ((myCreationMode & END_TAZ) == 0)) {
+        return false;
+    }
+    // continue depending of number of selected edge
+    if (mySelectedTAZs.size() > 0) {
+        // check double TAZs
+        if (mySelectedTAZs.back() == TAZ) {
+            // Write warning
+            WRITE_WARNING(TL("Double TAZs aren't allowed"));
+            // abort add TAZ
+            return false;
+        }
+    }
+    // check number of TAZs
+    if (mySelectedTAZs.size() == 2 && (myCreationMode & Mode::ONLY_FROMTO)) {
+        // Write warning
+        WRITE_WARNING(TL("Only two TAZs are allowed"));
+        // abort add TAZ
+        return false;
+    }
+    // All checks ok, then add it in selected elements
+    mySelectedTAZs.push_back(TAZ);
+    // enable abort route button
+    myAbortCreationButton->enable();
+    // enable finish button
+    myFinishCreationButton->enable();
+    // disable undo/redo
+    myFrameParent->getViewNet()->getViewParent()->getGNEAppWindows()->disableUndoRedo(TL("route creation"));
+    // enable or disable remove last TAZ button
+    if (mySelectedTAZs.size() > 1) {
+        myRemoveLastInsertedElement->enable();
+    } else {
+        myRemoveLastInsertedElement->disable();
+    }
+    // update info route label
+    updateInfoRouteLabel();
+    return true;
+}
+
+
+bool
 GNEPathCreator::addEdge(GNEEdge* edge, const bool shiftKeyPressed, const bool controlKeyPressed) {
     // check if edges are allowed
     if (((myCreationMode & START_EDGE) == 0) && ((myCreationMode & END_EDGE) == 0)) {
@@ -511,18 +573,27 @@
 }
 
 
+const std::vector&
+GNEPathCreator::getSelectedTAZs() const {
+    return mySelectedTAZs;
+}
+
+
 bool
 GNEPathCreator::addStoppingPlace(GNEAdditional* stoppingPlace, const bool /*shiftKeyPressed*/, const bool /*controlKeyPressed*/) {
     if (stoppingPlace == nullptr) {
         return false;
     }
-    // check if stoppingPlaces aren allowed
-    if (((myCreationMode & END_BUSSTOP) == 0) && ((myCreationMode & END_CONTAINERSTOP) == 0)) {
+    // check if stoppingPlaces are allowed
+    if (((myCreationMode & END_BUSSTOP) == 0) && ((myCreationMode & END_TRAINSTOP) == 0) && ((myCreationMode & END_CONTAINERSTOP) == 0)) {
         return false;
     }
     if (((myCreationMode & END_BUSSTOP) != 0) && (stoppingPlace->getTagProperty().getTag() != SUMO_TAG_BUS_STOP)) {
         return false;
     }
+    if (((myCreationMode & END_TRAINSTOP) != 0) && (stoppingPlace->getTagProperty().getTag() != SUMO_TAG_TRAIN_STOP)) {
+        return false;
+    }
     if (((myCreationMode & END_CONTAINERSTOP) != 0) && (stoppingPlace->getTagProperty().getTag() != SUMO_TAG_CONTAINER_STOP)) {
         return false;
     }
@@ -796,6 +867,19 @@
             // draw line
             GLHelper::drawBoxLine(posA, rot, len, 0.25);
         }
+    } else if (mySelectedTAZs.size() > 0) {
+        // set color
+        GLHelper::setColor(RGBColor::ORANGE);
+        // draw line between TAZs
+        for (int i = 0; i < (int)mySelectedTAZs.size() - 1; i++) {
+            // get two points
+            const Position posA = mySelectedTAZs.at(i)->getPositionInView();
+            const Position posB = mySelectedTAZs.at(i + 1)->getPositionInView();
+            const double rot = ((double)atan2((posB.x() - posA.x()), (posA.y() - posB.y())) * (double) 180.0 / (double)M_PI);
+            const double len = posA.distanceTo2D(posB);
+            // draw line
+            GLHelper::drawBoxLine(posA, rot, len, 0.25);
+        }
     }
     // Pop last matrix
     GLHelper::popMatrix();
@@ -812,7 +896,7 @@
 void
 GNEPathCreator::abortPathCreation() {
     // first check that there is elements
-    if ((mySelectedJunctions.size() > 0) || (mySelectedEdges.size() > 0) || myToStoppingPlace || myRoute) {
+    if ((mySelectedJunctions.size() > 0) || (mySelectedTAZs.size() > 0) || (mySelectedEdges.size() > 0) || myToStoppingPlace || myRoute) {
         // unblock undo/redo
         myFrameParent->getViewNet()->getViewParent()->getGNEAppWindows()->enableUndoRedo();
         // clear edges
@@ -955,8 +1039,9 @@
     /// reset flags
     clearJunctionColors();
     clearEdgeColors();
-    // clear junction, edges, additionals and route
+    // clear junction, TAZs, edges, additionals and route
     mySelectedJunctions.clear();
+    mySelectedTAZs.clear();
     mySelectedEdges.clear();
     myToStoppingPlace = nullptr;
     myRoute = nullptr;
diff -Nru sumo-1.17.0/src/netedit/frames/GNEPathCreator.h sumo-1.18.0/src/netedit/frames/GNEPathCreator.h
--- sumo-1.17.0/src/netedit/frames/GNEPathCreator.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/frames/GNEPathCreator.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -111,7 +111,10 @@
     void setVClass(SUMOVehicleClass vClass);
 
     /// @brief add junction
-    bool addJunction(GNEJunction* junction, const bool shiftKeyPressed, const bool controlKeyPressed);
+    bool addJunction(GNEJunction* junction);
+
+    /// @brief add TAZ
+    bool addTAZ(GNETAZ* taz);
 
     /// @brief add edge
     bool addEdge(GNEEdge* edge, const bool shiftKeyPressed, const bool controlKeyPressed);
@@ -121,7 +124,10 @@
 
     /// @brief get current selected junctions
     const std::vector& getSelectedJunctions() const;
-
+    
+    /// @brief get current selected TAZs
+    const std::vector& getSelectedTAZs() const;
+    
     /// @brief add stoppingPlace
     bool addStoppingPlace(GNEAdditional* stoppingPlace, const bool shiftKeyPressed, const bool controlKeyPressed);
 
@@ -192,18 +198,21 @@
     enum Mode {
         CONSECUTIVE_EDGES        = 1 << 0,   // Path's edges are consecutives
         NONCONSECUTIVE_EDGES     = 1 << 1,   // Path's edges aren't consecutives
-        START_EDGE               = 1 << 2,   // Path begins in an edge
-        END_EDGE                 = 1 << 3,   // Path ends in an edge
-        START_JUNCTION           = 1 << 4,   // Path begins in an edge
-        END_JUNCTION             = 1 << 5,   // Path ends in an edge
-        STOP                     = 1 << 6,   // Path is an stop
-        ONLY_FROMTO              = 1 << 7,   // Path only had two elements (first and last)
-        END_BUSSTOP              = 1 << 8,   // Path ends in a busStop
-        END_CONTAINERSTOP        = 1 << 9,   // Path ends in a containerStop
-        ROUTE                    = 1 << 10,  // Path uses a route
-        REQUIRE_FIRSTELEMENT     = 1 << 11,  // Path start always in a previous element
-        SHOW_CANDIDATE_EDGES     = 1 << 12,  // Show candidate edges
-        SHOW_CANDIDATE_JUNCTIONS = 1 << 13,  // show candidate junctions
+        START_EDGE               = 1 << 2,   // Path begins in edge
+        END_EDGE                 = 1 << 3,   // Path ends in edge
+        START_JUNCTION           = 1 << 4,   // Path begins in junction
+        END_JUNCTION             = 1 << 5,   // Path ends in junction
+        START_TAZ                = 1 << 6,   // Path begins in TAZ
+        END_TAZ                  = 1 << 7,   // Path ends in TAZ
+        STOP                     = 1 << 8,   // Path is stop
+        ONLY_FROMTO              = 1 << 9,   // Path only had two elements (first and last)
+        END_BUSSTOP              = 1 << 10,  // Path ends in a busStop
+        END_TRAINSTOP            = 1 << 11,  // Path ends in a trainStop
+        END_CONTAINERSTOP        = 1 << 12,  // Path ends in a containerStop
+        ROUTE                    = 1 << 13,  // Path uses a route
+        REQUIRE_FIRSTELEMENT     = 1 << 14,  // Path start always in a previous element
+        SHOW_CANDIDATE_EDGES     = 1 << 15,  // Show candidate edges
+        SHOW_CANDIDATE_JUNCTIONS = 1 << 16,  // show candidate junctions
     };
 
     /// @brief update InfoRouteLabel
@@ -233,6 +242,9 @@
     /// @brief vector with selected junctions
     std::vector mySelectedJunctions;
 
+    /// @brief vector with selected TAZs
+    std::vector mySelectedTAZs;
+
     /// @brief vector with selected edges
     std::vector mySelectedEdges;
 
diff -Nru sumo-1.17.0/src/netedit/frames/GNEPathLegendModule.cpp sumo-1.18.0/src/netedit/frames/GNEPathLegendModule.cpp
--- sumo-1.17.0/src/netedit/frames/GNEPathLegendModule.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/frames/GNEPathLegendModule.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/frames/GNEPathLegendModule.h sumo-1.18.0/src/netedit/frames/GNEPathLegendModule.h
--- sumo-1.17.0/src/netedit/frames/GNEPathLegendModule.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/frames/GNEPathLegendModule.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/frames/GNESelectorParent.cpp sumo-1.18.0/src/netedit/frames/GNESelectorParent.cpp
--- sumo-1.17.0/src/netedit/frames/GNESelectorParent.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/frames/GNESelectorParent.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/frames/GNESelectorParent.h sumo-1.18.0/src/netedit/frames/GNESelectorParent.h
--- sumo-1.17.0/src/netedit/frames/GNESelectorParent.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/frames/GNESelectorParent.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/frames/GNETagSelector.cpp sumo-1.18.0/src/netedit/frames/GNETagSelector.cpp
--- sumo-1.17.0/src/netedit/frames/GNETagSelector.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/frames/GNETagSelector.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -409,29 +409,34 @@
         case SUMO_TAG_VTYPE_DISTRIBUTION:
             myAC = new GNEVTypeDistribution(net);
             break;
+            case SUMO_TAG_TRIP:
         case SUMO_TAG_VEHICLE:
         case GNE_TAG_VEHICLE_WITHROUTE:
-        case GNE_TAG_FLOW_ROUTE:
-        case GNE_TAG_FLOW_WITHROUTE:
-        case SUMO_TAG_TRIP:
         case GNE_TAG_TRIP_JUNCTIONS:
+        case GNE_TAG_TRIP_TAZS:
         case SUMO_TAG_FLOW:
+        case GNE_TAG_FLOW_ROUTE:
+        case GNE_TAG_FLOW_WITHROUTE:
         case GNE_TAG_FLOW_JUNCTIONS:
+        case GNE_TAG_FLOW_TAZS:
             myAC = new GNEVehicle(tagProperty.getTag(), net);
             break;
         // stops
-        case SUMO_TAG_STOP_LANE:
-        case SUMO_TAG_STOP_BUSSTOP:
-        case SUMO_TAG_STOP_CONTAINERSTOP:
-        case SUMO_TAG_STOP_CHARGINGSTATION:
-        case SUMO_TAG_STOP_PARKINGAREA:
+        case GNE_TAG_STOP_LANE:
+        case GNE_TAG_STOP_BUSSTOP:
+        case GNE_TAG_STOP_TRAINSTOP:
+        case GNE_TAG_STOP_CONTAINERSTOP:
+        case GNE_TAG_STOP_CHARGINGSTATION:
+        case GNE_TAG_STOP_PARKINGAREA:
         case GNE_TAG_STOPPERSON_EDGE:
         case GNE_TAG_STOPPERSON_BUSSTOP:
+        case GNE_TAG_STOPPERSON_TRAINSTOP:
         case GNE_TAG_STOPCONTAINER_EDGE:
         case GNE_TAG_STOPCONTAINER_CONTAINERSTOP:
         // waypoints
         case GNE_TAG_WAYPOINT_LANE:
         case GNE_TAG_WAYPOINT_BUSSTOP:
+        case GNE_TAG_WAYPOINT_TRAINSTOP:
         case GNE_TAG_WAYPOINT_CONTAINERSTOP:
         case GNE_TAG_WAYPOINT_CHARGINGSTATION:
         case GNE_TAG_WAYPOINT_PARKINGAREA:
@@ -456,11 +461,13 @@
             break;
         case GNE_TAG_PERSONTRIP_EDGE:
         case GNE_TAG_PERSONTRIP_BUSSTOP:
+        case GNE_TAG_PERSONTRIP_TRAINSTOP:
         case GNE_TAG_PERSONTRIP_JUNCTIONS:
             myAC = new GNEPersonTrip(tagProperty.getTag(), net);
             break;
         case GNE_TAG_WALK_EDGE:
         case GNE_TAG_WALK_BUSSTOP:
+        case GNE_TAG_WALK_TRAINSTOP:
         case GNE_TAG_WALK_EDGES:
         case GNE_TAG_WALK_ROUTE:
         case GNE_TAG_WALK_JUNCTIONS:
@@ -468,6 +475,7 @@
             break;
         case GNE_TAG_RIDE_EDGE:
         case GNE_TAG_RIDE_BUSSTOP:
+        case GNE_TAG_RIDE_TRAINSTOP:
             myAC = new GNERide(tagProperty.getTag(), net);
             break;
         default:
diff -Nru sumo-1.17.0/src/netedit/frames/GNETagSelector.h sumo-1.18.0/src/netedit/frames/GNETagSelector.h
--- sumo-1.17.0/src/netedit/frames/GNETagSelector.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/frames/GNETagSelector.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/frames/GNETLSTable.cpp sumo-1.18.0/src/netedit/frames/GNETLSTable.cpp
--- sumo-1.17.0/src/netedit/frames/GNETLSTable.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/frames/GNETLSTable.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/frames/GNETLSTable.h sumo-1.18.0/src/netedit/frames/GNETLSTable.h
--- sumo-1.17.0/src/netedit/frames/GNETLSTable.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/frames/GNETLSTable.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/frames/network/GNEAdditionalFrame.cpp sumo-1.18.0/src/netedit/frames/network/GNEAdditionalFrame.cpp
--- sumo-1.17.0/src/netedit/frames/network/GNEAdditionalFrame.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/frames/network/GNEAdditionalFrame.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -326,7 +326,7 @@
         myBaseAdditional->addStringListAttribute(SUMO_ATTR_EDGES, myEdgesSelector->getSelectedIDs());
         // check if attribute has at least one edge
         if (myBaseAdditional->getStringListAttribute(SUMO_ATTR_EDGES).empty()) {
-            myAdditionalAttributes->showWarningMessage(TL("List ofe dges cannot be empty"));
+            myAdditionalAttributes->showWarningMessage(TL("List of edges cannot be empty"));
             return false;
         }
     }
diff -Nru sumo-1.17.0/src/netedit/frames/network/GNEAdditionalFrame.h sumo-1.18.0/src/netedit/frames/network/GNEAdditionalFrame.h
--- sumo-1.17.0/src/netedit/frames/network/GNEAdditionalFrame.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/frames/network/GNEAdditionalFrame.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/frames/network/GNEConnectorFrame.cpp sumo-1.18.0/src/netedit/frames/network/GNEConnectorFrame.cpp
--- sumo-1.17.0/src/netedit/frames/network/GNEConnectorFrame.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/frames/network/GNEConnectorFrame.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2011-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -19,6 +19,7 @@
 /****************************************************************************/
 #include 
 
+#include 
 #include 
 #include 
 #include 
@@ -306,26 +307,9 @@
 
 GNEConnectorFrame::ConnectionSelection::ConnectionSelection(GNEConnectorFrame* connectorFrameParent) :
     MFXGroupBoxModule(connectorFrameParent, TL("Selection")) {
-    // create Selection Hint
-    std::ostringstream informationA;
-    // add label for shift+click
-    informationA
-            << TL("-Hold  while") << "\n"
-            << TL(" clicking to create") << "\n"
-            << TL(" unyielding connections") << "\n"
-            << TL(" (pass=true).");
     // create label
-    new FXLabel(getCollapsableFrame(), informationA.str().c_str(), 0, GUIDesignLabelFrameInformation);
-    std::ostringstream informationB;
-    informationB
-            << TL("-Hold  while") << "\n"
-            << TL(" clicking to create ") << "\n"
-            << TL(" conflicting connections") << "\n"
-            << TL(" (i.e. at zipper nodes") << "\n"
-            << TL(" or with incompatible") << "\n"
-            << TL(" permissions");
-    // create label
-    new FXLabel(getCollapsableFrame(), informationB.str().c_str(), 0, GUIDesignLabelFrameInformation);
+    new MFXDynamicLabel(getCollapsableFrame(), (std::string("- ") + TL("Hold  while clicking to create unyielding connections (pass=true).")).c_str(), 0, GUIDesignLabelFrameInformation);
+    new MFXDynamicLabel(getCollapsableFrame(), (std::string("- ") + TL("Hold  while clicking to create conflicting connections (i.e. at zipper nodes or with incompatible permissions")).c_str(), 0, GUIDesignLabelFrameInformation);
 }
 
 
diff -Nru sumo-1.17.0/src/netedit/frames/network/GNEConnectorFrame.h sumo-1.18.0/src/netedit/frames/network/GNEConnectorFrame.h
--- sumo-1.17.0/src/netedit/frames/network/GNEConnectorFrame.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/frames/network/GNEConnectorFrame.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/frames/network/GNECreateEdgeFrame.cpp sumo-1.18.0/src/netedit/frames/network/GNECreateEdgeFrame.cpp
--- sumo-1.17.0/src/netedit/frames/network/GNECreateEdgeFrame.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/frames/network/GNECreateEdgeFrame.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -19,6 +19,7 @@
 /****************************************************************************/
 #include 
 
+#include 
 #include 
 #include 
 #include 
@@ -29,6 +30,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -620,16 +622,16 @@
     std::ostringstream information;
     // add label for shift+click
     information
-            << TL("- ESC:") << "\n"
-            << TL("  Deselect origin") << "\n"
-            << TL("- Control+Click:") << "\n"
-            << TL("  Move view") << "\n"
-            << TL("- Shift+Click:") << "\n"
-            << TL("  Splits edge in both directions") << "\n"
-            << TL("- Alt+Shift+Click:") << "\n"
-            << TL("  Splits edge in one direction");
+            << "- " << TL("ESC:") << "\n"
+            << "  " << TL("Deselect origin") << "\n"
+            << "- " << TL("Control+Click:") << "\n"
+            << "  " << TL("Move view") << "\n"
+            << "- " << TL("Shift+Click:") << "\n"
+            << "  " << TL("Splits edge in both directions") << "\n"
+            << "- " << TL("Alt+Shift+Click:") << "\n"
+            << "  " << TL("Splits edge in one direction");
     // create label
-    new FXLabel(getCollapsableFrame(), information.str().c_str(), 0, GUIDesignLabelFrameInformation);
+    new MFXDynamicLabel(getCollapsableFrame(), information.str().c_str(), 0, GUIDesignLabelFrameInformation);
 }
 
 
diff -Nru sumo-1.17.0/src/netedit/frames/network/GNECreateEdgeFrame.h sumo-1.18.0/src/netedit/frames/network/GNECreateEdgeFrame.h
--- sumo-1.17.0/src/netedit/frames/network/GNECreateEdgeFrame.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/frames/network/GNECreateEdgeFrame.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/frames/network/GNECrossingFrame.cpp sumo-1.18.0/src/netedit/frames/network/GNECrossingFrame.cpp
--- sumo-1.17.0/src/netedit/frames/network/GNECrossingFrame.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/frames/network/GNECrossingFrame.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -19,6 +19,7 @@
 /****************************************************************************/
 #include 
 
+#include 
 #include 
 #include 
 #include 
@@ -534,15 +535,8 @@
 GNECrossingFrame::Information::Information(GNECrossingFrame* crossingFrameParent) :
     MFXGroupBoxModule(crossingFrameParent, TL("Information")) {
 
-    std::ostringstream information;
-    // add label for shift+click
-    information
-            << TL("-Click over junction to") << "\n"
-            << TL(" mark candidate edges.") << "\n"
-            << TL("-Click over candidate") << "\n"
-            << TL(" edges for selecting.");
     // create label
-    new FXLabel(getCollapsableFrame(), information.str().c_str(), 0, GUIDesignLabelFrameInformation);
+    new MFXDynamicLabel(getCollapsableFrame(), (std::string("- ") + TL("Click over junction to  mark candidate edges.") + std::string("\n- ") + TL("Click over candidate edges for selecting.")).c_str(), 0, GUIDesignLabelFrameInformation);
     // candidate
     FXLabel* colorCandidateLabel = new FXLabel(getCollapsableFrame(), TL(" Candidate"), 0, GUIDesignLabel(JUSTIFY_LEFT));
     colorCandidateLabel->setBackColor(MFXUtils::getFXColor(crossingFrameParent->getViewNet()->getVisualisationSettings().candidateColorSettings.possible));
diff -Nru sumo-1.17.0/src/netedit/frames/network/GNECrossingFrame.h sumo-1.18.0/src/netedit/frames/network/GNECrossingFrame.h
--- sumo-1.17.0/src/netedit/frames/network/GNECrossingFrame.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/frames/network/GNECrossingFrame.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/frames/network/GNEProhibitionFrame.cpp sumo-1.18.0/src/netedit/frames/network/GNEProhibitionFrame.cpp
--- sumo-1.17.0/src/netedit/frames/network/GNEProhibitionFrame.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/frames/network/GNEProhibitionFrame.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/frames/network/GNEProhibitionFrame.h sumo-1.18.0/src/netedit/frames/network/GNEProhibitionFrame.h
--- sumo-1.17.0/src/netedit/frames/network/GNEProhibitionFrame.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/frames/network/GNEProhibitionFrame.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/frames/network/GNEShapeFrame.cpp sumo-1.18.0/src/netedit/frames/network/GNEShapeFrame.cpp
--- sumo-1.17.0/src/netedit/frames/network/GNEShapeFrame.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/frames/network/GNEShapeFrame.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -19,6 +19,7 @@
 /****************************************************************************/
 #include 
 
+#include 
 #include 
 #include 
 #include 
@@ -67,11 +68,11 @@
     // create button for create GEO POIs
     myCreateGEOPOIButton = new FXButton(getCollapsableFrame(), TL("Create GEO POI (clipboard)"), nullptr, this, MID_GNE_CREATE, GUIDesignButton);
     // create information label
-    myLabelCartesianPosition = new FXLabel(getCollapsableFrame(),
-                                           (TL("Cartesian equivalence:") + std::string("\n") +
-                                            TL("- X = give valid longitude") + std::string("\n") +
-                                            TL("- Y = give valid latitude")).c_str(),
-                                           0, GUIDesignLabelFrameInformation);
+    myLabelCartesianPosition = new MFXDynamicLabel(getCollapsableFrame(),
+            (TL("Cartesian equivalence:") + std::string("\n") +
+             TL("- X = give valid longitude") + std::string("\n") +
+             TL("- Y = give valid latitude")).c_str(),
+            0, GUIDesignLabelFrameInformation);
 }
 
 
diff -Nru sumo-1.17.0/src/netedit/frames/network/GNEShapeFrame.h sumo-1.18.0/src/netedit/frames/network/GNEShapeFrame.h
--- sumo-1.17.0/src/netedit/frames/network/GNEShapeFrame.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/frames/network/GNEShapeFrame.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/frames/network/GNETAZFrame.cpp sumo-1.18.0/src/netedit/frames/network/GNETAZFrame.cpp
--- sumo-1.17.0/src/netedit/frames/network/GNETAZFrame.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/frames/network/GNETAZFrame.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -19,6 +19,7 @@
 /****************************************************************************/
 #include 
 
+#include 
 #include 
 #include 
 #include 
@@ -508,10 +509,9 @@
     // Create information label
     std::ostringstream information;
     information
-            << TL("- Toggle Membership:") << "\n"
-            << TL("  Create new Sources/Sinks") << "\n"
-            << TL("  with given weights.");
-    myInformationLabel = new FXLabel(getCollapsableFrame(), information.str().c_str(), 0, GUIDesignLabelFrameInformation);
+            << std::string("- ") << TL("Toggle Membership:") << "\n"
+            << std::string("  ") << TL("Create new Sources/Sinks with given weights.");
+    myInformationLabel = new MFXDynamicLabel(getCollapsableFrame(), information.str().c_str(), 0, GUIDesignLabelFrameInformation);
     // always show
     show();
 }
@@ -643,9 +643,8 @@
             // update information label
             std::ostringstream information;
             information
-                    << TL("- Toggle Membership:") << "\n"
-                    << TL("  Create new Sources/Sinks") << "\n"
-                    << TL("  with given weights.");
+                    << std::string("- ") << TL("Toggle Membership:") << "\n"
+                    << std::string("  ") << TL("Create new Sources/Sinks with given weights.");
             myInformationLabel->setText(information.str().c_str());
             // hide TAZSelectionStatistics
             myTAZFrameParent->myTAZSelectionStatistics->hideTAZSelectionStatisticsModule();
@@ -666,10 +665,8 @@
             // update information label
             std::ostringstream information;
             information
-                    << TL("- Keep Membership:") << "\n"
-                    << TL("  Select Sources/Sinks.") << "\n"
-                    << TL("- Press ESC to clear") << "\n"
-                    << TL("  current selection.");
+                    << std::string("- ") << TL("Keep Membership:") << TL("  Select Sources/Sinks.") << "\n"
+                    << std::string("- ") << TL("Press ESC to clear the current selection.");
             myInformationLabel->setText(information.str().c_str());
             // show TAZSelectionStatistics
             myTAZFrameParent->myTAZSelectionStatistics->showTAZSelectionStatisticsModule();
diff -Nru sumo-1.17.0/src/netedit/frames/network/GNETAZFrame.h sumo-1.18.0/src/netedit/frames/network/GNETAZFrame.h
--- sumo-1.17.0/src/netedit/frames/network/GNETAZFrame.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/frames/network/GNETAZFrame.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/frames/network/GNETLSEditorFrame.cpp sumo-1.18.0/src/netedit/frames/network/GNETLSEditorFrame.cpp
--- sumo-1.17.0/src/netedit/frames/network/GNETLSEditorFrame.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/frames/network/GNETLSEditorFrame.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -55,7 +55,9 @@
     FXMAPFUNC(SEL_COMMAND,  MID_GNE_TLSFRAME_TLSJUNCTION_TOGGLEJOIN,    GNETLSEditorFrame::TLSJunction::onCmdToggleJoinTLS),
     FXMAPFUNC(SEL_UPDATE,   MID_GNE_TLSFRAME_TLSJUNCTION_TOGGLEJOIN,    GNETLSEditorFrame::TLSJunction::onUpdJoinTLS),
     FXMAPFUNC(SEL_COMMAND,  MID_GNE_TLSFRAME_TLSJUNCTION_DISJOIN,       GNETLSEditorFrame::TLSJunction::onCmdDisjoinTLS),
-    FXMAPFUNC(SEL_UPDATE,   MID_GNE_TLSFRAME_TLSJUNCTION_DISJOIN,       GNETLSEditorFrame::TLSJunction::onUpdDisjoinTLS)
+    FXMAPFUNC(SEL_UPDATE,   MID_GNE_TLSFRAME_TLSJUNCTION_DISJOIN,       GNETLSEditorFrame::TLSJunction::onUpdDisjoinTLS),
+    FXMAPFUNC(SEL_COMMAND,  MID_GNE_BUTTON_ACCEPT,                      GNETLSEditorFrame::TLSJunction::onCmdAcceptJoin),
+    FXMAPFUNC(SEL_COMMAND,  MID_GNE_BUTTON_CANCEL,                      GNETLSEditorFrame::TLSJunction::onCmdCancelJoin)
 };
 
 FXDEFMAP(GNETLSEditorFrame::TLSDefinition) TLSDefinitionMap[] = {
@@ -915,6 +917,14 @@
             TLSEditorParent->getViewNet()->getViewParent()->getGNEAppWindows()->getStaticTooltipMenu(),
             TL("Disjoin") + std::string("\t") + TL("Disjoin current TLS") + std::string("\t") + TL("Disjoin current TLS."),
             GUIIconSubSys::getIcon(GUIIcon::DISJOIN), this, MID_GNE_TLSFRAME_TLSJUNCTION_DISJOIN, GUIDesignButton);
+    // create frame for join control buttons
+    myJoinControlButtons = new FXHorizontalFrame(getCollapsableFrame(), GUIDesignAuxiliarHorizontalFrameUniform);
+    // create create tlDef button
+    new FXButton(myJoinControlButtons, (TL("Accept") + std::string("\t\t") + TL("Finish join.")).c_str(),
+                 GUIIconSubSys::getIcon(GUIIcon::ACCEPT), this, MID_GNE_BUTTON_ACCEPT, GUIDesignButton);
+    new FXButton(myJoinControlButtons, (TL("Cancel") + std::string("\t\t") + TL("Cancel Join.")).c_str(),
+                 GUIIconSubSys::getIcon(GUIIcon::CANCEL), this, MID_GNE_BUTTON_CANCEL, GUIDesignButton);
+    myJoinControlButtons->hide();
     // update junction description after creation
     updateJunctionDescription();
     // show TLS Junction
@@ -945,8 +955,8 @@
     myJunctionIDLabel->setText(TL("Junction ID"));
     // clear selected junctions
     mySelectedJunctionIDs.clear();
-    // disable joining junction mode
-    disableJoiningJunctionMode();
+    // cancel joining junction mode
+    onCmdCancelJoin(nullptr, 0, nullptr);
     // continue depending of current junction
     if (myCurrentJunction == nullptr) {
         myJunctionIDTextField->setText(TL("no junction selected"));
@@ -981,13 +991,6 @@
     }
 }
 
-
-void
-GNETLSEditorFrame::TLSJunction::disableJoiningJunctionMode() {
-    myJoinTLSToggleButton->setState(FALSE, TRUE);
-}
-
-
 bool
 GNETLSEditorFrame::TLSJunction::isJoiningJunctions() const {
     return (myJoinTLSToggleButton->getState() == TRUE);
@@ -1193,7 +1196,15 @@
         for (const auto& TLNode : TLNodes) {
             mySelectedJunctionIDs.push_back(TLNode->getID());
         }
-    } else {
+        // make a copy of selected junctions
+        myOriginalSelectedJunctionIDs = mySelectedJunctionIDs;
+        // show control buttons
+        myJoinControlButtons->show();
+        getCollapsableFrame()->recalc();
+    } else {
+        // hide control buttons
+        myJoinControlButtons->hide();
+        getCollapsableFrame()->recalc();
         // make a copy of current junction
         const auto currentJunction = myCurrentJunction;
         // declare vectors for junctions
@@ -1332,6 +1343,23 @@
     }
 }
 
+
+long
+GNETLSEditorFrame::TLSJunction::onCmdAcceptJoin(FXObject*, FXSelector, void*) {
+    myJoinTLSToggleButton->setState(FALSE, TRUE);
+    return 1;
+}
+
+
+long
+GNETLSEditorFrame::TLSJunction::onCmdCancelJoin(FXObject*, FXSelector, void*) {
+    // restore selected junction
+    mySelectedJunctionIDs = myOriginalSelectedJunctionIDs;
+    myJoinTLSToggleButton->setState(FALSE, TRUE);
+    return 1;
+}
+
+
 // ---------------------------------------------------------------------------
 // GNETLSEditorFrame::TLSDefinition - methods
 // ---------------------------------------------------------------------------
@@ -2018,7 +2046,7 @@
     } else if (col == colState) {
         return setState(col, row, value);
     } else if (col == colNext) {
-        return setNext(col, row, value);
+        return setNext(row, value);
     } else if (col == colName) {
         return setName(row, value);
     } else if (col == colMinDur) {
@@ -2614,28 +2642,21 @@
 
 
 bool
-GNETLSEditorFrame::TLSPhases::setNext(const int col, const int row, const std::string& value) {
-    // check value
-    if (value.empty()) {
-        // input empty, reset value
-        myPhaseTable->setItemText(row, col, toString(myTLSEditorParent->getPhase(row).next));
-        return true;
-    } else {
-        // check next
-        if (GNEAttributeCarrier::canParse >(value)) {
-            const auto nextEdited = GNEAttributeCarrier::parse >(value);
-            for (const auto nextPhase : nextEdited) {
-                if ((nextPhase < 0) || (nextPhase >= myPhaseTable->getNumRows())) {
-                    return false;
-                }
+GNETLSEditorFrame::TLSPhases::setNext(const int row, const std::string &value) {
+    // check next
+    if (GNEAttributeCarrier::canParse >(value)) {
+        const auto nextEdited = GNEAttributeCarrier::parse >(value);
+        for (const auto nextPhase : nextEdited) {
+            if ((nextPhase < 0) || (nextPhase >= myPhaseTable->getNumRows())) {
+                return false;
             }
-            // set new next
-            myTLSEditorParent->myEditedDef->getLogic()->setPhaseNext(row, nextEdited);
-            myTLSEditorParent->myTLSDefinition->markAsModified();
-            return true;
-        } else {
-            return false;
         }
+        // set new next
+        myTLSEditorParent->myEditedDef->getLogic()->setPhaseNext(row, nextEdited);
+        myTLSEditorParent->myTLSDefinition->markAsModified();
+        return true;
+    } else {
+        return false;
     }
 }
 
diff -Nru sumo-1.17.0/src/netedit/frames/network/GNETLSEditorFrame.h sumo-1.18.0/src/netedit/frames/network/GNETLSEditorFrame.h
--- sumo-1.17.0/src/netedit/frames/network/GNETLSEditorFrame.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/frames/network/GNETLSEditorFrame.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -68,9 +68,6 @@
         /// @brief update junction description
         void updateJunctionDescription();
 
-        /// @brief disable joining junction mode
-        void disableJoiningJunctionMode();
-
         /// @brief is joining junctions
         bool isJoiningJunctions() const;
 
@@ -109,6 +106,12 @@
         /// @brief Called when update join TLS
         long onUpdDisjoinTLS(FXObject*, FXSelector, void*);
 
+        /// @brief accept join
+        long onCmdAcceptJoin(FXObject*, FXSelector, void*);
+
+        /// @brief cancel join
+        long onCmdCancelJoin(FXObject*, FXSelector, void*);
+
         /// @}
 
     protected:
@@ -137,11 +140,17 @@
         /// @brief button for disjoin TLS
         MFXButtonTooltip* myDisjoinTLSButton = nullptr;
 
+        /// @brief frame for accept/cancel buttons
+        FXHorizontalFrame* myJoinControlButtons = nullptr;
+
         /// @brief the junction of the tls is being modified
         GNEJunction* myCurrentJunction = nullptr;
 
         /// @brief selected junction (used for join)
         std::vector mySelectedJunctionIDs;
+
+        /// @brief original selected junction (used for join)
+        std::vector myOriginalSelectedJunctionIDs;
     };
 
     // ===========================================================================
@@ -473,7 +482,7 @@
         bool setState(const int col, const int row, const std::string& value);
 
         /// @brief set next
-        bool setNext(const int col, const int row, const std::string& value);
+        bool setNext(const int row, const std::string &value);
 
         /// @brief set name
         bool setName(const int row, const std::string& value);
diff -Nru sumo-1.17.0/src/netedit/frames/network/GNEWireFrame.cpp sumo-1.18.0/src/netedit/frames/network/GNEWireFrame.cpp
--- sumo-1.17.0/src/netedit/frames/network/GNEWireFrame.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/frames/network/GNEWireFrame.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2021-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/frames/network/GNEWireFrame.h sumo-1.18.0/src/netedit/frames/network/GNEWireFrame.h
--- sumo-1.17.0/src/netedit/frames/network/GNEWireFrame.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/frames/network/GNEWireFrame.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2021-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/GNEApplicationWindow.cpp sumo-1.18.0/src/netedit/GNEApplicationWindow.cpp
--- sumo-1.17.0/src/netedit/GNEApplicationWindow.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/GNEApplicationWindow.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -26,6 +26,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -54,7 +55,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -187,17 +187,18 @@
     FXMAPFUNC(SEL_COMMAND,  MID_HOTKEY_F4_SUPERMODE_DATA,       GNEApplicationWindow::onCmdSetSuperMode),
     // Toolbar modes
     FXMAPFUNC(SEL_COMMAND,  MID_HOTKEY_A_MODE_STARTSIMULATION_ADDITIONALSTOP,   GNEApplicationWindow::onCmdSetMode),
-    FXMAPFUNC(SEL_COMMAND,  MID_HOTKEY_C_MODE_CONNECT_PERSONPLAN,               GNEApplicationWindow::onCmdSetMode),
+    FXMAPFUNC(SEL_COMMAND,  MID_HOTKEY_C_MODE_CONNECT_CONTAINER,                GNEApplicationWindow::onCmdSetMode),
     FXMAPFUNC(SEL_COMMAND,  MID_HOTKEY_D_MODE_SINGLESIMULATIONSTEP_DELETE,      GNEApplicationWindow::onCmdSetMode),
     FXMAPFUNC(SEL_COMMAND,  MID_HOTKEY_E_MODE_EDGE_EDGEDATA,                    GNEApplicationWindow::onCmdSetMode),
-    FXMAPFUNC(SEL_COMMAND,  MID_HOTKEY_G_MODE_CONTAINER,                        GNEApplicationWindow::onCmdSetMode),
     FXMAPFUNC(SEL_COMMAND,  MID_HOTKEY_H_MODE_PROHIBITION_CONTAINERPLAN,        GNEApplicationWindow::onCmdSetMode),
     FXMAPFUNC(SEL_COMMAND,  MID_HOTKEY_I_MODE_INSPECT,                          GNEApplicationWindow::onCmdSetMode),
+    FXMAPFUNC(SEL_COMMAND,  MID_HOTKEY_L_MODE_PERSONPLAN,                       GNEApplicationWindow::onCmdSetMode),
     FXMAPFUNC(SEL_COMMAND,  MID_HOTKEY_M_MODE_MOVE_MEANDATA,                    GNEApplicationWindow::onCmdSetMode),
     FXMAPFUNC(SEL_COMMAND,  MID_HOTKEY_P_MODE_POLYGON_PERSON,                   GNEApplicationWindow::onCmdSetMode),
     FXMAPFUNC(SEL_COMMAND,  MID_HOTKEY_R_MODE_CROSSING_ROUTE_EDGERELDATA,       GNEApplicationWindow::onCmdSetMode),
     FXMAPFUNC(SEL_COMMAND,  MID_HOTKEY_S_MODE_STOPSIMULATION_SELECT,            GNEApplicationWindow::onCmdSetMode),
     FXMAPFUNC(SEL_COMMAND,  MID_HOTKEY_T_MODE_TLS_TYPE,                         GNEApplicationWindow::onCmdSetMode),
+    FXMAPFUNC(SEL_COMMAND,  MID_HOTKEY_U_MODE_TYPEDISTRIBUTION,                 GNEApplicationWindow::onCmdSetMode),
     FXMAPFUNC(SEL_COMMAND,  MID_HOTKEY_V_MODE_VEHICLE,                          GNEApplicationWindow::onCmdSetMode),
     FXMAPFUNC(SEL_COMMAND,  MID_HOTKEY_W_MODE_WIRE,                             GNEApplicationWindow::onCmdSetMode),
     FXMAPFUNC(SEL_COMMAND,  MID_HOTKEY_Z_MODE_TAZ_TAZREL,                       GNEApplicationWindow::onCmdSetMode),
@@ -467,9 +468,14 @@
     // set SUMO Options descriptions
     mySumoOptions.setApplicationDescription(TL("A microscopic, multi-modal traffic simulation."));
     mySumoOptions.setApplicationName("sumo", "Eclipse SUMO sumo Version " VERSION_STRING);
+    // set default netedit options
+    GNELoadThread::fillOptions(myOriginalNeteditOptions);
+    GNELoadThread::setDefaultOptions(myOriginalNeteditOptions);
     // parse options
     TemplateHandler::parseTemplate(mySumoOptions, sumoTemplate);
+    TemplateHandler::parseTemplate(myOriginalSumoOptions, sumoTemplate);
     TemplateHandler::parseTemplate(myNetgenerateOptions, netgenerateTemplate);
+    TemplateHandler::parseTemplate(myOriginalNetgenerateOptions, netgenerateTemplate);
 }
 
 void
@@ -1083,7 +1089,8 @@
         // get filedata
         const std::string recentFile = ((const char*)fileData);
         // check if we're loading a network o a config
-        if ((recentFile.find(".neteditcfg") != std::string::npos) ||
+        if ((recentFile.find(".neteditcfg") != std::string::npos) ||    // neteditcfg deprecated
+                (recentFile.find(".netecfg") != std::string::npos) ||
                 (recentFile.find(".sumocfg") != std::string::npos) ||
                 (recentFile.find(".netccfg") != std::string::npos)) {
             // load config
@@ -1537,11 +1544,11 @@
     // check if view has to be saved
     if (myViewNet) {
         myViewNet->saveVisualizationSettings();
+        myViewNet->getDecals().clear();
     }
     // lock tracker
     myTrackerLock.lock();
     // clear decals
-    myViewNet->getDecals().clear();
     // remove trackers and other external windows
     while (!myGLWindows.empty()) {
         delete myGLWindows.front();
@@ -1703,8 +1710,8 @@
     neteditOptions.set("tls.guess-signals", "true");
     neteditOptions.set("tls.discard-simple", "true");
     // open wizard dialog
-    if (GUIDialog_Options::Options(this, &OptionsCont::getOptions(), TL("Select Import Options")).first == TRUE) {
-        NIFrame::checkOptions(); // needed to set projection parameters
+    if (GNEOptionsDialog::Options(this, GUIIcon::SUPERMODENETWORK, OptionsCont::getOptions(), myOriginalNeteditOptions, TL("Select Import Options")).first == TRUE) {
+        NIFrame::checkOptions(neteditOptions); // needed to set projection parameters
         // set file to load
         neteditOptions.resetWritable();
         neteditOptions.set("configuration-file", OSMFile);
@@ -1713,8 +1720,6 @@
         // load config
         myLoadThread->loadNetworkOrConfig();
     }
-    // after load, mark network saved
-    myNet->getSavingStatus()->networkSaved();
 }
 
 void
@@ -2316,12 +2321,13 @@
 
 long
 GNEApplicationWindow::onCmdOpenOptionsDialog(FXObject*, FXSelector, void*) {
-    const auto dialog = GUIDialog_Options::Options(this, &OptionsCont::getOptions(), TL("Netedit options"));
+    auto& neteditOptions = OptionsCont::getOptions();
+    const auto dialog = GNEOptionsDialog::Options(this, GUIIcon::NETEDIT_MINI, neteditOptions, myOriginalNeteditOptions, TL("Netedit options"));
     if (dialog.first == TRUE) {
-        NIFrame::checkOptions(); // needed to set projection parameters
-        NBFrame::checkOptions();
-        NWFrame::checkOptions();
-        SystemFrame::checkOptions(); // needed to set precision
+        NIFrame::checkOptions(neteditOptions); // needed to set projection parameters
+        NBFrame::checkOptions(neteditOptions);
+        NWFrame::checkOptions(neteditOptions);
+        SystemFrame::checkOptions(neteditOptions); // needed to set precision
         // check if mar netedit config as unsaved
         if (dialog.second) {
             myNet->getSavingStatus()->requireSaveNeteditConfig();
@@ -2333,7 +2339,7 @@
 
 long
 GNEApplicationWindow::onCmdOpenSumoOptionsDialog(FXObject*, FXSelector, void*) {
-    const auto dialog = GUIDialog_Options::Options(this, &mySumoOptions, TL("Sumo options"));
+    const auto dialog = GNEOptionsDialog::Options(this, GUIIcon::SUMO_MINI, mySumoOptions, myOriginalSumoOptions, TL("Sumo options"));
     // check if mark sumoConfig as unsaved
     if ((dialog.first == TRUE) && dialog.second) {
         myNet->getSavingStatus()->requireSaveSumoConfig();
@@ -2350,7 +2356,7 @@
 
 long
 GNEApplicationWindow::onCmdOpenNetgenerateOptionsDialog(FXObject*, FXSelector, void*) {
-    return GUIDialog_Options::Run(this, &myNetgenerateOptions, TL("Netgenerate options")).first;
+    return GNEOptionsDialog::Run(this, GUIIcon::NETGENERATE, myNetgenerateOptions, myOriginalNetgenerateOptions, TL("Netgenerate options")).first;
 }
 
 
@@ -3100,7 +3106,7 @@
 GNEApplicationWindow::onCmdSaveNetworkAs(FXObject*, FXSelector, void*) {
     // get network file file
     const auto networkFile = GNEApplicationWindowHelper::openNetworkFileDialog(this, true);
-    if (networkFile.size() > 0) {
+    if (!networkFile.empty()) {
         // set ouput file in netedit configs
         auto& neteditOptions = OptionsCont::getOptions();
         neteditOptions.resetWritable();
@@ -3119,11 +3125,21 @@
     // get neteditConfig filename
     auto plainXMLFile = GNEApplicationWindowHelper::savePlainXMLFileDialog(this);
     // Remove extension
-    if (plainXMLFile.size() > 0) {
-        plainXMLFile.pop_back();
+    if (!plainXMLFile.empty()) {
+        // adjust file
+        if (plainXMLFile.back() == '.') {
+            plainXMLFile.pop_back();
+        } else {
+            plainXMLFile = StringUtils::replace(plainXMLFile, ".edg.xml", "");
+            plainXMLFile = StringUtils::replace(plainXMLFile, ".nod.xml", "");
+            plainXMLFile = StringUtils::replace(plainXMLFile, ".con.xml", "");
+            plainXMLFile = StringUtils::replace(plainXMLFile, ".typ.xml", "");
+            plainXMLFile = StringUtils::replace(plainXMLFile, ".tll.xml", "");
+            plainXMLFile = StringUtils::replace(plainXMLFile, ".xml", "");
+        }
     }
     // continue depending of file
-    if (plainXMLFile.size() > 0) {
+    if (!plainXMLFile.empty()) {
         // start saving plain XML
         getApp()->beginWaitCursor();
         try {
@@ -3190,7 +3206,7 @@
         // get file path
         const auto filePath = FileHelpers::getFilePath(neteditConfigFile);
         // get patter file
-        const auto patterFile = StringUtils::replace(neteditConfigFile, ".neteditcfg", "");
+        const auto patterFile = StringUtils::replace(neteditConfigFile, ".netecfg", "");
         // get config file without extension
         if (neteditOptions.getString("net-file").empty()) {
             neteditOptions.set("net-file", patterFile + ".net.xml");
@@ -3483,7 +3499,7 @@
     // get TLS file
     const auto TLSFile = GNEApplicationWindowHelper::openTLSFileDialog(this, true);
     // check tat file is valid
-    if (TLSFile != "") {
+    if (!TLSFile.empty()) {
         // change value of "tls-file"
         neteditOptions.resetWritable();
         neteditOptions.set("tls-file", TLSFile);
@@ -3502,7 +3518,7 @@
     // get network file file
     const auto edgeTypesFile = GNEApplicationWindowHelper::openEdgeTypeFileDialog(this, true);
     // check tat file is valid
-    if (edgeTypesFile.size() > 0) {
+    if (!edgeTypesFile.empty()) {
         // change value of "edgetypes-file"
         neteditOptions.resetWritable();
         neteditOptions.set("edgetypes-file", edgeTypesFile);
@@ -3673,7 +3689,7 @@
     // get additional file
     const auto additionalFile = GNEApplicationWindowHelper::openAdditionalFileDialog(this, true);
     // check that file is valid
-    if (additionalFile.size() > 0) {
+    if (!additionalFile.empty()) {
         // reset writtable flag
         neteditOptions.resetWritable();
         // change value of "additional-files"
@@ -3834,7 +3850,7 @@
     // get route file
     const auto routeFile = GNEApplicationWindowHelper::openRouteFileDialog(this, true);
     // check that file is correct
-    if (routeFile != "") {
+    if (!routeFile.empty()) {
         // reset writtable flag
         neteditOptions.resetWritable();
         // change value of "route-files"
@@ -3856,7 +3872,7 @@
     // get file
     const auto dataFile = GNEApplicationWindowHelper::openDataFileDialog(this, false);
     // check file
-    if (dataFile.empty()) {
+    if (!dataFile.empty()) {
         // declare overwrite flag
         bool overwriteElements = false;
         // check if open question dialog box
@@ -4001,7 +4017,7 @@
     // get data file
     const auto dataFile = GNEApplicationWindowHelper::openDataFileDialog(this, true);
     // check that file is correct
-    if (dataFile != "") {
+    if (!dataFile.empty()) {
         // reset writtable flag
         neteditOptions.resetWritable();
         // change value of "data-files"
@@ -4158,7 +4174,7 @@
     // get meanData file
     const auto meanDataFile = GNEApplicationWindowHelper::openMeanDataDialog(this, true);
     // check that file is valid
-    if (meanDataFile != "") {
+    if (!meanDataFile.empty()) {
         // reset writtable flag
         neteditOptions.resetWritable();
         // change value of "meandata-files"
diff -Nru sumo-1.17.0/src/netedit/GNEApplicationWindow.h sumo-1.18.0/src/netedit/GNEApplicationWindow.h
--- sumo-1.17.0/src/netedit/GNEApplicationWindow.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/GNEApplicationWindow.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -676,12 +676,21 @@
     /// @brief string to check if undo/redo list is enabled (a String is used to keep the disabling reason)
     std::string myUndoRedoListEnabled;
 
+    /// @brief original netedit options container
+    OptionsCont myOriginalNeteditOptions;
+
     /// @brief sumo options container
     OptionsCont mySumoOptions;
 
+    /// @brief original sumo options container
+    OptionsCont myOriginalSumoOptions;
+
     /// @brief netgenerate options container
     OptionsCont myNetgenerateOptions;
 
+    /// @brief original netgenerate options container
+    OptionsCont myOriginalNetgenerateOptions;
+
     /// @brief flag for check if console options was already loaded
     bool myConsoleOptionsLoaded = true;
 
diff -Nru sumo-1.17.0/src/netedit/GNEApplicationWindowHelper.cpp sumo-1.18.0/src/netedit/GNEApplicationWindowHelper.cpp
--- sumo-1.17.0/src/netedit/GNEApplicationWindowHelper.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/GNEApplicationWindowHelper.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -508,6 +508,32 @@
 }
 
 // ---------------------------------------------------------------------------
+// GNEApplicationWindowHelper::ModesMenuCommands::SupermodeMenuCommands - methods
+// ---------------------------------------------------------------------------
+
+GNEApplicationWindowHelper::ModesMenuCommands::SupermodeMenuCommands::SupermodeMenuCommands(const ModesMenuCommands* modesMenuCommandsParent) :
+    networkSupermode(nullptr),
+    demandSupermode(nullptr),
+    dataSupermode(nullptr),
+    myModesMenuCommandsParent(modesMenuCommandsParent) {
+}
+
+
+void
+GNEApplicationWindowHelper::ModesMenuCommands::SupermodeMenuCommands::buildSupermodeMenuCommands(FXMenuPane* modesMenu) {
+    // build every FXMenuCommand giving it a shortcut
+    networkSupermode = GUIDesigns::buildFXMenuCommandShortcut(modesMenu,
+                       TL("&Network"), "F2", TL("Supermode network."),
+                       GUIIconSubSys::getIcon(GUIIcon::SUPERMODENETWORK), myModesMenuCommandsParent->myGNEApp, MID_HOTKEY_F2_SUPERMODE_NETWORK);
+    demandSupermode = GUIDesigns::buildFXMenuCommandShortcut(modesMenu,
+                      TL("&Demand"), "F3", TL("Supermode demand."),
+                      GUIIconSubSys::getIcon(GUIIcon::SUPERMODEDEMAND), myModesMenuCommandsParent->myGNEApp, MID_HOTKEY_F3_SUPERMODE_DEMAND);
+    dataSupermode = GUIDesigns::buildFXMenuCommandShortcut(modesMenu,
+                    TL("&Data"), "F4", TL("Supermode data."),
+                    GUIIconSubSys::getIcon(GUIIcon::SUPERMODEDATA), myModesMenuCommandsParent->myGNEApp, MID_HOTKEY_F4_SUPERMODE_DATA);
+}
+
+// ---------------------------------------------------------------------------
 // GNEApplicationWindowHelper::ModesMenuCommands::CommonMenuCommands - methods
 // ---------------------------------------------------------------------------
 
@@ -593,7 +619,7 @@
                      GUIIconSubSys::getIcon(GUIIcon::MODECREATEEDGE), myModesMenuCommandsParent->myGNEApp, MID_HOTKEY_E_MODE_EDGE_EDGEDATA);
     connectMode = GUIDesigns::buildFXMenuCommandShortcut(modesMenu,
                   TL("&Connection"), "C", TL("Modes connections between lanes."),
-                  GUIIconSubSys::getIcon(GUIIcon::MODECONNECTION), myModesMenuCommandsParent->myGNEApp, MID_HOTKEY_C_MODE_CONNECT_PERSONPLAN);
+                  GUIIconSubSys::getIcon(GUIIcon::MODECONNECTION), myModesMenuCommandsParent->myGNEApp, MID_HOTKEY_C_MODE_CONNECT_CONTAINER);
     prohibitionMode = GUIDesigns::buildFXMenuCommandShortcut(modesMenu,
                       TL("Pro&hibition"), "H", TL("Modes connection prohibitions."),
                       GUIIconSubSys::getIcon(GUIIcon::MODEPROHIBITION), myModesMenuCommandsParent->myGNEApp, MID_HOTKEY_H_MODE_PROHIBITION_CONTAINERPLAN);
@@ -678,6 +704,9 @@
     typeMode = GUIDesigns::buildFXMenuCommandShortcut(modesMenu,
                TL("Type"), "T", TL("Create types (vehicles, person an containers)."),
                GUIIconSubSys::getIcon(GUIIcon::MODETYPE), myModesMenuCommandsParent->myGNEApp, MID_HOTKEY_T_MODE_TLS_TYPE);
+    typeMode = GUIDesigns::buildFXMenuCommandShortcut(modesMenu,
+               TL("TypeDistribution"), "U", TL("Create type distributions."),
+               GUIIconSubSys::getIcon(GUIIcon::MODETYPEDISTRIBUTION), myModesMenuCommandsParent->myGNEApp, MID_HOTKEY_U_MODE_TYPEDISTRIBUTION);
     stopMode = GUIDesigns::buildFXMenuCommandShortcut(modesMenu,
                TL("Stop"), "A", TL("Create stops."),
                GUIIconSubSys::getIcon(GUIIcon::MODESTOP), myModesMenuCommandsParent->myGNEApp, MID_HOTKEY_A_MODE_STARTSIMULATION_ADDITIONALSTOP);
@@ -685,11 +714,11 @@
                  TL("Person"), "P", TL("Create persons."),
                  GUIIconSubSys::getIcon(GUIIcon::MODEPERSON), myModesMenuCommandsParent->myGNEApp, MID_HOTKEY_P_MODE_POLYGON_PERSON);
     personPlanMode = GUIDesigns::buildFXMenuCommandShortcut(modesMenu,
-                     TL("Person plan"), "C", TL("Create person plans."),
-                     GUIIconSubSys::getIcon(GUIIcon::MODEPERSONPLAN), myModesMenuCommandsParent->myGNEApp, MID_HOTKEY_C_MODE_CONNECT_PERSONPLAN);
+                     TL("Person plan"), "L", TL("Create person plans."),
+                     GUIIconSubSys::getIcon(GUIIcon::MODEPERSONPLAN), myModesMenuCommandsParent->myGNEApp, MID_HOTKEY_L_MODE_PERSONPLAN);
     containerMode = GUIDesigns::buildFXMenuCommandShortcut(modesMenu,
-                    TL("Container"), "G", TL("Create containers."),
-                    GUIIconSubSys::getIcon(GUIIcon::MODECONTAINER), myModesMenuCommandsParent->myGNEApp, MID_HOTKEY_G_MODE_CONTAINER);
+                    TL("Container"), "C", TL("Create containers."),
+                    GUIIconSubSys::getIcon(GUIIcon::MODECONTAINER), myModesMenuCommandsParent->myGNEApp, MID_HOTKEY_C_MODE_CONNECT_CONTAINER);
     containerPlanMode = GUIDesigns::buildFXMenuCommandShortcut(modesMenu,
                         TL("Container plan"), "H", TL("Create container plans."),
                         GUIIconSubSys::getIcon(GUIIcon::MODECONTAINERPLAN), myModesMenuCommandsParent->myGNEApp, MID_HOTKEY_H_MODE_PROHIBITION_CONTAINERPLAN);
@@ -744,6 +773,7 @@
 // ---------------------------------------------------------------------------
 
 GNEApplicationWindowHelper::ModesMenuCommands::ModesMenuCommands(GNEApplicationWindow* GNEApp) :
+    supermodeMenuCommands(this),
     commonMenuCommands(this),
     networkMenuCommands(this),
     demandMenuCommands(this),
@@ -754,7 +784,11 @@
 
 void
 GNEApplicationWindowHelper::ModesMenuCommands::buildModesMenuCommands(FXMenuPane* modesMenu) {
-    // build Common modes commands and hide it
+    // build supermode commands
+    supermodeMenuCommands.buildSupermodeMenuCommands(modesMenu);
+    // add separator
+    new FXSeparator(modesMenu);
+    // build Common modes commands
     commonMenuCommands.buildCommonMenuCommands(modesMenu);
     // build Network modes commands and hide it
     networkMenuCommands.buildNetworkMenuCommands(modesMenu);
@@ -2001,7 +2035,8 @@
 void
 GNEApplicationWindowHelper::ToolsMenuCommands::buildTools(FXMenuPane* toolsMenu,
         const std::map& menuPaneToolMaps) {
-    // build template tools
+    // build tools from template
+    // the templateTools vector is imported from templates.h (which only exists in the cmake-build folder)
     for (const auto& templateTool : templateTools) {
         if (templateTool.name == "netdiff") {
             myPythonTools.push_back(new GNENetDiffTool(myGNEApp, templateTool.pythonPath,
@@ -2184,6 +2219,9 @@
 GNEApplicationWindowHelper::GNESumoConfigHandler::loadSumoConfig() {
     // get options
     auto& neteditOptions = OptionsCont::getOptions();
+    // reset options
+    mySumoOptions.resetDefault();
+    neteditOptions.resetDefault();
     // make all options writables
     mySumoOptions.resetWritable();
     neteditOptions.resetWritable();
@@ -2214,7 +2252,7 @@
     neteditOptions.set("route-files", mySumoOptions.getString("route-files"));
     // check if we need to define the configuration file
     if (neteditOptions.getString("configuration-file").empty()) {
-        const auto newConfiguration = StringUtils::replace(neteditOptions.getString("configuration-file"), ".sumocfg", ".neteditcfg");
+        const auto newConfiguration = StringUtils::replace(neteditOptions.getString("configuration-file"), ".sumocfg", ".netecfg");
         neteditOptions.resetWritable();
         neteditOptions.set("configuration-file", newConfiguration);
     }
@@ -2234,6 +2272,8 @@
 GNEApplicationWindowHelper::GNENeteditConfigHandler::loadNeteditConfig() {
     // get options
     auto& neteditOptions = OptionsCont::getOptions();
+    // reset options
+    neteditOptions.resetDefault();
     // make all options writables
     neteditOptions.resetWritable();
     // build parser
@@ -2258,7 +2298,7 @@
     neteditOptions.relocateFiles(myFile);
     // check if we have loaded a netedit config or a netconvert config
     if (neteditOptions.getString("configuration-file").find(".netccfg") != std::string::npos) {
-        const auto newConfiguration = StringUtils::replace(neteditOptions.getString("configuration-file"), ".netccfg", ".neteditcfg");
+        const auto newConfiguration = StringUtils::replace(neteditOptions.getString("configuration-file"), ".netccfg", ".netecfg");
         neteditOptions.resetWritable();
         neteditOptions.set("configuration-file", newConfiguration);
     }
@@ -2735,7 +2775,9 @@
 
 std::string
 GNEApplicationWindowHelper::savePlainXMLFileDialog(FXWindow* window) {
-    return openFileDialog(window, TL("Save plain XML as"), GUIIcon::SAVE, "", true);
+    return openFileDialog(window, TL("Save plain XML as"), GUIIcon::SAVE,
+                          TL("XML files (*.xml)") + std::string("\n") +
+                          TL("All files (*)"), true);
 }
 
 
@@ -2767,11 +2809,12 @@
 GNEApplicationWindowHelper::openNeteditConfigFileDialog(FXWindow* window, bool save) {
     if (save) {
         return openFileDialog(window, TL("Save netedit Config file as"), GUIIcon::SAVE_NETEDITCONFIG,
-                              TL("Netedit Config files (*.neteditcfg)") + std::string("\n") +
+                              TL("Netedit Config files (*.netecfg)") + std::string("\n") +
                               TL("All files (*)"), save);
     } else {
         return openFileDialog(window, TL("Open netedit Config file"), GUIIcon::OPEN_NETEDITCONFIG,
-                              TL("Netedit Config files (*.neteditcfg)") + std::string("\n") +
+                              TL("Netedit Config files (*.netecfg)") + std::string("\n") +
+                              TL("Netedit Config files (*.neteditcfg)") + std::string("\n") +   // neteditcfg deprecated
                               TL("All files (*)"), save);
     }
 }
@@ -2912,7 +2955,7 @@
     if (save) {
         opendialog.setSelectMode(SELECTFILE_ANY);
     } else {
-        if (multi) { 
+        if (multi) {
             opendialog.setSelectMode(SELECTFILE_MULTIPLE);
         } else {
             opendialog.setSelectMode(SELECTFILE_EXISTING);
@@ -2937,7 +2980,7 @@
                 gCurrentFolder = opendialog.getDirectory();
                 // assureExtension
                 return MFXUtils::assureExtension(opendialog.getFilename(),
-                        opendialog.getPatternText(opendialog.getCurrentPattern()).after('.').before(')')).text();
+                                                 opendialog.getPatternText(opendialog.getCurrentPattern()).after('.').before(')')).text();
             } else {
                 // close additional dialog
                 WRITE_DEBUG("Abort overwritte file");
@@ -2955,7 +2998,7 @@
                 std::string result;
                 bool first = true;
                 if (files != nullptr) {
-                    for(int i=0; !files[i].empty(); i++){
+                    for (int i = 0; !files[i].empty(); i++) {
                         if (first) {
                             first = false;
                         } else {
@@ -2965,7 +3008,7 @@
                     }
                     delete [] files;
 
-                } 
+                }
                 return result;
             } else {
                 return opendialog.getFilename().text();
diff -Nru sumo-1.17.0/src/netedit/GNEApplicationWindowHelper.h sumo-1.18.0/src/netedit/GNEApplicationWindowHelper.h
--- sumo-1.17.0/src/netedit/GNEApplicationWindowHelper.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/GNEApplicationWindowHelper.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -230,6 +230,35 @@
     struct ModesMenuCommands {
 
         /// @brief struct for common menu commands
+        struct SupermodeMenuCommands {
+
+            /// @brief constructor
+            SupermodeMenuCommands(const ModesMenuCommands* modesMenuCommandsParent);
+
+            /// @brief build menu commands
+            void buildSupermodeMenuCommands(FXMenuPane* modesMenu);
+
+            /// @brief menu command for network supermode
+            FXMenuCommand* networkSupermode;
+
+            /// @brief menu command for demand supermode
+            FXMenuCommand* demandSupermode;
+
+            /// @brief menu command for data supermode
+            FXMenuCommand* dataSupermode;
+
+        private:
+            /// @brief reference to ModesMenuCommands
+            const ModesMenuCommands* myModesMenuCommandsParent;
+
+            /// @brief Invalidated copy constructor.
+            SupermodeMenuCommands(const SupermodeMenuCommands&) = delete;
+
+            /// @brief Invalidated assignment operator.
+            SupermodeMenuCommands& operator=(const SupermodeMenuCommands&) = delete;
+        };
+
+        /// @brief struct for common menu commands
         struct CommonMenuCommands {
 
             /// @brief constructor
@@ -411,6 +440,9 @@
         /// @brief build modes menu commands
         void buildModesMenuCommands(FXMenuPane* modesMenu);
 
+        /// @brief Supermodes Menu Commands
+        SupermodeMenuCommands supermodeMenuCommands;
+
         /// @brief Common Menu Commands
         CommonMenuCommands commonMenuCommands;
 
diff -Nru sumo-1.17.0/src/netedit/GNEEvent_NetworkLoaded.h sumo-1.18.0/src/netedit/GNEEvent_NetworkLoaded.h
--- sumo-1.17.0/src/netedit/GNEEvent_NetworkLoaded.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/GNEEvent_NetworkLoaded.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/GNELane2laneConnection.cpp sumo-1.18.0/src/netedit/GNELane2laneConnection.cpp
--- sumo-1.17.0/src/netedit/GNELane2laneConnection.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/GNELane2laneConnection.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/GNELane2laneConnection.h sumo-1.18.0/src/netedit/GNELane2laneConnection.h
--- sumo-1.17.0/src/netedit/GNELane2laneConnection.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/GNELane2laneConnection.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/GNELoadThread.cpp sumo-1.18.0/src/netedit/GNELoadThread.cpp
--- sumo-1.17.0/src/netedit/GNELoadThread.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/GNELoadThread.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -79,8 +79,13 @@
     std::string loadedFile;
     // check conditions
     if (neteditOptions.getBool("new")) {
+        // create new network
+        validInput = true;
+    } else if (neteditOptions.getString("osm-files").size() > 0) {
+        // load an osm file
         validInput = true;
     } else if (neteditOptions.getString("net-file").size() > 0) {
+        // load a network file
         validInput = true;
         loadedFile = neteditOptions.getString("net-file");
     } else if (neteditOptions.getString("sumocfg-file").size() > 0) {
@@ -125,7 +130,8 @@
     // init output options
     MsgHandler::initOutputOptions();
     // if there is an error checking options, stop
-    if (!(NIFrame::checkOptions() && NBFrame::checkOptions() && NWFrame::checkOptions() && SystemFrame::checkOptions())) {
+    if (!(NIFrame::checkOptions(neteditOptions) && NBFrame::checkOptions(neteditOptions) &&
+            NWFrame::checkOptions(neteditOptions) && SystemFrame::checkOptions(neteditOptions))) {
         // options are not valid
         WRITE_ERROR(TL("Invalid Options. Nothing loaded"));
         submitEndAndCleanup(net, loadedFile);
@@ -381,7 +387,10 @@
     neteditOptions.addDescription("route-prefix", "Netedit", TL("Prefix for route naming"));
 
     neteditOptions.doRegister("vType-prefix", new Option_String("t"));
-    neteditOptions.addDescription("vType-prefix", "Netedit", TL("Prefix for vType naming"));
+    neteditOptions.addDescription("vType-prefix", "Netedit", TL("Prefix for type naming"));
+
+    neteditOptions.doRegister("vTypeDistribution-prefix", new Option_String("td"));
+    neteditOptions.addDescription("vTypeDistribution-prefix", "Netedit", TL("Prefix for type distribution naming"));
 
     neteditOptions.doRegister("vehicle-prefix", new Option_String("v"));
     neteditOptions.addDescription("vehicle-prefix", "Netedit", TL("Prefix for vehicle naming"));
@@ -470,10 +479,10 @@
 
     // fill rest of options
 
-    NIFrame::fillOptions(true);
-    NBFrame::fillOptions(false);
-    NWFrame::fillOptions(false);
-    RandHelper::insertRandOptions();
+    NIFrame::fillOptions(neteditOptions, true);
+    NBFrame::fillOptions(neteditOptions, false);
+    NWFrame::fillOptions(neteditOptions, false);
+    RandHelper::insertRandOptions(neteditOptions);
 }
 
 
diff -Nru sumo-1.17.0/src/netedit/GNELoadThread.h sumo-1.18.0/src/netedit/GNELoadThread.h
--- sumo-1.17.0/src/netedit/GNELoadThread.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/GNELoadThread.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/GNEMoveElement.cpp sumo-1.18.0/src/netedit/GNEMoveElement.cpp
--- sumo-1.17.0/src/netedit/GNEMoveElement.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/GNEMoveElement.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/GNEMoveElement.h sumo-1.18.0/src/netedit/GNEMoveElement.h
--- sumo-1.17.0/src/netedit/GNEMoveElement.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/GNEMoveElement.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/GNENet.cpp sumo-1.18.0/src/netedit/GNENet.cpp
--- sumo-1.17.0/src/netedit/GNENet.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/GNENet.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -1005,8 +1005,11 @@
 
 GNEEdge*
 GNENet::addReversedEdge(GNEEdge* edge, const bool disconnected, GNEUndoList* undoList) {
+    GNEEdge* reversed = edge->getReverseEdge();
+    if (reversed != nullptr) {
+        return reversed;
+    }
     undoList->begin(GUIIcon::EDGE, TL("add reversed edge"));
-    GNEEdge* reversed = nullptr;
     if (!disconnected) {
         // for rail edges, we assume bi-directional tracks are wanted
         reversed = createEdge(edge->getToJunction(), edge->getFromJunction(), edge, undoList, "-" + edge->getID(), false, true);
@@ -2196,6 +2199,7 @@
     device.writeXMLHeader("additional", "additional_file.xsd", EMPTY_HEADER, false);
     // write vTypes with additional childrens (due calibrators)
     writeVTypeComment(device, true);
+    writeVTypeDistributions(device, true);
     writeVTypes(device, true);
     // write routes with additional children (due route prob reroutes)
     writeRouteComment(device, true);
@@ -2251,6 +2255,7 @@
     // first  write all vTypeDistributions (and their vTypes)
     writeVTypeComment(device, false);
     writeVTypes(device, false);
+    writeVTypeDistributions(device, false);
     // now write all routes (and their associated stops), except routes with additional children (due routeProbReroutes)
     writeRouteComment(device, false);
     writeRoutes(device, false);
@@ -2361,12 +2366,13 @@
 
 
 void
-GNENet::writeVTypes(OutputDevice& device, const bool additionalFile) const {
+GNENet::writeVTypeDistributions(OutputDevice& device, const bool additionalFile) const {
     std::map sortedElements;
-    // write vType Distributions
+    // first write vType Distributions
     for (const auto& vTypeDistribution : myAttributeCarriers->getDemandElements().at(SUMO_TAG_VTYPE_DISTRIBUTION)) {
-        if ((additionalFile && (vTypeDistribution->getChildAdditionals().size() > 0)) ||
-                (!additionalFile && (vTypeDistribution->getChildAdditionals().size() == 0))) {
+        // get number of additional children
+        const auto numChildren = vTypeDistribution->getAttributeDouble(GNE_ATTR_ADDITIONALCHILDREN);
+        if ((additionalFile && (numChildren != 0)) || (!additionalFile && (numChildren == 0))) {
             sortedElements[vTypeDistribution->getID()] = vTypeDistribution;
         }
     }
@@ -2374,17 +2380,18 @@
         element.second->writeDemandElement(device);
     }
     sortedElements.clear();
+}
+
+
+void
+GNENet::writeVTypes(OutputDevice& device, const bool additionalFile) const {
+    std::map sortedElements;
     // write vTypes
     for (const auto& vType : myAttributeCarriers->getDemandElements().at(SUMO_TAG_VTYPE)) {
-        // special case for default vTypes
-        const bool defaultVType = GNEAttributeCarrier::parse(vType->getAttribute(GNE_ATTR_DEFAULT_VTYPE));
-        const bool defaultVTypeModified = GNEAttributeCarrier::parse(vType->getAttribute(GNE_ATTR_DEFAULT_VTYPE_MODIFIED));
-        // only write default vType modified
-        if ((vType->getParentDemandElements().size() == 0) && (!defaultVType || (defaultVType && defaultVTypeModified))) {
-            if ((additionalFile && (vType->getChildAdditionals().size() > 0)) ||
-                    (!additionalFile && (vType->getChildAdditionals().size() == 0))) {
-                sortedElements[vType->getID()] = vType;
-            }
+        // get number of additional children
+        const auto numChildren = vType->getChildAdditionals().size();
+        if ((additionalFile && (numChildren != 0)) || (!additionalFile && (numChildren == 0))) {
+            sortedElements[vType->getID()] = vType;
         }
     }
     for (const auto& element : sortedElements) {
@@ -2410,16 +2417,6 @@
 
 bool
 GNENet::writeVTypeComment(OutputDevice& device, const bool additionalFile) const {
-    // vType Distributions
-    for (const auto& vTypeDistribution : myAttributeCarriers->getDemandElements().at(SUMO_TAG_VTYPE_DISTRIBUTION)) {
-        if (additionalFile && (vTypeDistribution->getChildAdditionals().size() > 0)) {
-            device << ("    \n");
-            return true;
-        } else if (!additionalFile && (vTypeDistribution->getChildAdditionals().size() == 0)) {
-            device << ("    \n");
-            return true;
-        }
-    }
     // vTypes
     for (const auto& vType : myAttributeCarriers->getDemandElements().at(SUMO_TAG_VTYPE)) {
         // special case for default vTypes
@@ -2427,7 +2424,7 @@
         const bool defaultVTypeModified = GNEAttributeCarrier::parse(vType->getAttribute(GNE_ATTR_DEFAULT_VTYPE_MODIFIED));
         // only write default vType modified
         if ((vType->getParentDemandElements().size() == 0) && (!defaultVType || (defaultVType && defaultVTypeModified))) {
-            if (additionalFile && (vType->getChildAdditionals().size() > 0)) {
+            if (additionalFile && (vType->getChildAdditionals().size() != 0)) {
                 device << ("    \n");
                 return true;
             } else if (!additionalFile && (vType->getChildAdditionals().size() == 0)) {
@@ -2443,7 +2440,7 @@
 bool
 GNENet::writeRouteComment(OutputDevice& device, const bool additionalFile) const {
     for (const auto& route : myAttributeCarriers->getDemandElements().at(SUMO_TAG_ROUTE)) {
-        if (additionalFile && (route->getChildAdditionals().size() > 0)) {
+        if (additionalFile && (route->getChildAdditionals().size() != 0)) {
             device << ("    \n");
             return true;
         } else if (!additionalFile && (route->getChildAdditionals().size() == 0)) {
diff -Nru sumo-1.17.0/src/netedit/GNENet.h sumo-1.18.0/src/netedit/GNENet.h
--- sumo-1.17.0/src/netedit/GNENet.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/GNENet.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -544,6 +544,9 @@
     /// @brief write route sorted by ID
     void writeRoutes(OutputDevice& device, const bool additionalFile) const;
 
+    /// @brief write vTypeDistributions sorted by ID
+    void writeVTypeDistributions(OutputDevice& device, const bool additionalFile) const;
+
     /// @brief write vTypes sorted by ID
     void writeVTypes(OutputDevice& device, const bool additionalFile) const;
 
diff -Nru sumo-1.17.0/src/netedit/GNENetHelper.cpp sumo-1.18.0/src/netedit/GNENetHelper.cpp
--- sumo-1.17.0/src/netedit/GNENetHelper.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/GNENetHelper.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -33,6 +33,14 @@
 #include 
 #include 
 #include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 #include 
 #include 
 #include 
@@ -112,7 +120,7 @@
             // decrease reference manually (because it was increased manually in GNERouteHandler)
             demandElement->decRef();
             // show extra information for tests
-            if (demandElement->getTagProperty().isVehicleType()) {
+            if (demandElement->getTagProperty().isType()) {
                 // special case for default VTypes
                 if (DEFAULT_VTYPES.count(demandElement->getID()) == 0) {
                     WRITE_DEBUG("Deleting unreferenced " + demandElement->getTagStr() + " in AttributeCarriers destructor");
@@ -1171,8 +1179,15 @@
         prefix = toString(SUMO_TAG_TAZ);
     }
     int counter = 0;
-    // special case for calibrators
-    if ((tag == SUMO_TAG_CALIBRATOR) || (tag == GNE_TAG_CALIBRATOR_LANE)) {
+    // check special cases
+    if ((tag == SUMO_TAG_BUS_STOP) || (tag == SUMO_TAG_TRAIN_STOP)) {
+        // BusStops and trainStops share namespace
+        while ((retrieveAdditional(SUMO_TAG_BUS_STOP, prefix + "_" + toString(counter), false) != nullptr) ||
+                (retrieveAdditional(SUMO_TAG_TRAIN_STOP, prefix + "_" + toString(counter), false) != nullptr)) {
+            counter++;
+        }
+    } else if ((tag == SUMO_TAG_CALIBRATOR) || (tag == GNE_TAG_CALIBRATOR_LANE)) {
+        // Calibrators over edge/lane share namespace
         while ((retrieveAdditional(SUMO_TAG_CALIBRATOR, prefix + "_" + toString(counter), false) != nullptr) ||
                 (retrieveAdditional(GNE_TAG_CALIBRATOR_LANE, prefix + "_" + toString(counter), false) != nullptr)) {
             counter++;
@@ -1338,6 +1353,21 @@
 }
 
 
+GNEDemandElement*
+GNENetHelper::AttributeCarriers::retrieveFirstDemandElement(SumoXMLTag type) const {
+    if (myDemandElements.at(type).size() == 0) {
+        return nullptr;
+    } else {
+        // map with elements sorted by ID
+        std::map map;
+        for (const auto& demandElement : myDemandElements.at(type)) {
+            map[demandElement->getID()] = demandElement;
+        }
+        return map.begin()->second;
+    }
+}
+
+
 std::vector
 GNENetHelper::AttributeCarriers::getSelectedDemandElements() const {
     std::vector result;
@@ -1390,7 +1420,9 @@
         prefix = neteditOptions.getString("route-prefix");
     } else if (tag == SUMO_TAG_VTYPE) {
         prefix = neteditOptions.getString("vType-prefix");
-    } else if ((tag == SUMO_TAG_TRIP) || (tag == GNE_TAG_TRIP_JUNCTIONS)) {
+    } else if (tag == SUMO_TAG_VTYPE_DISTRIBUTION) {
+        prefix = neteditOptions.getString("vTypeDistribution-prefix");
+    } else if ((tag == SUMO_TAG_TRIP) || (tag == GNE_TAG_TRIP_JUNCTIONS) || (tag == GNE_TAG_TRIP_TAZS)) {
         prefix = neteditOptions.getString("trip-prefix");
     } else if (tagProperty.isVehicle() && !tagProperty.isFlow()) {
         prefix = neteditOptions.getString("vehicle-prefix");
@@ -1411,7 +1443,15 @@
     }
     // declare counter
     int counter = 0;
-    if (tagProperty.isPerson()) {
+    if (tagProperty.isType()) {
+        // special case for persons (person and personFlows share nameSpaces)
+        while ((retrieveDemandElement(SUMO_TAG_VTYPE, prefix + "_" + toString(counter), false) != nullptr) ||
+                (retrieveDemandElement(SUMO_TAG_VTYPE_DISTRIBUTION, prefix + "_" + toString(counter), false) != nullptr)) {
+            counter++;
+        }
+        // return new person ID
+        return (prefix + "_" + toString(counter));
+    } else if (tagProperty.isPerson()) {
         // special case for persons (person and personFlows share nameSpaces)
         while ((retrieveDemandElement(SUMO_TAG_PERSON, prefix + "_" + toString(counter), false) != nullptr) ||
                 (retrieveDemandElement(SUMO_TAG_PERSONFLOW, prefix + "_" + toString(counter), false) != nullptr)) {
@@ -1433,10 +1473,12 @@
                 (retrieveDemandElement(SUMO_TAG_TRIP, prefix + "_" + toString(counter), false) != nullptr) ||
                 (retrieveDemandElement(GNE_TAG_VEHICLE_WITHROUTE, prefix + "_" + toString(counter), false) != nullptr) ||
                 (retrieveDemandElement(GNE_TAG_TRIP_JUNCTIONS, prefix + "_" + toString(counter), false) != nullptr) ||
+                (retrieveDemandElement(GNE_TAG_TRIP_TAZS, prefix + "_" + toString(counter), false) != nullptr) ||
                 (retrieveDemandElement(GNE_TAG_FLOW_ROUTE, prefix + "_" + toString(counter), false) != nullptr) ||
                 (retrieveDemandElement(SUMO_TAG_FLOW, prefix + "_" + toString(counter), false) != nullptr) ||
                 (retrieveDemandElement(GNE_TAG_FLOW_WITHROUTE, prefix + "_" + toString(counter), false) != nullptr) ||
-                (retrieveDemandElement(GNE_TAG_FLOW_JUNCTIONS, prefix + "_" + toString(counter), false) != nullptr)) {
+                (retrieveDemandElement(GNE_TAG_FLOW_JUNCTIONS, prefix + "_" + toString(counter), false) != nullptr) ||
+                (retrieveDemandElement(GNE_TAG_FLOW_TAZS, prefix + "_" + toString(counter), false) != nullptr)) {
             counter++;
         }
         // return new vehicle ID
@@ -1511,7 +1553,8 @@
 }
 
 
-int GNENetHelper::AttributeCarriers::getStopIndex() {
+int
+GNENetHelper::AttributeCarriers::getStopIndex() {
     return myStopIndex++;
 }
 
@@ -2386,13 +2429,15 @@
     if (myNet->isUpdateGeometryEnabled()) {
         demandElement->updateGeometry();
     }
+    // update demand elements frames
+    updateDemandElementFrames(demandElement->getTagProperty());
     // demandElements has to be saved
     myNet->getSavingStatus()->requireSaveDemandElements();
 }
 
 
 void
-GNENetHelper::AttributeCarriers::deleteDemandElement(GNEDemandElement* demandElement) {
+GNENetHelper::AttributeCarriers::deleteDemandElement(GNEDemandElement* demandElement, const bool updateFrames) {
     // find demanElement in demandElementTag
     auto itFind = myDemandElements.at(demandElement->getTagProperty().getTag()).find(demandElement);
     // check if demandElement was previously inserted
@@ -2403,6 +2448,7 @@
     myNet->getViewNet()->removeFromAttributeCarrierInspected(demandElement);
     myNet->getViewNet()->getViewParent()->getInspectorFrame()->getHierarchicalElementTree()->removeCurrentEditedAttributeCarrier(demandElement);
     myNet->getViewNet()->getViewParent()->getPersonPlanFrame()->getPersonHierarchy()->removeCurrentEditedAttributeCarrier(demandElement);
+    myNet->getViewNet()->getViewParent()->getContainerPlanFrame()->getContainerHierarchy()->removeCurrentEditedAttributeCarrier(demandElement);
     // if is the last inserted route, remove it from GNEViewNet
     if (myNet->getViewNet()->getLastCreatedRoute() == demandElement) {
         myNet->getViewNet()->setLastCreatedRoute(nullptr);
@@ -2413,6 +2459,10 @@
     myNet->removeGLObjectFromGrid(demandElement);
     // delete path element
     myNet->getPathManager()->removePath(demandElement);
+    // check if update demand elements frames
+    if (updateFrames) {
+        updateDemandElementFrames(demandElement->getTagProperty());
+    }
     // demandElements has to be saved
     myNet->getSavingStatus()->requireSaveDemandElements();
 }
@@ -2520,6 +2570,57 @@
     myNet->getSavingStatus()->requireSaveMeanDatas();
 }
 
+
+void
+GNENetHelper::AttributeCarriers::updateDemandElementFrames(const GNETagProperties& tagProperty) {
+    if (myNet->getViewNet()->getEditModes().isCurrentSupermodeDemand()) {
+        // continue depending of demand mode
+        switch (myNet->getViewNet()->getEditModes().demandEditMode) {
+            case DemandEditMode::DEMAND_VEHICLE:
+                if (tagProperty.isType()) {
+                    myNet->getViewNet()->getViewParent()->getVehicleFrame()->getTypeSelector()->refreshDemandElementSelector();
+                }
+                break;
+            case DemandEditMode::DEMAND_TYPE:
+                if (tagProperty.isType()) {
+                    myNet->getViewNet()->getViewParent()->getTypeFrame()->getTypeSelector()->refreshTypeSelector();
+                }
+                break;
+            case DemandEditMode::DEMAND_TYPEDISTRIBUTION:
+                if (tagProperty.isType()) {
+                    myNet->getViewNet()->getViewParent()->getTypeDistributionFrame()->getTypeDistributionSelector()->refreshTypeDistributionSelector();
+                }
+                break;
+            case DemandEditMode::DEMAND_STOP:
+                myNet->getViewNet()->getViewParent()->getStopFrame()->getStopParentSelector()->refreshDemandElementSelector();
+                break;
+            case DemandEditMode::DEMAND_PERSON:
+                if (tagProperty.isType()) {
+                    myNet->getViewNet()->getViewParent()->getPersonFrame()->getTypeSelector()->refreshDemandElementSelector();
+                }
+                break;
+            case DemandEditMode::DEMAND_PERSONPLAN:
+                if (tagProperty.isPerson()) {
+                    myNet->getViewNet()->getViewParent()->getPersonPlanFrame()->getPersonSelector()->refreshDemandElementSelector();
+                }
+                break;
+            case DemandEditMode::DEMAND_CONTAINER:
+                if (tagProperty.isType()) {
+                    myNet->getViewNet()->getViewParent()->getContainerFrame()->getTypeSelector()->refreshDemandElementSelector();
+                }
+                break;
+            case DemandEditMode::DEMAND_CONTAINERPLAN:
+                if (tagProperty.isContainer()) {
+                    myNet->getViewNet()->getViewParent()->getContainerPlanFrame()->getContainerSelector()->refreshDemandElementSelector();
+                }
+                break;
+            default:
+                // nothing to update
+                break;
+        }
+    }
+}
+
 // ---------------------------------------------------------------------------
 // GNENetHelper::SavingStatus - methods
 // ---------------------------------------------------------------------------
diff -Nru sumo-1.17.0/src/netedit/GNENetHelper.h sumo-1.18.0/src/netedit/GNENetHelper.h
--- sumo-1.17.0/src/netedit/GNENetHelper.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/GNENetHelper.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -423,6 +423,11 @@
          */
         GNEDemandElement* retrieveDemandElement(GNEAttributeCarrier* AC, bool hardFail = true) const;
 
+        /**@brief Returns the first demand element sorted by ID (or null if type is empty)
+         * @param[in] type tag with the type of demand element
+         */
+        GNEDemandElement* retrieveFirstDemandElement(SumoXMLTag type) const;
+
         /// @brief get selected demand elements
         std::vector getSelectedDemandElements() const;
 
@@ -664,7 +669,7 @@
         /**@brief delete demand element element of GNENet container
          * @throw processError if demand element wasn't previously inserted
          */
-        void deleteDemandElement(GNEDemandElement* demandElement);
+        void deleteDemandElement(GNEDemandElement* demandElement, const bool updateFrames);
 
         /// @}
 
@@ -704,6 +709,9 @@
 
         /// @}
 
+        /// @brief update demand element frames (called after insert/delete demand element)
+        void updateDemandElementFrames(const GNETagProperties& tagProperty);
+
     private:
         /// @brief pointer to net
         GNENet* myNet;
diff -Nru sumo-1.17.0/src/netedit/GNEPathManager.cpp sumo-1.18.0/src/netedit/GNEPathManager.cpp
--- sumo-1.17.0/src/netedit/GNEPathManager.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/GNEPathManager.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/GNEPathManager.h sumo-1.18.0/src/netedit/GNEPathManager.h
--- sumo-1.17.0/src/netedit/GNEPathManager.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/GNEPathManager.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/GNEReferenceCounter.h sumo-1.18.0/src/netedit/GNEReferenceCounter.h
--- sumo-1.17.0/src/netedit/GNEReferenceCounter.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/GNEReferenceCounter.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/GNEUndoList.cpp sumo-1.18.0/src/netedit/GNEUndoList.cpp
--- sumo-1.17.0/src/netedit/GNEUndoList.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/GNEUndoList.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/GNEUndoList.h sumo-1.18.0/src/netedit/GNEUndoList.h
--- sumo-1.17.0/src/netedit/GNEUndoList.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/GNEUndoList.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/GNEViewNet.cpp sumo-1.18.0/src/netedit/GNEViewNet.cpp
--- sumo-1.17.0/src/netedit/GNEViewNet.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/GNEViewNet.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -45,6 +45,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -87,17 +88,18 @@
     FXMAPFUNC(SEL_COMMAND, MID_HOTKEY_F4_SUPERMODE_DATA,    GNEViewNet::onCmdSetSupermode),
     // Modes
     FXMAPFUNC(SEL_COMMAND, MID_HOTKEY_A_MODE_STARTSIMULATION_ADDITIONALSTOP,    GNEViewNet::onCmdSetMode),
-    FXMAPFUNC(SEL_COMMAND, MID_HOTKEY_C_MODE_CONNECT_PERSONPLAN,                GNEViewNet::onCmdSetMode),
+    FXMAPFUNC(SEL_COMMAND, MID_HOTKEY_C_MODE_CONNECT_CONTAINER,                 GNEViewNet::onCmdSetMode),
     FXMAPFUNC(SEL_COMMAND, MID_HOTKEY_D_MODE_SINGLESIMULATIONSTEP_DELETE,       GNEViewNet::onCmdSetMode),
     FXMAPFUNC(SEL_COMMAND, MID_HOTKEY_E_MODE_EDGE_EDGEDATA,                     GNEViewNet::onCmdSetMode),
-    FXMAPFUNC(SEL_COMMAND, MID_HOTKEY_G_MODE_CONTAINER,                         GNEViewNet::onCmdSetMode),
     FXMAPFUNC(SEL_COMMAND, MID_HOTKEY_H_MODE_PROHIBITION_CONTAINERPLAN,         GNEViewNet::onCmdSetMode),
     FXMAPFUNC(SEL_COMMAND, MID_HOTKEY_I_MODE_INSPECT,                           GNEViewNet::onCmdSetMode),
+    FXMAPFUNC(SEL_COMMAND, MID_HOTKEY_L_MODE_PERSONPLAN,                        GNEViewNet::onCmdSetMode),
     FXMAPFUNC(SEL_COMMAND, MID_HOTKEY_M_MODE_MOVE_MEANDATA,                     GNEViewNet::onCmdSetMode),
     FXMAPFUNC(SEL_COMMAND, MID_HOTKEY_P_MODE_POLYGON_PERSON,                    GNEViewNet::onCmdSetMode),
     FXMAPFUNC(SEL_COMMAND, MID_HOTKEY_R_MODE_CROSSING_ROUTE_EDGERELDATA,        GNEViewNet::onCmdSetMode),
     FXMAPFUNC(SEL_COMMAND, MID_HOTKEY_S_MODE_STOPSIMULATION_SELECT,             GNEViewNet::onCmdSetMode),
     FXMAPFUNC(SEL_COMMAND, MID_HOTKEY_T_MODE_TLS_TYPE,                          GNEViewNet::onCmdSetMode),
+    FXMAPFUNC(SEL_COMMAND, MID_HOTKEY_U_MODE_TYPEDISTRIBUTION,                  GNEViewNet::onCmdSetMode),
     FXMAPFUNC(SEL_COMMAND, MID_HOTKEY_V_MODE_VEHICLE,                           GNEViewNet::onCmdSetMode),
     FXMAPFUNC(SEL_COMMAND, MID_HOTKEY_W_MODE_WIRE,                              GNEViewNet::onCmdSetMode),
     FXMAPFUNC(SEL_COMMAND, MID_HOTKEY_Z_MODE_TAZ_TAZREL,                        GNEViewNet::onCmdSetMode),
@@ -1342,7 +1344,7 @@
             if (myViewParent->getTLSEditorFrame()->getTLSAttributes()->isSetDetectorsToggleButtonEnabled()) {
                 myViewParent->getTLSEditorFrame()->getTLSAttributes()->disableE1DetectorMode();
             } else if (myViewParent->getTLSEditorFrame()->getTLSJunction()->isJoiningJunctions()) {
-                myViewParent->getTLSEditorFrame()->getTLSJunction()->disableJoiningJunctionMode();
+                myViewParent->getTLSEditorFrame()->getTLSJunction()->onCmdCancelJoin(nullptr, 0, nullptr);
             } else {
                 myViewParent->getTLSEditorFrame()->getTLSDefinition()->discardChanges(false);
             }
@@ -1487,7 +1489,7 @@
             if (myViewParent->getTLSEditorFrame()->getTLSAttributes()->isSetDetectorsToggleButtonEnabled()) {
                 myViewParent->getTLSEditorFrame()->getTLSAttributes()->disableE1DetectorMode();
             } else if (myViewParent->getTLSEditorFrame()->getTLSJunction()->isJoiningJunctions()) {
-                myViewParent->getTLSEditorFrame()->getTLSJunction()->disableJoiningJunctionMode();
+                myViewParent->getTLSEditorFrame()->getTLSJunction()->onCmdAcceptJoin(nullptr, 0, nullptr);
             } else if (myViewParent->getTLSEditorFrame()->getTLSDefinition()->checkHaveModifications()) {
                 myViewParent->getTLSEditorFrame()->getTLSDefinition()->onCmdSaveChanges(nullptr, 0, nullptr);
             }
@@ -1962,7 +1964,7 @@
             case MID_HOTKEY_E_MODE_EDGE_EDGEDATA:
                 myEditModes.setNetworkEditMode(NetworkEditMode::NETWORK_CREATE_EDGE);
                 break;
-            case MID_HOTKEY_C_MODE_CONNECT_PERSONPLAN:
+            case MID_HOTKEY_C_MODE_CONNECT_CONTAINER:
                 myEditModes.setNetworkEditMode(NetworkEditMode::NETWORK_CONNECT);
                 break;
             case MID_HOTKEY_T_MODE_TLS_TYPE:
@@ -1992,8 +1994,8 @@
     } else if (myEditModes.isCurrentSupermodeDemand()) {
         // check what demand mode will be set
         switch (FXSELID(sel)) {
-            case MID_HOTKEY_G_MODE_CONTAINER:
-                myEditModes.setDemandEditMode(DemandEditMode::DEMAND_CONTAINER);
+            case MID_HOTKEY_L_MODE_PERSONPLAN:
+                myEditModes.setDemandEditMode(DemandEditMode::DEMAND_PERSONPLAN);
                 break;
             case MID_HOTKEY_H_MODE_PROHIBITION_CONTAINERPLAN:
                 myEditModes.setDemandEditMode(DemandEditMode::DEMAND_CONTAINERPLAN);
@@ -2019,14 +2021,17 @@
             case MID_HOTKEY_T_MODE_TLS_TYPE:
                 myEditModes.setDemandEditMode(DemandEditMode::DEMAND_TYPE);
                 break;
+            case MID_HOTKEY_U_MODE_TYPEDISTRIBUTION:
+                myEditModes.setDemandEditMode(DemandEditMode::DEMAND_TYPEDISTRIBUTION);
+                break;
             case MID_HOTKEY_A_MODE_STARTSIMULATION_ADDITIONALSTOP:
                 myEditModes.setDemandEditMode(DemandEditMode::DEMAND_STOP);
                 break;
             case MID_HOTKEY_P_MODE_POLYGON_PERSON:
                 myEditModes.setDemandEditMode(DemandEditMode::DEMAND_PERSON);
                 break;
-            case MID_HOTKEY_C_MODE_CONNECT_PERSONPLAN:
-                myEditModes.setDemandEditMode(DemandEditMode::DEMAND_PERSONPLAN);
+            case MID_HOTKEY_C_MODE_CONNECT_CONTAINER:
+                myEditModes.setDemandEditMode(DemandEditMode::DEMAND_CONTAINER);
                 break;
             default:
                 break;
@@ -4733,6 +4738,13 @@
             // set checkable button
             myDemandCheckableButtons.typeButton->setChecked(true);
             break;
+        case DemandEditMode::DEMAND_TYPEDISTRIBUTION:
+            myViewParent->getTypeDistributionFrame()->show();
+            myViewParent->getTypeDistributionFrame()->focusUpperElement();
+            myCurrentFrame = myViewParent->getTypeDistributionFrame();
+            // set checkable button
+            myDemandCheckableButtons.typeDistributionButton->setChecked(true);
+            break;
         case DemandEditMode::DEMAND_STOP:
             myViewParent->getStopFrame()->show();
             myViewParent->getStopFrame()->focusUpperElement();
@@ -5044,6 +5056,9 @@
             case DemandEditMode::DEMAND_TYPE:
                 myViewParent->getTypeFrame()->show();
                 break;
+            case DemandEditMode::DEMAND_TYPEDISTRIBUTION:
+                myViewParent->getTypeDistributionFrame()->show();
+                break;
             case DemandEditMode::DEMAND_STOP:
                 myViewParent->getStopFrame()->show();
                 break;
diff -Nru sumo-1.17.0/src/netedit/GNEViewNet.h sumo-1.18.0/src/netedit/GNEViewNet.h
--- sumo-1.17.0/src/netedit/GNEViewNet.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/GNEViewNet.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/GNEViewNetHelper.cpp sumo-1.18.0/src/netedit/GNEViewNetHelper.cpp
--- sumo-1.17.0/src/netedit/GNEViewNetHelper.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/GNEViewNetHelper.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -3556,7 +3556,7 @@
     connectionButton = new MFXCheckableButton(false, myViewNet->myViewParent->getGNEAppWindows()->getToolbarsGrip().modes,
             myViewNet->myViewParent->getGNEAppWindows()->getStaticTooltipMenu(),
             std::string("\t") + TL("Set connection mode") + std::string("\t") + TL("Mode for edit connections between lanes. (C)"),
-            GUIIconSubSys::getIcon(GUIIcon::MODECONNECTION), myViewNet, MID_HOTKEY_C_MODE_CONNECT_PERSONPLAN, GUIDesignMFXCheckableButtonSquare);
+            GUIIconSubSys::getIcon(GUIIcon::MODECONNECTION), myViewNet, MID_HOTKEY_C_MODE_CONNECT_CONTAINER, GUIDesignMFXCheckableButtonSquare);
     connectionButton->create();
     // prohibition mode
     prohibitionButton = new MFXCheckableButton(false, myViewNet->myViewParent->getGNEAppWindows()->getToolbarsGrip().modes,
@@ -3669,15 +3669,6 @@
 // ---------------------------------------------------------------------------
 
 GNEViewNetHelper::DemandCheckableButtons::DemandCheckableButtons(GNEViewNet* viewNet) :
-    moveDemandElementsButton(nullptr),
-    routeButton(nullptr),
-    vehicleButton(nullptr),
-    typeButton(nullptr),
-    stopButton(nullptr),
-    personButton(nullptr),
-    personPlanButton(nullptr),
-    containerButton(nullptr),
-    containerPlanButton(nullptr),
     myViewNet(viewNet) {
 }
 
@@ -3708,6 +3699,12 @@
                                         std::string("\t") + TL("Create type mode") + std::string("\t") + TL("Mode for creating types (vehicles, person and containers). (T)"),
                                         GUIIconSubSys::getIcon(GUIIcon::MODETYPE), myViewNet, MID_HOTKEY_T_MODE_TLS_TYPE, GUIDesignMFXCheckableButtonSquare);
     typeButton->create();
+    // type distribution mode
+    typeDistributionButton = new MFXCheckableButton(false, myViewNet->myViewParent->getGNEAppWindows()->getToolbarsGrip().modes,
+            myViewNet->myViewParent->getGNEAppWindows()->getStaticTooltipMenu(),
+            std::string("\t") + TL("Create type distribution mode") + std::string("\t") + TL("Mode for creating type distribution. (U)"),
+            GUIIconSubSys::getIcon(GUIIcon::MODETYPEDISTRIBUTION), myViewNet, MID_HOTKEY_U_MODE_TYPEDISTRIBUTION, GUIDesignMFXCheckableButtonSquare);
+    typeDistributionButton->create();
     // stop mode
     stopButton = new MFXCheckableButton(false, myViewNet->myViewParent->getGNEAppWindows()->getToolbarsGrip().modes,
                                         myViewNet->myViewParent->getGNEAppWindows()->getStaticTooltipMenu(),
@@ -3723,14 +3720,14 @@
     // person plan mode
     personPlanButton = new MFXCheckableButton(false, myViewNet->myViewParent->getGNEAppWindows()->getToolbarsGrip().modes,
             myViewNet->myViewParent->getGNEAppWindows()->getStaticTooltipMenu(),
-            std::string("\t") + TL("Create person plan mode") + std::string("\t") + TL("Mode for creating person plans. (C)"),
-            GUIIconSubSys::getIcon(GUIIcon::MODEPERSONPLAN), myViewNet, MID_HOTKEY_C_MODE_CONNECT_PERSONPLAN, GUIDesignMFXCheckableButtonSquare);
+            std::string("\t") + TL("Create person plan mode") + std::string("\t") + TL("Mode for creating person plans. (L)"),
+            GUIIconSubSys::getIcon(GUIIcon::MODEPERSONPLAN), myViewNet, MID_HOTKEY_L_MODE_PERSONPLAN, GUIDesignMFXCheckableButtonSquare);
     personPlanButton->create();
     // container mode
     containerButton = new MFXCheckableButton(false, myViewNet->myViewParent->getGNEAppWindows()->getToolbarsGrip().modes,
             myViewNet->myViewParent->getGNEAppWindows()->getStaticTooltipMenu(),
-            std::string("\t") + TL("Create container mode") + std::string("\t") + TL("Mode for creating containers. (P)"),
-            GUIIconSubSys::getIcon(GUIIcon::MODECONTAINER), myViewNet, MID_HOTKEY_G_MODE_CONTAINER, GUIDesignMFXCheckableButtonSquare);
+            std::string("\t") + TL("Create container mode") + std::string("\t") + TL("Mode for creating containers. (C)"),
+            GUIIconSubSys::getIcon(GUIIcon::MODECONTAINER), myViewNet, MID_HOTKEY_C_MODE_CONNECT_CONTAINER, GUIDesignMFXCheckableButtonSquare);
     containerButton->create();
     // container plan mode
     containerPlanButton = new MFXCheckableButton(false, myViewNet->myViewParent->getGNEAppWindows()->getToolbarsGrip().modes,
@@ -3749,6 +3746,7 @@
     routeButton->show();
     vehicleButton->show();
     typeButton->show();
+    typeDistributionButton->show();
     stopButton->show();
     personButton->show();
     personPlanButton->show();
@@ -3763,6 +3761,7 @@
     routeButton->hide();
     vehicleButton->hide();
     typeButton->hide();
+    typeDistributionButton->hide();
     stopButton->hide();
     personButton->hide();
     personPlanButton->hide();
@@ -3777,6 +3776,7 @@
     routeButton->setChecked(false);
     vehicleButton->setChecked(false);
     typeButton->setChecked(false);
+    typeDistributionButton->setChecked(false);
     stopButton->setChecked(false);
     personButton->setChecked(false);
     personPlanButton->setChecked(false);
@@ -3791,6 +3791,7 @@
     routeButton->update();
     vehicleButton->update();
     typeButton->update();
+    typeDistributionButton->update();
     stopButton->update();
     personButton->update();
     personPlanButton->update();
diff -Nru sumo-1.17.0/src/netedit/GNEViewNetHelper.h sumo-1.18.0/src/netedit/GNEViewNetHelper.h
--- sumo-1.17.0/src/netedit/GNEViewNetHelper.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/GNEViewNetHelper.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -91,6 +91,8 @@
     DEMAND_VEHICLE,
     ///@brief Mode for editing types
     DEMAND_TYPE,
+    ///@brief Mode for editing type distributions
+    DEMAND_TYPEDISTRIBUTION,
     ///@brief Mode for editing stops
     DEMAND_STOP,
     ///@brief Mode for editing person
@@ -1274,31 +1276,34 @@
         void updateDemandCheckableButtons();
 
         /// @brief checkable button for edit mode "move demand elements"
-        MFXCheckableButton* moveDemandElementsButton;
+        MFXCheckableButton* moveDemandElementsButton = nullptr;
 
         /// @brief checkable button for edit mode create routes
-        MFXCheckableButton* routeButton;
+        MFXCheckableButton* routeButton = nullptr;
 
         /// @brief checkable button for edit mode create vehicles
-        MFXCheckableButton* vehicleButton;
+        MFXCheckableButton* vehicleButton = nullptr;
 
         /// @brief checkable button for edit mode create type
-        MFXCheckableButton* typeButton;
+        MFXCheckableButton* typeButton = nullptr;
+
+        /// @brief checkable button for edit mode create type distribution
+        MFXCheckableButton* typeDistributionButton = nullptr;
 
         /// @brief checkable button for edit mode create stops
-        MFXCheckableButton* stopButton;
+        MFXCheckableButton* stopButton = nullptr;
 
         /// @brief checkable button for edit mode create persons
-        MFXCheckableButton* personButton;
+        MFXCheckableButton* personButton = nullptr;
 
         /// @brief checkable button for edit mode create person plans
-        MFXCheckableButton* personPlanButton;
+        MFXCheckableButton* personPlanButton = nullptr;
 
         /// @brief checkable button for edit mode create containers
-        MFXCheckableButton* containerButton;
+        MFXCheckableButton* containerButton = nullptr;
 
         /// @brief checkable button for edit mode create container plans
-        MFXCheckableButton* containerPlanButton;
+        MFXCheckableButton* containerPlanButton = nullptr;
 
     private:
         /// @brief pointer to net
diff -Nru sumo-1.17.0/src/netedit/GNEViewParent.cpp sumo-1.18.0/src/netedit/GNEViewParent.cpp
--- sumo-1.17.0/src/netedit/GNEViewParent.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/GNEViewParent.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -39,6 +39,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -282,7 +283,13 @@
 
 GNETypeFrame*
 GNEViewParent::getTypeFrame() const {
-    return myDemandFrames.vehicleTypeFrame;
+    return myDemandFrames.typeFrame;
+}
+
+
+GNETypeDistributionFrame*
+GNEViewParent::getTypeDistributionFrame() const {
+    return myDemandFrames.typeDistributionFrame;
 }
 
 
@@ -533,10 +540,12 @@
                                     demandElements.at(SUMO_TAG_TRIP).size() +
                                     demandElements.at(GNE_TAG_VEHICLE_WITHROUTE).size() +
                                     demandElements.at(GNE_TAG_TRIP_JUNCTIONS).size() +
+                                    demandElements.at(GNE_TAG_TRIP_TAZS).size() +
                                     demandElements.at(SUMO_TAG_FLOW).size() +
                                     demandElements.at(GNE_TAG_FLOW_ROUTE).size() +
                                     demandElements.at(GNE_TAG_FLOW_WITHROUTE).size() +
-                                    demandElements.at(GNE_TAG_FLOW_JUNCTIONS).size());
+                                    demandElements.at(GNE_TAG_FLOW_JUNCTIONS).size() + 
+                                    demandElements.at(GNE_TAG_FLOW_TAZS).size());
                 // fill ACsToLocate with vehicles,...
                 for (const auto& vehicle : demandElements.at(SUMO_TAG_VEHICLE)) {
                     ACsToLocate.push_back(vehicle);
@@ -546,12 +555,16 @@
                     ACsToLocate.push_back(trip);
                 }
                 // ...vehicles with embedded routes,...
-                for (const auto& trip : demandElements.at(GNE_TAG_VEHICLE_WITHROUTE)) {
-                    ACsToLocate.push_back(trip);
+                for (const auto& tripEmbedded : demandElements.at(GNE_TAG_VEHICLE_WITHROUTE)) {
+                    ACsToLocate.push_back(tripEmbedded);
                 }
                 // ...trips over junctions,...
-                for (const auto& trip : demandElements.at(GNE_TAG_TRIP_JUNCTIONS)) {
-                    ACsToLocate.push_back(trip);
+                for (const auto& tripJunction : demandElements.at(GNE_TAG_TRIP_JUNCTIONS)) {
+                    ACsToLocate.push_back(tripJunction);
+                }
+                // ...trips over TAZs,...
+                for (const auto& tripTAZ : demandElements.at(GNE_TAG_TRIP_TAZS)) {
+                    ACsToLocate.push_back(tripTAZ);
                 }
                 // ...flows,...
                 for (const auto& flow : demandElements.at(SUMO_TAG_FLOW)) {
@@ -562,12 +575,16 @@
                     ACsToLocate.push_back(flowRoute);
                 }
                 // ...flows with embedded routes...
-                for (const auto& flowRoute : demandElements.at(GNE_TAG_FLOW_WITHROUTE)) {
-                    ACsToLocate.push_back(flowRoute);
+                for (const auto& flowRouteEmbedded : demandElements.at(GNE_TAG_FLOW_WITHROUTE)) {
+                    ACsToLocate.push_back(flowRouteEmbedded);
                 }
                 // ... and flows over junctions.
-                for (const auto& flowRoute : demandElements.at(GNE_TAG_FLOW_JUNCTIONS)) {
-                    ACsToLocate.push_back(flowRoute);
+                for (const auto& flowJunction : demandElements.at(GNE_TAG_FLOW_JUNCTIONS)) {
+                    ACsToLocate.push_back(flowJunction);
+                }
+                // ... and flows over TAZs.
+                for (const auto& flowTAZ : demandElements.at(GNE_TAG_FLOW_TAZS)) {
+                    ACsToLocate.push_back(flowTAZ);
                 }
                 break;
             }
@@ -597,29 +614,34 @@
                 chooserLoc = &myACChoosers.ACChooserStops;
                 locateTitle = TL("Stop Chooser");
                 // reserve memory
-                ACsToLocate.reserve(viewNet->getNet()->getAttributeCarriers()->getDemandElements().at(SUMO_TAG_STOP_LANE).size() +
-                                    viewNet->getNet()->getAttributeCarriers()->getDemandElements().at(SUMO_TAG_STOP_BUSSTOP).size() +
-                                    viewNet->getNet()->getAttributeCarriers()->getDemandElements().at(SUMO_TAG_STOP_CONTAINERSTOP).size() +
-                                    viewNet->getNet()->getAttributeCarriers()->getDemandElements().at(SUMO_TAG_STOP_CHARGINGSTATION).size() +
-                                    viewNet->getNet()->getAttributeCarriers()->getDemandElements().at(SUMO_TAG_STOP_PARKINGAREA).size());
+                ACsToLocate.reserve(viewNet->getNet()->getAttributeCarriers()->getDemandElements().at(GNE_TAG_STOP_LANE).size() +
+                                    viewNet->getNet()->getAttributeCarriers()->getDemandElements().at(GNE_TAG_STOP_BUSSTOP).size() +
+                                    viewNet->getNet()->getAttributeCarriers()->getDemandElements().at(GNE_TAG_STOP_TRAINSTOP).size() +
+                                    viewNet->getNet()->getAttributeCarriers()->getDemandElements().at(GNE_TAG_STOP_CONTAINERSTOP).size() +
+                                    viewNet->getNet()->getAttributeCarriers()->getDemandElements().at(GNE_TAG_STOP_CHARGINGSTATION).size() +
+                                    viewNet->getNet()->getAttributeCarriers()->getDemandElements().at(GNE_TAG_STOP_PARKINGAREA).size());
                 // fill ACsToLocate with stop over lanes
-                for (const auto& stopLane : viewNet->getNet()->getAttributeCarriers()->getDemandElements().at(SUMO_TAG_STOP_LANE)) {
+                for (const auto& stopLane : viewNet->getNet()->getAttributeCarriers()->getDemandElements().at(GNE_TAG_STOP_LANE)) {
                     ACsToLocate.push_back(stopLane);
                 }
-                // fill ACsToLocate with stop over busstops
-                for (const auto& stopBusStop : viewNet->getNet()->getAttributeCarriers()->getDemandElements().at(SUMO_TAG_STOP_BUSSTOP)) {
+                // fill ACsToLocate with stop over bus stops
+                for (const auto& stopBusStop : viewNet->getNet()->getAttributeCarriers()->getDemandElements().at(GNE_TAG_STOP_BUSSTOP)) {
                     ACsToLocate.push_back(stopBusStop);
                 }
+                // fill ACsToLocate with stop over train stops
+                for (const auto& stopTrainStop : viewNet->getNet()->getAttributeCarriers()->getDemandElements().at(GNE_TAG_STOP_TRAINSTOP)) {
+                    ACsToLocate.push_back(stopTrainStop);
+                }
                 // fill ACsToLocate with stop over container stops
-                for (const auto& stopContainerStop : viewNet->getNet()->getAttributeCarriers()->getDemandElements().at(SUMO_TAG_STOP_CONTAINERSTOP)) {
+                for (const auto& stopContainerStop : viewNet->getNet()->getAttributeCarriers()->getDemandElements().at(GNE_TAG_STOP_CONTAINERSTOP)) {
                     ACsToLocate.push_back(stopContainerStop);
                 }
                 // fill ACsToLocate with stop over charging stations
-                for (const auto& stopChargingStation : viewNet->getNet()->getAttributeCarriers()->getDemandElements().at(SUMO_TAG_STOP_CHARGINGSTATION)) {
+                for (const auto& stopChargingStation : viewNet->getNet()->getAttributeCarriers()->getDemandElements().at(GNE_TAG_STOP_CHARGINGSTATION)) {
                     ACsToLocate.push_back(stopChargingStation);
                 }
                 // fill ACsToLocate with stop over parking areas
-                for (const auto& stopParkingArea : viewNet->getNet()->getAttributeCarriers()->getDemandElements().at(SUMO_TAG_STOP_PARKINGAREA)) {
+                for (const auto& stopParkingArea : viewNet->getNet()->getAttributeCarriers()->getDemandElements().at(GNE_TAG_STOP_PARKINGAREA)) {
                     ACsToLocate.push_back(stopParkingArea);
                 }
                 break;
@@ -912,15 +934,7 @@
 // GNEViewParent::DemandFrames - methods
 // ---------------------------------------------------------------------------
 
-GNEViewParent::DemandFrames::DemandFrames() :
-    routeFrame(nullptr),
-    vehicleFrame(nullptr),
-    vehicleTypeFrame(nullptr),
-    stopFrame(nullptr),
-    personFrame(nullptr),
-    personPlanFrame(nullptr),
-    containerFrame(nullptr),
-    containerPlanFrame(nullptr) {
+GNEViewParent::DemandFrames::DemandFrames() {
 }
 
 
@@ -928,7 +942,8 @@
 GNEViewParent::DemandFrames::buildDemandFrames(GNEViewParent* viewParent, GNEViewNet* viewNet) {
     routeFrame = new GNERouteFrame(viewParent, viewNet);
     vehicleFrame = new GNEVehicleFrame(viewParent, viewNet);
-    vehicleTypeFrame = new GNETypeFrame(viewParent, viewNet);
+    typeFrame = new GNETypeFrame(viewParent, viewNet);
+    typeDistributionFrame = new GNETypeDistributionFrame(viewParent, viewNet);
     stopFrame = new GNEStopFrame(viewParent, viewNet);
     personFrame = new GNEPersonFrame(viewParent, viewNet);
     personPlanFrame = new GNEPersonPlanFrame(viewParent, viewNet);
@@ -941,7 +956,8 @@
 GNEViewParent::DemandFrames::hideDemandFrames() {
     routeFrame->hide();
     vehicleFrame->hide();
-    vehicleTypeFrame->hide();
+    typeFrame->hide();
+    typeDistributionFrame->hide();
     stopFrame->hide();
     personFrame->hide();
     personPlanFrame->hide();
@@ -955,7 +971,8 @@
     // set width in all frames
     routeFrame->setFrameWidth(frameWidth);
     vehicleFrame->setFrameWidth(frameWidth);
-    vehicleTypeFrame->setFrameWidth(frameWidth);
+    typeFrame->setFrameWidth(frameWidth);
+    typeDistributionFrame->setFrameWidth(frameWidth);
     stopFrame->setFrameWidth(frameWidth);
     personFrame->setFrameWidth(frameWidth);
     personPlanFrame->setFrameWidth(frameWidth);
@@ -971,7 +988,9 @@
         return true;
     } else if (vehicleFrame->shown()) {
         return true;
-    } else if (vehicleTypeFrame->shown()) {
+    } else if (typeFrame->shown()) {
+        return true;
+    } else if (typeDistributionFrame->shown()) {
         return true;
     } else if (stopFrame->shown()) {
         return true;
@@ -996,8 +1015,10 @@
         return routeFrame;
     } else if (vehicleFrame->shown()) {
         return vehicleFrame;
-    } else if (vehicleTypeFrame->shown()) {
-        return vehicleTypeFrame;
+    } else if (typeFrame->shown()) {
+        return typeFrame;
+    } else if (typeDistributionFrame->shown()) {
+        return typeDistributionFrame;
     } else if (stopFrame->shown()) {
         return stopFrame;
     } else if (personFrame->shown()) {
diff -Nru sumo-1.17.0/src/netedit/GNEViewParent.h sumo-1.18.0/src/netedit/GNEViewParent.h
--- sumo-1.17.0/src/netedit/GNEViewParent.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/GNEViewParent.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -61,6 +61,7 @@
 class GNEStopFrame;
 class GNEVehicleFrame;
 class GNETypeFrame;
+class GNETypeDistributionFrame;
 // data frames
 class GNEGenericDataFrame;
 class GNEEdgeDataFrame;
@@ -161,9 +162,12 @@
     /// @brief get frame for DEMAND_VEHICLE
     GNEVehicleFrame* getVehicleFrame() const;
 
-    /// @brief get frame for DEMAND_VEHICLETYPE
+    /// @brief get frame for DEMAND_TYPE
     GNETypeFrame* getTypeFrame() const;
 
+    /// @brief get frame for DEMAND_TYPEDISTRIBUTION
+    GNETypeDistributionFrame* getTypeDistributionFrame() const;
+
     /// @brief get frame for DEMAND_STOP
     GNEStopFrame* getStopFrame() const;
 
@@ -352,28 +356,31 @@
         GNEFrame* getCurrentShownFrame() const;
 
         /// @brief frame for DEMAND_ROUTE
-        GNERouteFrame* routeFrame;
+        GNERouteFrame* routeFrame = nullptr;
 
         /// @brief frame for DEMAND_VEHICLE
-        GNEVehicleFrame* vehicleFrame;
+        GNEVehicleFrame* vehicleFrame = nullptr;
+
+        /// @brief frame for DEMAND_TYPE
+        GNETypeFrame* typeFrame = nullptr;
 
-        /// @brief frame for DEMAND_VEHICLETYPE
-        GNETypeFrame* vehicleTypeFrame;
+        /// @brief frame for DEMAND_TYPEDISTRIBUTION
+        GNETypeDistributionFrame* typeDistributionFrame = nullptr;
 
         /// @brief frame for DEMAND_STOP
-        GNEStopFrame* stopFrame;
+        GNEStopFrame* stopFrame = nullptr;
 
         /// @brief frame for DEMAND_PERSON
-        GNEPersonFrame* personFrame;
+        GNEPersonFrame* personFrame = nullptr;
 
         /// @brief frame for DEMAND_PERSONPLAN
-        GNEPersonPlanFrame* personPlanFrame;
+        GNEPersonPlanFrame* personPlanFrame = nullptr;
 
         /// @brief frame for DEMAND_CONTAINER
-        GNEContainerFrame* containerFrame;
+        GNEContainerFrame* containerFrame = nullptr;
 
         /// @brief frame for DEMAND_CONTAINERPLAN
-        GNEContainerPlanFrame* containerPlanFrame;
+        GNEContainerPlanFrame* containerPlanFrame = nullptr;
     };
 
     /// @brief class for data frames
diff -Nru sumo-1.17.0/src/netedit/netedit_main.cpp sumo-1.18.0/src/netedit/netedit_main.cpp
--- sumo-1.17.0/src/netedit/netedit_main.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/netedit_main.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/tools/GNENetDiffTool.cpp sumo-1.18.0/src/netedit/tools/GNENetDiffTool.cpp
--- sumo-1.17.0/src/netedit/tools/GNENetDiffTool.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/tools/GNENetDiffTool.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -33,8 +33,8 @@
 // member method definitions
 // ===========================================================================
 
-GNENetDiffTool::GNENetDiffTool(GNEApplicationWindow* GNEApp, const std::string& pythonPath, FXMenuPane* menu) :
-    GNEPythonTool(GNEApp, pythonPath, "", menu) {
+GNENetDiffTool::GNENetDiffTool(GNEApplicationWindow* GNEApp, const std::string& toolPath, FXMenuPane* menu) :
+    GNEPythonTool(GNEApp, toolPath, "", menu) {
     // fill options
     fillNetDiffOptions(myPythonToolsOptions);
     fillNetDiffOptions(myPythonToolsOptionsOriginal);
@@ -93,9 +93,20 @@
     const char* pythonEnv = getenv("PYTHON");
     const std::string python = (pythonEnv == nullptr) ? "python" : pythonEnv;
     const char* sumoHomeEnv = getenv("SUMO_HOME");
-    const std::string sumoHome = (sumoHomeEnv == nullptr) ? "" : sumoHomeEnv + std::string("/");
+    std::string sumoHome = "";
+    if (sumoHomeEnv != nullptr && sumoHomeEnv != std::string("")) {
+        sumoHome = std::string(sumoHomeEnv);
+        // quote string to handle spaces but prevent double quotes
+        if (sumoHome.front() != '"') {
+            sumoHome = "\"" + sumoHome;
+        }
+        if (sumoHome.back() != '"') {
+            sumoHome += "\"";
+        }
+        sumoHome += "/";
+    }
     // get command
-    std::string command = python + " " + sumoHome + myPythonPath;
+    std::string command = python + " " + sumoHome + myToolPath;
     // declare arguments
     std::string arguments;
     // add arguments
@@ -121,15 +132,16 @@
 void
 GNENetDiffTool::fillNetDiffOptions(OptionsCont& options) {
     // build custom options for netdiff
-    options.addOptionSubTopic("Input");
+    options.addOptionSubTopic("input");
+    options.addOptionSubTopic("output");
     options.doRegister("original-net", new Option_Network(""));
-    options.addDescription("original-net", "Input", TL("Original network"));
+    options.addDescription("original-net", "input", TL("Original network"));
 
     options.doRegister("modified-net", new Option_Network(""));
-    options.addDescription("modified-net", "Input", TL("Modified network"));
+    options.addDescription("modified-net", "input", TL("Modified network"));
 
     options.doRegister("outprefix", new Option_FileName());
-    options.addDescription("outprefix", "Input", TL("Output prefix network"));
+    options.addDescription("outprefix", "output", TL("Output prefix network"));
 
     options.addOptionSubTopic("Select");
     options.doRegister("select-modified", new Option_Bool(false));
diff -Nru sumo-1.17.0/src/netedit/tools/GNENetDiffTool.h sumo-1.18.0/src/netedit/tools/GNENetDiffTool.h
--- sumo-1.17.0/src/netedit/tools/GNENetDiffTool.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/tools/GNENetDiffTool.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -30,7 +30,7 @@
 
 public:
     /// @brief Constructor
-    GNENetDiffTool(GNEApplicationWindow* GNEApp, const std::string& pythonPath,
+    GNENetDiffTool(GNEApplicationWindow* GNEApp, const std::string& toolPath,
                    FXMenuPane* menu);
 
     /// @brief destructor
diff -Nru sumo-1.17.0/src/netedit/tools/GNEPythonTool.cpp sumo-1.18.0/src/netedit/tools/GNEPythonTool.cpp
--- sumo-1.17.0/src/netedit/tools/GNEPythonTool.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/tools/GNEPythonTool.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -34,11 +34,11 @@
 // member method definitions
 // ===========================================================================
 
-GNEPythonTool::GNEPythonTool(GNEApplicationWindow* GNEApp, const std::string& pythonPath,
+GNEPythonTool::GNEPythonTool(GNEApplicationWindow* GNEApp, const std::string& toolPath,
                              const std::string& templateStr, FXMenuPane* menu) :
     myGNEApp(GNEApp),
-    myPythonPath(pythonPath),
-    myPythonToolName(FileHelpers::getFileFromPath(pythonPath, true)) {
+    myToolPath(toolPath),
+    myPythonToolName(FileHelpers::getFileFromPath(toolPath, true)) {
     // build menu command
     myMenuCommand = GUIDesigns::buildFXMenuCommandShortcut(menu, myPythonToolName, "", TL("Execute python tool '") + myPythonToolName + "'.",
                     GUIIconSubSys::getIcon(GUIIcon::TOOL_PYTHON), GNEApp, MID_GNE_OPENPYTHONTOOLDIALOG);
@@ -100,9 +100,20 @@
     const char* pythonEnv = getenv("PYTHON");
     const std::string python = (pythonEnv == nullptr) ? "python" : pythonEnv;
     const char* sumoHomeEnv = getenv("SUMO_HOME");
-    const std::string sumoHome = (sumoHomeEnv == nullptr) ? "" : sumoHomeEnv + std::string("/");
+    std::string sumoHome = "";
+    if (sumoHomeEnv != nullptr && sumoHomeEnv != std::string("")) {
+        sumoHome = std::string(sumoHomeEnv);
+        // quote string to handle spaces but prevent double quotes
+        if (sumoHome.front() != '"') {
+            sumoHome = "\"" + sumoHome;
+        }
+        if (sumoHome.back() != '"') {
+            sumoHome += "\"";
+        }
+        sumoHome += "/";
+    }
     // get command
-    std::string command = python + " " + sumoHome + myPythonPath;
+    std::string command = python + " " + sumoHome + myToolPath;
     // declare arguments
     std::string arguments;
     // add arguments
@@ -112,19 +123,19 @@
             // for boolean values avoid use "true"
             if (option.second->isBool()) {
                 arguments += ("--" + option.first + " ");
-            } else { 
+            } else {
                 if (!option.second->isPositional()) {
                     arguments += ("--" + option.first + " ");
                 }
-                const std::string sep = option.second->getListSeparator();
-                if (sep != "") {
+                const std::string listSeparator = option.second->getListSeparator();
+                if (listSeparator != "") {
                     StringTokenizer st(option.second->getValueString(), " ", true);
                     bool first = true;
                     for (const std::string& v : st.getVector()) {
                         if (first) {
                             first = false;
                         } else {
-                            arguments += sep;
+                            arguments += listSeparator;
                         }
                         arguments += ("\"" + v + "\"");
                     }
@@ -166,11 +177,11 @@
         parser.setErrorHandler(&handler);
         parser.parse(StringUtils::transcodeToLocal(file).c_str());
         if (handler.errorOccurred()) {
-            WRITE_ERROR(TL("Could not load netedit configuration '") + file + "'.");
+            WRITE_ERROR(TL("Could not load tool configuration '") + file + "'.");
             return false;
         }
     } catch (const XERCES_CPP_NAMESPACE::XMLException& e) {
-        WRITE_ERROR(TL("Could not load netedit configuration '") + file + "':\n " + StringUtils::transcode(e.getMessage()));
+        WRITE_ERROR(TL("Could not load tool configuration '") + file + "':\n " + StringUtils::transcode(e.getMessage()));
         return false;
     }
     // write info
@@ -187,7 +198,7 @@
     const char* sumoHomeEnv = getenv("SUMO_HOME");
     const std::string sumoHome = (sumoHomeEnv == nullptr) ? "" : sumoHomeEnv + std::string("/");
     // get command
-    std::string command = python + " " + sumoHome + myPythonPath + " -C " + file + " ";
+    std::string command = python + " " + sumoHome + myToolPath + " -C " + file + " ";
     // add arguments
     for (const auto& option : myPythonToolsOptions) {
         // only write modified values
diff -Nru sumo-1.17.0/src/netedit/tools/GNEPythonTool.h sumo-1.18.0/src/netedit/tools/GNEPythonTool.h
--- sumo-1.17.0/src/netedit/tools/GNEPythonTool.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/tools/GNEPythonTool.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -37,7 +37,7 @@
 
 public:
     /// @brief Constructor
-    GNEPythonTool(GNEApplicationWindow* GNEApp, const std::string& pythonPath,
+    GNEPythonTool(GNEApplicationWindow* GNEApp, const std::string& toolPath,
                   const std::string& templateStr, FXMenuPane* menu);
 
     /// @brief destructor
@@ -86,8 +86,8 @@
     /// @brief original tools options
     OptionsCont myPythonToolsOptionsOriginal;
 
-    /// @brief python path
-    const std::string myPythonPath;
+    /// @brief python tool path relative to SUMO_HOME
+    const std::string myToolPath;
 
     /// @brief tool name
     const std::string myPythonToolName;
diff -Nru sumo-1.17.0/src/netedit/tools/GNERunNetgenerate.cpp sumo-1.18.0/src/netedit/tools/GNERunNetgenerate.cpp
--- sumo-1.17.0/src/netedit/tools/GNERunNetgenerate.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/tools/GNERunNetgenerate.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -41,11 +41,29 @@
 void
 GNERunNetgenerate::run(const OptionsCont* netgenerateOptions) {
     // set command
+
 #ifdef WIN32
-    myNetgenerateCommand = getenv("SUMO_HOME") + std::string("/bin/netgenerate.exe");
+    std::string exePath = "netgenerate.exe";
 #else
-    myNetgenerateCommand = getenv("SUMO_HOME") + std::string("/bin/netgenerate");
+    std::string exePath = "netgenerate";
 #endif
+    const char* sumoHomeEnv = getenv("SUMO_HOME");
+    std::string sumoHome = "";
+    if (sumoHomeEnv != nullptr && sumoHomeEnv != std::string("")) {
+        sumoHome = std::string(sumoHomeEnv);
+        // prevent double quotes
+        if (sumoHome.front() == '"') {
+            sumoHome.erase(sumoHome.begin());
+        }
+        if (sumoHome.size() > 0 && sumoHome.back() == '"') {
+            sumoHome.pop_back();
+        }
+        sumoHome += "/bin/";
+    }
+    // quote to handle spaces. note that this differs from GNEPythonTool because the python interpreter is a bit smarter
+    // when handling quoted parts within a path
+    myNetgenerateCommand = "\"" + sumoHome + exePath + "\"";
+
     // iterate over all topics
     for (const auto& topic : netgenerateOptions->getSubTopics()) {
         // ignore configuration
@@ -67,14 +85,16 @@
 
 void
 GNERunNetgenerate::abort() {
-    // cancel thread
-    cancel();
-    // reset flags
-    myRunning = false;
-    myErrorOccurred = false;
-    // show info
-    myEventQueue.push_back(new GUIEvent_Message(GUIEventType::ERROR_OCCURRED, std::string(TL("cancelled by user\n"))));
-    myEventThrow.signal();
+    if (myRunning) {
+        // cancel thread
+        cancel();
+        // reset flags
+        myRunning = false;
+        myErrorOccurred = false;
+        // show info
+        myEventQueue.push_back(new GUIEvent_Message(GUIEventType::ERROR_OCCURRED, std::string(TL("cancelled by user\n"))));
+        myEventThrow.signal();
+    }
 }
 
 
@@ -150,6 +170,7 @@
     myRunning = false;
     // end process
     myEventQueue.push_back(new GUIEvent_Message(GUIEventType::MESSAGE_OCCURRED, std::string(TL("process finished\n"))));
+    myEventQueue.push_back(new GUIEvent_Message(GUIEventType::TOOL_ENDED, ""));
     myEventThrow.signal();
     return 1;
 }
diff -Nru sumo-1.17.0/src/netedit/tools/GNERunNetgenerate.h sumo-1.18.0/src/netedit/tools/GNERunNetgenerate.h
--- sumo-1.17.0/src/netedit/tools/GNERunNetgenerate.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/tools/GNERunNetgenerate.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netedit/tools/GNERunPythonTool.cpp sumo-1.18.0/src/netedit/tools/GNERunPythonTool.cpp
--- sumo-1.17.0/src/netedit/tools/GNERunPythonTool.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/tools/GNERunPythonTool.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -51,14 +51,16 @@
 
 void
 GNERunPythonTool::abortTool() {
-    // cancel thread
-    cancel();
-    // reset flags
-    myRunning = false;
-    myErrorOccurred = false;
-    // show info
-    myEventQueue.push_back(new GUIEvent_Message(GUIEventType::ERROR_OCCURRED, std::string(TL("cancelled by user\n"))));
-    myEventThrow.signal();
+    if (myRunning) {
+        // cancel thread
+        cancel();
+        // reset flags
+        myRunning = false;
+        myErrorOccurred = false;
+        // show info
+        myEventQueue.push_back(new GUIEvent_Message(GUIEventType::ERROR_OCCURRED, std::string(TL("cancelled by user\n"))));
+        myEventThrow.signal();
+    }
 }
 
 
diff -Nru sumo-1.17.0/src/netedit/tools/GNERunPythonTool.h sumo-1.18.0/src/netedit/tools/GNERunPythonTool.h
--- sumo-1.17.0/src/netedit/tools/GNERunPythonTool.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netedit/tools/GNERunPythonTool.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netgen/netgen_main.cpp sumo-1.18.0/src/netgen/netgen_main.cpp
--- sumo-1.17.0/src/netgen/netgen_main.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netgen/netgen_main.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -83,12 +83,12 @@
     SystemFrame::addReportOptions(oc); // this subtopic is filled here, too
 
     NGFrame::fillOptions();
-    NBFrame::fillOptions(true);
-    NWFrame::fillOptions(true);
+    NBFrame::fillOptions(oc, true);
+    NWFrame::fillOptions(oc, true);
     oc.doRegister("default-junction-type", 'j', new Option_String());
     oc.addSynonyme("default-junction-type", "junctions");
     oc.addDescription("default-junction-type", "Building Defaults", TL("[traffic_light|priority|right_before_left|left_before_right|traffic_light_right_on_red|priority_stop|allway_stop|...] Determines junction type (see wiki/Networks/PlainXML#Node_types)"));
-    RandHelper::insertRandOptions();
+    RandHelper::insertRandOptions(oc);
 
     oc.doRegister("tls.discard-simple", new Option_Bool(false));
     oc.addDescription("tls.discard-simple", "TLS Building", "Does not instatiate traffic lights at geometry-like nodes");
@@ -97,10 +97,11 @@
 
 bool
 checkOptions() {
+    OptionsCont& oc = OptionsCont::getOptions();
     bool ok = NGFrame::checkOptions();
-    ok &= NBFrame::checkOptions();
-    ok &= NWFrame::checkOptions();
-    ok &= SystemFrame::checkOptions();
+    ok &= NBFrame::checkOptions(oc);
+    ok &= NWFrame::checkOptions(oc);
+    ok &= SystemFrame::checkOptions(oc);
     return ok;
 }
 
@@ -119,7 +120,7 @@
             WRITE_ERROR(TL("Spider networks need at least 3 arms."));
             hadError = true;
         }
-        if (oc.getInt("spider.arm-number") > 4 && oc.isDefault("spider.omit-center")) {
+        if (oc.getInt("spider.arm-number") > 4 && !oc.getBool("spider.omit-center")) {
             WRITE_WARNING(TL("Spider networks with many arms should use option spider.omit-center"));
         }
         if (oc.getInt("spider.circle-number") < 1) {
diff -Nru sumo-1.17.0/src/netgen/NGEdge.cpp sumo-1.18.0/src/netgen/NGEdge.cpp
--- sumo-1.17.0/src/netgen/NGEdge.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netgen/NGEdge.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2003-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netgen/NGEdge.h sumo-1.18.0/src/netgen/NGEdge.h
--- sumo-1.17.0/src/netgen/NGEdge.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netgen/NGEdge.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netgen/NGFrame.cpp sumo-1.18.0/src/netgen/NGFrame.cpp
--- sumo-1.17.0/src/netgen/NGFrame.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netgen/NGFrame.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2011-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netgen/NGFrame.h sumo-1.18.0/src/netgen/NGFrame.h
--- sumo-1.17.0/src/netgen/NGFrame.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netgen/NGFrame.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netgen/NGNet.cpp sumo-1.18.0/src/netgen/NGNet.cpp
--- sumo-1.17.0/src/netgen/NGNet.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netgen/NGNet.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2003-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netgen/NGNet.h sumo-1.18.0/src/netgen/NGNet.h
--- sumo-1.17.0/src/netgen/NGNet.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netgen/NGNet.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netgen/NGNode.cpp sumo-1.18.0/src/netgen/NGNode.cpp
--- sumo-1.17.0/src/netgen/NGNode.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netgen/NGNode.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netgen/NGNode.h sumo-1.18.0/src/netgen/NGNode.h
--- sumo-1.17.0/src/netgen/NGNode.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netgen/NGNode.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netgen/NGRandomNetBuilder.cpp sumo-1.18.0/src/netgen/NGRandomNetBuilder.cpp
--- sumo-1.17.0/src/netgen/NGRandomNetBuilder.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netgen/NGRandomNetBuilder.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netgen/NGRandomNetBuilder.h sumo-1.18.0/src/netgen/NGRandomNetBuilder.h
--- sumo-1.17.0/src/netgen/NGRandomNetBuilder.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netgen/NGRandomNetBuilder.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/NIFrame.cpp sumo-1.18.0/src/netimport/NIFrame.cpp
--- sumo-1.17.0/src/netimport/NIFrame.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/NIFrame.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -43,9 +43,9 @@
 // ===========================================================================
 // method definitions
 // ===========================================================================
+
 void
-NIFrame::fillOptions(bool forNetedit) {
-    OptionsCont& oc = OptionsCont::getOptions();
+NIFrame::fillOptions(OptionsCont& oc, bool forNetedit) {
     // register input formats
     oc.doRegister("sumo-net-file", 's', new Option_FileName());
     oc.addSynonyme("sumo-net-file", "sumo-net", true);
@@ -215,9 +215,11 @@
     oc.addDescription("osm.stop-output.length.train", "Formats", TL("The default length of a train stop in FLOAT m"));
 
     oc.doRegister("osm.all-attributes", new Option_Bool(false));
+    oc.addSynonyme("osm.all-attributes", "osm.all-tags");
     oc.addDescription("osm.all-attributes", "Formats", TL("Whether additional attributes shall be imported"));
 
-    oc.doRegister("osm.extra-attributes", new Option_StringVector(StringVector({ "bridge", "tunnel", "layer", "postal_code" })));
+    oc.doRegister("osm.extra-attributes", new Option_StringVector(StringVector({ "all" })));
+    oc.addSynonyme("osm.extra-attributes", "osm.extra-tags");
     oc.addDescription("osm.extra-attributes", "Formats", TL("List of additional attributes that shall be imported from OSM via osm.all-attributes (set 'all' to import all)"));
 
     oc.doRegister("osm.speedlimit-none", new Option_Float(39.4444));
@@ -362,6 +364,8 @@
     oc.addDescription("opendrive.position-ids", "Formats", TL("Sets edge-id based on road-id and offset in m (legacy)"));
     oc.doRegister("opendrive.lane-shapes", new Option_Bool(false));
     oc.addDescription("opendrive.lane-shapes", "Formats", TL("Use custom lane shapes to compensate discarded lane types"));
+    oc.doRegister("opendrive.signal-groups", new Option_Bool(false));
+    oc.addDescription("opendrive.signal-groups", "Formats", TL("Use the OpenDRIVE controller information for the generated signal program"));
 
     // register some additional options
     oc.doRegister("tls.discard-loaded", new Option_Bool(false));
@@ -377,8 +381,7 @@
 
 
 bool
-NIFrame::checkOptions() {
-    OptionsCont& oc = OptionsCont::getOptions();
+NIFrame::checkOptions(OptionsCont& oc) {
     bool ok = oc.checkDependingSuboptions("shapefile", "shapefile.");
     ok &= oc.checkDependingSuboptions("visum-file", "visum.");
     ok &= oc.checkDependingSuboptions("vissim-file", "vissim.");
diff -Nru sumo-1.17.0/src/netimport/NIFrame.h sumo-1.18.0/src/netimport/NIFrame.h
--- sumo-1.17.0/src/netimport/NIFrame.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/NIFrame.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -25,25 +25,29 @@
 // ===========================================================================
 // class declarations
 // ===========================================================================
+
+class OptionsCont;
+
+// ===========================================================================
+// class definitions
+// ===========================================================================
 /**
  * @class NIFrame
  * @brief Sets and checks options for netimport
  */
 class NIFrame {
+
 public:
     /** @brief Inserts options used by the network importer and network building modules
      *
      * Calls "NBNetBuilder::insertNetBuildOptions" for inserting network
      *  building options.
      */
-    static void fillOptions(bool forNetedit = false);
-
+    static void fillOptions(OptionsCont& oc, bool forNetedit = false);
 
-    /** @brief Checks set options from the OptionsCont-singleton for being valid
+    /** @brief Checks set options for being valid
      * @return Whether all needed options are set
      * @todo Unused currently; repair/fill
      */
-    static bool checkOptions();
-
-
+    static bool checkOptions(OptionsCont& oc);
 };
diff -Nru sumo-1.17.0/src/netimport/NIImporter_ArcView.cpp sumo-1.18.0/src/netimport/NIImporter_ArcView.cpp
--- sumo-1.17.0/src/netimport/NIImporter_ArcView.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/NIImporter_ArcView.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -326,7 +326,7 @@
         if (existing != nullptr || existingReverse != nullptr) {
             if ((existing != nullptr && existing->getGeometry() == shape)
                     || (existingReverse != nullptr && existingReverse->getGeometry() == shape.reverse())) {
-                WRITE_ERRORF(TL("Edge '% is not unique."), (existing != nullptr ? id : existingReverse->getID()));
+                WRITE_ERRORF(TL("Edge '%' is not unique."), (existing != nullptr ? id : existingReverse->getID()));
             } else {
                 if (idIndex.count(id) == 0) {
                     idIndex[id] = 0;
diff -Nru sumo-1.17.0/src/netimport/NIImporter_ArcView.h sumo-1.18.0/src/netimport/NIImporter_ArcView.h
--- sumo-1.17.0/src/netimport/NIImporter_ArcView.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/NIImporter_ArcView.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2002-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/NIImporter_DlrNavteq.cpp sumo-1.18.0/src/netimport/NIImporter_DlrNavteq.cpp
--- sumo-1.17.0/src/netimport/NIImporter_DlrNavteq.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/NIImporter_DlrNavteq.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/NIImporter_DlrNavteq.h sumo-1.18.0/src/netimport/NIImporter_DlrNavteq.h
--- sumo-1.17.0/src/netimport/NIImporter_DlrNavteq.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/NIImporter_DlrNavteq.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2008-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/NIImporter_ITSUMO.cpp sumo-1.18.0/src/netimport/NIImporter_ITSUMO.cpp
--- sumo-1.17.0/src/netimport/NIImporter_ITSUMO.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/NIImporter_ITSUMO.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2011-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/NIImporter_ITSUMO.h sumo-1.18.0/src/netimport/NIImporter_ITSUMO.h
--- sumo-1.17.0/src/netimport/NIImporter_ITSUMO.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/NIImporter_ITSUMO.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/NIImporter_MATSim.cpp sumo-1.18.0/src/netimport/NIImporter_MATSim.cpp
--- sumo-1.17.0/src/netimport/NIImporter_MATSim.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/NIImporter_MATSim.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/NIImporter_MATSim.h sumo-1.18.0/src/netimport/NIImporter_MATSim.h
--- sumo-1.17.0/src/netimport/NIImporter_MATSim.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/NIImporter_MATSim.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/NIImporter_OpenDrive.cpp sumo-1.18.0/src/netimport/NIImporter_OpenDrive.cpp
--- sumo-1.17.0/src/netimport/NIImporter_OpenDrive.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/NIImporter_OpenDrive.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -41,6 +41,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -48,6 +49,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include "NILoader.h"
@@ -92,6 +94,8 @@
     { "access",           NIImporter_OpenDrive::OPENDRIVE_TAG_ACCESS },
     { "signal",           NIImporter_OpenDrive::OPENDRIVE_TAG_SIGNAL },
     { "signalReference",  NIImporter_OpenDrive::OPENDRIVE_TAG_SIGNALREFERENCE },
+    { "controller",       NIImporter_OpenDrive::OPENDRIVE_TAG_CONTROLLER },
+    { "control",          NIImporter_OpenDrive::OPENDRIVE_TAG_CONTROL },
     { "validity",         NIImporter_OpenDrive::OPENDRIVE_TAG_VALIDITY },
     { "junction",         NIImporter_OpenDrive::OPENDRIVE_TAG_JUNCTION },
     { "connection",       NIImporter_OpenDrive::OPENDRIVE_TAG_CONNECTION },
@@ -160,6 +164,7 @@
     { "rule",           NIImporter_OpenDrive::OPENDRIVE_ATTR_RULE },
     { "restriction",    NIImporter_OpenDrive::OPENDRIVE_ATTR_RESTRICTION },
     { "name",           NIImporter_OpenDrive::OPENDRIVE_ATTR_NAME },
+    { "signalId",       NIImporter_OpenDrive::OPENDRIVE_ATTR_SIGNALID },
     // towards xodr v1.4 speed:unit
     { "unit",           NIImporter_OpenDrive::OPENDRIVE_ATTR_UNIT },
 
@@ -171,6 +176,7 @@
 bool NIImporter_OpenDrive::myImportWidths;
 double NIImporter_OpenDrive::myMinWidth;
 bool NIImporter_OpenDrive::myImportInternalShapes;
+NIImporter_OpenDrive::OpenDriveController NIImporter_OpenDrive::myDummyController("", "");
 
 // ===========================================================================
 // method definitions
@@ -214,6 +220,7 @@
                     signal.type = ref.type;
                     signal.name = ref.name;
                     signal.dynamic = ref.dynamic;
+                    signal.controller = ref.controller;
                 }
             }
         }
@@ -619,55 +626,18 @@
             sB = sE;
             sFrom = sTo;
         }
-        // optionally write road objects
         if (oc.isSet("polygon-output")) {
-            const bool writeGeo = GeoConvHelper::getLoaded().usingGeoProjection() && (
-                                      oc.isDefault("proj.plain-geo") || oc.getBool("proj.plain-geo"));
-            OutputDevice& dev = OutputDevice::getDevice(oc.getString("polygon-output"));
-            dev.writeXMLHeader("additional", "additional_file.xsd");
-            //SUMOPolygon poly("road_" + e->id, "road", RGBColor::BLUE, e->geom, true, false);
-            //poly.writeXML(dev, false);
-            for (auto& o : e->objects) {
-                Position ref = e->geom.positionAtOffset2D(o.s, -o.t);
-                if (o.radius >= 0) {
-                    // cicrular shape
-                    // GeoConvHelper::getFinal is not ready yet
-                    GeoConvHelper::getLoaded().cartesian2geo(ref);
-                    PointOfInterest poly(o.id, o.type, RGBColor::YELLOW, ref, true, "", -1, false, 0);
-                    poly.setParameter("name", o.name);
-                    poly.writeXML(dev, writeGeo);
-                } else {
-                    // rectangular shape
-                    PositionVector centerLine;
-                    centerLine.push_back(Position(-o.length / 2, 0));
-                    centerLine.push_back(Position(o.length / 2, 0));
-                    double roadHdg = e->geom.rotationAtOffset(o.s);
-                    centerLine.rotate2D(roadHdg + o.hdg);
-                    //PointOfInterest poiRef("ref_" + o.id, "", RGBColor::CYAN, ref, false, "", 0, 0, Shape::DEFAULT_LAYER + 2);
-                    //poiRef.writeXML(dev, false);
-                    centerLine.add(ref);
-                    //SUMOPolygon polyCenter("center_" + o.id, "", RGBColor::MAGENTA, centerLine, true, false, Shape::DEFAULT_LAYER + 1);
-                    //polyCenter.writeXML(dev, false);
-                    centerLine.move2side(o.width / 2);
-                    PositionVector shape = centerLine;
-                    centerLine.move2side(-o.width);
-                    shape.append(centerLine.reverse(), POSITION_EPS);
-                    if (writeGeo) {
-                        // GeoConvHelper::getFinal is not ready yet
-                        for (Position& p : shape) {
-                            GeoConvHelper::getLoaded().cartesian2geo(p);
-                        }
-                    }
-                    SUMOPolygon poly(o.id, o.type, RGBColor::YELLOW, shape, true, true, 1);
-                    poly.setParameter("name", o.name);
-                    poly.writeXML(dev, writeGeo);
-                }
-            }
+            writeRoadObjects(e);
         }
         if (!lanesBuilt) {
             WRITE_WARNINGF(TL("Edge '%' has no lanes."), e->id);
         }
     }
+    if (oc.isSet("polygon-output")) {
+        for (auto item : innerEdges) {
+            writeRoadObjects(item.second);
+        }
+    }
 
     // -------------------------
     // connections building
@@ -776,7 +746,32 @@
     // -------------------------
     // traffic lights
     // -------------------------
-    std::map tlsControlled;
+    std::map signal2junction;
+    std::map& controllers = handler.getControllers();
+
+    for (const auto& it : edges) {
+        const OpenDriveEdge* e = it.second;
+        for (const OpenDriveSignal& signal : e->signals) { // signal for which junction?
+            if (signal.controller.size() == 0) {
+                continue;
+            }
+            std::string junctionID;
+            for (auto connection : e->connections) {
+                if ((connection.fromLane < 0 && signal.orientation < 0) || (connection.fromLane > 0 && signal.orientation > 0)) {
+                    continue;
+                }
+                if ((signal.minLane == 0 && signal.maxLane == 0) || (signal.maxLane >= connection.fromLane && signal.minLane <= connection.fromLane)) {
+                    const OpenDriveEdge* connectedEdge = edges[connection.toEdge];
+                    if (controllers[signal.controller].junction.size() > 0 && controllers[signal.controller].junction != connectedEdge->junction) {
+                        WRITE_WARNINGF(TL("Controlling multiple junctions by the same controller '%' is currently not implemented."), signal.controller);
+                    }
+                    controllers[signal.controller].junction = connectedEdge->junction;
+                }
+            }
+        }
+    }
+
+    const bool importSignalGroups = oc.getBool("opendrive.signal-groups");
     for (std::map::iterator i = edges.begin(); i != edges.end(); ++i) {
         OpenDriveEdge* e = (*i).second;
         for (const OpenDriveSignal& signal : e->signals) {
@@ -872,9 +867,23 @@
                                     c.setParameter("signalID", signal.id);
                                 }
                             }
+                            // set tlIndex to allow signal groups (defined in OpenDRIVE controller elements)
+                            if (importSignalGroups) {
+                                const OpenDriveController& controller = handler.getController(signal.id);
+                                if (controller.id != "") {
+                                    if (c.getParameter("controllerID") != "") {
+                                        WRITE_WARNINGF(TL("The signaling of the connection from '%' to '%' (controller '%') is ambiguous because it is overwritten signal '%' and with controller '%'."), from->getID(), c.toEdge->getID(), c.getParameter("controllerID"), signal.id, controller.id);
+                                    }
+                                    //junctionsWithControllers.insert(from->getToNode()->getID());
+                                    int tlIndex = handler.getTLIndexForController(controller.id);
+                                    c.tlLinkIndex = tlIndex;
+                                    c.setParameter("controllerID", controller.id);
+                                }
+                            }
                         }
                     }
                     getTLSSecure(from, nb);
+
                     //std::cout << "odrEdge=" << e->id << " fromID=" << fromID << " toID=" << toID << " from=" << from->getID() << " to=" << to->getID()
                     //    << " signal=" << signal.id << " minLane=" << signal.minLane << " maxLane=" << signal.maxLane << "\n";
                 } else {
@@ -892,7 +901,7 @@
                     WRITE_WARNINGF(TL("Could not find edge '%' for signal '%'."), id, signal.id);
                     continue;
                 }
-                getTLSSecure(edge, nb);
+
                 /// XXX consider lane validity
                 for (NBEdge::Connection& c : edge->getConnections()) {
                     int odLane = laneIndexMap[std::make_pair(edge, c.fromLane)];
@@ -903,11 +912,27 @@
                             c.setParameter("signalID", signal.id);
                         }
                     }
+
+                    // set tlIndex to allow signal groups (defined in OpenDRIVE controller elements)
+                    if (importSignalGroups) {
+                        const OpenDriveController& controller = handler.getController(signal.id);
+                        if (controller.id != "") {
+                            if (c.getParameter("controllerID") != "") {
+                                WRITE_WARNINGF(TL("The signaling of the connection from '%' to '%' (controller '%') is ambiguous because it is overwritten with signal '%' and controller '%'."), edge->getID(), c.toEdge->getID(), c.getParameter("controllerID"), signal.id, controller.id);
+                            }
+                            //junctionsWithControllers.insert(edge->getToNode()->getID());
+                            int tlIndex = handler.getTLIndexForController(controller.id);
+                            c.tlLinkIndex = tlIndex;
+                            c.setParameter("controllerID", controller.id);
+                        }
+                    }
                 }
+                getTLSSecure(edge, nb);
                 //std::cout << "odrEdge=" << e->id << " sumoID=" << (*k).sumoID << " sumoEdge=" << edge->getID()
                 //    << " signal=" << signal.id << " minLane=" << signal.minLane << " maxLane=" << signal.maxLane << "\n";
             }
             // @note: tls 'signalID' parameters are set via NBTrafficLightLogicCont::setOpenDriveSignalParameters
+            // @note: OpenDRIVE controllers are applied to the signal programs in NBTrafficLightLogicCont::applyOpenDriveControllers
         }
     }
 
@@ -919,6 +944,55 @@
     }
 }
 
+
+void
+NIImporter_OpenDrive::writeRoadObjects(const OpenDriveEdge* e) {
+    OptionsCont& oc = OptionsCont::getOptions();
+    const bool writeGeo = GeoConvHelper::getLoaded().usingGeoProjection() && (
+                              oc.isDefault("proj.plain-geo") || oc.getBool("proj.plain-geo"));
+    OutputDevice& dev = OutputDevice::getDevice(oc.getString("polygon-output"));
+    dev.writeXMLHeader("additional", "additional_file.xsd");
+    //SUMOPolygon poly("road_" + e->id, "road", RGBColor::BLUE, e->geom, true, false);
+    //poly.writeXML(dev, false);
+    for (auto& o : e->objects) {
+        Position ref = e->geom.positionAtOffset2D(o.s, -o.t);
+        if (o.radius >= 0) {
+            // cicrular shape
+            // GeoConvHelper::getFinal is not ready yet
+            GeoConvHelper::getLoaded().cartesian2geo(ref);
+            PointOfInterest poly(o.id, o.type, RGBColor::YELLOW, ref, true, "", -1, false, 0);
+            poly.setParameter("name", o.name);
+            poly.writeXML(dev, writeGeo);
+        } else {
+            // rectangular shape
+            PositionVector centerLine;
+            centerLine.push_back(Position(-o.length / 2, 0));
+            centerLine.push_back(Position(o.length / 2, 0));
+            double roadHdg = e->geom.rotationAtOffset(o.s);
+            centerLine.rotate2D(roadHdg + o.hdg);
+            //PointOfInterest poiRef("ref_" + o.id, "", RGBColor::CYAN, ref, false, "", 0, 0, Shape::DEFAULT_LAYER + 2);
+            //poiRef.writeXML(dev, false);
+            centerLine.add(ref);
+            //SUMOPolygon polyCenter("center_" + o.id, "", RGBColor::MAGENTA, centerLine, true, false, Shape::DEFAULT_LAYER + 1);
+            //polyCenter.writeXML(dev, false);
+            centerLine.move2side(o.width / 2);
+            PositionVector shape = centerLine;
+            centerLine.move2side(-o.width);
+            shape.append(centerLine.reverse(), POSITION_EPS);
+            if (writeGeo) {
+                // GeoConvHelper::getFinal is not ready yet
+                for (Position& p : shape) {
+                    GeoConvHelper::getLoaded().cartesian2geo(p);
+                }
+            }
+            SUMOPolygon poly(o.id, o.type, RGBColor::YELLOW, shape, true, true, 1, 7);
+            poly.setParameter("name", o.name);
+            poly.writeXML(dev, writeGeo);
+        }
+    }
+}
+
+
 std::pair
 NIImporter_OpenDrive::retrieveSignalEdges(NBNetBuilder& nb, const std::string& fromID, const std::string& toID, const std::string& junction) {
     NBEdge* from;
@@ -936,7 +1010,7 @@
 
 
 NBTrafficLightDefinition*
-NIImporter_OpenDrive::getTLSSecure(NBEdge* inEdge, NBNetBuilder& nb) {
+NIImporter_OpenDrive::getTLSSecure(NBEdge* inEdge, /*const NBEdge::Connection& conn,*/ NBNetBuilder& nb) {
     NBNode* toNode = inEdge->getToNode();
     if (!toNode->isTLControlled()) {
         TrafficLightType type = SUMOXMLDefinitions::TrafficLightTypes.get(OptionsCont::getOptions().getString("tls.default-type"));
@@ -2179,7 +2253,7 @@
 // ---------------------------------------------------------------------------
 NIImporter_OpenDrive::NIImporter_OpenDrive(const NBTypeCont& tc, std::map& edges)
     : GenericSAXHandler(openDriveTags, OPENDRIVE_TAG_NOTHING, openDriveAttrs, OPENDRIVE_ATTR_NOTHING, "opendrive"),
-      myTypeContainer(tc), myCurrentEdge("", "", "", -1), myEdges(edges), myOffset(0, 0) {
+      myTypeContainer(tc), myCurrentEdge("", "", "", -1), myCurrentController("", ""), myEdges(edges), myOffset(0, 0) {
 }
 
 
@@ -2381,6 +2455,22 @@
             myCurrentEdge.signals.push_back(signal);
         }
         break;
+        case OPENDRIVE_TAG_CONTROLLER: {
+            std::string id = attrs.get(OPENDRIVE_ATTR_ID, nullptr, ok);
+            std::string name = attrs.getOpt(OPENDRIVE_ATTR_NAME, nullptr, ok, "", false);
+            myCurrentController = OpenDriveController(id, name);
+        }
+        break;
+        case OPENDRIVE_TAG_CONTROL: {
+            std::string signalID = attrs.get(OPENDRIVE_ATTR_SIGNALID, myCurrentController.id.c_str(), ok);
+            myCurrentController.signalIDs.push_back(signalID);
+            if (mySignals.find(signalID) != mySignals.end()) {
+                mySignals[signalID].controller = myCurrentController.id;
+            } else {
+                WRITE_WARNINGF(TL("Ignoring missing signal '%' in controller '%'."), signalID, myCurrentController.id);
+            }
+        }
+        break;
         case OPENDRIVE_TAG_VALIDITY: {
             int fromLane = attrs.get(OPENDRIVE_ATTR_FROMLANE, myCurrentEdge.id.c_str(), ok);
             int toLane = attrs.get(OPENDRIVE_ATTR_TOLANE, myCurrentEdge.id.c_str(), ok);
@@ -2618,6 +2708,10 @@
                 }
             }
             break;
+        case OPENDRIVE_TAG_CONTROLLER: {
+            myControllers.insert({ myCurrentController.id, myCurrentController });
+        }
+        break;
         case OPENDRIVE_TAG_LANESECTION: {
             myCurrentEdge.laneSections.back().buildLaneMapping(myTypeContainer);
         }
diff -Nru sumo-1.17.0/src/netimport/NIImporter_OpenDrive.h sumo-1.18.0/src/netimport/NIImporter_OpenDrive.h
--- sumo-1.17.0/src/netimport/NIImporter_OpenDrive.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/NIImporter_OpenDrive.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -15,6 +15,7 @@
 /// @author  Daniel Krajzewicz
 /// @author  Jakob Erdmann
 /// @author  Michael Behrisch
+/// @author  Mirko Barthauer
 /// @date    Mon, 14.04.2008
 ///
 // Importer for networks stored in openDrive format
@@ -98,6 +99,8 @@
         OPENDRIVE_TAG_LANE,
         OPENDRIVE_TAG_SIGNAL,
         OPENDRIVE_TAG_SIGNALREFERENCE,
+        OPENDRIVE_TAG_CONTROLLER,
+        OPENDRIVE_TAG_CONTROL,
         OPENDRIVE_TAG_VALIDITY,
         OPENDRIVE_TAG_JUNCTION,
         OPENDRIVE_TAG_CONNECTION,
@@ -170,7 +173,8 @@
         OPENDRIVE_ATTR_RULE,
         OPENDRIVE_ATTR_RESTRICTION,
         OPENDRIVE_ATTR_NAME,
-        OPENDRIVE_ATTR_UNIT    // xodr v1.4
+        OPENDRIVE_ATTR_UNIT,    // xodr v1.4
+        OPENDRIVE_ATTR_SIGNALID
     };
 
 
@@ -422,6 +426,30 @@
         /// @brief signal validity range
         int minLane;
         int maxLane;
+        /// @brief the controller ID
+        std::string controller;
+    };
+
+
+    /**
+     * @struct OpenDriveController
+     * @brief Representation of a signal group
+     */
+    struct OpenDriveController {
+        /** @brief Constructor
+         * @param[in] idArg The OpenDrive id of the signal group
+         * @param[in] nameArg The type of the signal group
+         */
+        OpenDriveController(const std::string& idArg, const std::string nameArg) :
+            id(idArg), name(nameArg) { }
+
+        /// dummy constructor for use in maps
+        OpenDriveController() {}
+
+        std::string id;
+        std::string name;
+        std::vector signalIDs;
+        std::string junction;
     };
 
     /**
@@ -600,6 +628,35 @@
         return mySignals;
     }
 
+    std::map& getControllers() {
+        return myControllers;
+    }
+
+    std::map>& getJunctions2Controllers() {
+        return myJunctions2Controllers;
+    }
+
+    const OpenDriveController& getController(std::string signalID) {
+        if (mySignals.find(signalID) != mySignals.end() && myControllers.find(mySignals[signalID].controller) != myControllers.end()) {
+            return myControllers[mySignals[signalID].controller];
+        }
+        return myDummyController;
+    }
+
+    int getTLIndexForController(std::string controllerID) {
+        // sort them by their id
+        std::string junctionID = myControllers[controllerID].junction;
+        std::vector junctionControllers;
+        for (auto& it : myControllers) {
+            if (it.second.junction == junctionID) {
+                junctionControllers.push_back(it.first);
+            }
+        }
+        std::sort(junctionControllers.begin(), junctionControllers.end());
+        auto it = std::find(junctionControllers.begin(), junctionControllers.end(), controllerID);
+        return (int)(it - junctionControllers.begin());
+    }
+
 
 private:
     void addLink(LinkType lt, const std::string& elementType, const std::string& elementID,
@@ -616,6 +673,7 @@
     static std::string revertID(const std::string& id);
     const NBTypeCont& myTypeContainer;
     OpenDriveEdge myCurrentEdge;
+    OpenDriveController myCurrentController;
 
     std::map& myEdges;
     std::vector myElementStack;
@@ -626,12 +684,15 @@
     ContactPoint myCurrentContactPoint;
     bool myConnectionWasEmpty;
     std::map mySignals;
+    std::map myControllers;
+    std::map> myJunctions2Controllers;
     Position myOffset;
 
     static bool myImportAllTypes;
     static bool myImportWidths;
     static double myMinWidth;
     static bool myImportInternalShapes;
+    static OpenDriveController myDummyController;
 
 
 protected:
@@ -684,7 +745,7 @@
     static void setNodeSecure(NBNodeCont& nc, OpenDriveEdge& e,
                               const std::string& nodeID, NIImporter_OpenDrive::LinkType lt, std::vector& joinedNodeIDs);
 
-    static NBTrafficLightDefinition* getTLSSecure(NBEdge* inEdge, NBNetBuilder& nb);
+    static NBTrafficLightDefinition* getTLSSecure(NBEdge* inEdge, /*const NBEdge::Connection& conn,*/ NBNetBuilder& nb);
 
 
     static std::pair retrieveSignalEdges(NBNetBuilder& nb, const std::string& fromID, const std::string& toID, const std::string& junction);
@@ -702,6 +763,7 @@
     static void recomputeWidths(OpenDriveLaneSection& sec, double start, double end, double sectionStart, double sectionEnd);
     static void recomputeWidths(std::vector& lanes, double start, double end, double sectionStart, double sectionEnd);
     static void setLaneAttributes(const OpenDriveEdge* e, NBEdge::Lane& sumoLane, const OpenDriveLane& odLane, bool saveOrigIDs, const NBTypeCont& tc);
+    static void writeRoadObjects(const OpenDriveEdge* e);
 
     /// The names of openDrive-XML elements (for passing to GenericSAXHandler)
     static StringBijection::Entry openDriveTags[];
diff -Nru sumo-1.17.0/src/netimport/NIImporter_OpenStreetMap.cpp sumo-1.18.0/src/netimport/NIImporter_OpenStreetMap.cpp
--- sumo-1.17.0/src/netimport/NIImporter_OpenStreetMap.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/NIImporter_OpenStreetMap.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -551,6 +551,10 @@
         }
     }
     double bikeLaneWidth = tc.getEdgeTypeBikeLaneWidth(type);
+    const std::string& onewayBike = e->myExtraTags["oneway:bicycle"];
+    if (onewayBike == "false" || onewayBike == "no" || onewayBike == "0") {
+        e->myCyclewayType = e->myCyclewayType == WAY_UNKNOWN ? WAY_BACKWARD : (WayType)(e->myCyclewayType | WAY_BACKWARD);
+    }
     const bool addBikeLane = bikeLaneWidth != NBEdge::UNSPECIFIED_WIDTH ||
                              (myImportBikeAccess && ((e->myCyclewayType & WAY_BOTH) != 0 || e->myExtraTags.count("segregated") != 0));
     if (addBikeLane && bikeLaneWidth == NBEdge::UNSPECIFIED_WIDTH) {
@@ -573,13 +577,16 @@
             && e->myIsOneWay != "yes" && e->myIsOneWay != "-1" && e->myIsOneWay != "1" && e->myIsOneWay != "reverse") {
         WRITE_WARNINGF(TL("New value for oneway found: %"), e->myIsOneWay);
     }
-    if (isBikepath(permissions) && e->myCyclewayType != WAY_UNKNOWN && e->myCyclewayType != WAY_NONE) {
-        if ((e->myCyclewayType & WAY_BACKWARD) == 0) {
+    if ((permissions == SVC_BICYCLE || permissions == (SVC_BICYCLE | SVC_PEDESTRIAN) || permissions == SVC_PEDESTRIAN)) {
+        if (addBackward && (onewayBike == "true" || onewayBike == "yes" || onewayBike == "1")) {
             addBackward = false;
         }
-        if ((e->myCyclewayType & WAY_FORWARD) == 0) {
+        if (addForward && (onewayBike == "reverse" || onewayBike == "-1")) {
             addForward = false;
         }
+        if (!addBackward && (onewayBike == "false" || onewayBike == "no" || onewayBike == "0")) {
+            addBackward = true;
+        }
     }
     bool ok = true;
     // if we had been able to extract the number of lanes, override the highway type default
@@ -635,7 +642,7 @@
             forwardWidth = bikeLaneWidth;
             numLanesForward = 1;
             // do not add an additional cycle lane
-            cyclewayType = (WayType)(cyclewayType & ~WAY_FORWARD);  //clang tidy thinks "!WAY_FORWARD" is always false
+            cyclewayType = (WayType)(cyclewayType & ~WAY_FORWARD);
         }
         if (!addBackward && (cyclewayType & WAY_BACKWARD) != 0) {
             addBackward = true;
@@ -643,7 +650,7 @@
             backwardWidth = bikeLaneWidth;
             numLanesBackward = 1;
             // do not add an additional cycle lane
-            cyclewayType = (WayType)(cyclewayType & ~WAY_BACKWARD); //clang tidy thinks "!WAY_BACKWARD" is always false
+            cyclewayType = (WayType)(cyclewayType & ~WAY_BACKWARD);
         }
     }
     // deal with sidewalks that run in the opposite direction of a one-way street
@@ -937,7 +944,7 @@
             } else if (myImportElevation && key == "ele") {
                 try {
                     const double elevation = StringUtils::toDouble(value);
-                    if (ISNAN(elevation)) {
+                    if (std::isnan(elevation)) {
                         WRITE_WARNINGF(TL("Value of key '%' is invalid ('%') in node '%'."), key, value, myLastNodeID);
                     } else {
                         myCurrentNode->ele = elevation;
@@ -1141,6 +1148,7 @@
                 && key != "railway:bidirectional"
                 && key != "railway:track_ref"
                 && key != "usage"
+                && key != "service"
                 && key != "electrified"
                 && key != "segregated"
                 && key != "bus"
@@ -1167,12 +1175,12 @@
 
         if ((key == "highway" && value != "platform") || key == "railway" || key == "waterway" || StringUtils::startsWith(key, "cycleway")
                 || key == "busway" || key == "route" || StringUtils::startsWith(key, "sidewalk") || key == "highspeed"
-                || key == "aeroway" || key == "aerialway" || key == "usage") {
+                || key == "aeroway" || key == "aerialway" || key == "usage" || key == "service") {
             // build type id
             myCurrentEdge->myCurrentIsRoad = true;
             // special cycleway stuff https://wiki.openstreetmap.org/wiki/Key:cycleway
             if (key == "cycleway") {
-                if (value == "no" || value == "none" || value == "separate" || value == "opposite") {
+                if (value == "no" || value == "none" || value == "separate") {
                     myCurrentEdge->myCyclewayType = WAY_NONE;
                 } else if (value == "both") {
                     myCurrentEdge->myCyclewayType = WAY_BOTH;
@@ -1184,6 +1192,9 @@
                     myCurrentEdge->myCyclewayType = WAY_BACKWARD;
                 } else if (value == "opposite_lane") {
                     myCurrentEdge->myCyclewayType = WAY_BACKWARD;
+                } else if (value == "opposite") {
+                    // according to the wiki ref above, this should rather be a bidi lane, see #13438
+                    myCurrentEdge->myCyclewayType = WAY_BACKWARD;
                 }
             }
             if (key == "cycleway:left") {
@@ -1344,14 +1355,7 @@
                 myCurrentEdge->myExtraAllowed |= SVC_BICYCLE;
             }
         } else if (key == "oneway:bicycle") {
-            if (value == "yes") {
-                // actually this should be a simple "oneway" tag
-                myCurrentEdge->myIsOneWay = value;
-            }
-            if (value == "no") {
-                // need to add a cycle way in reversed direction of way
-                myCurrentEdge->myCyclewayType = WAY_BACKWARD;
-            }
+            myCurrentEdge->myExtraTags["oneway:bicycle"] = value;
         } else if (key == "oneway:bus") {
             if (value == "no") {
                 // need to add a bus way in reversed direction of way
@@ -1410,7 +1414,7 @@
         } else if (key == "maxspeed:backward" && myCurrentEdge->myMaxSpeedBackward == MAXSPEED_UNGIVEN) {
             myCurrentEdge->myMaxSpeedBackward = interpretSpeed(key, value);
         } else if (key == "junction") {
-            if ((value == "roundabout" || value == "circular") && (myCurrentEdge->myIsOneWay.empty())) {
+            if ((value == "roundabout" || value == "circular") && myCurrentEdge->myIsOneWay.empty()) {
                 myCurrentEdge->myIsOneWay = "yes";
             }
         } else if (key == "oneway") {
@@ -2308,11 +2312,15 @@
                 types.push_back(t);
             }
         } else if (tok.size() > 1) {
-            WRITE_WARNINGF(TL("Discarding unknown compound '%' in type '%' (first occurrence for edge '%')."), t, type, id);
+            if (!StringUtils::startsWith(t, "service.")) {
+                WRITE_WARNINGF(TL("Discarding unknown compound '%' in type '%' (first occurrence for edge '%')."), t, type, id);
+            }
         }
     }
     if (types.empty()) {
-        WRITE_WARNINGF(TL("Discarding unusable type '%' (first occurrence for edge '%')."), type, id);
+        if (!StringUtils::startsWith(type, "service.")) {
+            WRITE_WARNINGF(TL("Discarding unusable type '%' (first occurrence for edge '%')."), type, id);
+        }
         myUnusableTypes.insert(type);
         return "";
     }
@@ -2334,6 +2342,7 @@
         SVCPermissions permissions = 0;
         LaneSpreadFunction spreadType = LaneSpreadFunction::RIGHT;
         bool discard = true;
+        bool hadDiscard = false;
         for (auto& type2 : types) {
             if (!tc.getEdgeTypeShallBeDiscarded(type2)) {
                 numLanes = MAX2(numLanes, tc.getEdgeTypeNumLanes(type2));
@@ -2347,8 +2356,18 @@
                 sidewalkWidth = MAX2(sidewalkWidth, tc.getEdgeTypeSidewalkWidth(type2));
                 bikelaneWidth = MAX2(bikelaneWidth, tc.getEdgeTypeBikeLaneWidth(type2));
                 discard = false;
+            } else {
+                hadDiscard = true;
             }
         }
+        if (hadDiscard && permissions == 0) {
+            discard = true;
+        }
+        if (discard) {
+            WRITE_WARNINGF(TL("Discarding compound type '%' (first occurrence for edge '%')."), newType, id);
+            myUnusableTypes.insert(newType);
+            return "";
+        }
         if (width != NBEdge::UNSPECIFIED_WIDTH) {
             width = MAX2(width, SUMO_const_laneWidth);
         }
@@ -2360,12 +2379,6 @@
             sidewalkWidth = OptionsCont::getOptions().getFloat("default.sidewalk-width");
         }
 
-        if (discard) {
-            WRITE_WARNINGF(TL("Discarding compound type '%' (first occurrence for edge '%')."), newType, id);
-            myUnusableTypes.insert(newType);
-            return "";
-        }
-
         WRITE_MESSAGEF(TL("Adding new type '%' (first occurrence for edge '%')."), type, id);
         tc.insertEdgeType(newType, numLanes, maxSpeed, prio, permissions, spreadType, width,
                           defaultIsOneWay, sidewalkWidth, bikelaneWidth, 0, 0, 0);
diff -Nru sumo-1.17.0/src/netimport/NIImporter_OpenStreetMap.h sumo-1.18.0/src/netimport/NIImporter_OpenStreetMap.h
--- sumo-1.17.0/src/netimport/NIImporter_OpenStreetMap.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/NIImporter_OpenStreetMap.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/NIImporter_SUMO.cpp sumo-1.18.0/src/netimport/NIImporter_SUMO.cpp
--- sumo-1.17.0/src/netimport/NIImporter_SUMO.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/NIImporter_SUMO.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/NIImporter_SUMO.h sumo-1.18.0/src/netimport/NIImporter_SUMO.h
--- sumo-1.17.0/src/netimport/NIImporter_SUMO.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/NIImporter_SUMO.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/NIImporter_VISUM.cpp sumo-1.18.0/src/netimport/NIImporter_VISUM.cpp
--- sumo-1.17.0/src/netimport/NIImporter_VISUM.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/NIImporter_VISUM.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/NIImporter_VISUM.h sumo-1.18.0/src/netimport/NIImporter_VISUM.h
--- sumo-1.17.0/src/netimport/NIImporter_VISUM.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/NIImporter_VISUM.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/NILoader.cpp sumo-1.18.0/src/netimport/NILoader.cpp
--- sumo-1.17.0/src/netimport/NILoader.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/NILoader.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/NILoader.h sumo-1.18.0/src/netimport/NILoader.h
--- sumo-1.17.0/src/netimport/NILoader.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/NILoader.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/NINavTeqHelper.cpp sumo-1.18.0/src/netimport/NINavTeqHelper.cpp
--- sumo-1.17.0/src/netimport/NINavTeqHelper.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/NINavTeqHelper.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/NINavTeqHelper.h sumo-1.18.0/src/netimport/NINavTeqHelper.h
--- sumo-1.17.0/src/netimport/NINavTeqHelper.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/NINavTeqHelper.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/NITypeLoader.cpp sumo-1.18.0/src/netimport/NITypeLoader.cpp
--- sumo-1.17.0/src/netimport/NITypeLoader.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/NITypeLoader.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/NITypeLoader.h sumo-1.18.0/src/netimport/NITypeLoader.h
--- sumo-1.17.0/src/netimport/NITypeLoader.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/NITypeLoader.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/NIVisumTL.cpp sumo-1.18.0/src/netimport/NIVisumTL.cpp
--- sumo-1.17.0/src/netimport/NIVisumTL.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/NIVisumTL.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2003-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/NIVisumTL.h sumo-1.18.0/src/netimport/NIVisumTL.h
--- sumo-1.17.0/src/netimport/NIVisumTL.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/NIVisumTL.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/NIXMLConnectionsHandler.cpp sumo-1.18.0/src/netimport/NIXMLConnectionsHandler.cpp
--- sumo-1.17.0/src/netimport/NIXMLConnectionsHandler.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/NIXMLConnectionsHandler.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/NIXMLConnectionsHandler.h sumo-1.18.0/src/netimport/NIXMLConnectionsHandler.h
--- sumo-1.17.0/src/netimport/NIXMLConnectionsHandler.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/NIXMLConnectionsHandler.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/NIXMLEdgesHandler.cpp sumo-1.18.0/src/netimport/NIXMLEdgesHandler.cpp
--- sumo-1.17.0/src/netimport/NIXMLEdgesHandler.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/NIXMLEdgesHandler.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/NIXMLEdgesHandler.h sumo-1.18.0/src/netimport/NIXMLEdgesHandler.h
--- sumo-1.17.0/src/netimport/NIXMLEdgesHandler.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/NIXMLEdgesHandler.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/NIXMLNodesHandler.cpp sumo-1.18.0/src/netimport/NIXMLNodesHandler.cpp
--- sumo-1.17.0/src/netimport/NIXMLNodesHandler.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/NIXMLNodesHandler.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/NIXMLNodesHandler.h sumo-1.18.0/src/netimport/NIXMLNodesHandler.h
--- sumo-1.17.0/src/netimport/NIXMLNodesHandler.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/NIXMLNodesHandler.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/NIXMLPTHandler.cpp sumo-1.18.0/src/netimport/NIXMLPTHandler.cpp
--- sumo-1.17.0/src/netimport/NIXMLPTHandler.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/NIXMLPTHandler.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/NIXMLPTHandler.h sumo-1.18.0/src/netimport/NIXMLPTHandler.h
--- sumo-1.17.0/src/netimport/NIXMLPTHandler.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/NIXMLPTHandler.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/NIXMLShapeHandler.cpp sumo-1.18.0/src/netimport/NIXMLShapeHandler.cpp
--- sumo-1.17.0/src/netimport/NIXMLShapeHandler.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/NIXMLShapeHandler.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/NIXMLShapeHandler.h sumo-1.18.0/src/netimport/NIXMLShapeHandler.h
--- sumo-1.17.0/src/netimport/NIXMLShapeHandler.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/NIXMLShapeHandler.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/NIXMLTrafficLightsHandler.cpp sumo-1.18.0/src/netimport/NIXMLTrafficLightsHandler.cpp
--- sumo-1.17.0/src/netimport/NIXMLTrafficLightsHandler.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/NIXMLTrafficLightsHandler.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2011-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/NIXMLTrafficLightsHandler.h sumo-1.18.0/src/netimport/NIXMLTrafficLightsHandler.h
--- sumo-1.17.0/src/netimport/NIXMLTrafficLightsHandler.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/NIXMLTrafficLightsHandler.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/NIXMLTypesHandler.cpp sumo-1.18.0/src/netimport/NIXMLTypesHandler.cpp
--- sumo-1.17.0/src/netimport/NIXMLTypesHandler.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/NIXMLTypesHandler.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/NIXMLTypesHandler.h sumo-1.18.0/src/netimport/NIXMLTypesHandler.h
--- sumo-1.17.0/src/netimport/NIXMLTypesHandler.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/NIXMLTypesHandler.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/NIImporter_Vissim.cpp sumo-1.18.0/src/netimport/vissim/NIImporter_Vissim.cpp
--- sumo-1.17.0/src/netimport/vissim/NIImporter_Vissim.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/NIImporter_Vissim.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/NIImporter_Vissim.h sumo-1.18.0/src/netimport/vissim/NIImporter_Vissim.h
--- sumo-1.17.0/src/netimport/vissim/NIImporter_Vissim.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/NIImporter_Vissim.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/NIVissimElements.h sumo-1.18.0/src/netimport/vissim/NIVissimElements.h
--- sumo-1.17.0/src/netimport/vissim/NIVissimElements.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/NIVissimElements.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/tempstructs/NIVissimAbstractEdge.cpp sumo-1.18.0/src/netimport/vissim/tempstructs/NIVissimAbstractEdge.cpp
--- sumo-1.17.0/src/netimport/vissim/tempstructs/NIVissimAbstractEdge.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/tempstructs/NIVissimAbstractEdge.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/tempstructs/NIVissimAbstractEdge.h sumo-1.18.0/src/netimport/vissim/tempstructs/NIVissimAbstractEdge.h
--- sumo-1.17.0/src/netimport/vissim/tempstructs/NIVissimAbstractEdge.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/tempstructs/NIVissimAbstractEdge.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/tempstructs/NIVissimBoundedClusterObject.cpp sumo-1.18.0/src/netimport/vissim/tempstructs/NIVissimBoundedClusterObject.cpp
--- sumo-1.17.0/src/netimport/vissim/tempstructs/NIVissimBoundedClusterObject.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/tempstructs/NIVissimBoundedClusterObject.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/tempstructs/NIVissimBoundedClusterObject.h sumo-1.18.0/src/netimport/vissim/tempstructs/NIVissimBoundedClusterObject.h
--- sumo-1.17.0/src/netimport/vissim/tempstructs/NIVissimBoundedClusterObject.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/tempstructs/NIVissimBoundedClusterObject.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/tempstructs/NIVissimClosedLaneDef.cpp sumo-1.18.0/src/netimport/vissim/tempstructs/NIVissimClosedLaneDef.cpp
--- sumo-1.17.0/src/netimport/vissim/tempstructs/NIVissimClosedLaneDef.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/tempstructs/NIVissimClosedLaneDef.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2002-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/tempstructs/NIVissimClosedLaneDef.h sumo-1.18.0/src/netimport/vissim/tempstructs/NIVissimClosedLaneDef.h
--- sumo-1.17.0/src/netimport/vissim/tempstructs/NIVissimClosedLaneDef.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/tempstructs/NIVissimClosedLaneDef.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2002-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/tempstructs/NIVissimClosedLanesVector.h sumo-1.18.0/src/netimport/vissim/tempstructs/NIVissimClosedLanesVector.h
--- sumo-1.17.0/src/netimport/vissim/tempstructs/NIVissimClosedLanesVector.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/tempstructs/NIVissimClosedLanesVector.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/tempstructs/NIVissimClosures.cpp sumo-1.18.0/src/netimport/vissim/tempstructs/NIVissimClosures.cpp
--- sumo-1.17.0/src/netimport/vissim/tempstructs/NIVissimClosures.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/tempstructs/NIVissimClosures.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2002-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/tempstructs/NIVissimClosures.h sumo-1.18.0/src/netimport/vissim/tempstructs/NIVissimClosures.h
--- sumo-1.17.0/src/netimport/vissim/tempstructs/NIVissimClosures.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/tempstructs/NIVissimClosures.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2002-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/tempstructs/NIVissimConflictArea.cpp sumo-1.18.0/src/netimport/vissim/tempstructs/NIVissimConflictArea.cpp
--- sumo-1.17.0/src/netimport/vissim/tempstructs/NIVissimConflictArea.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/tempstructs/NIVissimConflictArea.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/tempstructs/NIVissimConflictArea.h sumo-1.18.0/src/netimport/vissim/tempstructs/NIVissimConflictArea.h
--- sumo-1.17.0/src/netimport/vissim/tempstructs/NIVissimConflictArea.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/tempstructs/NIVissimConflictArea.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2002-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/tempstructs/NIVissimConnectionCluster.cpp sumo-1.18.0/src/netimport/vissim/tempstructs/NIVissimConnectionCluster.cpp
--- sumo-1.17.0/src/netimport/vissim/tempstructs/NIVissimConnectionCluster.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/tempstructs/NIVissimConnectionCluster.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/tempstructs/NIVissimConnectionCluster.h sumo-1.18.0/src/netimport/vissim/tempstructs/NIVissimConnectionCluster.h
--- sumo-1.17.0/src/netimport/vissim/tempstructs/NIVissimConnectionCluster.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/tempstructs/NIVissimConnectionCluster.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/tempstructs/NIVissimConnection.cpp sumo-1.18.0/src/netimport/vissim/tempstructs/NIVissimConnection.cpp
--- sumo-1.17.0/src/netimport/vissim/tempstructs/NIVissimConnection.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/tempstructs/NIVissimConnection.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/tempstructs/NIVissimConnection.h sumo-1.18.0/src/netimport/vissim/tempstructs/NIVissimConnection.h
--- sumo-1.17.0/src/netimport/vissim/tempstructs/NIVissimConnection.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/tempstructs/NIVissimConnection.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/tempstructs/NIVissimDistrictConnection.cpp sumo-1.18.0/src/netimport/vissim/tempstructs/NIVissimDistrictConnection.cpp
--- sumo-1.17.0/src/netimport/vissim/tempstructs/NIVissimDistrictConnection.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/tempstructs/NIVissimDistrictConnection.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/tempstructs/NIVissimDistrictConnection.h sumo-1.18.0/src/netimport/vissim/tempstructs/NIVissimDistrictConnection.h
--- sumo-1.17.0/src/netimport/vissim/tempstructs/NIVissimDistrictConnection.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/tempstructs/NIVissimDistrictConnection.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/tempstructs/NIVissimDisturbance.cpp sumo-1.18.0/src/netimport/vissim/tempstructs/NIVissimDisturbance.cpp
--- sumo-1.17.0/src/netimport/vissim/tempstructs/NIVissimDisturbance.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/tempstructs/NIVissimDisturbance.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/tempstructs/NIVissimDisturbance.h sumo-1.18.0/src/netimport/vissim/tempstructs/NIVissimDisturbance.h
--- sumo-1.17.0/src/netimport/vissim/tempstructs/NIVissimDisturbance.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/tempstructs/NIVissimDisturbance.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2002-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/tempstructs/NIVissimEdge.cpp sumo-1.18.0/src/netimport/vissim/tempstructs/NIVissimEdge.cpp
--- sumo-1.17.0/src/netimport/vissim/tempstructs/NIVissimEdge.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/tempstructs/NIVissimEdge.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/tempstructs/NIVissimEdge.h sumo-1.18.0/src/netimport/vissim/tempstructs/NIVissimEdge.h
--- sumo-1.17.0/src/netimport/vissim/tempstructs/NIVissimEdge.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/tempstructs/NIVissimEdge.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/tempstructs/NIVissimEdgePosMap.cpp sumo-1.18.0/src/netimport/vissim/tempstructs/NIVissimEdgePosMap.cpp
--- sumo-1.17.0/src/netimport/vissim/tempstructs/NIVissimEdgePosMap.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/tempstructs/NIVissimEdgePosMap.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/tempstructs/NIVissimEdgePosMap.h sumo-1.18.0/src/netimport/vissim/tempstructs/NIVissimEdgePosMap.h
--- sumo-1.17.0/src/netimport/vissim/tempstructs/NIVissimEdgePosMap.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/tempstructs/NIVissimEdgePosMap.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/tempstructs/NIVissimExtendedEdgePoint.cpp sumo-1.18.0/src/netimport/vissim/tempstructs/NIVissimExtendedEdgePoint.cpp
--- sumo-1.17.0/src/netimport/vissim/tempstructs/NIVissimExtendedEdgePoint.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/tempstructs/NIVissimExtendedEdgePoint.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/tempstructs/NIVissimExtendedEdgePoint.h sumo-1.18.0/src/netimport/vissim/tempstructs/NIVissimExtendedEdgePoint.h
--- sumo-1.17.0/src/netimport/vissim/tempstructs/NIVissimExtendedEdgePoint.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/tempstructs/NIVissimExtendedEdgePoint.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/tempstructs/NIVissimExtendedEdgePointVector.h sumo-1.18.0/src/netimport/vissim/tempstructs/NIVissimExtendedEdgePointVector.h
--- sumo-1.17.0/src/netimport/vissim/tempstructs/NIVissimExtendedEdgePointVector.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/tempstructs/NIVissimExtendedEdgePointVector.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/tempstructs/NIVissimNodeCluster.cpp sumo-1.18.0/src/netimport/vissim/tempstructs/NIVissimNodeCluster.cpp
--- sumo-1.17.0/src/netimport/vissim/tempstructs/NIVissimNodeCluster.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/tempstructs/NIVissimNodeCluster.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/tempstructs/NIVissimNodeCluster.h sumo-1.18.0/src/netimport/vissim/tempstructs/NIVissimNodeCluster.h
--- sumo-1.17.0/src/netimport/vissim/tempstructs/NIVissimNodeCluster.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/tempstructs/NIVissimNodeCluster.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/tempstructs/NIVissimNodeDef.cpp sumo-1.18.0/src/netimport/vissim/tempstructs/NIVissimNodeDef.cpp
--- sumo-1.17.0/src/netimport/vissim/tempstructs/NIVissimNodeDef.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/tempstructs/NIVissimNodeDef.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2002-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/tempstructs/NIVissimNodeDef_Edges.cpp sumo-1.18.0/src/netimport/vissim/tempstructs/NIVissimNodeDef_Edges.cpp
--- sumo-1.17.0/src/netimport/vissim/tempstructs/NIVissimNodeDef_Edges.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/tempstructs/NIVissimNodeDef_Edges.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/tempstructs/NIVissimNodeDef_Edges.h sumo-1.18.0/src/netimport/vissim/tempstructs/NIVissimNodeDef_Edges.h
--- sumo-1.17.0/src/netimport/vissim/tempstructs/NIVissimNodeDef_Edges.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/tempstructs/NIVissimNodeDef_Edges.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/tempstructs/NIVissimNodeDef.h sumo-1.18.0/src/netimport/vissim/tempstructs/NIVissimNodeDef.h
--- sumo-1.17.0/src/netimport/vissim/tempstructs/NIVissimNodeDef.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/tempstructs/NIVissimNodeDef.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2002-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/tempstructs/NIVissimNodeDef_Poly.cpp sumo-1.18.0/src/netimport/vissim/tempstructs/NIVissimNodeDef_Poly.cpp
--- sumo-1.17.0/src/netimport/vissim/tempstructs/NIVissimNodeDef_Poly.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/tempstructs/NIVissimNodeDef_Poly.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/tempstructs/NIVissimNodeDef_Poly.h sumo-1.18.0/src/netimport/vissim/tempstructs/NIVissimNodeDef_Poly.h
--- sumo-1.17.0/src/netimport/vissim/tempstructs/NIVissimNodeDef_Poly.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/tempstructs/NIVissimNodeDef_Poly.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/tempstructs/NIVissimNodeParticipatingEdge.cpp sumo-1.18.0/src/netimport/vissim/tempstructs/NIVissimNodeParticipatingEdge.cpp
--- sumo-1.17.0/src/netimport/vissim/tempstructs/NIVissimNodeParticipatingEdge.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/tempstructs/NIVissimNodeParticipatingEdge.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/tempstructs/NIVissimNodeParticipatingEdge.h sumo-1.18.0/src/netimport/vissim/tempstructs/NIVissimNodeParticipatingEdge.h
--- sumo-1.17.0/src/netimport/vissim/tempstructs/NIVissimNodeParticipatingEdge.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/tempstructs/NIVissimNodeParticipatingEdge.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/tempstructs/NIVissimNodeParticipatingEdgeVector.h sumo-1.18.0/src/netimport/vissim/tempstructs/NIVissimNodeParticipatingEdgeVector.h
--- sumo-1.17.0/src/netimport/vissim/tempstructs/NIVissimNodeParticipatingEdgeVector.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/tempstructs/NIVissimNodeParticipatingEdgeVector.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/tempstructs/NIVissimSource.cpp sumo-1.18.0/src/netimport/vissim/tempstructs/NIVissimSource.cpp
--- sumo-1.17.0/src/netimport/vissim/tempstructs/NIVissimSource.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/tempstructs/NIVissimSource.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/tempstructs/NIVissimSource.h sumo-1.18.0/src/netimport/vissim/tempstructs/NIVissimSource.h
--- sumo-1.17.0/src/netimport/vissim/tempstructs/NIVissimSource.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/tempstructs/NIVissimSource.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/tempstructs/NIVissimTL.cpp sumo-1.18.0/src/netimport/vissim/tempstructs/NIVissimTL.cpp
--- sumo-1.17.0/src/netimport/vissim/tempstructs/NIVissimTL.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/tempstructs/NIVissimTL.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/tempstructs/NIVissimTL.h sumo-1.18.0/src/netimport/vissim/tempstructs/NIVissimTL.h
--- sumo-1.17.0/src/netimport/vissim/tempstructs/NIVissimTL.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/tempstructs/NIVissimTL.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/tempstructs/NIVissimTrafficDescription.cpp sumo-1.18.0/src/netimport/vissim/tempstructs/NIVissimTrafficDescription.cpp
--- sumo-1.17.0/src/netimport/vissim/tempstructs/NIVissimTrafficDescription.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/tempstructs/NIVissimTrafficDescription.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/tempstructs/NIVissimTrafficDescription.h sumo-1.18.0/src/netimport/vissim/tempstructs/NIVissimTrafficDescription.h
--- sumo-1.17.0/src/netimport/vissim/tempstructs/NIVissimTrafficDescription.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/tempstructs/NIVissimTrafficDescription.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/tempstructs/NIVissimVehicleClass.cpp sumo-1.18.0/src/netimport/vissim/tempstructs/NIVissimVehicleClass.cpp
--- sumo-1.17.0/src/netimport/vissim/tempstructs/NIVissimVehicleClass.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/tempstructs/NIVissimVehicleClass.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/tempstructs/NIVissimVehicleClass.h sumo-1.18.0/src/netimport/vissim/tempstructs/NIVissimVehicleClass.h
--- sumo-1.17.0/src/netimport/vissim/tempstructs/NIVissimVehicleClass.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/tempstructs/NIVissimVehicleClass.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/tempstructs/NIVissimVehicleClassVector.h sumo-1.18.0/src/netimport/vissim/tempstructs/NIVissimVehicleClassVector.h
--- sumo-1.17.0/src/netimport/vissim/tempstructs/NIVissimVehicleClassVector.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/tempstructs/NIVissimVehicleClassVector.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/tempstructs/NIVissimVehicleType.cpp sumo-1.18.0/src/netimport/vissim/tempstructs/NIVissimVehicleType.cpp
--- sumo-1.17.0/src/netimport/vissim/tempstructs/NIVissimVehicleType.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/tempstructs/NIVissimVehicleType.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/tempstructs/NIVissimVehicleType.h sumo-1.18.0/src/netimport/vissim/tempstructs/NIVissimVehicleType.h
--- sumo-1.17.0/src/netimport/vissim/tempstructs/NIVissimVehicleType.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/tempstructs/NIVissimVehicleType.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/tempstructs/NIVissimVehTypeClass.cpp sumo-1.18.0/src/netimport/vissim/tempstructs/NIVissimVehTypeClass.cpp
--- sumo-1.17.0/src/netimport/vissim/tempstructs/NIVissimVehTypeClass.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/tempstructs/NIVissimVehTypeClass.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2002-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/tempstructs/NIVissimVehTypeClass.h sumo-1.18.0/src/netimport/vissim/tempstructs/NIVissimVehTypeClass.h
--- sumo-1.17.0/src/netimport/vissim/tempstructs/NIVissimVehTypeClass.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/tempstructs/NIVissimVehTypeClass.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2002-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Auswertungsdefinition.cpp sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Auswertungsdefinition.cpp
--- sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Auswertungsdefinition.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Auswertungsdefinition.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Auswertungsdefinition.h sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Auswertungsdefinition.h
--- sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Auswertungsdefinition.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Auswertungsdefinition.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Detektordefinition.cpp sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Detektordefinition.cpp
--- sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Detektordefinition.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Detektordefinition.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Detektordefinition.h sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Detektordefinition.h
--- sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Detektordefinition.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Detektordefinition.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_DynUml.cpp sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_DynUml.cpp
--- sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_DynUml.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_DynUml.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_DynUml.h sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_DynUml.h
--- sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_DynUml.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_DynUml.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Einheitendefinition.cpp sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Einheitendefinition.cpp
--- sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Einheitendefinition.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Einheitendefinition.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Einheitendefinition.h sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Einheitendefinition.h
--- sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Einheitendefinition.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Einheitendefinition.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Emission.cpp sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Emission.cpp
--- sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Emission.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Emission.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Emission.h sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Emission.h
--- sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Emission.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Emission.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Fahrtverlaufdateien.cpp sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Fahrtverlaufdateien.cpp
--- sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Fahrtverlaufdateien.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Fahrtverlaufdateien.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Fahrtverlaufdateien.h sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Fahrtverlaufdateien.h
--- sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Fahrtverlaufdateien.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Fahrtverlaufdateien.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Fahrverhaltendefinition.cpp sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Fahrverhaltendefinition.cpp
--- sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Fahrverhaltendefinition.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Fahrverhaltendefinition.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Fahrverhaltendefinition.h sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Fahrverhaltendefinition.h
--- sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Fahrverhaltendefinition.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Fahrverhaltendefinition.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Fahrzeugklassendefinition.cpp sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Fahrzeugklassendefinition.cpp
--- sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Fahrzeugklassendefinition.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Fahrzeugklassendefinition.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Fahrzeugklassendefinition.h sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Fahrzeugklassendefinition.h
--- sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Fahrzeugklassendefinition.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Fahrzeugklassendefinition.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Fahrzeugtypdefinition.cpp sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Fahrzeugtypdefinition.cpp
--- sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Fahrzeugtypdefinition.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Fahrzeugtypdefinition.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Fahrzeugtypdefinition.h sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Fahrzeugtypdefinition.h
--- sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Fahrzeugtypdefinition.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Fahrzeugtypdefinition.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Fensterdefinition.cpp sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Fensterdefinition.cpp
--- sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Fensterdefinition.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Fensterdefinition.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Fensterdefinition.h sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Fensterdefinition.h
--- sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Fensterdefinition.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Fensterdefinition.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Gefahrwarnungsdefinition.cpp sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Gefahrwarnungsdefinition.cpp
--- sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Gefahrwarnungsdefinition.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Gefahrwarnungsdefinition.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Gefahrwarnungsdefinition.h sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Gefahrwarnungsdefinition.h
--- sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Gefahrwarnungsdefinition.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Gefahrwarnungsdefinition.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Gelbverhaltendefinition.cpp sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Gelbverhaltendefinition.cpp
--- sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Gelbverhaltendefinition.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Gelbverhaltendefinition.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Gelbverhaltendefinition.h sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Gelbverhaltendefinition.h
--- sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Gelbverhaltendefinition.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Gelbverhaltendefinition.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Geschwindigkeitsverteilungsdefinition.cpp sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Geschwindigkeitsverteilungsdefinition.cpp
--- sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Geschwindigkeitsverteilungsdefinition.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Geschwindigkeitsverteilungsdefinition.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Geschwindigkeitsverteilungsdefinition.h sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Geschwindigkeitsverteilungsdefinition.h
--- sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Geschwindigkeitsverteilungsdefinition.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Geschwindigkeitsverteilungsdefinition.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Haltestellendefinition.cpp sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Haltestellendefinition.cpp
--- sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Haltestellendefinition.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Haltestellendefinition.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Haltestellendefinition.h sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Haltestellendefinition.h
--- sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Haltestellendefinition.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Haltestellendefinition.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Kantensperrung.cpp sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Kantensperrung.cpp
--- sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Kantensperrung.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Kantensperrung.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Kantensperrung.h sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Kantensperrung.h
--- sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Kantensperrung.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Kantensperrung.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Kennungszeile.cpp sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Kennungszeile.cpp
--- sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Kennungszeile.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Kennungszeile.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Kennungszeile.h sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Kennungszeile.h
--- sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Kennungszeile.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Kennungszeile.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Knotendefinition.cpp sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Knotendefinition.cpp
--- sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Knotendefinition.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Knotendefinition.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Knotendefinition.h sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Knotendefinition.h
--- sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Knotendefinition.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Knotendefinition.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Laengenverteilungsdefinition.cpp sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Laengenverteilungsdefinition.cpp
--- sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Laengenverteilungsdefinition.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Laengenverteilungsdefinition.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Laengenverteilungsdefinition.h sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Laengenverteilungsdefinition.h
--- sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Laengenverteilungsdefinition.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Laengenverteilungsdefinition.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Langsamfahrbereichdefinition.cpp sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Langsamfahrbereichdefinition.cpp
--- sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Langsamfahrbereichdefinition.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Langsamfahrbereichdefinition.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Langsamfahrbereichdefinition.h sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Langsamfahrbereichdefinition.h
--- sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Langsamfahrbereichdefinition.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Langsamfahrbereichdefinition.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Lichtsignalanlagendefinition.cpp sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Lichtsignalanlagendefinition.cpp
--- sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Lichtsignalanlagendefinition.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Lichtsignalanlagendefinition.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Lichtsignalanlagendefinition.h sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Lichtsignalanlagendefinition.h
--- sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Lichtsignalanlagendefinition.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Lichtsignalanlagendefinition.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Liniendefinition.cpp sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Liniendefinition.cpp
--- sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Liniendefinition.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Liniendefinition.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Liniendefinition.h sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Liniendefinition.h
--- sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Liniendefinition.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Liniendefinition.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Linksverkehr.cpp sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Linksverkehr.cpp
--- sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Linksverkehr.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Linksverkehr.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Linksverkehr.h sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Linksverkehr.h
--- sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Linksverkehr.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Linksverkehr.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_LSAKopplungsdefinition.cpp sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_LSAKopplungsdefinition.cpp
--- sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_LSAKopplungsdefinition.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_LSAKopplungsdefinition.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_LSAKopplungsdefinition.h sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_LSAKopplungsdefinition.h
--- sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_LSAKopplungsdefinition.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_LSAKopplungsdefinition.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Messungsdefinition.cpp sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Messungsdefinition.cpp
--- sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Messungsdefinition.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Messungsdefinition.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Messungsdefinition.h sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Messungsdefinition.h
--- sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Messungsdefinition.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Messungsdefinition.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Netzobjektdefinition.cpp sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Netzobjektdefinition.cpp
--- sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Netzobjektdefinition.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Netzobjektdefinition.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Netzobjektdefinition.h sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Netzobjektdefinition.h
--- sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Netzobjektdefinition.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Netzobjektdefinition.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Parkplatzdefinition.cpp sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Parkplatzdefinition.cpp
--- sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Parkplatzdefinition.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Parkplatzdefinition.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Parkplatzdefinition.h sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Parkplatzdefinition.h
--- sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Parkplatzdefinition.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Parkplatzdefinition.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Querschnittsmessungsdefinition.cpp sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Querschnittsmessungsdefinition.cpp
--- sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Querschnittsmessungsdefinition.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Querschnittsmessungsdefinition.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Querschnittsmessungsdefinition.h sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Querschnittsmessungsdefinition.h
--- sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Querschnittsmessungsdefinition.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Querschnittsmessungsdefinition.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Querverkehrsstoerungsdefinition.cpp sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Querverkehrsstoerungsdefinition.cpp
--- sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Querverkehrsstoerungsdefinition.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Querverkehrsstoerungsdefinition.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Querverkehrsstoerungsdefinition.h sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Querverkehrsstoerungsdefinition.h
--- sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Querverkehrsstoerungsdefinition.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Querverkehrsstoerungsdefinition.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Rautedefinition.cpp sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Rautedefinition.cpp
--- sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Rautedefinition.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Rautedefinition.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Rautedefinition.h sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Rautedefinition.h
--- sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Rautedefinition.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Rautedefinition.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Reisezeitmessungsdefinition.cpp sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Reisezeitmessungsdefinition.cpp
--- sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Reisezeitmessungsdefinition.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Reisezeitmessungsdefinition.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Reisezeitmessungsdefinition.h sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Reisezeitmessungsdefinition.h
--- sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Reisezeitmessungsdefinition.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Reisezeitmessungsdefinition.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Richtungsentscheidungsdefinition.cpp sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Richtungsentscheidungsdefinition.cpp
--- sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Richtungsentscheidungsdefinition.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Richtungsentscheidungsdefinition.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Richtungsentscheidungsdefinition.h sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Richtungsentscheidungsdefinition.h
--- sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Richtungsentscheidungsdefinition.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Richtungsentscheidungsdefinition.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Richtungspfeildefinition.cpp sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Richtungspfeildefinition.cpp
--- sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Richtungspfeildefinition.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Richtungspfeildefinition.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Richtungspfeildefinition.h sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Richtungspfeildefinition.h
--- sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Richtungspfeildefinition.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Richtungspfeildefinition.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Routenentscheidungsdefinition.cpp sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Routenentscheidungsdefinition.cpp
--- sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Routenentscheidungsdefinition.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Routenentscheidungsdefinition.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Routenentscheidungsdefinition.h sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Routenentscheidungsdefinition.h
--- sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Routenentscheidungsdefinition.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Routenentscheidungsdefinition.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Signalgeberdefinition.cpp sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Signalgeberdefinition.cpp
--- sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Signalgeberdefinition.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Signalgeberdefinition.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Signalgeberdefinition.h sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Signalgeberdefinition.h
--- sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Signalgeberdefinition.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Signalgeberdefinition.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Signalgruppendefinition.cpp sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Signalgruppendefinition.cpp
--- sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Signalgruppendefinition.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Signalgruppendefinition.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Signalgruppendefinition.h sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Signalgruppendefinition.h
--- sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Signalgruppendefinition.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Signalgruppendefinition.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Simdauer.cpp sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Simdauer.cpp
--- sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Simdauer.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Simdauer.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Simdauer.h sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Simdauer.h
--- sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Simdauer.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Simdauer.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_SimRate.cpp sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_SimRate.cpp
--- sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_SimRate.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_SimRate.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_SimRate.h sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_SimRate.h
--- sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_SimRate.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_SimRate.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Startuhrzeit.cpp sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Startuhrzeit.cpp
--- sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Startuhrzeit.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Startuhrzeit.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Startuhrzeit.h sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Startuhrzeit.h
--- sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Startuhrzeit.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Startuhrzeit.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Startzufallszahl.cpp sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Startzufallszahl.cpp
--- sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Startzufallszahl.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Startzufallszahl.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Startzufallszahl.h sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Startzufallszahl.h
--- sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Startzufallszahl.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Startzufallszahl.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Stauparameterdefinition.cpp sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Stauparameterdefinition.cpp
--- sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Stauparameterdefinition.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Stauparameterdefinition.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Stauparameterdefinition.h sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Stauparameterdefinition.h
--- sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Stauparameterdefinition.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Stauparameterdefinition.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Stauzaehlerdefinition.cpp sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Stauzaehlerdefinition.cpp
--- sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Stauzaehlerdefinition.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Stauzaehlerdefinition.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Stauzaehlerdefinition.h sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Stauzaehlerdefinition.h
--- sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Stauzaehlerdefinition.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Stauzaehlerdefinition.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Stopschilddefinition.cpp sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Stopschilddefinition.cpp
--- sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Stopschilddefinition.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Stopschilddefinition.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Stopschilddefinition.h sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Stopschilddefinition.h
--- sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Stopschilddefinition.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Stopschilddefinition.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Streckendefinition.cpp sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Streckendefinition.cpp
--- sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Streckendefinition.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Streckendefinition.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Streckendefinition.h sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Streckendefinition.h
--- sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Streckendefinition.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Streckendefinition.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Streckentypdefinition.cpp sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Streckentypdefinition.cpp
--- sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Streckentypdefinition.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Streckentypdefinition.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Streckentypdefinition.h sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Streckentypdefinition.h
--- sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Streckentypdefinition.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Streckentypdefinition.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_TEAPACDefinition.cpp sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_TEAPACDefinition.cpp
--- sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_TEAPACDefinition.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_TEAPACDefinition.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_TEAPACDefinition.h sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_TEAPACDefinition.h
--- sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_TEAPACDefinition.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_TEAPACDefinition.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Verbindungsdefinition.cpp sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Verbindungsdefinition.cpp
--- sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Verbindungsdefinition.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Verbindungsdefinition.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Verbindungsdefinition.h sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Verbindungsdefinition.h
--- sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Verbindungsdefinition.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Verbindungsdefinition.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Verkehrszusammensetzungsdefinition.cpp sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Verkehrszusammensetzungsdefinition.cpp
--- sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Verkehrszusammensetzungsdefinition.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Verkehrszusammensetzungsdefinition.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Verkehrszusammensetzungsdefinition.h sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Verkehrszusammensetzungsdefinition.h
--- sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Verkehrszusammensetzungsdefinition.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Verkehrszusammensetzungsdefinition.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Verlustzeitmessungsdefinition.cpp sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Verlustzeitmessungsdefinition.cpp
--- sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Verlustzeitmessungsdefinition.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Verlustzeitmessungsdefinition.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Verlustzeitmessungsdefinition.h sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Verlustzeitmessungsdefinition.h
--- sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Verlustzeitmessungsdefinition.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Verlustzeitmessungsdefinition.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_VWunschentscheidungsdefinition.cpp sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_VWunschentscheidungsdefinition.cpp
--- sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_VWunschentscheidungsdefinition.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_VWunschentscheidungsdefinition.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_VWunschentscheidungsdefinition.h sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_VWunschentscheidungsdefinition.h
--- sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_VWunschentscheidungsdefinition.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_VWunschentscheidungsdefinition.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser__XKurvedefinition.cpp sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser__XKurvedefinition.cpp
--- sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser__XKurvedefinition.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser__XKurvedefinition.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser__XKurvedefinition.h sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser__XKurvedefinition.h
--- sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser__XKurvedefinition.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser__XKurvedefinition.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser__XVerteilungsdefinition.cpp sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser__XVerteilungsdefinition.cpp
--- sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser__XVerteilungsdefinition.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser__XVerteilungsdefinition.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser__XVerteilungsdefinition.h sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser__XVerteilungsdefinition.h
--- sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser__XVerteilungsdefinition.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser__XVerteilungsdefinition.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Zeitenverteilungsdefinition.cpp sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Zeitenverteilungsdefinition.cpp
--- sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Zeitenverteilungsdefinition.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Zeitenverteilungsdefinition.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Zeitenverteilungsdefinition.h sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Zeitenverteilungsdefinition.h
--- sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Zeitenverteilungsdefinition.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Zeitenverteilungsdefinition.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Zeitschrittfaktor.cpp sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Zeitschrittfaktor.cpp
--- sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Zeitschrittfaktor.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Zeitschrittfaktor.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Zeitschrittfaktor.h sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Zeitschrittfaktor.h
--- sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Zeitschrittfaktor.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Zeitschrittfaktor.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Zuflussdefinition.cpp sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Zuflussdefinition.cpp
--- sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Zuflussdefinition.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Zuflussdefinition.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Zuflussdefinition.h sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Zuflussdefinition.h
--- sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Zuflussdefinition.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Zuflussdefinition.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Zusammensetzungsdefinition.cpp sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Zusammensetzungsdefinition.cpp
--- sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Zusammensetzungsdefinition.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Zusammensetzungsdefinition.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Zusammensetzungsdefinition.h sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Zusammensetzungsdefinition.h
--- sumo-1.17.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Zusammensetzungsdefinition.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Zusammensetzungsdefinition.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netload/NLBuilder.cpp sumo-1.18.0/src/netload/NLBuilder.cpp
--- sumo-1.17.0/src/netload/NLBuilder.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netload/NLBuilder.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -220,6 +220,8 @@
         }
         MSTriggeredRerouter::checkParkingRerouteConsistency();
     }
+    // init tls after all detectors have been loaded
+    myJunctionBuilder.postLoadInitialization();
     // declare meandata set by options
     buildDefaultMeanData("edgedata-output", "DEFAULT_EDGEDATA", false);
     buildDefaultMeanData("lanedata-output", "DEFAULT_LANEDATA", true);
@@ -297,7 +299,7 @@
         SystemFrame::close();
         return nullptr;
     }
-    SystemFrame::checkOptions();
+    SystemFrame::checkOptions(oc);
     std::string validation = oc.getString("xml-validation");
     std::string routeValidation = oc.getString("xml-validation.routes");
     if (isLibsumo) {
diff -Nru sumo-1.17.0/src/netload/NLBuilder.h sumo-1.18.0/src/netload/NLBuilder.h
--- sumo-1.17.0/src/netload/NLBuilder.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netload/NLBuilder.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netload/NLDetectorBuilder.cpp sumo-1.18.0/src/netload/NLDetectorBuilder.cpp
--- sumo-1.17.0/src/netload/NLDetectorBuilder.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netload/NLDetectorBuilder.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2002-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -66,7 +66,7 @@
         SUMOTime haltingTimeThreshold, SUMOTime splInterval,
         const std::string name, const std::string& vTypes,
         const std::string& nextEdges,
-        int detectPersons, bool openEntry) :
+        int detectPersons, bool openEntry, bool expectArrival) :
     myID(id), myDevice(device),
     myHaltingSpeedThreshold(haltingSpeedThreshold),
     myHaltingTimeThreshold(haltingTimeThreshold),
@@ -75,7 +75,9 @@
     myVehicleTypes(vTypes),
     myNextEdges(nextEdges),
     myDetectPersons(detectPersons),
-    myOpenEntry(openEntry) {
+    myOpenEntry(openEntry),
+    myExpectArrival(expectArrival)
+{
 }
 
 
@@ -316,9 +318,9 @@
                                    const std::string name,
                                    const std::string& vTypes,
                                    const std::string& nextEdges,
-                                   int detectPersons, bool openEntry) {
+                                   int detectPersons, bool openEntry, bool expectArrival) {
     checkSampleInterval(splInterval, SUMO_TAG_E3DETECTOR, id);
-    myE3Definition = new E3DetectorDefinition(id, device, haltingSpeedThreshold, haltingTimeThreshold, splInterval, name, vTypes, nextEdges, detectPersons, openEntry);
+    myE3Definition = new E3DetectorDefinition(id, device, haltingSpeedThreshold, haltingTimeThreshold, splInterval, name, vTypes, nextEdges, detectPersons, openEntry, expectArrival);
     return myE3Definition;
 }
 
@@ -375,7 +377,8 @@
                                     myE3Definition->myVehicleTypes,
                                     myE3Definition->myNextEdges,
                                     myE3Definition->myDetectPersons,
-                                    myE3Definition->myOpenEntry);
+                                    myE3Definition->myOpenEntry,
+                                    myE3Definition->myExpectArrival);
         det->updateParameters(myE3Definition->getParametersMap());
         // add to net
         myNet.getDetectorControl().add(SUMO_TAG_ENTRY_EXIT_DETECTOR, det, myE3Definition->myDevice, myE3Definition->mySampleInterval);
@@ -464,8 +467,9 @@
                                     const std::string name, const std::string& vTypes,
                                     const std::string& nextEdges,
                                     int detectPersons,
-                                    bool openEntry) {
-    return new MSE3Collector(id, entries, exits, haltingSpeedThreshold, haltingTimeThreshold, name, vTypes, nextEdges, detectPersons, openEntry);
+                                    bool openEntry,
+                                    bool expectArrival) {
+    return new MSE3Collector(id, entries, exits, haltingSpeedThreshold, haltingTimeThreshold, name, vTypes, nextEdges, detectPersons, openEntry, expectArrival);
 }
 
 
diff -Nru sumo-1.17.0/src/netload/NLDetectorBuilder.h sumo-1.18.0/src/netload/NLDetectorBuilder.h
--- sumo-1.17.0/src/netload/NLDetectorBuilder.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netload/NLDetectorBuilder.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -162,7 +162,7 @@
                                    double haltingSpeedThreshold, SUMOTime haltingTimeThreshold,
                                    const std::string name, const std::string& vTypes,
                                    const std::string& nextEdges,
-                                   int detectPersons, bool openEntry);
+                                   int detectPersons, bool openEntry, bool expectArrival);
 
 
     /** @brief Builds an entry point of an e3 detector
@@ -332,7 +332,7 @@
             double haltingSpeedThreshold, SUMOTime haltingTimeThreshold,
             const std::string name, const std::string& vTypes,
             const std::string& nextEdges,
-            int detectPersons, bool openEntry);
+            int detectPersons, bool openEntry, bool expectArrival);
 
 
     /** @brief Creates edge based mean data collector using the given specification
@@ -385,7 +385,7 @@
                              SUMOTime haltingTimeThreshold, SUMOTime splInterval,
                              const std::string name, const std::string& vTypes,
                              const std::string& nextEdges,
-                             int detectPersons, bool openEntry);
+                             int detectPersons, bool openEntry, bool expectArrival);
 
         /// @brief Destructor
         virtual ~E3DetectorDefinition();
@@ -414,6 +414,8 @@
         int myDetectPersons;
         /// @brief Whether the detector is declared as having incomplete entry detectors
         bool myOpenEntry;
+        /// @brief Whether the detector expects vehicles to arrive inside (and doesn't issue a warning in this case)
+        bool myExpectArrival;
         //@}
 
     private:
diff -Nru sumo-1.17.0/src/netload/NLDiscreteEventBuilder.cpp sumo-1.18.0/src/netload/NLDiscreteEventBuilder.cpp
--- sumo-1.17.0/src/netload/NLDiscreteEventBuilder.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netload/NLDiscreteEventBuilder.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netload/NLDiscreteEventBuilder.h sumo-1.18.0/src/netload/NLDiscreteEventBuilder.h
--- sumo-1.17.0/src/netload/NLDiscreteEventBuilder.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netload/NLDiscreteEventBuilder.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netload/NLEdgeControlBuilder.cpp sumo-1.18.0/src/netload/NLEdgeControlBuilder.cpp
--- sumo-1.17.0/src/netload/NLEdgeControlBuilder.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netload/NLEdgeControlBuilder.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netload/NLEdgeControlBuilder.h sumo-1.18.0/src/netload/NLEdgeControlBuilder.h
--- sumo-1.17.0/src/netload/NLEdgeControlBuilder.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netload/NLEdgeControlBuilder.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netload/NLHandler.cpp sumo-1.18.0/src/netload/NLHandler.cpp
--- sumo-1.17.0/src/netload/NLHandler.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netload/NLHandler.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -1253,6 +1253,7 @@
     const std::string vTypes = attrs.getOpt(SUMO_ATTR_VTYPES, id.c_str(), ok, "");
     const std::string nextEdges = attrs.getOpt(SUMO_ATTR_NEXT_EDGES, id.c_str(), ok, "");
     const bool openEntry = attrs.getOpt(SUMO_ATTR_OPEN_ENTRY, id.c_str(), ok, false);
+    const bool expectArrival = attrs.getOpt(SUMO_ATTR_EXPECT_ARRIVAL, id.c_str(), ok, false);
     const std::string detectPersonsString = attrs.getOpt(SUMO_ATTR_DETECT_PERSONS, id.c_str(), ok, "");
     int detectPersons = 0;
     for (std::string mode : StringTokenizer(detectPersonsString).getVector()) {
@@ -1271,7 +1272,7 @@
     try {
         Parameterised* det = myDetectorBuilder.beginE3Detector(id,
                              FileHelpers::checkForRelativity(file, getFileName()),
-                             period, haltingSpeedThreshold, haltingTimeThreshold, name, vTypes, nextEdges, detectPersons, openEntry);
+                             period, haltingSpeedThreshold, haltingTimeThreshold, name, vTypes, nextEdges, detectPersons, openEntry, expectArrival);
         myLastParameterised.push_back(det);
     } catch (InvalidArgument& e) {
         myCurrentIsBroken = true;
diff -Nru sumo-1.17.0/src/netload/NLHandler.h sumo-1.18.0/src/netload/NLHandler.h
--- sumo-1.17.0/src/netload/NLHandler.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netload/NLHandler.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netload/NLJunctionControlBuilder.cpp sumo-1.18.0/src/netload/NLJunctionControlBuilder.cpp
--- sumo-1.17.0/src/netload/NLJunctionControlBuilder.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netload/NLJunctionControlBuilder.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -255,7 +255,7 @@
                 // parameters that are used when initializing a logic will not take
                 // effect but parameters that are checked at runtime can be used
                 // here (i.e. device.glosa.range)
-                existing->updateParameters(myAdditionalParameter);
+                myLogicParams[existing] = myAdditionalParameter;
                 return;
             }
         }
@@ -336,9 +336,13 @@
     if (tlLogic != nullptr) {
         if (getTLLogicControlToUse().add(myActiveKey, myActiveProgram, tlLogic)) {
             if (myNetIsLoaded) {
-                tlLogic->init(myDetectorBuilder);
+                myAdditionalLogics.push_back(tlLogic);
+            } else if (myLogicType == TrafficLightType::RAIL_SIGNAL) {
+                // special case: intialize earlier because signals are already used when
+                // loading train routes in additional files
+                myRailSignals.push_back(tlLogic);
             } else {
-                myLogics2PostLoadInit.push_back(tlLogic);
+                myNetworkLogics.push_back(tlLogic);
             }
         } else {
             WRITE_ERRORF(TL("Another logic with id '%' and programID '%' exists."), myActiveKey, myActiveProgram);
@@ -466,11 +470,14 @@
 
 MSTLLogicControl*
 NLJunctionControlBuilder::buildTLLogics() {
-    postLoadInitialization(); // must happen after edgeBuilder is finished
     if (!myLogicControl->closeNetworkReading()) {
         throw ProcessError(TL("Traffic lights could not be built."));
     }
+    for (MSTrafficLightLogic* const logic : myRailSignals) {
+        logic->init(myDetectorBuilder);
+    }
     MSTLLogicControl* ret = myLogicControl;
+    myNetIsLoaded = true;
     myLogicControl = nullptr;
     return ret;
 }
@@ -506,10 +513,16 @@
 
 void
 NLJunctionControlBuilder::postLoadInitialization() {
-    for (MSTrafficLightLogic* const logic : myLogics2PostLoadInit) {
+    for (MSTrafficLightLogic* const logic : myNetworkLogics) {
         logic->init(myDetectorBuilder);
     }
-    myNetIsLoaded = true;
+    for (MSTrafficLightLogic* const logic : myAdditionalLogics) {
+        logic->init(myDetectorBuilder);
+    }
+    // delay parameter loading until initialization
+    for (auto item : myLogicParams) {
+        item.first->updateParameters(item.second);
+    }
 }
 
 
diff -Nru sumo-1.17.0/src/netload/NLJunctionControlBuilder.h sumo-1.18.0/src/netload/NLJunctionControlBuilder.h
--- sumo-1.17.0/src/netload/NLJunctionControlBuilder.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netload/NLJunctionControlBuilder.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -259,6 +259,10 @@
         return myActivePhases;
     }
 
+    void netIsLoaded() {
+        myNetIsLoaded = true;
+    }
+
 protected:
     /// @name Factory methods, virtual so that other versions of the structures can be built
     /// @{
@@ -362,15 +366,18 @@
     /// @brief the name of the current junction
     std::string myActiveName;
 
+    /// @brief Definition of a parameter map (key->value)
+    typedef Parameterised::Map StringParameterMap;
+
     /// @brief The container for information which junctions shall be initialised using which values
-    std::vector myLogics2PostLoadInit;
+    std::vector myNetworkLogics;
+    std::vector myAdditionalLogics;
+    std::vector myRailSignals;
+    std::map myLogicParams;
 
     /// @brief The tls control to use (0 if net's tls control shall be used)
     mutable MSTLLogicControl* myLogicControl;
 
-    /// @brief Definition of a parameter map (key->value)
-    typedef Parameterised::Map StringParameterMap;
-
     /// @brief Parameter map (key->value)
     StringParameterMap myAdditionalParameter;
 
@@ -389,4 +396,5 @@
     /// @brief whether the network has been loaded
     bool myNetIsLoaded;
 
+
 };
diff -Nru sumo-1.17.0/src/netload/NLNetShapeHandler.cpp sumo-1.18.0/src/netload/NLNetShapeHandler.cpp
--- sumo-1.17.0/src/netload/NLNetShapeHandler.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netload/NLNetShapeHandler.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -38,7 +38,8 @@
 // ===========================================================================
 NLNetShapeHandler::NLNetShapeHandler(const std::string& file, MSNet& net) :
     SUMOSAXHandler(file, "net"),
-    myNet(net) {
+    myNet(net),
+    myPrimaryEdges(MSEdge::getAllEdges().begin(), MSEdge::getAllEdges().end()) {
 }
 
 
@@ -82,6 +83,7 @@
     }
     const PositionVector shape = attrs.get(SUMO_ATTR_SHAPE, id.c_str(), ok);
     lane->addSecondaryShape(shape);
+    myPrimaryEdges.erase(&lane->getEdge());
 }
 
 
@@ -144,7 +146,7 @@
     // even when the alternative network has the same topology as
     // the primary network, the ids of internal lanes may differ
     // since they are based on a clockwise sorting of the edges.
-    // hence we must verify connections and suffle the shapes as needed
+    // hence we must verify connections and shuffle the shapes as needed
     for (auto item : myShuffledJunctions) {
         const MSJunction* junction = item.first;
         std::map shapes2;
@@ -156,5 +158,9 @@
             laneMap.first->addSecondaryShape(shapes2[laneMap.second]);
         }
     }
+    // final warning
+    if (myPrimaryEdges.size() > 0) {
+        WRITE_WARNING(TLF("% edges of the primary network did not occur in the alternative-net-file", myPrimaryEdges.size()));
+    }
 }
 /****************************************************************************/
diff -Nru sumo-1.17.0/src/netload/NLNetShapeHandler.h sumo-1.18.0/src/netload/NLNetShapeHandler.h
--- sumo-1.17.0/src/netload/NLNetShapeHandler.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netload/NLNetShapeHandler.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -93,6 +93,9 @@
     /// @brief mapping between primary internal lane and corresponding secondary internal lane
     std::map > myShuffledJunctions;
 
+    /// @brief lanes of the primary network that should receive a secondary shape
+    std::set myPrimaryEdges;
+
 private:
     /** invalid copy constructor */
     NLNetShapeHandler(const NLNetShapeHandler& s);
diff -Nru sumo-1.17.0/src/netload/NLTriggerBuilder.cpp sumo-1.18.0/src/netload/NLTriggerBuilder.cpp
--- sumo-1.17.0/src/netload/NLTriggerBuilder.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netload/NLTriggerBuilder.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -562,12 +562,13 @@
     double angle = attrs.getOpt(SUMO_ATTR_ANGLE, id.c_str(), ok, 0);
     const std::string name = attrs.getOpt(SUMO_ATTR_NAME, id.c_str(), ok);
     const std::string departPos = attrs.getOpt(SUMO_ATTR_DEPARTPOS, id.c_str(), ok);
+    bool lefthand = attrs.getOpt(SUMO_ATTR_LEFTHAND, id.c_str(), ok, false);
     if (!ok || (myHandler->checkStopPos(frompos, topos, lane->getLength(), POSITION_EPS, friendlyPos) != SUMORouteHandler::StopPos::STOPPOS_VALID)) {
         throw InvalidArgument("Invalid position for parking area '" + id + "'.");
     }
     const std::vector& lines = attrs.getOpt >(SUMO_ATTR_LINES, id.c_str(), ok);
     // build the parking area
-    beginParkingArea(net, id, lines, lane, frompos, topos, capacity, width, length, angle, name, onRoad, departPos);
+    beginParkingArea(net, id, lines, lane, frompos, topos, capacity, width, length, angle, name, onRoad, departPos, lefthand);
 }
 
 
@@ -767,9 +768,10 @@
                                    unsigned int capacity,
                                    double width, double length, double angle, const std::string& name,
                                    bool onRoad,
-                                   const std::string& departPos) {
-    // Close previous parking area if there are not lots inside
-    MSParkingArea* stop = new MSParkingArea(id, lines, *lane, frompos, topos, capacity, width, length, angle, name, onRoad, departPos);
+                                   const std::string& departPos,
+                                   bool lefthand) {
+    // Close previous parking area if there are no lots inside
+    MSParkingArea* stop = new MSParkingArea(id, lines, *lane, frompos, topos, capacity, width, length, angle, name, onRoad, departPos, lefthand);
     if (!net.addStoppingPlace(SUMO_TAG_PARKING_AREA, stop)) {
         delete stop;
         throw InvalidArgument("Could not build parking area '" + id + "'; probably declared twice.");
diff -Nru sumo-1.17.0/src/netload/NLTriggerBuilder.h sumo-1.18.0/src/netload/NLTriggerBuilder.h
--- sumo-1.17.0/src/netload/NLTriggerBuilder.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netload/NLTriggerBuilder.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2002-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -151,7 +151,8 @@
                                   unsigned int capacity,
                                   double width, double length, double angle, const std::string& name,
                                   bool onRoad,
-                                  const std::string& departPos);
+                                  const std::string& departPos,
+                                  bool lefthand);
 
 
     /** @brief Add a lot entry to current parking area
diff -Nru sumo-1.17.0/src/netwrite/NWFrame.cpp sumo-1.18.0/src/netwrite/NWFrame.cpp
--- sumo-1.17.0/src/netwrite/NWFrame.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netwrite/NWFrame.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -44,9 +44,9 @@
 // ===========================================================================
 // method definitions
 // ===========================================================================
+
 void
-NWFrame::fillOptions(bool forNetgen) {
-    OptionsCont& oc = OptionsCont::getOptions();
+NWFrame::fillOptions(OptionsCont& oc, bool forNetgen) {
     // register options
     oc.doRegister("output-file", 'o', new Option_FileName());
     oc.addSynonyme("output-file", "sumo-output");
@@ -133,8 +133,7 @@
 
 
 bool
-NWFrame::checkOptions() {
-    OptionsCont& oc = OptionsCont::getOptions();
+NWFrame::checkOptions(OptionsCont& oc) {
     bool ok = true;
     // check whether the output is valid and can be build
     if (!oc.isSet("output-file")
@@ -168,6 +167,7 @@
     }
     if (oc.isSet("dlr-navteq-output") && oc.isDefault("osm.all-attributes")) {
         oc.setDefault("osm.all-attributes", "true");
+        oc.setDefault("osm.extra-attributes", "bridge,tunnel,layer,postal_code");
     }
     if (oc.exists("ptline-output") && oc.isSet("ptline-output") && !oc.isSet("ptstop-output")) {
         WRITE_ERROR(TL("public transport lines output requires 'ptstop-output' to be set"));
@@ -203,5 +203,4 @@
     }
 }
 
-
 /****************************************************************************/
diff -Nru sumo-1.17.0/src/netwrite/NWFrame.h sumo-1.18.0/src/netwrite/NWFrame.h
--- sumo-1.17.0/src/netwrite/NWFrame.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netwrite/NWFrame.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -26,12 +26,12 @@
 // ===========================================================================
 // class declarations
 // ===========================================================================
+
 class OptionsCont;
 class NBNetBuilder;
 class Position;
 class OutputDevice;
 
-
 // ===========================================================================
 // class definitions
 // ===========================================================================
@@ -40,19 +40,19 @@
  * @brief Sets and checks options for netwrite; saves the network
  */
 class NWFrame {
+
 public:
     /// @brief Inserts options used by the network writer
-    static void fillOptions(bool forNetgen);
+    static void fillOptions(OptionsCont& oc, bool forNetgen);
 
-    /** @brief Checks set options from the OptionsCont-singleton for being valid
+    /** @brief Checks set options for being valid
      * @return Whether needed options are set and have proper values
      */
-    static bool checkOptions();
+    static bool checkOptions(OptionsCont& oc);
 
     /// @brief Writes the network stored in the given net builder
     static void writeNetwork(const OptionsCont& oc, NBNetBuilder& nb);
 
     /// @brief Writes the given position to device in long format (one attribute per dimension)
     static void writePositionLong(const Position& pos, OutputDevice& dev);
-
 };
diff -Nru sumo-1.17.0/src/netwrite/NWWriter_Amitran.cpp sumo-1.18.0/src/netwrite/NWWriter_Amitran.cpp
--- sumo-1.17.0/src/netwrite/NWWriter_Amitran.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netwrite/NWWriter_Amitran.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2014-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netwrite/NWWriter_Amitran.h sumo-1.18.0/src/netwrite/NWWriter_Amitran.h
--- sumo-1.17.0/src/netwrite/NWWriter_Amitran.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netwrite/NWWriter_Amitran.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2014-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netwrite/NWWriter_DlrNavteq.cpp sumo-1.18.0/src/netwrite/NWWriter_DlrNavteq.cpp
--- sumo-1.17.0/src/netwrite/NWWriter_DlrNavteq.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netwrite/NWWriter_DlrNavteq.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netwrite/NWWriter_DlrNavteq.h sumo-1.18.0/src/netwrite/NWWriter_DlrNavteq.h
--- sumo-1.17.0/src/netwrite/NWWriter_DlrNavteq.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netwrite/NWWriter_DlrNavteq.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netwrite/NWWriter_MATSim.cpp sumo-1.18.0/src/netwrite/NWWriter_MATSim.cpp
--- sumo-1.17.0/src/netwrite/NWWriter_MATSim.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netwrite/NWWriter_MATSim.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netwrite/NWWriter_MATSim.h sumo-1.18.0/src/netwrite/NWWriter_MATSim.h
--- sumo-1.17.0/src/netwrite/NWWriter_MATSim.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netwrite/NWWriter_MATSim.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netwrite/NWWriter_OpenDrive.cpp sumo-1.18.0/src/netwrite/NWWriter_OpenDrive.cpp
--- sumo-1.17.0/src/netwrite/NWWriter_OpenDrive.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netwrite/NWWriter_OpenDrive.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2011-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -127,19 +127,25 @@
     for (auto it = nc.begin(); it != nc.end(); ++it) {
         NBNode* n = it->second;
         auto crosswalks = n->getCrossings();
-        for (size_t i = 0; i < crosswalks.size(); i++) {
+        for (const auto& cw : n->getCrossings()) {
             // getting from crosswalk line to a full shape
-            crosswalk_shape = crosswalks[i]->shape;
-            auto additionalCorner = crosswalk_shape.getOrthogonal(crosswalk_shape[0], true, false, crosswalks[i]->width);
-            auto finalCorner = crosswalk_shape.getOrthogonal(crosswalk_shape[1], true, false, crosswalks[i]->width);
-            crosswalk_shape.push_back(finalCorner[1]);
-            crosswalk_shape.push_back(additionalCorner[1]);
-
-            auto crosswalkId = crosswalks[i]->id;
+            crosswalk_shape = cw->shape;
+            PositionVector rightside = cw->shape;
+            try {
+                crosswalk_shape.move2side(cw->width / 2);
+                rightside.move2side(cw->width / -2);
+            } catch (InvalidArgument&) { }
+            rightside = rightside.reverse();
+            crosswalk_shape.append(rightside);
+            auto crosswalkId = cw->id;
             nb.getShapeCont().addPolygon(crosswalkId, "crosswalk", RGBColor::DEFAULT_COLOR, 0,
                                          Shape::DEFAULT_ANGLE, Shape::DEFAULT_IMG_FILE, Shape::DEFAULT_RELATIVEPATH,
                                          crosswalk_shape, false, true, 1, false, crosswalkId);
-            crosswalksByEdge[crosswalks[i]->edges[0]->getID()].push_back(crosswalkId);
+            SUMOPolygon* cwp = nb.getShapeCont().getPolygons().get(crosswalkId);
+            cwp->setParameter("length", toString(cw->width));
+            cwp->setParameter("width", toString(cw->shape.length2D()));
+            cwp->setParameter("hdg", "0");
+            crosswalksByEdge[cw->edges[0]->getID()].push_back(crosswalkId);
         }
     }
 
@@ -1364,11 +1370,35 @@
     device.openTag("object");
     device.writeAttr("id", p->getID());
     device.writeAttr("type", shapeType);
-    device.writeAttr("name", StringUtils::escapeXML(p->getParameter("name", ""), true));
+    if (p->knowsParameter("name")) {
+        device.writeAttr("name", StringUtils::escapeXML(p->getParameter("name", ""), true));
+    }
     device.writeAttr("s", edgeOffset);
     device.writeAttr("t", shapeType == "crosswalk" && !lefthand ? 0 : sideOffset);
-    device.writeAttr("hdg", -edgeAngle);
-
+    double hdg = -edgeAngle;
+    if (p->knowsParameter("hdg")) {
+        try {
+            hdg = StringUtils::toDoubleSecure(p->getParameter("hdg", ""), 0);
+        } catch (NumberFormatException&) {}
+    }
+    device.writeAttr("hdg", hdg);
+    if (p->knowsParameter("length")) {
+        try {
+            device.writeAttr("length", StringUtils::toDoubleSecure(p->getParameter("length", ""), 0));
+        } catch (NumberFormatException&) {}
+    }
+    if (p->knowsParameter("width")) {
+        try {
+            device.writeAttr("width", StringUtils::toDoubleSecure(p->getParameter("width", ""), 0));
+        } catch (NumberFormatException&) {}
+    }
+    double height = 0;
+    if (p->knowsParameter("height")) {
+        try {
+            height = StringUtils::toDoubleSecure(p->getParameter("height", ""), 0);
+            device.writeAttr("height", height);
+        } catch (NumberFormatException&) {}
+    }
     //device.openTag("outlines");
     device.openTag("outline");
     device.writeAttr("id", 0);
@@ -1377,12 +1407,10 @@
     device.writeAttr("closed", p->getShape().isClosed() ? "true" : "false");
     device.writeAttr("laneType", "border");
 
-    double height = 0;
-    try {
-        height = StringUtils::toDoubleSecure(p->getParameter("height", ""), 0);
-    } catch (NumberFormatException&) {}
-
     shape.sub(center);
+    if (hdg != -edgeAngle) {
+        shape.rotate2D(-edgeAngle - hdg);
+    }
     int i = 0;
     for (Position pos : shape) {
         device.openTag("cornerLocal");
diff -Nru sumo-1.17.0/src/netwrite/NWWriter_OpenDrive.h sumo-1.18.0/src/netwrite/NWWriter_OpenDrive.h
--- sumo-1.17.0/src/netwrite/NWWriter_OpenDrive.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netwrite/NWWriter_OpenDrive.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/netwrite/NWWriter_SUMO.cpp sumo-1.18.0/src/netwrite/NWWriter_SUMO.cpp
--- sumo-1.17.0/src/netwrite/NWWriter_SUMO.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netwrite/NWWriter_SUMO.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -92,7 +92,10 @@
     if (!oc.isDefault("tls.ignore-internal-junction-jam")) {
         attrs[SUMO_ATTR_TLS_IGNORE_INTERNAL_JUNCTION_JAM] = toString(oc.getBool("tls.ignore-internal-junction-jam"));
     }
-    if (oc.getString("default.spreadtype") != "right") {
+    if (oc.getString("default.spreadtype") == "roadCenter") {
+        // it makes no sense to store the default=center in the net since
+        // centered edges would have the attribute written anyway and edges that
+        // should have 'right' would be misinterpreted
         attrs[SUMO_ATTR_SPREADTYPE] = oc.getString("default.spreadtype");
     }
     if (oc.exists("geometry.avoid-overlap") && !oc.getBool("geometry.avoid-overlap")) {
@@ -115,7 +118,8 @@
     GeoConvHelper::writeLocation(device);
 
     // write edge types and restrictions
-    nb.getTypeCont().writeEdgeTypes(device);
+    std::set usedTypes = ec.getUsedTypes();
+    nb.getTypeCont().writeEdgeTypes(device, usedTypes);
 
     // write inner lanes
     if (!oc.getBool("no-internal-links")) {
@@ -343,12 +347,9 @@
                     }
                     if (e->getBidiEdge() && k.toEdge->getBidiEdge() &&
                             e != k.toEdge->getTurnDestination(true)) {
-                        try {
-                            NBEdge::Connection bidiCon = k.toEdge->getTurnDestination(true)->getConnection(
-                                                             0, e->getTurnDestination(true), 0);
-                            into.writeAttr(SUMO_ATTR_BIDI, bidiCon.id);
-                        } catch (ProcessError&) {
-                            WRITE_WARNINGF(TL("Could not find bidi-connection for edge '%'"), edgeID)
+                        const std::string bidiEdge = getInternalBidi(e, k);
+                        if (bidiEdge != "") {
+                            into.writeAttr(SUMO_ATTR_BIDI, bidiEdge);
                         }
                     }
                     // open a new edge
@@ -432,6 +433,33 @@
 }
 
 
+std::string
+NWWriter_SUMO::getInternalBidi(const NBEdge* e, const NBEdge::Connection& k) {
+    const NBEdge* fromBidi = e->getTurnDestination(true);
+    const NBEdge* toBidi = k.toEdge->getTurnDestination(true);
+    const std::vector cons = toBidi->getConnectionsFromLane(-1, fromBidi, -1);
+    if (cons.size() > 0) {
+        if (e->getNumLanes() == 1 && k.toEdge->getNumLanes() == 1 && fromBidi->getNumLanes() == 1 && toBidi->getNumLanes() == 1) {
+            return cons.back().id;
+        }
+        // do a more careful check in case there are parallel internal edges
+        // note: k is the first connection with the new id
+        for (const NBEdge::Connection& c : e->getConnections()) {
+            if (c.id == k.id) {
+                PositionVector rShape = c.shape.reverse();
+                for (const NBEdge::Connection& k2 : cons) {
+                    if (k2.shape.almostSame(rShape, POSITION_EPS)) {
+                        return k2.id;
+                    }
+                }
+            }
+        }
+    } else {
+        WRITE_WARNINGF(TL("Could not find bidi-connection for edge '%'"), k.id)
+    }
+    return "";
+}
+
 void
 NWWriter_SUMO::writeEdge(OutputDevice& into, const NBEdge& e, bool noNames) {
     // write the edge's begin
diff -Nru sumo-1.17.0/src/netwrite/NWWriter_SUMO.h sumo-1.18.0/src/netwrite/NWWriter_SUMO.h
--- sumo-1.17.0/src/netwrite/NWWriter_SUMO.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netwrite/NWWriter_SUMO.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -119,6 +119,10 @@
     static bool writeInternalEdges(OutputDevice& into, const NBEdgeCont& ec, const NBNode& n);
 
 
+    /// @brief retrieve bidi edge id for internal corresponding to the given connection
+    static std::string getInternalBidi(const NBEdge* e, const NBEdge::Connection& k);
+
+
     /** @brief Writes an edge ( 0) {
-            writeTypes(prefix, nb.getTypeCont());
+            writeTypes(prefix, nb.getEdgeCont(), nb.getTypeCont());
         }
         writeEdgesAndConnections(oc, prefix, nb.getNodeCont(), nb.getEdgeCont());
         writeTrafficLights(prefix, nb.getTLLogicCont(), nb.getEdgeCont());
@@ -172,12 +172,13 @@
 
 
 void
-NWWriter_XML::writeTypes(const std::string& prefix, NBTypeCont& tc) {
+NWWriter_XML::writeTypes(const std::string& prefix, NBEdgeCont& ec, NBTypeCont& tc) {
     OutputDevice& device = OutputDevice::getDevice(prefix + ".typ.xml");
     std::map attrs;
     attrs[SUMO_ATTR_VERSION] = toString(NETWORK_VERSION);
     device.writeXMLHeader("types", "types_file.xsd", attrs);
-    tc.writeEdgeTypes(device);
+    std::set usedTypes = ec.getUsedTypes();
+    tc.writeEdgeTypes(device, usedTypes);
     device.close();
 }
 
diff -Nru sumo-1.17.0/src/netwrite/NWWriter_XML.h sumo-1.18.0/src/netwrite/NWWriter_XML.h
--- sumo-1.17.0/src/netwrite/NWWriter_XML.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/netwrite/NWWriter_XML.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -84,7 +84,7 @@
      * @param[in] oc The options to use
      * @param[in] nc The type-container from which to read data
      */
-    static void writeTypes(const std::string& prefix, NBTypeCont& tc);
+    static void writeTypes(const std::string& prefix, NBEdgeCont& ec, NBTypeCont& tc);
 
     /** @brief Writes the edges and connections files
      * @param[in] oc The options to use
diff -Nru sumo-1.17.0/src/od/ODAmitranHandler.cpp sumo-1.18.0/src/od/ODAmitranHandler.cpp
--- sumo-1.17.0/src/od/ODAmitranHandler.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/od/ODAmitranHandler.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/od/ODAmitranHandler.h sumo-1.18.0/src/od/ODAmitranHandler.h
--- sumo-1.17.0/src/od/ODAmitranHandler.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/od/ODAmitranHandler.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2014-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/od/ODCell.h sumo-1.18.0/src/od/ODCell.h
--- sumo-1.17.0/src/od/ODCell.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/od/ODCell.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2002-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/od/ODDistrictCont.cpp sumo-1.18.0/src/od/ODDistrictCont.cpp
--- sumo-1.17.0/src/od/ODDistrictCont.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/od/ODDistrictCont.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2002-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/od/ODDistrictCont.h sumo-1.18.0/src/od/ODDistrictCont.h
--- sumo-1.17.0/src/od/ODDistrictCont.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/od/ODDistrictCont.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2002-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/od/ODDistrict.cpp sumo-1.18.0/src/od/ODDistrict.cpp
--- sumo-1.17.0/src/od/ODDistrict.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/od/ODDistrict.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2002-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/od/ODDistrict.h sumo-1.18.0/src/od/ODDistrict.h
--- sumo-1.17.0/src/od/ODDistrict.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/od/ODDistrict.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2002-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/od/ODDistrictHandler.cpp sumo-1.18.0/src/od/ODDistrictHandler.cpp
--- sumo-1.17.0/src/od/ODDistrictHandler.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/od/ODDistrictHandler.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/od/ODDistrictHandler.h sumo-1.18.0/src/od/ODDistrictHandler.h
--- sumo-1.17.0/src/od/ODDistrictHandler.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/od/ODDistrictHandler.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/od/ODMatrix.cpp sumo-1.18.0/src/od/ODMatrix.cpp
--- sumo-1.17.0/src/od/ODMatrix.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/od/ODMatrix.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2006-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/od/ODMatrix.h sumo-1.18.0/src/od/ODMatrix.h
--- sumo-1.17.0/src/od/ODMatrix.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/od/ODMatrix.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2006-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/od2trips_main.cpp sumo-1.18.0/src/od2trips_main.cpp
--- sumo-1.17.0/src/od2trips_main.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/od2trips_main.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2002-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -182,7 +182,7 @@
     oc.addDescription("arrivalspeed", "Defaults", TL("Assigns a default arrival speed"));
 
     // add rand options
-    RandHelper::insertRandOptions();
+    RandHelper::insertRandOptions(oc);
 }
 
 bool
@@ -232,7 +232,7 @@
         WRITE_ERROR(error);
         ok = false;
     }
-    ok &= SystemFrame::checkOptions();
+    ok &= SystemFrame::checkOptions(oc);
     return ok;
 }
 
diff -Nru sumo-1.17.0/src/osgview/GUIOSGBuilder.cpp sumo-1.18.0/src/osgview/GUIOSGBuilder.cpp
--- sumo-1.17.0/src/osgview/GUIOSGBuilder.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/osgview/GUIOSGBuilder.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/osgview/GUIOSGBuilder.h sumo-1.18.0/src/osgview/GUIOSGBuilder.h
--- sumo-1.17.0/src/osgview/GUIOSGBuilder.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/osgview/GUIOSGBuilder.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/osgview/GUIOSGHeader.h sumo-1.18.0/src/osgview/GUIOSGHeader.h
--- sumo-1.17.0/src/osgview/GUIOSGHeader.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/osgview/GUIOSGHeader.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -51,6 +51,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
diff -Nru sumo-1.17.0/src/osgview/GUIOSGManipulator.cpp sumo-1.18.0/src/osgview/GUIOSGManipulator.cpp
--- sumo-1.17.0/src/osgview/GUIOSGManipulator.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/osgview/GUIOSGManipulator.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/osgview/GUIOSGManipulator.h sumo-1.18.0/src/osgview/GUIOSGManipulator.h
--- sumo-1.17.0/src/osgview/GUIOSGManipulator.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/osgview/GUIOSGManipulator.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/osgview/GUIOSGPerspectiveChanger.cpp sumo-1.18.0/src/osgview/GUIOSGPerspectiveChanger.cpp
--- sumo-1.17.0/src/osgview/GUIOSGPerspectiveChanger.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/osgview/GUIOSGPerspectiveChanger.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/osgview/GUIOSGPerspectiveChanger.h sumo-1.18.0/src/osgview/GUIOSGPerspectiveChanger.h
--- sumo-1.17.0/src/osgview/GUIOSGPerspectiveChanger.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/osgview/GUIOSGPerspectiveChanger.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/osgview/GUIOSGView.cpp sumo-1.18.0/src/osgview/GUIOSGView.cpp
--- sumo-1.17.0/src/osgview/GUIOSGView.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/osgview/GUIOSGView.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -196,6 +196,9 @@
     recenterView();
     myViewer->home();
     getApp()->addChore(this, MID_CHORE);
+#ifdef DEBUG
+    myAdapter->getState()->checkGLErrors("GUIOSGView constructor after first init steps");
+#endif
     myTextNode = new osg::Geode();
     myText = new osgText::Text;
     myText->setCharacterSizeMode(osgText::Text::SCREEN_COORDS);
@@ -210,6 +213,9 @@
     myText->setDrawMode(osgText::TextBase::DrawModeMask::FILLEDBOUNDINGBOX | osgText::TextBase::DrawModeMask::TEXT);
     myText->setBoundingBoxColor(osg::Vec4(0.0f, 0.0f, 0.2f, 0.5f));
     myText->setBoundingBoxMargin(2.0f);
+#ifdef DEBUG
+    myAdapter->getState()->checkGLErrors("GUIOSGView constructor after myText init");
+#endif
 
     myHUD = new osg::Camera;
     myHUD->setProjectionMatrixAsOrtho2D(0, 800, 0, 800); // default size will be overwritten
@@ -223,9 +229,15 @@
     myHUD->setViewport(0, 0, w, h);
     myViewer->addSlave(myHUD, false);
     myCameraManipulator->updateHUDText();
+#ifdef DEBUG
+    myAdapter->getState()->checkGLErrors("GUIOSGView constructor after HUD");
+#endif
 
     // adjust the main light
     adoptViewSettings();
+#ifdef DEBUG
+    myAdapter->getState()->checkGLErrors("GUIOSGView constructor after adoptViewSettings");
+#endif
 
     osgUtil::Optimizer optimizer;
     optimizer.optimize(myRoot);
@@ -376,26 +388,14 @@
 void
 GUIOSGView::updateHUDPosition(int w, int h) {
     // keep the HUD text in the left top corner
-#ifdef DEBUG
-    std::cout << "GUIOSGView::updateHUDPosition() begin" << std::endl;
-#endif
     myHUD->setProjectionMatrixAsOrtho2D(0, w, 0, h);
     myText->setPosition(osg::Vec3d(0., static_cast(height), 0.));
-#ifdef DEBUG
-    std::cout << "GUIOSGView::updateHUDPosition() end" << std::endl;
-#endif
 }
 
 
 void
 GUIOSGView::updateHUDText(const std::string text) {
-#ifdef DEBUG
-    std::cout << "GUIOSGView::updateHUDText(" << text << ") begin" << std::endl;
-#endif
     myText->setText(text, osgText::String::ENCODING_UTF8);
-#ifdef DEBUG
-    std::cout << "GUIOSGView::updateHUDText(" << text << ") end" << std::endl;
-#endif
 }
 
 
@@ -1104,6 +1104,10 @@
     if (valid()) {
         setState(new osg::State());
         getState()->setGraphicsContext(this);
+#ifdef DEBUG
+        getState()->setCheckForGLErrors(osg::State::ONCE_PER_ATTRIBUTE);
+        std::cout << "OSG getCheckForGLErrors " << getState()->getCheckForGLErrors() << std::endl;
+#endif
         if (_traits.valid() && _traits->sharedContext != 0) {
             getState()->setContextID(_traits->sharedContext->getState()->getContextID());
             incrementContextIDUsageCount(getState()->getContextID());
diff -Nru sumo-1.17.0/src/osgview/GUIOSGView.h sumo-1.18.0/src/osgview/GUIOSGView.h
--- sumo-1.17.0/src/osgview/GUIOSGView.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/osgview/GUIOSGView.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/polyconvert/PCLoaderArcView.cpp sumo-1.18.0/src/polyconvert/PCLoaderArcView.cpp
--- sumo-1.17.0/src/polyconvert/PCLoaderArcView.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/polyconvert/PCLoaderArcView.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/polyconvert/PCLoaderArcView.h sumo-1.18.0/src/polyconvert/PCLoaderArcView.h
--- sumo-1.17.0/src/polyconvert/PCLoaderArcView.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/polyconvert/PCLoaderArcView.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/polyconvert/PCLoaderDlrNavteq.cpp sumo-1.18.0/src/polyconvert/PCLoaderDlrNavteq.cpp
--- sumo-1.17.0/src/polyconvert/PCLoaderDlrNavteq.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/polyconvert/PCLoaderDlrNavteq.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/polyconvert/PCLoaderDlrNavteq.h sumo-1.18.0/src/polyconvert/PCLoaderDlrNavteq.h
--- sumo-1.17.0/src/polyconvert/PCLoaderDlrNavteq.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/polyconvert/PCLoaderDlrNavteq.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/polyconvert/PCLoaderOSM.cpp sumo-1.18.0/src/polyconvert/PCLoaderOSM.cpp
--- sumo-1.17.0/src/polyconvert/PCLoaderOSM.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/polyconvert/PCLoaderOSM.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2008-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/polyconvert/PCLoaderOSM.h sumo-1.18.0/src/polyconvert/PCLoaderOSM.h
--- sumo-1.17.0/src/polyconvert/PCLoaderOSM.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/polyconvert/PCLoaderOSM.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2008-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/polyconvert/PCLoaderVisum.cpp sumo-1.18.0/src/polyconvert/PCLoaderVisum.cpp
--- sumo-1.17.0/src/polyconvert/PCLoaderVisum.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/polyconvert/PCLoaderVisum.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/polyconvert/PCLoaderVisum.h sumo-1.18.0/src/polyconvert/PCLoaderVisum.h
--- sumo-1.17.0/src/polyconvert/PCLoaderVisum.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/polyconvert/PCLoaderVisum.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/polyconvert/PCLoaderXML.cpp sumo-1.18.0/src/polyconvert/PCLoaderXML.cpp
--- sumo-1.17.0/src/polyconvert/PCLoaderXML.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/polyconvert/PCLoaderXML.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/polyconvert/PCLoaderXML.h sumo-1.18.0/src/polyconvert/PCLoaderXML.h
--- sumo-1.17.0/src/polyconvert/PCLoaderXML.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/polyconvert/PCLoaderXML.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/polyconvert/PCNetProjectionLoader.cpp sumo-1.18.0/src/polyconvert/PCNetProjectionLoader.cpp
--- sumo-1.17.0/src/polyconvert/PCNetProjectionLoader.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/polyconvert/PCNetProjectionLoader.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/polyconvert/PCNetProjectionLoader.h sumo-1.18.0/src/polyconvert/PCNetProjectionLoader.h
--- sumo-1.17.0/src/polyconvert/PCNetProjectionLoader.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/polyconvert/PCNetProjectionLoader.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/polyconvert/PCPolyContainer.cpp sumo-1.18.0/src/polyconvert/PCPolyContainer.cpp
--- sumo-1.17.0/src/polyconvert/PCPolyContainer.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/polyconvert/PCPolyContainer.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2005-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/polyconvert/PCPolyContainer.h sumo-1.18.0/src/polyconvert/PCPolyContainer.h
--- sumo-1.17.0/src/polyconvert/PCPolyContainer.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/polyconvert/PCPolyContainer.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2005-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/polyconvert/PCTypeDefHandler.cpp sumo-1.18.0/src/polyconvert/PCTypeDefHandler.cpp
--- sumo-1.17.0/src/polyconvert/PCTypeDefHandler.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/polyconvert/PCTypeDefHandler.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/polyconvert/PCTypeDefHandler.h sumo-1.18.0/src/polyconvert/PCTypeDefHandler.h
--- sumo-1.17.0/src/polyconvert/PCTypeDefHandler.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/polyconvert/PCTypeDefHandler.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/polyconvert/PCTypeMap.cpp sumo-1.18.0/src/polyconvert/PCTypeMap.cpp
--- sumo-1.17.0/src/polyconvert/PCTypeMap.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/polyconvert/PCTypeMap.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2005-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/polyconvert/PCTypeMap.h sumo-1.18.0/src/polyconvert/PCTypeMap.h
--- sumo-1.17.0/src/polyconvert/PCTypeMap.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/polyconvert/PCTypeMap.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2005-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/polyconvert/polyconvert_main.cpp sumo-1.18.0/src/polyconvert/polyconvert_main.cpp
--- sumo-1.17.0/src/polyconvert/polyconvert_main.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/polyconvert/polyconvert_main.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2005-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -242,7 +242,7 @@
             SystemFrame::close();
             return 0;
         }
-        SystemFrame::checkOptions();
+        SystemFrame::checkOptions(oc);
         XMLSubSys::setValidation(oc.getString("xml-validation"), oc.getString("xml-validation.net"), "never");
         if (oc.isDefault("aggregate-warnings")) {
             oc.setDefault("aggregate-warnings", "5");
diff -Nru sumo-1.17.0/src/router/ROAbstractEdgeBuilder.h sumo-1.18.0/src/router/ROAbstractEdgeBuilder.h
--- sumo-1.17.0/src/router/ROAbstractEdgeBuilder.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/router/ROAbstractEdgeBuilder.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2004-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/router/ROEdge.cpp sumo-1.18.0/src/router/ROEdge.cpp
--- sumo-1.17.0/src/router/ROEdge.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/router/ROEdge.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2002-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/router/ROEdge.h sumo-1.18.0/src/router/ROEdge.h
--- sumo-1.17.0/src/router/ROEdge.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/router/ROEdge.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2002-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/router/ROFrame.cpp sumo-1.18.0/src/router/ROFrame.cpp
--- sumo-1.17.0/src/router/ROFrame.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/router/ROFrame.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/router/ROFrame.h sumo-1.18.0/src/router/ROFrame.h
--- sumo-1.17.0/src/router/ROFrame.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/router/ROFrame.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/router/ROHelper.cpp sumo-1.18.0/src/router/ROHelper.cpp
--- sumo-1.17.0/src/router/ROHelper.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/router/ROHelper.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/router/ROHelper.h sumo-1.18.0/src/router/ROHelper.h
--- sumo-1.17.0/src/router/ROHelper.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/router/ROHelper.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/router/ROLane.h sumo-1.18.0/src/router/ROLane.h
--- sumo-1.17.0/src/router/ROLane.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/router/ROLane.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/router/ROLoader.cpp sumo-1.18.0/src/router/ROLoader.cpp
--- sumo-1.17.0/src/router/ROLoader.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/router/ROLoader.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/router/ROLoader.h sumo-1.18.0/src/router/ROLoader.h
--- sumo-1.17.0/src/router/ROLoader.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/router/ROLoader.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2002-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/router/RONet.cpp sumo-1.18.0/src/router/RONet.cpp
--- sumo-1.17.0/src/router/RONet.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/router/RONet.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/router/RONet.h sumo-1.18.0/src/router/RONet.h
--- sumo-1.17.0/src/router/RONet.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/router/RONet.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2002-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/router/RONetHandler.cpp sumo-1.18.0/src/router/RONetHandler.cpp
--- sumo-1.17.0/src/router/RONetHandler.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/router/RONetHandler.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2002-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/router/RONetHandler.h sumo-1.18.0/src/router/RONetHandler.h
--- sumo-1.17.0/src/router/RONetHandler.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/router/RONetHandler.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/router/RONode.cpp sumo-1.18.0/src/router/RONode.cpp
--- sumo-1.17.0/src/router/RONode.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/router/RONode.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/router/RONode.h sumo-1.18.0/src/router/RONode.h
--- sumo-1.17.0/src/router/RONode.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/router/RONode.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/router/ROPerson.cpp sumo-1.18.0/src/router/ROPerson.cpp
--- sumo-1.17.0/src/router/ROPerson.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/router/ROPerson.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2002-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -363,15 +363,22 @@
                     trip->addTripItem(new Walk(start, item.edges, item.cost, item.exitTimes, depPos, arrPos, item.destStop));
                 }
             } else if (veh != nullptr && item.line == veh->getID()) {
-                trip->addTripItem(new Ride(start, item.edges.front(), item.edges.back(), veh->getID(), trip->getGroup(), item.cost, item.arrivalPos, item.length, item.destStop));
+                double cost = item.cost;
                 if (veh->getVClass() != SVC_TAXI) {
                     RORoute* route = new RORoute(veh->getID() + "_RouteDef", item.edges);
                     route->setProbability(1);
                     veh->getRouteDefinition()->addLoadedAlternative(route);
                     carUsed = true;
+                } else if (trip->needsRouting()) {
+                    // if this is the first plan item the initial taxi waiting time wasn't added yet
+                    const double taxiWait = STEPS2TIME(string2time(OptionsCont::getOptions().getString("persontrip.taxi.waiting-time")));
+                    cost += taxiWait;
                 }
+                trip->addTripItem(new Ride(start, item.edges.front(), item.edges.back(), veh->getID(), trip->getGroup(), cost, item.arrivalPos, item.length, item.destStop));
             } else {
-                trip->addTripItem(new Ride(start, nullptr, nullptr, item.line, trip->getGroup(), item.cost, item.arrivalPos, item.length, item.destStop, item.intended, TIME2STEPS(item.depart)));
+                // write origin for first element of the plan
+                const ROEdge* origin = trip == myPlan.front() && trip->needsRouting() ? trip->getOrigin() : nullptr;
+                trip->addTripItem(new Ride(start, origin, nullptr, item.line, trip->getGroup(), item.cost, item.arrivalPos, item.length, item.destStop, item.intended, TIME2STEPS(item.depart)));
             }
         }
         start += TIME2STEPS(item.cost);
@@ -396,15 +403,31 @@
             if (vehicles.empty()) {
                 computeIntermodal(time, provider, trip, nullptr, errorHandler);
             } else {
+                double bestCost = std::numeric_limits::infinity();
+                PersonTrip* best = nullptr;
+                ROVehicle* bestVeh = nullptr;
                 for (std::vector::iterator v = vehicles.begin(); v != vehicles.end();) {
                     if (!computeIntermodal(time, provider, trip, *v, errorHandler)) {
                         delete (*v)->getRouteDefinition();
                         delete *v;
                         v = vehicles.erase(v);
                     } else {
+                        const double cost = trip->getCost();
+                        if (cost < bestCost) {
+                            bestCost = cost;
+                            if (best != nullptr) {
+                                delete best;
+                            }
+                            best = static_cast(trip->clone());
+                            bestVeh = *v;
+                        }
+                        trip->clearItems();
                         ++v;
                     }
                 }
+                if (best != nullptr) {
+                    trip->copyItems(best, bestVeh);
+                }
             }
         }
         time += it->getDuration();
diff -Nru sumo-1.17.0/src/router/ROPerson.h sumo-1.18.0/src/router/ROPerson.h
--- sumo-1.17.0/src/router/ROPerson.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/router/ROPerson.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2002-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -100,6 +100,9 @@
         virtual bool needsRouting() const {
             return false;
         }
+        virtual SUMOVehicleParameter::Stop* getStopParameters() {
+            return nullptr;
+        }
 
         virtual SUMOTime getDuration() const = 0;
         virtual const std::string& getStopDest() const {
@@ -137,6 +140,9 @@
         bool isStop() const {
             return true;
         }
+        virtual SUMOVehicleParameter::Stop* getStopParameters() {
+            return &stopDesc;
+        }
         SUMOTime getDuration() const {
             return stopDesc.duration;
         }
@@ -358,6 +364,38 @@
         virtual bool needsRouting() const {
             return myTripItems.empty();
         }
+
+        double getCost() const {
+            double result = 0;
+            for (TripItem* const it : myTripItems) {
+                result += it->getCost();
+            }
+            return result;
+        }
+
+        void clearItems() {
+            for (TripItem* const it : myTripItems) {
+                delete it;
+            }
+            myTripItems.clear();
+        }
+
+        void copyItems(PersonTrip* trip, ROVehicle* veh) {
+            for (TripItem* const it : myTripItems) {
+                delete it;
+            }
+            myTripItems = trip->myTripItems;
+            for (auto it = myVehicles.begin(); it != myVehicles.end();) {
+                if (*it != veh) {
+                    delete (*it)->getRouteDefinition();
+                    delete (*it);
+                    it = myVehicles.erase(it);
+                } else {
+                    it++;
+                }
+            }
+        }
+
         void saveVehicles(OutputDevice& os, OutputDevice* const typeos, bool asAlternatives, OptionsCont& options) const;
         void saveAsXML(OutputDevice& os, const bool extended, const bool asTrip, OptionsCont& options) const;
 
diff -Nru sumo-1.17.0/src/router/RORoutable.h sumo-1.18.0/src/router/RORoutable.h
--- sumo-1.17.0/src/router/RORoutable.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/router/RORoutable.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2002-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/router/RORoute.cpp sumo-1.18.0/src/router/RORoute.cpp
--- sumo-1.17.0/src/router/RORoute.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/router/RORoute.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2002-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/router/RORouteDef.cpp sumo-1.18.0/src/router/RORouteDef.cpp
--- sumo-1.17.0/src/router/RORouteDef.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/router/RORouteDef.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2002-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -291,10 +291,10 @@
             delete myAlternatives[0];
             myAlternatives[0] = current;
         }
-        double costs = router.recomputeCosts(current->getEdgeVector(), veh, begin);
-        if (costs < 0) {
+        if (!router.isValid(current->getEdgeVector(), veh)) {
             throw ProcessError("Route '" + getID() + "' (vehicle '" + veh->getID() + "') is not valid.");
         }
+        double costs = router.recomputeCosts(current->getEdgeVector(), veh, begin);
         if (veh->hasJumps()) {
             // @todo: jumpTime should be applied in recomputeCost to ensure the
             // correctness of time-dependent traveltimes
@@ -310,11 +310,11 @@
     // recompute the costs and (when a new route was added) scale the probabilities
     const double scale = double(myAlternatives.size() - 1) / double(myAlternatives.size());
     for (RORoute* const alt : myAlternatives) {
-        // recompute the costs for all routes
-        const double newCosts = router.recomputeCosts(alt->getEdgeVector(), veh, begin);
-        if (newCosts < 0.) {
+        if (!router.isValid(alt->getEdgeVector(), veh)) {
             throw ProcessError("Route '" + current->getID() + "' (vehicle '" + veh->getID() + "') is not valid.");
         }
+        // recompute the costs for all routes
+        const double newCosts = router.recomputeCosts(alt->getEdgeVector(), veh, begin);
         assert(myAlternatives.size() != 0);
         if (myNewRoute) {
             if (alt == current) {
diff -Nru sumo-1.17.0/src/router/RORouteDef.h sumo-1.18.0/src/router/RORouteDef.h
--- sumo-1.17.0/src/router/RORouteDef.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/router/RORouteDef.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2002-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/router/RORoute.h sumo-1.18.0/src/router/RORoute.h
--- sumo-1.17.0/src/router/RORoute.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/router/RORoute.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2002-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/router/RORouteHandler.cpp sumo-1.18.0/src/router/RORouteHandler.cpp
--- sumo-1.17.0/src/router/RORouteHandler.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/router/RORouteHandler.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -847,14 +847,15 @@
     return toStop;
 }
 
-void
+Parameterised*
 RORouteHandler::addStop(const SUMOSAXAttributes& attrs) {
+    Parameterised* result = nullptr;
     if (myActiveContainerPlan != nullptr) {
         myActiveContainerPlan->openTag(SUMO_TAG_STOP);
         (*myActiveContainerPlan) << attrs;
         myActiveContainerPlan->closeTag();
         myActiveContainerPlanSize++;
-        return;
+        return result;
     }
     std::string errorSuffix;
     if (myActivePlan != nullptr) {
@@ -869,7 +870,7 @@
     SUMOVehicleParameter::Stop stop;
     bool ok = parseStop(stop, attrs, errorSuffix, myErrorOutput);
     if (!ok) {
-        return;
+        return result;
     }
     // try to parse the assigned bus stop
     const ROEdge* edge = nullptr;
@@ -889,13 +890,13 @@
             edge = myNet.getEdge(stop.edge);
             if (edge == nullptr) {
                 myErrorOutput->inform("The edge '" + stop.edge + "' for a stop is not known" + errorSuffix);
-                return;
+                return result;
             }
         } else if (ok && stop.lane != "") {
             edge = myNet.getEdge(SUMOXMLDefinitions::getEdgeIDFromLane(stop.lane));
             if (edge == nullptr) {
                 myErrorOutput->inform("The lane '" + stop.lane + "' for a stop is not known" + errorSuffix);
-                return;
+                return result;
             }
         } else if (ok && ((attrs.hasAttribute(SUMO_ATTR_X) && attrs.hasAttribute(SUMO_ATTR_Y))
                           || (attrs.hasAttribute(SUMO_ATTR_LON) && attrs.hasAttribute(SUMO_ATTR_LAT)))) {
@@ -920,11 +921,11 @@
                 stop.parametersSet |= STOP_END_SET;
                 stop.endPos = edge->getLanes()[0]->getShape().nearest_offset_to_point2D(pos, false);
             } else {
-                return;
+                return result;
             }
         } else if (!ok || (stop.lane == "" && stop.edge == "")) {
             myErrorOutput->inform("A stop must be placed on a bus stop, a container stop, a parking area, an edge or a lane" + errorSuffix);
-            return;
+            return result;
         }
         if (!hasPos) {
             stop.endPos = attrs.getOpt(SUMO_ATTR_ENDPOS, nullptr, ok, edge->getLength());
@@ -934,21 +935,25 @@
         const double endPosOffset = edge->isInternal() ? edge->getNormalBefore()->getLength() : 0;
         if (!ok || (checkStopPos(stop.startPos, stop.endPos, edge->getLength() + endPosOffset, POSITION_EPS, friendlyPos) != SUMORouteHandler::StopPos::STOPPOS_VALID)) {
             myErrorOutput->inform("Invalid start or end position for stop" + errorSuffix);
-            return;
+            return result;
         }
     }
     stop.edge = edge->getID();
     if (myActivePlan != nullptr) {
         ROPerson::addStop(*myActivePlan, stop, edge);
+        result = myActivePlan->back()->getStopParameters();
     } else if (myVehicleParameter != nullptr) {
         myVehicleParameter->stops.push_back(stop);
+        result = &myVehicleParameter->stops.back();
     } else {
         myActiveRouteStops.push_back(stop);
+        result = &myActiveRouteStops.back();
     }
     if (myInsertStopEdgesAt >= 0) {
         myActiveRoute.insert(myActiveRoute.begin() + myInsertStopEdgesAt, edge);
         myInsertStopEdgesAt++;
     }
+    return result;
 }
 
 
diff -Nru sumo-1.17.0/src/router/RORouteHandler.h sumo-1.18.0/src/router/RORouteHandler.h
--- sumo-1.17.0/src/router/RORouteHandler.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/router/RORouteHandler.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -154,7 +154,7 @@
     const SUMOVehicleParameter::Stop* retrieveStoppingPlace(const SUMOSAXAttributes& attrs, const std::string& errorSuffix, std::string& id, const SUMOVehicleParameter::Stop* stopParam = nullptr);
 
     /// @brief Processing of a stop
-    void addStop(const SUMOSAXAttributes& attrs);
+    Parameterised* addStop(const SUMOSAXAttributes& attrs);
 
     /// @brief Processing of a person
     void addPerson(const SUMOSAXAttributes& attrs);
diff -Nru sumo-1.17.0/src/router/ROVehicle.cpp sumo-1.18.0/src/router/ROVehicle.cpp
--- sumo-1.17.0/src/router/ROVehicle.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/router/ROVehicle.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2002-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/router/ROVehicle.h sumo-1.18.0/src/router/ROVehicle.h
--- sumo-1.17.0/src/router/ROVehicle.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/router/ROVehicle.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2002-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/sumo_main.cpp sumo-1.18.0/src/sumo_main.cpp
--- sumo-1.17.0/src/sumo_main.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/sumo_main.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/tools/emissionsDrivingCycle_main.cpp sumo-1.18.0/src/tools/emissionsDrivingCycle_main.cpp
--- sumo-1.17.0/src/tools/emissionsDrivingCycle_main.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/tools/emissionsDrivingCycle_main.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2013-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/tools/emissionsMap_main.cpp sumo-1.18.0/src/tools/emissionsMap_main.cpp
--- sumo-1.17.0/src/tools/emissionsMap_main.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/tools/emissionsMap_main.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2013-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/tools/TrajectoriesHandler.cpp sumo-1.18.0/src/tools/TrajectoriesHandler.cpp
--- sumo-1.17.0/src/tools/TrajectoriesHandler.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/tools/TrajectoriesHandler.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2014-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/tools/TrajectoriesHandler.h sumo-1.18.0/src/tools/TrajectoriesHandler.h
--- sumo-1.17.0/src/tools/TrajectoriesHandler.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/tools/TrajectoriesHandler.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2014-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/tools/VTypesHandler.cpp sumo-1.18.0/src/tools/VTypesHandler.cpp
--- sumo-1.17.0/src/tools/VTypesHandler.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/tools/VTypesHandler.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2014-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/tools/VTypesHandler.h sumo-1.18.0/src/tools/VTypesHandler.h
--- sumo-1.17.0/src/tools/VTypesHandler.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/tools/VTypesHandler.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2014-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -81,8 +81,9 @@
     void closeContainerFlow() {}
     void closeFlow() {}
     void closeTrip() {}
-    void addStop(const SUMOSAXAttributes& attrs) {
+    SUMOVehicleParameter::Stop* addStop(const SUMOSAXAttributes& attrs) {
         UNUSED_PARAMETER(attrs);
+        return nullptr;
     }
     void addPersonTrip(const SUMOSAXAttributes& attrs) {
         UNUSED_PARAMETER(attrs);
diff -Nru sumo-1.17.0/src/traci-server/TraCIServerAPI_BusStop.cpp sumo-1.18.0/src/traci-server/TraCIServerAPI_BusStop.cpp
--- sumo-1.17.0/src/traci-server/TraCIServerAPI_BusStop.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/traci-server/TraCIServerAPI_BusStop.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/traci-server/TraCIServerAPI_BusStop.h sumo-1.18.0/src/traci-server/TraCIServerAPI_BusStop.h
--- sumo-1.17.0/src/traci-server/TraCIServerAPI_BusStop.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/traci-server/TraCIServerAPI_BusStop.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/traci-server/TraCIServerAPI_Calibrator.cpp sumo-1.18.0/src/traci-server/TraCIServerAPI_Calibrator.cpp
--- sumo-1.17.0/src/traci-server/TraCIServerAPI_Calibrator.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/traci-server/TraCIServerAPI_Calibrator.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/traci-server/TraCIServerAPI_Calibrator.h sumo-1.18.0/src/traci-server/TraCIServerAPI_Calibrator.h
--- sumo-1.17.0/src/traci-server/TraCIServerAPI_Calibrator.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/traci-server/TraCIServerAPI_Calibrator.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/traci-server/TraCIServerAPI_ChargingStation.cpp sumo-1.18.0/src/traci-server/TraCIServerAPI_ChargingStation.cpp
--- sumo-1.17.0/src/traci-server/TraCIServerAPI_ChargingStation.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/traci-server/TraCIServerAPI_ChargingStation.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/traci-server/TraCIServerAPI_ChargingStation.h sumo-1.18.0/src/traci-server/TraCIServerAPI_ChargingStation.h
--- sumo-1.17.0/src/traci-server/TraCIServerAPI_ChargingStation.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/traci-server/TraCIServerAPI_ChargingStation.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/traci-server/TraCIServerAPI_Edge.cpp sumo-1.18.0/src/traci-server/TraCIServerAPI_Edge.cpp
--- sumo-1.17.0/src/traci-server/TraCIServerAPI_Edge.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/traci-server/TraCIServerAPI_Edge.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2002-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/traci-server/TraCIServerAPI_Edge.h sumo-1.18.0/src/traci-server/TraCIServerAPI_Edge.h
--- sumo-1.17.0/src/traci-server/TraCIServerAPI_Edge.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/traci-server/TraCIServerAPI_Edge.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/traci-server/TraCIServerAPI_InductionLoop.cpp sumo-1.18.0/src/traci-server/TraCIServerAPI_InductionLoop.cpp
--- sumo-1.17.0/src/traci-server/TraCIServerAPI_InductionLoop.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/traci-server/TraCIServerAPI_InductionLoop.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2009-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/traci-server/TraCIServerAPI_InductionLoop.h sumo-1.18.0/src/traci-server/TraCIServerAPI_InductionLoop.h
--- sumo-1.17.0/src/traci-server/TraCIServerAPI_InductionLoop.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/traci-server/TraCIServerAPI_InductionLoop.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/traci-server/TraCIServerAPI_Junction.cpp sumo-1.18.0/src/traci-server/TraCIServerAPI_Junction.cpp
--- sumo-1.17.0/src/traci-server/TraCIServerAPI_Junction.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/traci-server/TraCIServerAPI_Junction.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2009-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/traci-server/TraCIServerAPI_Junction.h sumo-1.18.0/src/traci-server/TraCIServerAPI_Junction.h
--- sumo-1.17.0/src/traci-server/TraCIServerAPI_Junction.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/traci-server/TraCIServerAPI_Junction.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/traci-server/TraCIServerAPI_LaneArea.cpp sumo-1.18.0/src/traci-server/TraCIServerAPI_LaneArea.cpp
--- sumo-1.17.0/src/traci-server/TraCIServerAPI_LaneArea.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/traci-server/TraCIServerAPI_LaneArea.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2014-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/traci-server/TraCIServerAPI_LaneArea.h sumo-1.18.0/src/traci-server/TraCIServerAPI_LaneArea.h
--- sumo-1.17.0/src/traci-server/TraCIServerAPI_LaneArea.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/traci-server/TraCIServerAPI_LaneArea.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2013-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/traci-server/TraCIServerAPI_Lane.cpp sumo-1.18.0/src/traci-server/TraCIServerAPI_Lane.cpp
--- sumo-1.17.0/src/traci-server/TraCIServerAPI_Lane.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/traci-server/TraCIServerAPI_Lane.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2009-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/traci-server/TraCIServerAPI_Lane.h sumo-1.18.0/src/traci-server/TraCIServerAPI_Lane.h
--- sumo-1.17.0/src/traci-server/TraCIServerAPI_Lane.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/traci-server/TraCIServerAPI_Lane.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2009-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/traci-server/TraCIServerAPI_MeanData.cpp sumo-1.18.0/src/traci-server/TraCIServerAPI_MeanData.cpp
--- sumo-1.17.0/src/traci-server/TraCIServerAPI_MeanData.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/traci-server/TraCIServerAPI_MeanData.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/traci-server/TraCIServerAPI_MeanData.h sumo-1.18.0/src/traci-server/TraCIServerAPI_MeanData.h
--- sumo-1.17.0/src/traci-server/TraCIServerAPI_MeanData.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/traci-server/TraCIServerAPI_MeanData.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/traci-server/TraCIServerAPI_MultiEntryExit.cpp sumo-1.18.0/src/traci-server/TraCIServerAPI_MultiEntryExit.cpp
--- sumo-1.17.0/src/traci-server/TraCIServerAPI_MultiEntryExit.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/traci-server/TraCIServerAPI_MultiEntryExit.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/traci-server/TraCIServerAPI_MultiEntryExit.h sumo-1.18.0/src/traci-server/TraCIServerAPI_MultiEntryExit.h
--- sumo-1.17.0/src/traci-server/TraCIServerAPI_MultiEntryExit.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/traci-server/TraCIServerAPI_MultiEntryExit.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/traci-server/TraCIServerAPI_OverheadWire.cpp sumo-1.18.0/src/traci-server/TraCIServerAPI_OverheadWire.cpp
--- sumo-1.17.0/src/traci-server/TraCIServerAPI_OverheadWire.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/traci-server/TraCIServerAPI_OverheadWire.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/traci-server/TraCIServerAPI_OverheadWire.h sumo-1.18.0/src/traci-server/TraCIServerAPI_OverheadWire.h
--- sumo-1.17.0/src/traci-server/TraCIServerAPI_OverheadWire.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/traci-server/TraCIServerAPI_OverheadWire.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/traci-server/TraCIServerAPI_ParkingArea.cpp sumo-1.18.0/src/traci-server/TraCIServerAPI_ParkingArea.cpp
--- sumo-1.17.0/src/traci-server/TraCIServerAPI_ParkingArea.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/traci-server/TraCIServerAPI_ParkingArea.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/traci-server/TraCIServerAPI_ParkingArea.h sumo-1.18.0/src/traci-server/TraCIServerAPI_ParkingArea.h
--- sumo-1.17.0/src/traci-server/TraCIServerAPI_ParkingArea.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/traci-server/TraCIServerAPI_ParkingArea.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/traci-server/TraCIServerAPI_Person.cpp sumo-1.18.0/src/traci-server/TraCIServerAPI_Person.cpp
--- sumo-1.17.0/src/traci-server/TraCIServerAPI_Person.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/traci-server/TraCIServerAPI_Person.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/traci-server/TraCIServerAPI_Person.h sumo-1.18.0/src/traci-server/TraCIServerAPI_Person.h
--- sumo-1.17.0/src/traci-server/TraCIServerAPI_Person.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/traci-server/TraCIServerAPI_Person.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/traci-server/TraCIServerAPI_POI.cpp sumo-1.18.0/src/traci-server/TraCIServerAPI_POI.cpp
--- sumo-1.17.0/src/traci-server/TraCIServerAPI_POI.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/traci-server/TraCIServerAPI_POI.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/traci-server/TraCIServerAPI_POI.h sumo-1.18.0/src/traci-server/TraCIServerAPI_POI.h
--- sumo-1.17.0/src/traci-server/TraCIServerAPI_POI.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/traci-server/TraCIServerAPI_POI.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/traci-server/TraCIServerAPI_Polygon.cpp sumo-1.18.0/src/traci-server/TraCIServerAPI_Polygon.cpp
--- sumo-1.17.0/src/traci-server/TraCIServerAPI_Polygon.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/traci-server/TraCIServerAPI_Polygon.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2002-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/traci-server/TraCIServerAPI_Polygon.h sumo-1.18.0/src/traci-server/TraCIServerAPI_Polygon.h
--- sumo-1.17.0/src/traci-server/TraCIServerAPI_Polygon.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/traci-server/TraCIServerAPI_Polygon.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/traci-server/TraCIServerAPI_Rerouter.cpp sumo-1.18.0/src/traci-server/TraCIServerAPI_Rerouter.cpp
--- sumo-1.17.0/src/traci-server/TraCIServerAPI_Rerouter.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/traci-server/TraCIServerAPI_Rerouter.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/traci-server/TraCIServerAPI_Rerouter.h sumo-1.18.0/src/traci-server/TraCIServerAPI_Rerouter.h
--- sumo-1.17.0/src/traci-server/TraCIServerAPI_Rerouter.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/traci-server/TraCIServerAPI_Rerouter.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/traci-server/TraCIServerAPI_Route.cpp sumo-1.18.0/src/traci-server/TraCIServerAPI_Route.cpp
--- sumo-1.17.0/src/traci-server/TraCIServerAPI_Route.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/traci-server/TraCIServerAPI_Route.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/traci-server/TraCIServerAPI_Route.h sumo-1.18.0/src/traci-server/TraCIServerAPI_Route.h
--- sumo-1.17.0/src/traci-server/TraCIServerAPI_Route.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/traci-server/TraCIServerAPI_Route.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/traci-server/TraCIServerAPI_RouteProbe.cpp sumo-1.18.0/src/traci-server/TraCIServerAPI_RouteProbe.cpp
--- sumo-1.17.0/src/traci-server/TraCIServerAPI_RouteProbe.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/traci-server/TraCIServerAPI_RouteProbe.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/traci-server/TraCIServerAPI_RouteProbe.h sumo-1.18.0/src/traci-server/TraCIServerAPI_RouteProbe.h
--- sumo-1.17.0/src/traci-server/TraCIServerAPI_RouteProbe.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/traci-server/TraCIServerAPI_RouteProbe.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/traci-server/TraCIServerAPI_Simulation.cpp sumo-1.18.0/src/traci-server/TraCIServerAPI_Simulation.cpp
--- sumo-1.17.0/src/traci-server/TraCIServerAPI_Simulation.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/traci-server/TraCIServerAPI_Simulation.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/traci-server/TraCIServerAPI_Simulation.h sumo-1.18.0/src/traci-server/TraCIServerAPI_Simulation.h
--- sumo-1.17.0/src/traci-server/TraCIServerAPI_Simulation.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/traci-server/TraCIServerAPI_Simulation.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/traci-server/TraCIServerAPI_TrafficLight.cpp sumo-1.18.0/src/traci-server/TraCIServerAPI_TrafficLight.cpp
--- sumo-1.17.0/src/traci-server/TraCIServerAPI_TrafficLight.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/traci-server/TraCIServerAPI_TrafficLight.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2009-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/traci-server/TraCIServerAPI_TrafficLight.h sumo-1.18.0/src/traci-server/TraCIServerAPI_TrafficLight.h
--- sumo-1.17.0/src/traci-server/TraCIServerAPI_TrafficLight.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/traci-server/TraCIServerAPI_TrafficLight.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/traci-server/TraCIServerAPI_VariableSpeedSign.cpp sumo-1.18.0/src/traci-server/TraCIServerAPI_VariableSpeedSign.cpp
--- sumo-1.17.0/src/traci-server/TraCIServerAPI_VariableSpeedSign.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/traci-server/TraCIServerAPI_VariableSpeedSign.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/traci-server/TraCIServerAPI_VariableSpeedSign.h sumo-1.18.0/src/traci-server/TraCIServerAPI_VariableSpeedSign.h
--- sumo-1.17.0/src/traci-server/TraCIServerAPI_VariableSpeedSign.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/traci-server/TraCIServerAPI_VariableSpeedSign.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/traci-server/TraCIServerAPI_Vehicle.cpp sumo-1.18.0/src/traci-server/TraCIServerAPI_Vehicle.cpp
--- sumo-1.17.0/src/traci-server/TraCIServerAPI_Vehicle.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/traci-server/TraCIServerAPI_Vehicle.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2009-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -221,8 +221,8 @@
                         return server.writeErrorStatusCmd(libsumo::CMD_SET_VEHICLE_VARIABLE, "getting stop parameter needs a compound object description.", outputStorage);
                     }
                     int compoundSize = inputStorage.readInt();
-                    if (compoundSize != 2) {
-                        return server.writeErrorStatusCmd(libsumo::CMD_SET_VEHICLE_VARIABLE, "getting a stop parameter needs a compound object description of 2 items.", outputStorage);
+                    if (compoundSize != 2 && compoundSize != 3) {
+                        return server.writeErrorStatusCmd(libsumo::CMD_SET_VEHICLE_VARIABLE, "getting a stop parameter needs a compound object description of 2 or 3 items.", outputStorage);
                     }
                     int nextStopIndex;
                     if (!server.readTypeCheckingInt(inputStorage, nextStopIndex)) {
@@ -232,8 +232,14 @@
                     if (!server.readTypeCheckingString(inputStorage, param)) {
                         return server.writeErrorStatusCmd(libsumo::CMD_SET_VEHICLE_VARIABLE, "The second setStopParameter parameter must be the param given as a string.", outputStorage);
                     }
+                    int customParam = 0;
+                    if (compoundSize == 3) {
+                        if (!server.readTypeCheckingByte(inputStorage, customParam)) {
+                            return server.writeErrorStatusCmd(libsumo::CMD_SET_VEHICLE_VARIABLE, "The third setStopParameter parameter must be the customParam flag given as a byte.", outputStorage);
+                        }
+                    }
                     server.getWrapperStorage().writeUnsignedByte(libsumo::TYPE_STRING);
-                    server.getWrapperStorage().writeString(libsumo::Vehicle::getStopParameter(id, nextStopIndex, param));
+                    server.getWrapperStorage().writeString(libsumo::Vehicle::getStopParameter(id, nextStopIndex, param, customParam != 0));
                 }
                 break;
                 case libsumo::DISTANCE_REQUEST: {
@@ -413,6 +419,39 @@
                     server.getWrapperStorage().writeDouble(libsumo::Vehicle::getStopSpeed(id, speed, gap));
                 }
                 break;
+                case libsumo::VAR_FOES: {
+                    double distance;
+                    if (!server.readTypeCheckingDouble(inputStorage, distance)) {
+                        return server.writeErrorStatusCmd(libsumo::CMD_GET_VEHICLE_VARIABLE, "Retrieval of junction foes requires the distance as first parameter.", outputStorage);
+                    }
+                    std::vector junctionFoes = libsumo::Vehicle::getJunctionFoes(id, distance);
+                    server.getWrapperStorage().writeUnsignedByte(libsumo::TYPE_COMPOUND);
+                    const int cnt = 1 + (int)junctionFoes.size() * 9;
+                    server.getWrapperStorage().writeInt(cnt);
+                    server.getWrapperStorage().writeUnsignedByte(libsumo::TYPE_INTEGER);
+                    server.getWrapperStorage().writeInt((int)junctionFoes.size());
+                    for (std::vector::iterator it = junctionFoes.begin(); it != junctionFoes.end(); ++it) {
+                        server.getWrapperStorage().writeUnsignedByte(libsumo::TYPE_STRING);
+                        server.getWrapperStorage().writeString(it->foeId);
+                        server.getWrapperStorage().writeUnsignedByte(libsumo::TYPE_DOUBLE);
+                        server.getWrapperStorage().writeDouble(it->egoDist);
+                        server.getWrapperStorage().writeUnsignedByte(libsumo::TYPE_DOUBLE);
+                        server.getWrapperStorage().writeDouble(it->foeDist);
+                        server.getWrapperStorage().writeUnsignedByte(libsumo::TYPE_DOUBLE);
+                        server.getWrapperStorage().writeDouble(it->egoExitDist);
+                        server.getWrapperStorage().writeUnsignedByte(libsumo::TYPE_DOUBLE);
+                        server.getWrapperStorage().writeDouble(it->foeExitDist);
+                        server.getWrapperStorage().writeUnsignedByte(libsumo::TYPE_STRING);
+                        server.getWrapperStorage().writeString(it->egoLane);
+                        server.getWrapperStorage().writeUnsignedByte(libsumo::TYPE_STRING);
+                        server.getWrapperStorage().writeString(it->foeLane);
+                        server.getWrapperStorage().writeUnsignedByte(libsumo::TYPE_UBYTE);
+                        server.getWrapperStorage().writeChar(it->egoResponse);
+                        server.getWrapperStorage().writeUnsignedByte(libsumo::TYPE_UBYTE);
+                        server.getWrapperStorage().writeChar(it->foeResponse);
+                    }
+                    break;
+                }
                 default:
                     return server.writeErrorStatusCmd(libsumo::CMD_GET_VEHICLE_VARIABLE, "Get Vehicle Variable: unsupported variable " + toHex(variable, 2) + " specified", outputStorage);
             }
@@ -461,6 +500,8 @@
             && variable != libsumo::VAR_MINGAP_LAT
             && variable != libsumo::VAR_LINE
             && variable != libsumo::VAR_VIA
+            && variable != libsumo::VAR_IMPATIENCE
+            && variable != libsumo::VAR_BOARDING_DURATION
             && variable != libsumo::VAR_HIGHLIGHT
             && variable != libsumo::CMD_TAXI_DISPATCH
             && variable != libsumo::MOVE_TO_XY && variable != libsumo::VAR_PARAMETER/* && variable != libsumo::VAR_SPEED_TIME_LINE && variable != libsumo::VAR_LANE_TIME_LINE*/
@@ -548,8 +589,8 @@
                     return server.writeErrorStatusCmd(libsumo::CMD_SET_VEHICLE_VARIABLE, "Setting stop parameter needs a compound object description.", outputStorage);
                 }
                 int compoundSize = inputStorage.readInt();
-                if (compoundSize != 3) {
-                    return server.writeErrorStatusCmd(libsumo::CMD_SET_VEHICLE_VARIABLE, "Setting a stop parameter needs a compound object description of 3 items.", outputStorage);
+                if (compoundSize != 3 && compoundSize != 4) {
+                    return server.writeErrorStatusCmd(libsumo::CMD_SET_VEHICLE_VARIABLE, "Setting a stop parameter needs a compound object description of 3 or 4 items.", outputStorage);
                 }
                 int nextStopIndex;
                 if (!server.readTypeCheckingInt(inputStorage, nextStopIndex)) {
@@ -563,7 +604,13 @@
                 if (!server.readTypeCheckingString(inputStorage, value)) {
                     return server.writeErrorStatusCmd(libsumo::CMD_SET_VEHICLE_VARIABLE, "The third setStopParameter parameter must be the value given as a string.", outputStorage);
                 }
-                libsumo::Vehicle::setStopParameter(id, nextStopIndex, param, value);
+                int customParam = 0;
+                if (compoundSize == 4) {
+                    if (!server.readTypeCheckingByte(inputStorage, customParam)) {
+                        return server.writeErrorStatusCmd(libsumo::CMD_SET_VEHICLE_VARIABLE, "The fourth setStopParameter parameter must be the customParam flag given as a byte.", outputStorage);
+                    }
+                }
+                libsumo::Vehicle::setStopParameter(id, nextStopIndex, param, value, customParam != 0);
             }
             break;
             case libsumo::CMD_REROUTE_TO_PARKING: {
@@ -902,6 +949,14 @@
                 libsumo::Vehicle::moveTo(id, laneID, position, reason);
             }
             break;
+            case libsumo::VAR_IMPATIENCE: {
+                double impatience = 0;
+                if (!server.readTypeCheckingDouble(inputStorage, impatience)) {
+                    return server.writeErrorStatusCmd(libsumo::CMD_SET_VEHICLE_VARIABLE, "Setting impatience requires a double.", outputStorage);
+                }
+                libsumo::Vehicle::setImpatience(id, impatience);
+            }
+            break;
             case libsumo::VAR_SPEED: {
                 double speed = 0;
                 if (!server.readTypeCheckingDouble(inputStorage, speed)) {
diff -Nru sumo-1.17.0/src/traci-server/TraCIServerAPI_Vehicle.h sumo-1.18.0/src/traci-server/TraCIServerAPI_Vehicle.h
--- sumo-1.17.0/src/traci-server/TraCIServerAPI_Vehicle.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/traci-server/TraCIServerAPI_Vehicle.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/traci-server/TraCIServerAPI_VehicleType.cpp sumo-1.18.0/src/traci-server/TraCIServerAPI_VehicleType.cpp
--- sumo-1.17.0/src/traci-server/TraCIServerAPI_VehicleType.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/traci-server/TraCIServerAPI_VehicleType.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -74,6 +74,8 @@
             && variable != libsumo::VAR_MINGAP_LAT
             && variable != libsumo::VAR_MAXSPEED_LAT
             && variable != libsumo::VAR_LATALIGNMENT
+            && variable != libsumo::VAR_BOARDING_DURATION
+            && variable != libsumo::VAR_IMPATIENCE
             && variable != libsumo::VAR_PARAMETER
             && variable != libsumo::COPY
        ) {
@@ -345,6 +347,22 @@
             libsumo::VehicleType::setTau(id, value);
         }
         break;
+        case libsumo::VAR_IMPATIENCE: {
+            double value = 0;
+            if (!server.readTypeCheckingDouble(inputStorage, value)) {
+                return server.writeErrorStatusCmd(cmd, "Setting impatience requires a double.", outputStorage);
+            }
+            libsumo::VehicleType::setImpatience(id, value);
+        }
+        break;
+        case libsumo::VAR_BOARDING_DURATION: {
+            double value = 0;
+            if (!server.readTypeCheckingDouble(inputStorage, value)) {
+                return server.writeErrorStatusCmd(cmd, "Setting boardingDuration requires a double.", outputStorage);
+            }
+            libsumo::VehicleType::setBoardingDuration(id, value);
+        }
+        break;
         case libsumo::VAR_COLOR: {
             libsumo::TraCIColor col;
             if (!server.readTypeCheckingColor(inputStorage, col)) {
diff -Nru sumo-1.17.0/src/traci-server/TraCIServerAPI_VehicleType.h sumo-1.18.0/src/traci-server/TraCIServerAPI_VehicleType.h
--- sumo-1.17.0/src/traci-server/TraCIServerAPI_VehicleType.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/traci-server/TraCIServerAPI_VehicleType.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/traci-server/TraCIServer.cpp sumo-1.18.0/src/traci-server/TraCIServer.cpp
--- sumo-1.17.0/src/traci-server/TraCIServer.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/traci-server/TraCIServer.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2007-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -1068,38 +1068,42 @@
     tcpip::Storage writeInto;
     std::string errors;
     libsumo::Subscription* modifiedSubscription = nullptr;
-    if (processSingleSubscription(s, writeInto, errors)) {
-        if (s.endTime < MSNet::getInstance()->getCurrentTimeStep()) {
-            writeStatusCmd(s.commandId, libsumo::RTYPE_ERR, "Subscription has ended.");
-        } else {
-            if (libsumo::Helper::needNewSubscription(s, mySubscriptions, modifiedSubscription)) {
-                // Add new subscription to subscription cache (note: seems a bit inefficient)
-                if (s.beginTime < MSNet::getInstance()->getCurrentTimeStep()) {
-                    // copy new subscription into cache
-                    int noActive = 1 + (mySubscriptionCache.size() > 0 ? mySubscriptionCache.readInt() : 0);
-                    tcpip::Storage tmp;
-                    tmp.writeInt(noActive);
-                    while (mySubscriptionCache.valid_pos()) {
-                        tmp.writeByte(mySubscriptionCache.readByte());
+    try {
+        if (processSingleSubscription(s, writeInto, errors)) {
+            if (s.endTime < MSNet::getInstance()->getCurrentTimeStep()) {
+                writeStatusCmd(s.commandId, libsumo::RTYPE_ERR, "Subscription has ended.");
+            } else {
+                if (libsumo::Helper::needNewSubscription(s, mySubscriptions, modifiedSubscription)) {
+                    // Add new subscription to subscription cache (note: seems a bit inefficient)
+                    if (s.beginTime < MSNet::getInstance()->getCurrentTimeStep()) {
+                        // copy new subscription into cache
+                        int noActive = 1 + (mySubscriptionCache.size() > 0 ? mySubscriptionCache.readInt() : 0);
+                        tcpip::Storage tmp;
+                        tmp.writeInt(noActive);
+                        while (mySubscriptionCache.valid_pos()) {
+                            tmp.writeByte(mySubscriptionCache.readByte());
+                        }
+                        tmp.writeStorage(writeInto);
+                        mySubscriptionCache.reset();
+                        mySubscriptionCache.writeStorage(tmp);
                     }
-                    tmp.writeStorage(writeInto);
-                    mySubscriptionCache.reset();
-                    mySubscriptionCache.writeStorage(tmp);
                 }
+                writeStatusCmd(s.commandId, libsumo::RTYPE_OK, "");
+            }
+            if (modifiedSubscription != nullptr && (
+                        modifiedSubscription->isVehicleToVehicleContextSubscription()
+                        || modifiedSubscription->isVehicleToPersonContextSubscription())) {
+                // Set last modified vehicle context subscription active for filter modifications
+                myLastContextSubscription = modifiedSubscription;
+            } else {
+                // adding other subscriptions deactivates the activation for filter addition
+                myLastContextSubscription = nullptr;
             }
-            writeStatusCmd(s.commandId, libsumo::RTYPE_OK, "");
-        }
-        if (modifiedSubscription != nullptr && (
-                    modifiedSubscription->isVehicleToVehicleContextSubscription()
-                    || modifiedSubscription->isVehicleToPersonContextSubscription())) {
-            // Set last modified vehicle context subscription active for filter modifications
-            myLastContextSubscription = modifiedSubscription;
         } else {
-            // adding other subscriptions deactivates the activation for filter addition
-            myLastContextSubscription = nullptr;
+            writeStatusCmd(s.commandId, libsumo::RTYPE_ERR, "Could not add subscription. " + errors);
         }
-    } else {
-        writeStatusCmd(s.commandId, libsumo::RTYPE_ERR, "Could not add subscription. " + errors);
+    } catch (libsumo::TraCIException& e) {
+        writeStatusCmd(s.commandId, libsumo::RTYPE_ERR, e.what());
     }
     myOutputStorage.writeStorage(writeInto);
 }
diff -Nru sumo-1.17.0/src/traci-server/TraCIServer.h sumo-1.18.0/src/traci-server/TraCIServer.h
--- sumo-1.17.0/src/traci-server/TraCIServer.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/traci-server/TraCIServer.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/traci_testclient/testlibsumo_main.cpp sumo-1.18.0/src/traci_testclient/testlibsumo_main.cpp
--- sumo-1.17.0/src/traci_testclient/testlibsumo_main.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/traci_testclient/testlibsumo_main.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/traci_testclient/testlibtraci_main.cpp sumo-1.18.0/src/traci_testclient/testlibtraci_main.cpp
--- sumo-1.17.0/src/traci_testclient/testlibtraci_main.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/traci_testclient/testlibtraci_main.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/traci_testclient/TraCITestClient.cpp sumo-1.18.0/src/traci_testclient/TraCITestClient.cpp
--- sumo-1.17.0/src/traci_testclient/TraCITestClient.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/traci_testclient/TraCITestClient.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2008-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/traci_testclient/TraCITestClient.h sumo-1.18.0/src/traci_testclient/TraCITestClient.h
--- sumo-1.17.0/src/traci_testclient/TraCITestClient.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/traci_testclient/TraCITestClient.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/traci_testclient/tracitestclient_main.cpp sumo-1.18.0/src/traci_testclient/tracitestclient_main.cpp
--- sumo-1.17.0/src/traci_testclient/tracitestclient_main.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/traci_testclient/tracitestclient_main.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/common/Command.h sumo-1.18.0/src/utils/common/Command.h
--- sumo-1.17.0/src/utils/common/Command.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/common/Command.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/common/FileHelpers.cpp sumo-1.18.0/src/utils/common/FileHelpers.cpp
--- sumo-1.17.0/src/utils/common/FileHelpers.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/common/FileHelpers.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/common/FileHelpers.h sumo-1.18.0/src/utils/common/FileHelpers.h
--- sumo-1.17.0/src/utils/common/FileHelpers.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/common/FileHelpers.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/common/IDSupplier.cpp sumo-1.18.0/src/utils/common/IDSupplier.cpp
--- sumo-1.17.0/src/utils/common/IDSupplier.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/common/IDSupplier.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/common/IDSupplier.h sumo-1.18.0/src/utils/common/IDSupplier.h
--- sumo-1.17.0/src/utils/common/IDSupplier.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/common/IDSupplier.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/common/InstancePool.h sumo-1.18.0/src/utils/common/InstancePool.h
--- sumo-1.17.0/src/utils/common/InstancePool.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/common/InstancePool.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/common/MsgHandler.cpp sumo-1.18.0/src/utils/common/MsgHandler.cpp
--- sumo-1.17.0/src/utils/common/MsgHandler.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/common/MsgHandler.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -113,6 +113,31 @@
     myWriteDebugGLMessages = enable;
 }
 
+
+std::string
+MsgHandler::insertLineBreaks(std::string msg, int lineWidth) {
+    // TODO: check what FXFont::getTextWidth can do
+    //int textWidth = getApp()->getNormalFont()->getTextWidth
+    if ((int)msg.size() <= lineWidth) {
+        return msg;
+    }
+    size_t pos = 0;
+    size_t nextLineBreak = msg.find('\n');
+    size_t spaceAfterLine = msg.find(' ', lineWidth);
+    while (spaceAfterLine != std::string::npos) {
+        if (nextLineBreak == std::string::npos || nextLineBreak > spaceAfterLine) {
+            msg = msg.replace(spaceAfterLine, 1, "\n");
+            pos = spaceAfterLine + 1;
+        } else {
+            pos = nextLineBreak + 1;
+        }
+        spaceAfterLine = msg.find(' ', pos + lineWidth);
+        nextLineBreak = msg.find('\n', pos);
+    }
+    return msg;
+}
+
+
 void
 MsgHandler::inform(std::string msg, bool addType) {
     if (addType && !myInitialMessages.empty() && myInitialMessages.size() < 5) {
diff -Nru sumo-1.17.0/src/utils/common/MsgHandler.h sumo-1.18.0/src/utils/common/MsgHandler.h
--- sumo-1.17.0/src/utils/common/MsgHandler.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/common/MsgHandler.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2003-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -98,6 +98,9 @@
         return myWriteDebugGLMessages;
     }
 
+    /// @brief reformats a long string to contain newline after a certain line length in px (depending on the current font)
+    static std::string insertLineBreaks(std::string msg, int lineWidth);
+
     /// @brief ensure that that given output device is no longer used as retriever by any instance
     static void removeRetrieverFromAllInstances(OutputDevice* out);
 
diff -Nru sumo-1.17.0/src/utils/common/MsgRetrievingFunction.h sumo-1.18.0/src/utils/common/MsgRetrievingFunction.h
--- sumo-1.17.0/src/utils/common/MsgRetrievingFunction.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/common/MsgRetrievingFunction.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/common/Named.h sumo-1.18.0/src/utils/common/Named.h
--- sumo-1.17.0/src/utils/common/Named.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/common/Named.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/common/NamedObjectCont.h sumo-1.18.0/src/utils/common/NamedObjectCont.h
--- sumo-1.17.0/src/utils/common/NamedObjectCont.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/common/NamedObjectCont.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2002-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/common/NamedRTree.h sumo-1.18.0/src/utils/common/NamedRTree.h
--- sumo-1.17.0/src/utils/common/NamedRTree.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/common/NamedRTree.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2008-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/common/Parameterised.cpp sumo-1.18.0/src/utils/common/Parameterised.cpp
--- sumo-1.17.0/src/utils/common/Parameterised.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/common/Parameterised.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/common/Parameterised.h sumo-1.18.0/src/utils/common/Parameterised.h
--- sumo-1.17.0/src/utils/common/Parameterised.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/common/Parameterised.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2002-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/common/ParametrisedWrappingCommand.h sumo-1.18.0/src/utils/common/ParametrisedWrappingCommand.h
--- sumo-1.17.0/src/utils/common/ParametrisedWrappingCommand.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/common/ParametrisedWrappingCommand.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/common/PolySolver.cpp sumo-1.18.0/src/utils/common/PolySolver.cpp
--- sumo-1.17.0/src/utils/common/PolySolver.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/common/PolySolver.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/common/PolySolver.h sumo-1.18.0/src/utils/common/PolySolver.h
--- sumo-1.17.0/src/utils/common/PolySolver.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/common/PolySolver.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2005-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/common/RandHelper.cpp sumo-1.18.0/src/utils/common/RandHelper.cpp
--- sumo-1.17.0/src/utils/common/RandHelper.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/common/RandHelper.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -54,9 +54,9 @@
 // ===========================================================================
 // member method definitions
 // ===========================================================================
+
 void
-RandHelper::insertRandOptions() {
-    OptionsCont& oc = OptionsCont::getOptions();
+RandHelper::insertRandOptions(OptionsCont& oc) {
     // registers random number options
     oc.addOptionSubTopic("Random Number");
 
diff -Nru sumo-1.17.0/src/utils/common/RandHelper.h sumo-1.18.0/src/utils/common/RandHelper.h
--- sumo-1.17.0/src/utils/common/RandHelper.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/common/RandHelper.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2005-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -29,6 +29,11 @@
 #include 
 
 
+// ===========================================================================
+// class declaration
+// ===========================================================================
+
+class OptionsCont;
 
 // ===========================================================================
 // class definitions
@@ -107,9 +112,10 @@
  * @brief Utility functions for using a global, resetable random number generator
  */
 class RandHelper {
+
 public:
     /// @brief Initialises the given options container with random number options
-    static void insertRandOptions();
+    static void insertRandOptions(OptionsCont& oc);
 
     /// @brief Initialises the random number generator with hardware randomness or seed
     static void initRand(SumoRNG* which = nullptr, const bool random = false, const int seed = 23423);
diff -Nru sumo-1.17.0/src/utils/common/RGBColor.cpp sumo-1.18.0/src/utils/common/RGBColor.cpp
--- sumo-1.17.0/src/utils/common/RGBColor.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/common/RGBColor.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/common/RGBColor.h sumo-1.18.0/src/utils/common/RGBColor.h
--- sumo-1.17.0/src/utils/common/RGBColor.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/common/RGBColor.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/common/ScopedLocker.h sumo-1.18.0/src/utils/common/ScopedLocker.h
--- sumo-1.17.0/src/utils/common/ScopedLocker.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/common/ScopedLocker.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2018-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/common/StaticCommand.h sumo-1.18.0/src/utils/common/StaticCommand.h
--- sumo-1.17.0/src/utils/common/StaticCommand.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/common/StaticCommand.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/common/StdDefs.cpp sumo-1.18.0/src/utils/common/StdDefs.cpp
--- sumo-1.17.0/src/utils/common/StdDefs.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/common/StdDefs.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2014-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/common/StdDefs.h sumo-1.18.0/src/utils/common/StdDefs.h
--- sumo-1.17.0/src/utils/common/StdDefs.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/common/StdDefs.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2005-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -112,14 +112,6 @@
 }
 
 
-template
-inline T
-ISNAN(T a) {
-    volatile T d = a;
-    return d != d;
-}
-
-
 /// the precision for floating point outputs
 extern int gPrecision;
 extern int gPrecisionGeo; // for lon,lat
diff -Nru sumo-1.17.0/src/utils/common/StopWatch.h sumo-1.18.0/src/utils/common/StopWatch.h
--- sumo-1.17.0/src/utils/common/StopWatch.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/common/StopWatch.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2020-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/common/StringBijection.h sumo-1.18.0/src/utils/common/StringBijection.h
--- sumo-1.17.0/src/utils/common/StringBijection.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/common/StringBijection.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2011-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/common/StringTokenizer.cpp sumo-1.18.0/src/utils/common/StringTokenizer.cpp
--- sumo-1.17.0/src/utils/common/StringTokenizer.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/common/StringTokenizer.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/common/StringTokenizer.h sumo-1.18.0/src/utils/common/StringTokenizer.h
--- sumo-1.17.0/src/utils/common/StringTokenizer.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/common/StringTokenizer.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/common/StringUtils.cpp sumo-1.18.0/src/utils/common/StringUtils.cpp
--- sumo-1.17.0/src/utils/common/StringUtils.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/common/StringUtils.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/common/StringUtils.h sumo-1.18.0/src/utils/common/StringUtils.h
--- sumo-1.17.0/src/utils/common/StringUtils.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/common/StringUtils.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -38,34 +38,34 @@
  * @brief Some static methods for string processing
  */
 class StringUtils {
+
 public:
-    /// Removes trailing and leading whitechars
+
+    /// @brief Removes trailing and leading whitechars
     static std::string prune(const std::string& str);
 
-    /// Removes trailing zeros (at most 'max')
+    /// @brief Removes trailing zeros (at most 'max')
     static std::string pruneZeros(const std::string& str, int max);
 
-    /// Transfers the content to lower case
+    /// @brief Transfers the content to lower case
     static std::string to_lower_case(const std::string& str);
 
-    /// Transfers from Latin 1 (ISO-8859-1) to UTF-8
+    /// @brief Transfers from Latin 1 (ISO-8859-1) to UTF-8
     static std::string latin1_to_utf8(std::string str);
 
-    /// Converts german "Umlaute" to their latin-version
+    /// @brief Converts german "Umlaute" to their latin-version
     static std::string convertUmlaute(std::string str);
 
-    /** Replaces all occurrences of the second string by the third
-        string within the first string */
+    /// @brief Replaces all occurrences of the second string by the third string within the first string
     static std::string replace(std::string str, const std::string& what, const std::string& by);
 
-    /** Replaces an environment variable with its value (similar to bash);
-        syntax for a variable is ${NAME} */
+    /// @brief Replaces an environment variable with its value (similar to bash); syntax for a variable is ${NAME}
     static std::string substituteEnvironment(const std::string& str, const std::chrono::time_point* const timeRef = nullptr);
 
-    /// Checks whether a given string starts with the prefix
+    ///@brief  Checks whether a given string starts with the prefix
     static bool startsWith(const std::string& str, const std::string prefix);
 
-    /// Checks whether a given string ends with the suffix
+    /// @brief Checks whether a given string ends with the suffix
     static bool endsWith(const std::string& str, const std::string suffix);
 
     //// @brief pads the given string with padding character up to the given total length
@@ -82,15 +82,19 @@
      */
     static std::string escapeXML(const std::string& orig, const bool maskDoubleHyphen = false);
 
-    /// An empty string
+    /// @brief An empty string
     static std::string emptyString;
 
-    // the following methods stem from http://bogomip.net/blog/cpp-url-encoding-and-decoding/
-
+    /// @brief encode url (stem from http://bogomip.net/blog/cpp-url-encoding-and-decoding/)
     static std::string urlEncode(const std::string& url, const std::string encodeWhich = "");
+
+    /// @brief decode url (stem from http://bogomip.net/blog/cpp-url-encoding-and-decoding/)
     static std::string urlDecode(const std::string& encoded);
 
+    /// @brief char to hexadecimal
     static std::string charToHex(unsigned char c);
+
+    /// @brief hexadecimal to char
     static unsigned char hexToChar(const std::string& str);
 
     /**@brief converts a string into the integer value described by it by calling the char-type converter, which
@@ -133,6 +137,7 @@
      */
     static bool toBool(const std::string& sData);
 
+    /// @brief to version
     static MMVersion toVersion(const std::string& sData);
 
     /**@brief converts a 0-terminated XMLCh* array (usually UTF-16, stemming from Xerces) into std::string in UTF-8
@@ -194,6 +199,5 @@
         }
     }
 
-private:
     static XERCES_CPP_NAMESPACE::XMLLCPTranscoder* myLCPTranscoder;
 };
diff -Nru sumo-1.17.0/src/utils/common/SUMOTime.cpp sumo-1.18.0/src/utils/common/SUMOTime.cpp
--- sumo-1.17.0/src/utils/common/SUMOTime.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/common/SUMOTime.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -15,6 +15,7 @@
 /// @author  Daniel Krajzewicz
 /// @author  Jakob Erdmann
 /// @author  Michael Behrisch
+/// @author  Mirko Barthauer
 /// @date    Fri, 29.04.2005
 ///
 // Variables, methods, and tools for internal time representation
@@ -65,7 +66,7 @@
 
 
 std::string
-time2string(SUMOTime t) {
+time2string(SUMOTime t, bool humanReadable) {
     std::ostringstream oss;
     if (t < 0) {
         oss << "-";
@@ -77,7 +78,7 @@
         t = (t + scale / 2) / scale;
     }
     const SUMOTime second = TIME2STEPS(1) / scale;
-    if (gHumanReadableTime) {
+    if (humanReadable) {
         const SUMOTime minute = 60 * second;
         const SUMOTime hour = 60 * minute;
         const SUMOTime day = 24 * hour;
@@ -106,6 +107,13 @@
     return oss.str();
 }
 
+
+std::string
+time2string(SUMOTime t) {
+    return time2string(t, gHumanReadableTime);
+}
+
+
 std::string
 elapsedMs2string(long long int t) {
     if (gHumanReadableTime) {
@@ -120,9 +128,16 @@
     }
 }
 
-bool checkStepLengthMultiple(const SUMOTime t, const std::string& error, SUMOTime deltaT) {
-    if (t % deltaT != 0) {
-        WRITE_WARNING("The given time value " + time2string(t) + " is not a multiple of the step length " + time2string(deltaT) + error + ".")
+bool checkStepLengthMultiple(const SUMOTime t, const std::string& error, SUMOTime deltaT, SUMOTime begin) {
+    if (begin % deltaT == 0) {
+        if (t % deltaT != 0) {
+            WRITE_WARNING("The given time value " + time2string(t) + " is not a multiple of the step length " + time2string(deltaT) + error + ".")
+        }
+    } else {
+        if ((t - begin) % deltaT != 0) {
+            WRITE_WARNING("The given time value " + time2string(t) + " is not reached with step length " + time2string(deltaT)
+                          + " and begin time " + time2string(begin) + error + ".")
+        }
     }
     // next line used to fix build
     return false;
diff -Nru sumo-1.17.0/src/utils/common/SUMOTime.h sumo-1.18.0/src/utils/common/SUMOTime.h
--- sumo-1.17.0/src/utils/common/SUMOTime.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/common/SUMOTime.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -15,6 +15,7 @@
 /// @author  Daniel Krajzewicz
 /// @author  Jakob Erdmann
 /// @author  Michael Behrisch
+/// @author  Mirko Barthauer
 /// @date    Fri, 29.04.2005
 ///
 // Variables, methods, and tools for internal time representation
@@ -67,11 +68,14 @@
 /// @brief convert string to SUMOTime
 SUMOTime string2time(const std::string& r);
 
-/// @brief convert SUMOTime to string
+/// @brief convert SUMOTime to string (independently of global format setting)
+std::string time2string(SUMOTime t, bool humanReadable);
+
+/// @brief convert SUMOTime to string (using the global format setting)
 std::string time2string(SUMOTime t);
 
 /// @brief convert ms to string for log output
 std::string elapsedMs2string(long long int t);
 
 /// @brief check if given SUMOTime is multiple of the step length
-bool checkStepLengthMultiple(const SUMOTime t, const std::string& error = "", SUMOTime deltaT = DELTA_T);
+bool checkStepLengthMultiple(const SUMOTime t, const std::string& error = "", SUMOTime deltaT = DELTA_T, SUMOTime begin = 0);
diff -Nru sumo-1.17.0/src/utils/common/SUMOVehicleClass.cpp sumo-1.18.0/src/utils/common/SUMOVehicleClass.cpp
--- sumo-1.17.0/src/utils/common/SUMOVehicleClass.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/common/SUMOVehicleClass.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/common/SUMOVehicleClass.h sumo-1.18.0/src/utils/common/SUMOVehicleClass.h
--- sumo-1.17.0/src/utils/common/SUMOVehicleClass.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/common/SUMOVehicleClass.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/common/SystemFrame.cpp sumo-1.18.0/src/utils/common/SystemFrame.cpp
--- sumo-1.17.0/src/utils/common/SystemFrame.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/common/SystemFrame.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -130,8 +130,7 @@
 
 
 bool
-SystemFrame::checkOptions() {
-    OptionsCont& oc = OptionsCont::getOptions();
+SystemFrame::checkOptions(OptionsCont& oc) {
     gPrecision = oc.getInt("precision");
     gPrecisionGeo = oc.getInt("precision.geo");
     gHumanReadableTime = oc.getBool("human-readable-time");
diff -Nru sumo-1.17.0/src/utils/common/SystemFrame.h sumo-1.18.0/src/utils/common/SystemFrame.h
--- sumo-1.17.0/src/utils/common/SystemFrame.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/common/SystemFrame.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -20,11 +20,13 @@
 /****************************************************************************/
 #pragma once
 #include 
+
+
 // ===========================================================================
 // class declarations
 // ===========================================================================
-class OptionsCont;
 
+class OptionsCont;
 
 // ===========================================================================
 // class definitions
@@ -44,6 +46,7 @@
  *  subsystems.
  */
 class SystemFrame {
+
 public:
     /** @brief Adds configuration options to the given container
      *
@@ -52,7 +55,6 @@
      */
     static void addConfigurationOptions(OptionsCont& oc);
 
-
     /** @brief Adds reporting options to the given container
      *
      * @param[in] oc The options container to add the options to
@@ -61,7 +63,7 @@
     static void addReportOptions(OptionsCont& oc);
 
     /// @brief checks shared options and sets StdDefs
-    static bool checkOptions();
+    static bool checkOptions(OptionsCont& oc);
 
     /** @brief Closes all of an applications subsystems
      *
@@ -74,6 +76,4 @@
      * @see MsgHandler::cleanupOnEnd()
      */
     static void close();
-
-
 };
diff -Nru sumo-1.17.0/src/utils/common/SysUtils.cpp sumo-1.18.0/src/utils/common/SysUtils.cpp
--- sumo-1.17.0/src/utils/common/SysUtils.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/common/SysUtils.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2005-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/common/SysUtils.h sumo-1.18.0/src/utils/common/SysUtils.h
--- sumo-1.17.0/src/utils/common/SysUtils.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/common/SysUtils.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/common/ToString.h sumo-1.18.0/src/utils/common/ToString.h
--- sumo-1.17.0/src/utils/common/ToString.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/common/ToString.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2002-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/common/Translation.h sumo-1.18.0/src/utils/common/Translation.h
--- sumo-1.17.0/src/utils/common/Translation.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/common/Translation.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2003-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/common/UtilExceptions.h sumo-1.18.0/src/utils/common/UtilExceptions.h
--- sumo-1.17.0/src/utils/common/UtilExceptions.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/common/UtilExceptions.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/common/ValueRetriever.h sumo-1.18.0/src/utils/common/ValueRetriever.h
--- sumo-1.17.0/src/utils/common/ValueRetriever.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/common/ValueRetriever.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/common/ValueSource.h sumo-1.18.0/src/utils/common/ValueSource.h
--- sumo-1.17.0/src/utils/common/ValueSource.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/common/ValueSource.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/common/ValueTimeLine.h sumo-1.18.0/src/utils/common/ValueTimeLine.h
--- sumo-1.17.0/src/utils/common/ValueTimeLine.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/common/ValueTimeLine.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/common/VectorHelper.h sumo-1.18.0/src/utils/common/VectorHelper.h
--- sumo-1.17.0/src/utils/common/VectorHelper.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/common/VectorHelper.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/common/WrappingCommand.h sumo-1.18.0/src/utils/common/WrappingCommand.h
--- sumo-1.17.0/src/utils/common/WrappingCommand.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/common/WrappingCommand.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/distribution/DistributionCont.cpp sumo-1.18.0/src/utils/distribution/DistributionCont.cpp
--- sumo-1.17.0/src/utils/distribution/DistributionCont.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/distribution/DistributionCont.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/distribution/DistributionCont.h sumo-1.18.0/src/utils/distribution/DistributionCont.h
--- sumo-1.17.0/src/utils/distribution/DistributionCont.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/distribution/DistributionCont.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/distribution/Distribution.h sumo-1.18.0/src/utils/distribution/Distribution.h
--- sumo-1.17.0/src/utils/distribution/Distribution.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/distribution/Distribution.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/distribution/Distribution_Parameterized.cpp sumo-1.18.0/src/utils/distribution/Distribution_Parameterized.cpp
--- sumo-1.17.0/src/utils/distribution/Distribution_Parameterized.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/distribution/Distribution_Parameterized.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/distribution/Distribution_Parameterized.h sumo-1.18.0/src/utils/distribution/Distribution_Parameterized.h
--- sumo-1.17.0/src/utils/distribution/Distribution_Parameterized.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/distribution/Distribution_Parameterized.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/distribution/Distribution_Points.cpp sumo-1.18.0/src/utils/distribution/Distribution_Points.cpp
--- sumo-1.17.0/src/utils/distribution/Distribution_Points.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/distribution/Distribution_Points.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/distribution/Distribution_Points.h sumo-1.18.0/src/utils/distribution/Distribution_Points.h
--- sumo-1.17.0/src/utils/distribution/Distribution_Points.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/distribution/Distribution_Points.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/distribution/RandomDistributor.h sumo-1.18.0/src/utils/distribution/RandomDistributor.h
--- sumo-1.17.0/src/utils/distribution/RandomDistributor.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/distribution/RandomDistributor.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2005-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/emissions/CharacteristicMap.cpp sumo-1.18.0/src/utils/emissions/CharacteristicMap.cpp
--- sumo-1.17.0/src/utils/emissions/CharacteristicMap.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/emissions/CharacteristicMap.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2002-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/emissions/CharacteristicMap.h sumo-1.18.0/src/utils/emissions/CharacteristicMap.h
--- sumo-1.17.0/src/utils/emissions/CharacteristicMap.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/emissions/CharacteristicMap.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2002-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/emissions/EnergyParams.cpp sumo-1.18.0/src/utils/emissions/EnergyParams.cpp
--- sumo-1.17.0/src/utils/emissions/EnergyParams.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/emissions/EnergyParams.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/emissions/EnergyParams.h sumo-1.18.0/src/utils/emissions/EnergyParams.h
--- sumo-1.17.0/src/utils/emissions/EnergyParams.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/emissions/EnergyParams.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2002-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/emissions/HelpersEnergy.cpp sumo-1.18.0/src/utils/emissions/HelpersEnergy.cpp
--- sumo-1.17.0/src/utils/emissions/HelpersEnergy.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/emissions/HelpersEnergy.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/emissions/HelpersEnergy.h sumo-1.18.0/src/utils/emissions/HelpersEnergy.h
--- sumo-1.17.0/src/utils/emissions/HelpersEnergy.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/emissions/HelpersEnergy.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/emissions/HelpersHarmonoise.cpp sumo-1.18.0/src/utils/emissions/HelpersHarmonoise.cpp
--- sumo-1.17.0/src/utils/emissions/HelpersHarmonoise.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/emissions/HelpersHarmonoise.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/emissions/HelpersHarmonoise.h sumo-1.18.0/src/utils/emissions/HelpersHarmonoise.h
--- sumo-1.17.0/src/utils/emissions/HelpersHarmonoise.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/emissions/HelpersHarmonoise.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/emissions/HelpersHBEFA3.cpp sumo-1.18.0/src/utils/emissions/HelpersHBEFA3.cpp
--- sumo-1.17.0/src/utils/emissions/HelpersHBEFA3.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/emissions/HelpersHBEFA3.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/emissions/HelpersHBEFA3.h sumo-1.18.0/src/utils/emissions/HelpersHBEFA3.h
--- sumo-1.17.0/src/utils/emissions/HelpersHBEFA3.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/emissions/HelpersHBEFA3.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/emissions/HelpersHBEFA4.cpp sumo-1.18.0/src/utils/emissions/HelpersHBEFA4.cpp
--- sumo-1.17.0/src/utils/emissions/HelpersHBEFA4.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/emissions/HelpersHBEFA4.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -36,592 +36,592 @@
 HelpersHBEFA4::myFunctionParameter[833][7][7] = {
     {
         // PC_petrol_ltECE
-        { 1.707e+03, 4.273e+00, 1.044e+03, 0.000e+00, 3.337e-03, 3.289e+01, 4.593e-01 }, // CO2(total)
-        { 1.002e+02, 9.894e-01, 0.000e+00, 0.000e+00, 2.739e-04, 0.000e+00, 9.287e-02 }, // CO
-        { 3.049e+01, 4.899e-02, 1.458e+00, 0.000e+00, 1.002e-05, 0.000e+00, 2.994e-03 }, // HC
-        { 5.532e+02, 1.385e+00, 3.384e+02, 0.000e+00, 1.082e-03, 1.066e+01, 1.489e-01 }, // FC
-        { 1.485e+00, 4.048e-01, 1.015e+01, 0.000e+00, 1.317e-05, 7.177e-01, 0.000e+00 }, // NOx
-        { 0.000e+00, 7.185e-03, 0.000e+00, 9.561e-06, 6.294e-07, 0.000e+00, 1.752e-04 }, // PM + PM (non-exhaust)
+        { 1.707e+03, 1.538e+01, 1.044e+03, 0.000e+00, 1.557e-01, 1.184e+02, 5.952e+00 }, // CO2(total)
+        { 1.002e+02, 3.562e+00, 0.000e+00, 0.000e+00, 1.278e-02, 0.000e+00, 1.204e+00 }, // CO
+        { 3.049e+01, 1.764e-01, 1.458e+00, 0.000e+00, 4.676e-04, 0.000e+00, 3.881e-02 }, // HC
+        { 5.532e+02, 4.987e+00, 3.384e+02, 0.000e+00, 5.047e-02, 3.839e+01, 1.930e+00 }, // FC
+        { 1.485e+00, 1.457e+00, 1.015e+01, 0.000e+00, 6.143e-04, 2.584e+00, 0.000e+00 }, // NOx
+        { 0.000e+00, 2.587e-02, 0.000e+00, 1.239e-04, 2.936e-05, 0.000e+00, 2.271e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // PC_petrol_ECE-15_00
-        { 1.707e+03, 4.273e+00, 1.044e+03, 0.000e+00, 3.337e-03, 3.289e+01, 4.593e-01 }, // CO2(total)
-        { 1.002e+02, 9.894e-01, 0.000e+00, 0.000e+00, 2.739e-04, 0.000e+00, 9.287e-02 }, // CO
-        { 2.492e+01, 9.682e-02, 1.567e+00, 0.000e+00, 6.369e-06, 0.000e+00, 2.627e-03 }, // HC
-        { 5.532e+02, 1.385e+00, 3.384e+02, 0.000e+00, 1.082e-03, 1.066e+01, 1.489e-01 }, // FC
-        { 1.485e+00, 4.048e-01, 1.015e+01, 0.000e+00, 1.317e-05, 7.177e-01, 0.000e+00 }, // NOx
-        { 0.000e+00, 7.185e-03, 0.000e+00, 9.561e-06, 6.294e-07, 0.000e+00, 1.752e-04 }, // PM + PM (non-exhaust)
+        { 1.707e+03, 1.538e+01, 1.044e+03, 0.000e+00, 1.557e-01, 1.184e+02, 5.952e+00 }, // CO2(total)
+        { 1.002e+02, 3.562e+00, 0.000e+00, 0.000e+00, 1.278e-02, 0.000e+00, 1.204e+00 }, // CO
+        { 2.492e+01, 3.486e-01, 1.567e+00, 0.000e+00, 2.971e-04, 0.000e+00, 3.404e-02 }, // HC
+        { 5.532e+02, 4.987e+00, 3.384e+02, 0.000e+00, 5.047e-02, 3.839e+01, 1.930e+00 }, // FC
+        { 1.485e+00, 1.457e+00, 1.015e+01, 0.000e+00, 6.143e-04, 2.584e+00, 0.000e+00 }, // NOx
+        { 0.000e+00, 2.587e-02, 0.000e+00, 1.239e-04, 2.936e-05, 0.000e+00, 2.271e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // PC_petrol_ECE-15_01_02
-        { 1.707e+03, 4.273e+00, 1.044e+03, 0.000e+00, 3.337e-03, 3.289e+01, 4.593e-01 }, // CO2(total)
-        { 1.002e+02, 9.894e-01, 0.000e+00, 0.000e+00, 2.739e-04, 0.000e+00, 9.287e-02 }, // CO
-        { 2.055e+01, 4.028e-02, 5.129e-01, 0.000e+00, 7.982e-06, 0.000e+00, 2.225e-03 }, // HC
-        { 5.532e+02, 1.385e+00, 3.384e+02, 0.000e+00, 1.082e-03, 1.066e+01, 1.489e-01 }, // FC
-        { 1.485e+00, 4.048e-01, 1.015e+01, 0.000e+00, 1.317e-05, 7.177e-01, 0.000e+00 }, // NOx
-        { 0.000e+00, 7.185e-03, 0.000e+00, 9.561e-06, 6.294e-07, 0.000e+00, 1.752e-04 }, // PM + PM (non-exhaust)
+        { 1.707e+03, 1.538e+01, 1.044e+03, 0.000e+00, 1.557e-01, 1.184e+02, 5.952e+00 }, // CO2(total)
+        { 1.002e+02, 3.562e+00, 0.000e+00, 0.000e+00, 1.278e-02, 0.000e+00, 1.204e+00 }, // CO
+        { 2.055e+01, 1.450e-01, 5.129e-01, 0.000e+00, 3.724e-04, 0.000e+00, 2.883e-02 }, // HC
+        { 5.532e+02, 4.987e+00, 3.384e+02, 0.000e+00, 5.047e-02, 3.839e+01, 1.930e+00 }, // FC
+        { 1.485e+00, 1.457e+00, 1.015e+01, 0.000e+00, 6.143e-04, 2.584e+00, 0.000e+00 }, // NOx
+        { 0.000e+00, 2.587e-02, 0.000e+00, 1.239e-04, 2.936e-05, 0.000e+00, 2.271e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // PC_petrol_ECE-15_03
-        { 1.707e+03, 4.273e+00, 1.044e+03, 0.000e+00, 3.337e-03, 3.289e+01, 4.593e-01 }, // CO2(total)
-        { 1.002e+02, 9.894e-01, 0.000e+00, 0.000e+00, 2.739e-04, 0.000e+00, 9.287e-02 }, // CO
-        { 1.902e+01, 0.000e+00, 5.154e-01, 0.000e+00, 7.777e-06, 0.000e+00, 1.832e-03 }, // HC
-        { 5.532e+02, 1.385e+00, 3.384e+02, 0.000e+00, 1.082e-03, 1.066e+01, 1.489e-01 }, // FC
-        { 3.605e+00, 3.425e-01, 5.448e+00, 0.000e+00, 2.012e-05, 8.182e-01, 0.000e+00 }, // NOx
-        { 0.000e+00, 7.185e-03, 0.000e+00, 9.561e-06, 6.294e-07, 0.000e+00, 1.752e-04 }, // PM + PM (non-exhaust)
+        { 1.707e+03, 1.538e+01, 1.044e+03, 0.000e+00, 1.557e-01, 1.184e+02, 5.952e+00 }, // CO2(total)
+        { 1.002e+02, 3.562e+00, 0.000e+00, 0.000e+00, 1.278e-02, 0.000e+00, 1.204e+00 }, // CO
+        { 1.902e+01, 0.000e+00, 5.154e-01, 0.000e+00, 3.629e-04, 0.000e+00, 2.375e-02 }, // HC
+        { 5.532e+02, 4.987e+00, 3.384e+02, 0.000e+00, 5.047e-02, 3.839e+01, 1.930e+00 }, // FC
+        { 3.605e+00, 1.233e+00, 5.448e+00, 0.000e+00, 9.386e-04, 2.946e+00, 0.000e+00 }, // NOx
+        { 0.000e+00, 2.587e-02, 0.000e+00, 1.239e-04, 2.936e-05, 0.000e+00, 2.271e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // PC_petrol_ECE-15_04
-        { 1.700e+03, 4.256e+00, 1.040e+03, 0.000e+00, 3.323e-03, 3.276e+01, 4.574e-01 }, // CO2(total)
-        { 1.180e+02, 0.000e+00, 0.000e+00, 0.000e+00, 2.099e-04, 0.000e+00, 6.440e-02 }, // CO
-        { 1.803e+01, 0.000e+00, 1.333e+00, 0.000e+00, 5.001e-06, 0.000e+00, 1.436e-03 }, // HC
-        { 5.510e+02, 1.380e+00, 3.371e+02, 0.000e+00, 1.077e-03, 1.062e+01, 1.483e-01 }, // FC
-        { 4.077e+00, 2.931e-01, 2.500e+00, 0.000e+00, 2.193e-05, 8.126e-01, 0.000e+00 }, // NOx
-        { 0.000e+00, 7.185e-03, 0.000e+00, 9.561e-06, 6.294e-07, 0.000e+00, 1.752e-04 }, // PM + PM (non-exhaust)
+        { 1.700e+03, 1.532e+01, 1.040e+03, 0.000e+00, 1.551e-01, 1.179e+02, 5.928e+00 }, // CO2(total)
+        { 1.180e+02, 0.000e+00, 0.000e+00, 0.000e+00, 9.794e-03, 0.000e+00, 8.346e-01 }, // CO
+        { 1.803e+01, 0.000e+00, 1.333e+00, 0.000e+00, 2.333e-04, 0.000e+00, 1.861e-02 }, // HC
+        { 5.510e+02, 4.967e+00, 3.371e+02, 0.000e+00, 5.026e-02, 3.823e+01, 1.922e+00 }, // FC
+        { 4.077e+00, 1.055e+00, 2.500e+00, 0.000e+00, 1.023e-03, 2.925e+00, 0.000e+00 }, // NOx
+        { 0.000e+00, 2.587e-02, 0.000e+00, 1.239e-04, 2.936e-05, 0.000e+00, 2.271e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // PC_petrol_AGV82_(CH)
-        { 1.700e+03, 4.256e+00, 1.040e+03, 0.000e+00, 3.323e-03, 3.276e+01, 4.574e-01 }, // CO2(total)
-        { 5.618e+01, 0.000e+00, 0.000e+00, 0.000e+00, 1.552e-04, 0.000e+00, 4.268e-02 }, // CO
-        { 1.198e+01, 7.379e-02, 1.548e+00, 0.000e+00, 8.463e-07, 0.000e+00, 1.153e-03 }, // HC
-        { 5.510e+02, 1.380e+00, 3.371e+02, 0.000e+00, 1.077e-03, 1.062e+01, 1.483e-01 }, // FC
-        { 2.175e+00, 1.692e-01, 0.000e+00, 0.000e+00, 1.894e-05, 5.789e-01, 0.000e+00 }, // NOx
-        { 0.000e+00, 7.185e-03, 0.000e+00, 9.561e-06, 6.294e-07, 0.000e+00, 1.752e-04 }, // PM + PM (non-exhaust)
+        { 1.700e+03, 1.532e+01, 1.040e+03, 0.000e+00, 1.551e-01, 1.179e+02, 5.928e+00 }, // CO2(total)
+        { 5.618e+01, 0.000e+00, 0.000e+00, 0.000e+00, 7.241e-03, 0.000e+00, 5.531e-01 }, // CO
+        { 1.198e+01, 2.656e-01, 1.548e+00, 0.000e+00, 3.948e-05, 0.000e+00, 1.494e-02 }, // HC
+        { 5.510e+02, 4.967e+00, 3.371e+02, 0.000e+00, 5.026e-02, 3.823e+01, 1.922e+00 }, // FC
+        { 2.175e+00, 6.090e-01, 0.000e+00, 0.000e+00, 8.836e-04, 2.084e+00, 0.000e+00 }, // NOx
+        { 0.000e+00, 2.587e-02, 0.000e+00, 1.239e-04, 2.936e-05, 0.000e+00, 2.271e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // PC_petrol_conv_other_concepts
-        { 1.700e+03, 4.256e+00, 1.040e+03, 0.000e+00, 3.323e-03, 3.276e+01, 4.574e-01 }, // CO2(total)
-        { 5.618e+01, 0.000e+00, 0.000e+00, 0.000e+00, 1.552e-04, 0.000e+00, 4.268e-02 }, // CO
-        { 1.198e+01, 7.379e-02, 1.548e+00, 0.000e+00, 8.463e-07, 0.000e+00, 1.153e-03 }, // HC
-        { 5.510e+02, 1.380e+00, 3.371e+02, 0.000e+00, 1.077e-03, 1.062e+01, 1.483e-01 }, // FC
-        { 2.175e+00, 1.692e-01, 0.000e+00, 0.000e+00, 1.894e-05, 5.789e-01, 0.000e+00 }, // NOx
-        { 0.000e+00, 7.185e-03, 0.000e+00, 9.561e-06, 6.294e-07, 0.000e+00, 1.752e-04 }, // PM + PM (non-exhaust)
+        { 1.700e+03, 1.532e+01, 1.040e+03, 0.000e+00, 1.551e-01, 1.179e+02, 5.928e+00 }, // CO2(total)
+        { 5.618e+01, 0.000e+00, 0.000e+00, 0.000e+00, 7.241e-03, 0.000e+00, 5.531e-01 }, // CO
+        { 1.198e+01, 2.656e-01, 1.548e+00, 0.000e+00, 3.948e-05, 0.000e+00, 1.494e-02 }, // HC
+        { 5.510e+02, 4.967e+00, 3.371e+02, 0.000e+00, 5.026e-02, 3.823e+01, 1.922e+00 }, // FC
+        { 2.175e+00, 6.090e-01, 0.000e+00, 0.000e+00, 8.836e-04, 2.084e+00, 0.000e+00 }, // NOx
+        { 0.000e+00, 2.587e-02, 0.000e+00, 1.239e-04, 2.936e-05, 0.000e+00, 2.271e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // PC_petrol_Ucat
-        { 1.700e+03, 4.256e+00, 1.040e+03, 0.000e+00, 3.323e-03, 3.276e+01, 4.574e-01 }, // CO2(total)
-        { 8.337e+01, 0.000e+00, 0.000e+00, 0.000e+00, 1.651e-04, 0.000e+00, 4.858e-02 }, // CO
-        { 6.410e+00, 0.000e+00, 4.668e-01, 0.000e+00, 1.701e-06, 0.000e+00, 5.005e-04 }, // HC
-        { 5.510e+02, 1.380e+00, 3.371e+02, 0.000e+00, 1.077e-03, 1.062e+01, 1.483e-01 }, // FC
-        { 2.846e-01, 1.625e-01, 0.000e+00, 0.000e+00, 1.426e-05, 4.655e-01, 0.000e+00 }, // NOx
-        { 0.000e+00, 7.185e-03, 0.000e+00, 9.561e-06, 6.294e-07, 0.000e+00, 1.752e-04 }, // PM + PM (non-exhaust)
+        { 1.700e+03, 1.532e+01, 1.040e+03, 0.000e+00, 1.551e-01, 1.179e+02, 5.928e+00 }, // CO2(total)
+        { 8.337e+01, 0.000e+00, 0.000e+00, 0.000e+00, 7.702e-03, 0.000e+00, 6.296e-01 }, // CO
+        { 6.410e+00, 0.000e+00, 4.668e-01, 0.000e+00, 7.934e-05, 0.000e+00, 6.487e-03 }, // HC
+        { 5.510e+02, 4.967e+00, 3.371e+02, 0.000e+00, 5.026e-02, 3.823e+01, 1.922e+00 }, // FC
+        { 2.846e-01, 5.850e-01, 0.000e+00, 0.000e+00, 6.654e-04, 1.676e+00, 0.000e+00 }, // NOx
+        { 0.000e+00, 2.587e-02, 0.000e+00, 1.239e-04, 2.936e-05, 0.000e+00, 2.271e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // PC_petrol_Euro-1
-        { 1.568e+03, 4.851e+00, 7.128e+02, 0.000e+00, 2.967e-03, 3.916e+01, 3.280e-01 }, // CO2(total)
-        { 9.562e-01, 0.000e+00, 0.000e+00, 0.000e+00, 6.812e-05, 0.000e+00, 1.896e-02 }, // CO
-        { 1.147e+00, 0.000e+00, 6.498e-01, 0.000e+00, 2.179e-06, 0.000e+00, 6.650e-04 }, // HC
-        { 5.084e+02, 1.573e+00, 2.311e+02, 0.000e+00, 9.620e-04, 1.270e+01, 1.063e-01 }, // FC
-        { 2.363e+00, 0.000e+00, 0.000e+00, 5.138e-04, 3.995e-06, 8.941e-02, 4.265e-04 }, // NOx
-        { 0.000e+00, 7.192e-03, 0.000e+00, 9.480e-06, 3.868e-07, 0.000e+00, 9.584e-05 }, // PM + PM (non-exhaust)
+        { 1.568e+03, 1.746e+01, 7.128e+02, 0.000e+00, 1.384e-01, 1.410e+02, 4.251e+00 }, // CO2(total)
+        { 9.562e-01, 0.000e+00, 0.000e+00, 0.000e+00, 3.178e-03, 0.000e+00, 2.457e-01 }, // CO
+        { 1.147e+00, 0.000e+00, 6.498e-01, 0.000e+00, 1.017e-04, 0.000e+00, 8.618e-03 }, // HC
+        { 5.084e+02, 5.661e+00, 2.311e+02, 0.000e+00, 4.488e-02, 4.570e+01, 1.378e+00 }, // FC
+        { 2.363e+00, 0.000e+00, 0.000e+00, 6.659e-03, 1.864e-04, 3.219e-01, 5.528e-03 }, // NOx
+        { 0.000e+00, 2.589e-02, 0.000e+00, 1.229e-04, 1.805e-05, 0.000e+00, 1.242e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // PC_petrol_PreEuro_3WCat_lt1987
-        { 1.591e+03, 4.920e+00, 7.230e+02, 0.000e+00, 3.010e-03, 3.972e+01, 3.326e-01 }, // CO2(total)
-        { 9.562e-01, 0.000e+00, 0.000e+00, 0.000e+00, 6.812e-05, 0.000e+00, 1.896e-02 }, // CO
-        { 1.147e+00, 0.000e+00, 6.498e-01, 0.000e+00, 2.179e-06, 0.000e+00, 6.650e-04 }, // HC
-        { 5.157e+02, 1.595e+00, 2.344e+02, 0.000e+00, 9.757e-04, 1.288e+01, 1.078e-01 }, // FC
-        { 2.363e+00, 0.000e+00, 0.000e+00, 5.138e-04, 3.995e-06, 8.941e-02, 4.265e-04 }, // NOx
-        { 0.000e+00, 7.192e-03, 0.000e+00, 9.480e-06, 3.868e-07, 0.000e+00, 9.584e-05 }, // PM + PM (non-exhaust)
+        { 1.591e+03, 1.771e+01, 7.230e+02, 0.000e+00, 1.404e-01, 1.430e+02, 4.311e+00 }, // CO2(total)
+        { 9.562e-01, 0.000e+00, 0.000e+00, 0.000e+00, 3.178e-03, 0.000e+00, 2.457e-01 }, // CO
+        { 1.147e+00, 0.000e+00, 6.498e-01, 0.000e+00, 1.017e-04, 0.000e+00, 8.618e-03 }, // HC
+        { 5.157e+02, 5.742e+00, 2.344e+02, 0.000e+00, 4.552e-02, 4.635e+01, 1.398e+00 }, // FC
+        { 2.363e+00, 0.000e+00, 0.000e+00, 6.659e-03, 1.864e-04, 3.219e-01, 5.528e-03 }, // NOx
+        { 0.000e+00, 2.589e-02, 0.000e+00, 1.229e-04, 1.805e-05, 0.000e+00, 1.242e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // PC_petrol_PreEuro_3WCat_1987-90
-        { 1.567e+03, 4.847e+00, 7.123e+02, 0.000e+00, 2.965e-03, 3.913e+01, 3.277e-01 }, // CO2(total)
-        { 9.562e-01, 0.000e+00, 0.000e+00, 0.000e+00, 6.812e-05, 0.000e+00, 1.896e-02 }, // CO
-        { 1.147e+00, 0.000e+00, 6.498e-01, 0.000e+00, 2.179e-06, 0.000e+00, 6.650e-04 }, // HC
-        { 5.081e+02, 1.571e+00, 2.309e+02, 0.000e+00, 9.613e-04, 1.269e+01, 1.062e-01 }, // FC
-        { 2.363e+00, 0.000e+00, 0.000e+00, 5.138e-04, 3.995e-06, 8.941e-02, 4.265e-04 }, // NOx
-        { 0.000e+00, 7.192e-03, 0.000e+00, 9.480e-06, 3.868e-07, 0.000e+00, 9.584e-05 }, // PM + PM (non-exhaust)
+        { 1.567e+03, 1.745e+01, 7.123e+02, 0.000e+00, 1.383e-01, 1.409e+02, 4.247e+00 }, // CO2(total)
+        { 9.562e-01, 0.000e+00, 0.000e+00, 0.000e+00, 3.178e-03, 0.000e+00, 2.457e-01 }, // CO
+        { 1.147e+00, 0.000e+00, 6.498e-01, 0.000e+00, 1.017e-04, 0.000e+00, 8.618e-03 }, // HC
+        { 5.081e+02, 5.657e+00, 2.309e+02, 0.000e+00, 4.485e-02, 4.567e+01, 1.377e+00 }, // FC
+        { 2.363e+00, 0.000e+00, 0.000e+00, 6.659e-03, 1.864e-04, 3.219e-01, 5.528e-03 }, // NOx
+        { 0.000e+00, 2.589e-02, 0.000e+00, 1.229e-04, 1.805e-05, 0.000e+00, 1.242e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // PC_petrol_Euro-2
-        { 1.578e+03, 4.626e+00, 7.018e+02, 0.000e+00, 2.839e-03, 3.820e+01, 3.097e-01 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.003e-04, 0.000e+00, 2.816e-02 }, // CO
-        { 0.000e+00, 9.010e-03, 0.000e+00, 4.054e-05, 0.000e+00, 1.839e-02, 7.316e-05 }, // HC
-        { 5.116e+02, 1.500e+00, 2.275e+02, 0.000e+00, 9.203e-04, 1.238e+01, 1.004e-01 }, // FC
-        { 1.586e+00, 0.000e+00, 0.000e+00, 0.000e+00, 3.688e-06, 0.000e+00, 6.785e-04 }, // NOx
-        { 0.000e+00, 7.192e-03, 0.000e+00, 9.477e-06, 6.375e-07, 0.000e+00, 1.651e-04 }, // PM + PM (non-exhaust)
+        { 1.578e+03, 1.665e+01, 7.018e+02, 0.000e+00, 1.324e-01, 1.375e+02, 4.013e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 4.679e-03, 0.000e+00, 3.649e-01 }, // CO
+        { 0.000e+00, 3.243e-02, 0.000e+00, 5.254e-04, 0.000e+00, 6.622e-02, 9.482e-04 }, // HC
+        { 5.116e+02, 5.399e+00, 2.275e+02, 0.000e+00, 4.294e-02, 4.458e+01, 1.301e+00 }, // FC
+        { 1.586e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.721e-04, 0.000e+00, 8.793e-03 }, // NOx
+        { 0.000e+00, 2.589e-02, 0.000e+00, 1.228e-04, 2.974e-05, 0.000e+00, 2.139e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // PC_petrol_Euro-3
-        { 1.515e+03, 4.462e+00, 6.912e+02, 0.000e+00, 2.668e-03, 3.616e+01, 2.940e-01 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 9.516e-05, 0.000e+00, 2.698e-02 }, // CO
-        { 7.401e-02, 0.000e+00, 0.000e+00, 0.000e+00, 8.081e-07, 0.000e+00, 2.119e-04 }, // HC
-        { 4.912e+02, 1.446e+00, 2.241e+02, 0.000e+00, 8.648e-04, 1.172e+01, 9.532e-02 }, // FC
-        { 4.919e-01, 0.000e+00, 0.000e+00, 0.000e+00, 1.120e-06, 0.000e+00, 2.056e-04 }, // NOx
-        { 0.000e+00, 7.193e-03, 0.000e+00, 9.470e-06, 2.254e-07, 0.000e+00, 5.470e-05 }, // PM + PM (non-exhaust)
+        { 1.515e+03, 1.606e+01, 6.912e+02, 0.000e+00, 1.245e-01, 1.302e+02, 3.811e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 4.440e-03, 0.000e+00, 3.497e-01 }, // CO
+        { 7.401e-02, 0.000e+00, 0.000e+00, 0.000e+00, 3.770e-05, 0.000e+00, 2.746e-03 }, // HC
+        { 4.912e+02, 5.207e+00, 2.241e+02, 0.000e+00, 4.035e-02, 4.220e+01, 1.235e+00 }, // FC
+        { 4.919e-01, 0.000e+00, 0.000e+00, 0.000e+00, 5.224e-05, 0.000e+00, 2.665e-03 }, // NOx
+        { 0.000e+00, 2.589e-02, 0.000e+00, 1.227e-04, 1.052e-05, 0.000e+00, 7.089e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // PC_petrol_Euro-4
-        { 1.521e+03, 4.330e+00, 6.951e+02, 0.000e+00, 2.570e-03, 3.681e+01, 2.650e-01 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 6.556e-05, 0.000e+00, 1.413e-02 }, // CO
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 4.569e-07, 0.000e+00, 9.278e-05 }, // HC
-        { 4.931e+02, 1.404e+00, 2.253e+02, 0.000e+00, 8.332e-04, 1.193e+01, 8.589e-02 }, // FC
-        { 6.117e-01, 0.000e+00, 0.000e+00, 0.000e+00, 1.176e-06, 1.205e-02, 2.104e-04 }, // NOx
-        { 0.000e+00, 7.192e-03, 0.000e+00, 9.481e-06, 1.222e-07, 0.000e+00, 2.793e-05 }, // PM + PM (non-exhaust)
+        { 1.521e+03, 1.559e+01, 6.951e+02, 0.000e+00, 1.199e-01, 1.325e+02, 3.434e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 3.059e-03, 0.000e+00, 1.832e-01 }, // CO
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 2.132e-05, 0.000e+00, 1.202e-03 }, // HC
+        { 4.931e+02, 5.054e+00, 2.253e+02, 0.000e+00, 3.887e-02, 4.296e+01, 1.113e+00 }, // FC
+        { 6.117e-01, 0.000e+00, 0.000e+00, 0.000e+00, 5.485e-05, 4.339e-02, 2.726e-03 }, // NOx
+        { 0.000e+00, 2.589e-02, 0.000e+00, 1.229e-04, 5.704e-06, 0.000e+00, 3.620e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // PC_petrol_Euro-5
-        { 1.391e+03, 4.820e+00, 6.968e+02, 0.000e+00, 2.288e-03, 3.309e+01, 2.476e-01 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 7.794e-05, 0.000e+00, 2.193e-02 }, // CO
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 5.023e-07, 0.000e+00, 1.208e-04 }, // HC
-        { 4.510e+02, 1.563e+00, 2.259e+02, 0.000e+00, 7.416e-04, 1.073e+01, 8.026e-02 }, // FC
-        { 3.233e-01, 0.000e+00, 1.097e-01, 0.000e+00, 1.309e-07, 0.000e+00, 4.408e-05 }, // NOx
-        { 7.254e-03, 7.196e-03, 0.000e+00, 9.428e-06, 6.735e-08, 1.733e-04, 1.046e-05 }, // PM + PM (non-exhaust)
+        { 1.391e+03, 1.735e+01, 6.968e+02, 0.000e+00, 1.067e-01, 1.191e+02, 3.209e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 3.636e-03, 0.000e+00, 2.842e-01 }, // CO
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 2.343e-05, 0.000e+00, 1.566e-03 }, // HC
+        { 4.510e+02, 5.626e+00, 2.259e+02, 0.000e+00, 3.460e-02, 3.862e+01, 1.040e+00 }, // FC
+        { 3.233e-01, 0.000e+00, 1.097e-01, 0.000e+00, 6.108e-06, 0.000e+00, 5.713e-04 }, // NOx
+        { 7.254e-03, 2.591e-02, 0.000e+00, 1.222e-04, 3.142e-06, 6.239e-04, 1.355e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // PC_petrol_Euro-6ab
-        { 1.415e+03, 5.459e+00, 8.683e+02, 0.000e+00, 2.072e-03, 2.827e+01, 2.663e-01 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 3.017e-05, 0.000e+00, 7.738e-03 }, // CO
-        { 2.848e-02, 0.000e+00, 0.000e+00, 0.000e+00, 2.194e-07, 0.000e+00, 5.598e-05 }, // HC
-        { 4.588e+02, 1.770e+00, 2.815e+02, 0.000e+00, 6.716e-04, 9.165e+00, 8.634e-02 }, // FC
-        { 4.354e-01, 1.959e-03, 5.637e-01, 0.000e+00, 2.008e-07, 0.000e+00, 6.136e-05 }, // NOx
-        { 1.255e-02, 7.201e-03, 4.491e-03, 9.372e-06, 1.186e-08, 1.212e-06, 1.596e-08 }, // PM + PM (non-exhaust)
+        { 1.415e+03, 1.965e+01, 8.683e+02, 0.000e+00, 9.666e-02, 1.018e+02, 3.452e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.408e-03, 0.000e+00, 1.003e-01 }, // CO
+        { 2.848e-02, 0.000e+00, 0.000e+00, 0.000e+00, 1.024e-05, 0.000e+00, 7.255e-04 }, // HC
+        { 4.588e+02, 6.371e+00, 2.815e+02, 0.000e+00, 3.133e-02, 3.299e+01, 1.119e+00 }, // FC
+        { 4.354e-01, 7.053e-03, 5.637e-01, 0.000e+00, 9.367e-06, 0.000e+00, 7.952e-04 }, // NOx
+        { 1.255e-02, 2.592e-02, 4.491e-03, 1.215e-04, 5.535e-07, 4.365e-06, 2.068e-07 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // PC_petrol_Euro-6c
-        { 1.465e+03, 5.753e+00, 8.826e+02, 0.000e+00, 2.119e-03, 2.983e+01, 2.681e-01 }, // CO2(total)
-        { 8.851e-02, 0.000e+00, 0.000e+00, 0.000e+00, 1.655e-05, 0.000e+00, 4.079e-03 }, // CO
-        { 4.523e-03, 0.000e+00, 0.000e+00, 0.000e+00, 9.489e-08, 0.000e+00, 2.595e-05 }, // HC
-        { 4.750e+02, 1.865e+00, 2.861e+02, 0.000e+00, 6.869e-04, 9.670e+00, 8.691e-02 }, // FC
-        { 1.596e-01, 0.000e+00, 0.000e+00, 0.000e+00, 1.987e-07, 0.000e+00, 6.113e-05 }, // NOx
-        { 4.899e-03, 7.202e-03, 0.000e+00, 9.666e-06, 0.000e+00, 2.577e-05, 1.549e-08 }, // PM + PM (non-exhaust)
+        { 1.465e+03, 2.071e+01, 8.826e+02, 0.000e+00, 9.886e-02, 1.074e+02, 3.474e+00 }, // CO2(total)
+        { 8.851e-02, 0.000e+00, 0.000e+00, 0.000e+00, 7.724e-04, 0.000e+00, 5.287e-02 }, // CO
+        { 4.523e-03, 0.000e+00, 0.000e+00, 0.000e+00, 4.427e-06, 0.000e+00, 3.364e-04 }, // HC
+        { 4.750e+02, 6.714e+00, 2.861e+02, 0.000e+00, 3.205e-02, 3.481e+01, 1.126e+00 }, // FC
+        { 1.596e-01, 0.000e+00, 0.000e+00, 0.000e+00, 9.269e-06, 0.000e+00, 7.923e-04 }, // NOx
+        { 4.899e-03, 2.593e-02, 0.000e+00, 1.253e-04, 0.000e+00, 9.278e-05, 2.007e-07 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // PC_petrol_Euro-6d-temp
-        { 1.498e+03, 6.909e+00, 8.713e+02, 0.000e+00, 2.173e-03, 3.454e+01, 2.607e-01 }, // CO2(total)
-        { 2.929e+00, 0.000e+00, 0.000e+00, 0.000e+00, 9.008e-06, 0.000e+00, 2.423e-03 }, // CO
-        { 2.228e-02, 0.000e+00, 0.000e+00, 9.268e-06, 8.179e-08, 2.703e-03, 0.000e+00 }, // HC
-        { 4.855e+02, 2.240e+00, 2.825e+02, 0.000e+00, 7.045e-04, 1.120e+01, 8.450e-02 }, // FC
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.341e-06, 0.000e+00, 3.360e-04 }, // NOx
-        { 0.000e+00, 7.378e-03, 8.411e-03, 1.156e-05, 0.000e+00, 3.629e-04, 1.380e-08 }, // PM + PM (non-exhaust)
+        { 1.498e+03, 2.487e+01, 8.713e+02, 0.000e+00, 1.014e-01, 1.244e+02, 3.378e+00 }, // CO2(total)
+        { 2.929e+00, 0.000e+00, 0.000e+00, 0.000e+00, 4.203e-04, 0.000e+00, 3.141e-02 }, // CO
+        { 2.228e-02, 0.000e+00, 0.000e+00, 1.201e-04, 3.816e-06, 9.731e-03, 0.000e+00 }, // HC
+        { 4.855e+02, 8.063e+00, 2.825e+02, 0.000e+00, 3.287e-02, 4.031e+01, 1.095e+00 }, // FC
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 6.257e-05, 0.000e+00, 4.355e-03 }, // NOx
+        { 0.000e+00, 2.656e-02, 8.411e-03, 1.498e-04, 0.000e+00, 1.306e-03, 1.788e-07 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // PC_petrol_Euro-6d
-        { 1.275e+03, 7.341e+00, 7.801e+02, 0.000e+00, 1.922e-03, 3.381e+01, 2.238e-01 }, // CO2(total)
-        { 3.242e+00, 1.200e-02, 2.953e+00, 0.000e+00, 3.127e-06, 3.101e-02, 5.416e-04 }, // CO
-        { 1.389e-02, 0.000e+00, 3.798e-02, 1.269e-05, 3.815e-08, 1.512e-03, 0.000e+00 }, // HC
-        { 4.132e+02, 2.380e+00, 2.529e+02, 0.000e+00, 6.229e-04, 1.096e+01, 7.254e-02 }, // FC
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.367e-06, 0.000e+00, 3.464e-04 }, // NOx
-        { 0.000e+00, 7.373e-03, 1.022e-02, 1.220e-05, 0.000e+00, 4.467e-04, 9.849e-09 }, // PM + PM (non-exhaust)
+        { 1.275e+03, 2.643e+01, 7.801e+02, 0.000e+00, 8.965e-02, 1.217e+02, 2.900e+00 }, // CO2(total)
+        { 3.242e+00, 4.320e-02, 2.953e+00, 0.000e+00, 1.459e-04, 1.116e-01, 7.019e-03 }, // CO
+        { 1.389e-02, 0.000e+00, 3.798e-02, 1.645e-04, 1.780e-06, 5.444e-03, 0.000e+00 }, // HC
+        { 4.132e+02, 8.567e+00, 2.529e+02, 0.000e+00, 2.906e-02, 3.946e+01, 9.401e-01 }, // FC
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 6.379e-05, 0.000e+00, 4.489e-03 }, // NOx
+        { 0.000e+00, 2.654e-02, 1.022e-02, 1.581e-04, 0.000e+00, 1.608e-03, 1.276e-07 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // PC_petrol_Euro-7
-        { 1.049e+03, 8.497e+00, 6.875e+02, 0.000e+00, 1.692e-03, 3.552e+01, 1.830e-01 }, // CO2(total)
-        { 2.086e+00, 1.158e-02, 1.311e+00, 0.000e+00, 1.906e-06, 4.385e-02, 2.083e-04 }, // CO
-        { 1.193e-02, 0.000e+00, 2.001e-02, 6.495e-06, 4.357e-08, 1.093e-03, 0.000e+00 }, // HC
-        { 3.401e+02, 2.755e+00, 2.229e+02, 0.000e+00, 5.485e-04, 1.151e+01, 5.933e-02 }, // FC
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 8.828e-07, 0.000e+00, 2.226e-04 }, // NOx
-        { 0.000e+00, 7.234e-03, 1.653e-03, 1.013e-05, 0.000e+00, 1.133e-04, 6.370e-09 }, // PM + PM (non-exhaust)
+        { 1.049e+03, 3.059e+01, 6.875e+02, 0.000e+00, 7.894e-02, 1.279e+02, 2.372e+00 }, // CO2(total)
+        { 2.086e+00, 4.167e-02, 1.311e+00, 0.000e+00, 8.895e-05, 1.578e-01, 2.700e-03 }, // CO
+        { 1.193e-02, 0.000e+00, 2.001e-02, 8.418e-05, 2.033e-06, 3.934e-03, 0.000e+00 }, // HC
+        { 3.401e+02, 9.916e+00, 2.229e+02, 0.000e+00, 2.559e-02, 4.145e+01, 7.689e-01 }, // FC
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 4.119e-05, 0.000e+00, 2.885e-03 }, // NOx
+        { 0.000e+00, 2.604e-02, 1.653e-03, 1.313e-04, 0.000e+00, 4.079e-04, 8.256e-08 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // PC_diesel_conv
-        { 1.424e+03, 9.708e+00, 2.364e+02, 0.000e+00, 3.192e-03, 6.167e+01, 3.830e-01 }, // CO2(total)
-        { 1.089e+01, 0.000e+00, 7.177e+00, 0.000e+00, 1.524e-05, 0.000e+00, 2.701e-03 }, // CO
-        { 2.982e+00, 0.000e+00, 1.246e+00, 0.000e+00, 1.103e-06, 0.000e+00, 0.000e+00 }, // HC
-        { 4.577e+02, 3.120e+00, 7.596e+01, 0.000e+00, 1.026e-03, 1.982e+01, 1.231e-01 }, // FC
-        { 1.389e+00, 2.081e-01, 0.000e+00, 0.000e+00, 8.333e-06, 3.800e-01, 1.579e-03 }, // NOx
-        { 9.946e-01, 7.159e-03, 1.805e+00, 9.881e-06, 5.071e-06, 3.841e-03, 4.649e-04 }, // PM + PM (non-exhaust)
+        { 1.424e+03, 3.495e+01, 2.364e+02, 0.000e+00, 1.489e-01, 2.220e+02, 4.963e+00 }, // CO2(total)
+        { 1.089e+01, 0.000e+00, 7.177e+00, 0.000e+00, 7.111e-04, 0.000e+00, 3.500e-02 }, // CO
+        { 2.982e+00, 0.000e+00, 1.246e+00, 0.000e+00, 5.146e-05, 0.000e+00, 0.000e+00 }, // HC
+        { 4.577e+02, 1.123e+01, 7.596e+01, 0.000e+00, 4.787e-02, 7.135e+01, 1.595e+00 }, // FC
+        { 1.389e+00, 7.491e-01, 0.000e+00, 0.000e+00, 3.888e-04, 1.368e+00, 2.047e-02 }, // NOx
+        { 9.946e-01, 2.577e-02, 1.805e+00, 1.281e-04, 2.366e-04, 1.383e-02, 6.026e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // PC_diesel_1986-1988
-        { 1.409e+03, 9.603e+00, 2.338e+02, 0.000e+00, 3.158e-03, 6.101e+01, 3.788e-01 }, // CO2(total)
-        { 5.830e+00, 0.000e+00, 3.513e+00, 0.000e+00, 7.147e-06, 0.000e+00, 1.404e-03 }, // CO
-        { 1.203e+00, 1.184e-04, 7.097e-01, 7.079e-05, 6.885e-08, 0.000e+00, 0.000e+00 }, // HC
-        { 4.527e+02, 3.086e+00, 7.514e+01, 0.000e+00, 1.015e-03, 1.961e+01, 1.218e-01 }, // FC
-        { 5.572e+00, 1.667e-02, 0.000e+00, 0.000e+00, 1.413e-05, 1.515e-01, 2.427e-03 }, // NOx
-        { 7.749e-01, 7.159e-03, 0.000e+00, 7.134e-05, 2.170e-06, 4.166e-02, 3.533e-05 }, // PM + PM (non-exhaust)
+        { 1.409e+03, 3.457e+01, 2.338e+02, 0.000e+00, 1.473e-01, 2.196e+02, 4.910e+00 }, // CO2(total)
+        { 5.830e+00, 0.000e+00, 3.513e+00, 0.000e+00, 3.334e-04, 0.000e+00, 1.820e-02 }, // CO
+        { 1.203e+00, 4.261e-04, 7.097e-01, 9.175e-04, 3.212e-06, 0.000e+00, 0.000e+00 }, // HC
+        { 4.527e+02, 1.111e+01, 7.514e+01, 0.000e+00, 4.735e-02, 7.058e+01, 1.578e+00 }, // FC
+        { 5.572e+00, 6.001e-02, 0.000e+00, 0.000e+00, 6.593e-04, 5.453e-01, 3.146e-02 }, // NOx
+        { 7.749e-01, 2.577e-02, 0.000e+00, 9.246e-04, 1.013e-04, 1.500e-01, 4.579e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // PC_diesel_Euro-1
-        { 1.436e+03, 9.420e+00, 2.800e+02, 0.000e+00, 3.064e-03, 5.964e+01, 3.691e-01 }, // CO2(total)
-        { 4.174e+00, 0.000e+00, 2.617e+00, 0.000e+00, 4.124e-06, 0.000e+00, 5.544e-04 }, // CO
-        { 7.714e-01, 1.759e-03, 3.388e-01, 1.711e-05, 6.415e-08, 0.000e+00, 0.000e+00 }, // HC
-        { 4.616e+02, 3.027e+00, 9.000e+01, 0.000e+00, 9.848e-04, 1.917e+01, 1.186e-01 }, // FC
-        { 5.588e+00, 2.404e-02, 0.000e+00, 0.000e+00, 1.544e-05, 1.508e-01, 2.983e-03 }, // NOx
-        { 9.653e-01, 7.167e-03, 0.000e+00, 1.043e-04, 1.591e-06, 3.713e-02, 1.635e-05 }, // PM + PM (non-exhaust)
+        { 1.436e+03, 3.391e+01, 2.800e+02, 0.000e+00, 1.430e-01, 2.147e+02, 4.783e+00 }, // CO2(total)
+        { 4.174e+00, 0.000e+00, 2.617e+00, 0.000e+00, 1.924e-04, 0.000e+00, 7.185e-03 }, // CO
+        { 7.714e-01, 6.332e-03, 3.388e-01, 2.218e-04, 2.993e-06, 0.000e+00, 0.000e+00 }, // HC
+        { 4.616e+02, 1.090e+01, 9.000e+01, 0.000e+00, 4.595e-02, 6.901e+01, 1.537e+00 }, // FC
+        { 5.588e+00, 8.653e-02, 0.000e+00, 0.000e+00, 7.204e-04, 5.429e-01, 3.866e-02 }, // NOx
+        { 9.653e-01, 2.580e-02, 0.000e+00, 1.352e-03, 7.422e-05, 1.337e-01, 2.119e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // PC_diesel_Euro-2
-        { 1.489e+03, 9.351e+00, 6.982e+02, 0.000e+00, 2.839e-03, 4.670e+01, 4.168e-01 }, // CO2(total)
-        { 2.016e+00, 0.000e+00, 6.353e-01, 0.000e+00, 2.326e-07, 0.000e+00, 0.000e+00 }, // CO
-        { 4.671e-01, 1.032e-03, 5.062e-02, 0.000e+00, 2.644e-08, 0.000e+00, 0.000e+00 }, // HC
-        { 4.784e+02, 3.005e+00, 2.244e+02, 0.000e+00, 9.123e-04, 1.501e+01, 1.339e-01 }, // FC
-        { 6.968e+00, 0.000e+00, 3.961e+00, 0.000e+00, 1.889e-05, 1.665e-03, 4.461e-03 }, // NOx
-        { 7.037e-01, 7.186e-03, 3.516e-01, 1.195e-04, 3.766e-07, 1.403e-02, 1.462e-07 }, // PM + PM (non-exhaust)
+        { 1.489e+03, 3.367e+01, 6.982e+02, 0.000e+00, 1.324e-01, 1.681e+02, 5.402e+00 }, // CO2(total)
+        { 2.016e+00, 0.000e+00, 6.353e-01, 0.000e+00, 1.085e-05, 0.000e+00, 0.000e+00 }, // CO
+        { 4.671e-01, 3.715e-03, 5.062e-02, 0.000e+00, 1.233e-06, 0.000e+00, 0.000e+00 }, // HC
+        { 4.784e+02, 1.082e+01, 2.244e+02, 0.000e+00, 4.256e-02, 5.403e+01, 1.736e+00 }, // FC
+        { 6.968e+00, 0.000e+00, 3.961e+00, 0.000e+00, 8.815e-04, 5.995e-03, 5.782e-02 }, // NOx
+        { 7.037e-01, 2.587e-02, 3.516e-01, 1.548e-03, 1.757e-05, 5.052e-02, 1.895e-06 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // PC_diesel_Euro-2_(DPF)
-        { 1.504e+03, 9.445e+00, 7.051e+02, 0.000e+00, 2.867e-03, 4.716e+01, 4.210e-01 }, // CO2(total)
-        { 2.016e+00, 0.000e+00, 6.353e-01, 0.000e+00, 2.326e-07, 0.000e+00, 0.000e+00 }, // CO
-        { 4.671e-01, 1.032e-03, 5.062e-02, 0.000e+00, 2.644e-08, 0.000e+00, 0.000e+00 }, // HC
-        { 4.832e+02, 3.035e+00, 2.266e+02, 0.000e+00, 9.214e-04, 1.516e+01, 1.353e-01 }, // FC
-        { 6.968e+00, 0.000e+00, 3.961e+00, 0.000e+00, 1.889e-05, 1.665e-03, 4.461e-03 }, // NOx
-        { 4.926e-01, 7.186e-03, 2.462e-01, 8.649e-05, 2.636e-07, 9.824e-03, 1.462e-07 }, // PM + PM (non-exhaust)
+        { 1.504e+03, 3.400e+01, 7.051e+02, 0.000e+00, 1.338e-01, 1.698e+02, 5.456e+00 }, // CO2(total)
+        { 2.016e+00, 0.000e+00, 6.353e-01, 0.000e+00, 1.085e-05, 0.000e+00, 0.000e+00 }, // CO
+        { 4.671e-01, 3.715e-03, 5.062e-02, 0.000e+00, 1.233e-06, 0.000e+00, 0.000e+00 }, // HC
+        { 4.832e+02, 1.093e+01, 2.266e+02, 0.000e+00, 4.299e-02, 5.457e+01, 1.753e+00 }, // FC
+        { 6.968e+00, 0.000e+00, 3.961e+00, 0.000e+00, 8.815e-04, 5.995e-03, 5.782e-02 }, // NOx
+        { 4.926e-01, 2.587e-02, 2.462e-01, 1.121e-03, 1.230e-05, 3.537e-02, 1.895e-06 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // PC_diesel_Euro-3
-        { 1.303e+03, 1.136e+01, 8.631e+02, 0.000e+00, 2.384e-03, 3.699e+01, 4.345e-01 }, // CO2(total)
+        { 1.303e+03, 4.091e+01, 8.631e+02, 0.000e+00, 1.112e-01, 1.332e+02, 5.631e+00 }, // CO2(total)
         { 7.072e-01, 0.000e+00, 6.223e-01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 2.853e-01, 0.000e+00, 8.464e-02, 0.000e+00, 1.152e-07, 3.115e-03, 0.000e+00 }, // HC
-        { 4.187e+02, 3.652e+00, 2.774e+02, 0.000e+00, 7.662e-04, 1.189e+01, 1.396e-01 }, // FC
-        { 8.619e+00, 0.000e+00, 3.068e+00, 0.000e+00, 2.818e-05, 0.000e+00, 7.192e-03 }, // NOx
-        { 3.827e-01, 7.609e-03, 0.000e+00, 9.475e-06, 6.774e-07, 1.232e-02, 5.130e-05 }, // PM + PM (non-exhaust)
+        { 2.853e-01, 0.000e+00, 8.464e-02, 0.000e+00, 5.374e-06, 1.121e-02, 0.000e+00 }, // HC
+        { 4.187e+02, 1.315e+01, 2.774e+02, 0.000e+00, 3.575e-02, 4.280e+01, 1.810e+00 }, // FC
+        { 8.619e+00, 0.000e+00, 3.068e+00, 0.000e+00, 1.315e-03, 0.000e+00, 9.321e-02 }, // NOx
+        { 3.827e-01, 2.739e-02, 0.000e+00, 1.228e-04, 3.161e-05, 4.437e-02, 6.649e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // PC_diesel_Euro-3_(DPF)
-        { 1.316e+03, 1.148e+01, 8.717e+02, 0.000e+00, 2.408e-03, 3.736e+01, 4.388e-01 }, // CO2(total)
+        { 1.316e+03, 4.132e+01, 8.717e+02, 0.000e+00, 1.123e-01, 1.345e+02, 5.687e+00 }, // CO2(total)
         { 7.072e-01, 0.000e+00, 6.223e-01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 2.853e-01, 0.000e+00, 8.464e-02, 0.000e+00, 1.152e-07, 3.115e-03, 0.000e+00 }, // HC
-        { 4.229e+02, 3.689e+00, 2.801e+02, 0.000e+00, 7.738e-04, 1.201e+01, 1.410e-01 }, // FC
-        { 8.619e+00, 0.000e+00, 3.068e+00, 0.000e+00, 2.818e-05, 0.000e+00, 7.192e-03 }, // NOx
-        { 2.679e-01, 7.484e-03, 0.000e+00, 9.475e-06, 4.742e-07, 8.627e-03, 3.594e-05 }, // PM + PM (non-exhaust)
+        { 2.853e-01, 0.000e+00, 8.464e-02, 0.000e+00, 5.374e-06, 1.121e-02, 0.000e+00 }, // HC
+        { 4.229e+02, 1.328e+01, 2.801e+02, 0.000e+00, 3.610e-02, 4.323e+01, 1.828e+00 }, // FC
+        { 8.619e+00, 0.000e+00, 3.068e+00, 0.000e+00, 1.315e-03, 0.000e+00, 9.321e-02 }, // NOx
+        { 2.679e-01, 2.694e-02, 0.000e+00, 1.228e-04, 2.212e-05, 3.106e-02, 4.658e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // PC_diesel_Euro-4
-        { 1.322e+03, 1.302e+01, 1.029e+03, 0.000e+00, 2.180e-03, 3.503e+01, 4.402e-01 }, // CO2(total)
+        { 1.322e+03, 4.688e+01, 1.029e+03, 0.000e+00, 1.017e-01, 1.261e+02, 5.705e+00 }, // CO2(total)
         { 5.105e-01, 0.000e+00, 4.618e-01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 1.252e-01, 3.585e-04, 2.824e-02, 0.000e+00, 5.065e-08, 8.873e-04, 1.571e-06 }, // HC
-        { 4.249e+02, 4.185e+00, 3.306e+02, 0.000e+00, 7.008e-04, 1.126e+01, 1.415e-01 }, // FC
-        { 5.261e+00, 0.000e+00, 0.000e+00, 0.000e+00, 2.533e-05, 0.000e+00, 6.285e-03 }, // NOx
-        { 3.195e-01, 1.052e-02, 9.338e-02, 9.388e-06, 2.770e-07, 9.466e-03, 2.514e-08 }, // PM + PM (non-exhaust)
+        { 1.252e-01, 1.291e-03, 2.824e-02, 0.000e+00, 2.363e-06, 3.194e-03, 2.035e-05 }, // HC
+        { 4.249e+02, 1.507e+01, 3.306e+02, 0.000e+00, 3.269e-02, 4.053e+01, 1.833e+00 }, // FC
+        { 5.261e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.182e-03, 0.000e+00, 8.146e-02 }, // NOx
+        { 3.195e-01, 3.786e-02, 9.338e-02, 1.217e-04, 1.292e-05, 3.408e-02, 3.259e-07 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // PC_diesel_Euro-4_(DPF)
-        { 1.322e+03, 1.302e+01, 1.029e+03, 0.000e+00, 2.180e-03, 3.503e+01, 4.402e-01 }, // CO2(total)
+        { 1.322e+03, 4.688e+01, 1.029e+03, 0.000e+00, 1.017e-01, 1.261e+02, 5.705e+00 }, // CO2(total)
         { 5.130e-01, 0.000e+00, 4.641e-01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 1.282e-01, 3.671e-04, 2.891e-02, 0.000e+00, 5.186e-08, 9.086e-04, 1.608e-06 }, // HC
-        { 4.249e+02, 4.185e+00, 3.306e+02, 0.000e+00, 7.008e-04, 1.126e+01, 1.415e-01 }, // FC
-        { 5.508e+00, 0.000e+00, 0.000e+00, 0.000e+00, 2.652e-05, 0.000e+00, 6.581e-03 }, // NOx
-        { 0.000e+00, 7.200e-03, 0.000e+00, 9.388e-06, 1.690e-07, 0.000e+00, 4.851e-05 }, // PM + PM (non-exhaust)
+        { 1.282e-01, 1.322e-03, 2.891e-02, 0.000e+00, 2.420e-06, 3.271e-03, 2.084e-05 }, // HC
+        { 4.249e+02, 1.507e+01, 3.306e+02, 0.000e+00, 3.269e-02, 4.053e+01, 1.833e+00 }, // FC
+        { 5.508e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.237e-03, 0.000e+00, 8.529e-02 }, // NOx
+        { 0.000e+00, 2.592e-02, 0.000e+00, 1.217e-04, 7.885e-06, 0.000e+00, 6.286e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // PC_diesel_Euro-5
-        { 1.246e+03, 1.261e+01, 9.019e+02, 0.000e+00, 2.035e-03, 3.569e+01, 3.896e-01 }, // CO2(total)
+        { 1.246e+03, 4.541e+01, 9.019e+02, 0.000e+00, 9.496e-02, 1.285e+02, 5.049e+00 }, // CO2(total)
         { 3.936e-01, 0.000e+00, 4.226e-01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 1.097e-01, 0.000e+00, 2.103e-02, 0.000e+00, 2.814e-08, 2.679e-04, 0.000e+00 }, // HC
-        { 4.004e+02, 4.054e+00, 2.899e+02, 0.000e+00, 6.541e-04, 1.147e+01, 1.252e-01 }, // FC
-        { 1.005e+01, 5.366e-03, 1.517e+00, 0.000e+00, 2.410e-05, 5.506e-02, 6.119e-03 }, // NOx
-        { 2.772e-02, 7.200e-03, 1.079e-02, 9.390e-06, 1.623e-08, 0.000e+00, 2.319e-06 }, // PM + PM (non-exhaust)
+        { 1.097e-01, 0.000e+00, 2.103e-02, 0.000e+00, 1.313e-06, 9.644e-04, 0.000e+00 }, // HC
+        { 4.004e+02, 1.459e+01, 2.899e+02, 0.000e+00, 3.052e-02, 4.129e+01, 1.623e+00 }, // FC
+        { 1.005e+01, 1.932e-02, 1.517e+00, 0.000e+00, 1.125e-03, 1.982e-01, 7.930e-02 }, // NOx
+        { 2.772e-02, 2.592e-02, 1.079e-02, 1.217e-04, 7.573e-07, 0.000e+00, 3.005e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // PC_diesel_Euro-5_other_SU_before_software_update
-        { 1.246e+03, 1.261e+01, 9.019e+02, 0.000e+00, 2.035e-03, 3.569e+01, 3.896e-01 }, // CO2(total)
+        { 1.246e+03, 4.541e+01, 9.019e+02, 0.000e+00, 9.496e-02, 1.285e+02, 5.049e+00 }, // CO2(total)
         { 3.936e-01, 0.000e+00, 4.226e-01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 1.097e-01, 0.000e+00, 2.103e-02, 0.000e+00, 2.814e-08, 2.679e-04, 0.000e+00 }, // HC
-        { 4.004e+02, 4.054e+00, 2.899e+02, 0.000e+00, 6.541e-04, 1.147e+01, 1.252e-01 }, // FC
-        { 9.240e+00, 4.934e-03, 1.395e+00, 0.000e+00, 2.217e-05, 5.063e-02, 5.627e-03 }, // NOx
-        { 2.772e-02, 7.200e-03, 1.079e-02, 9.390e-06, 1.623e-08, 0.000e+00, 2.319e-06 }, // PM + PM (non-exhaust)
+        { 1.097e-01, 0.000e+00, 2.103e-02, 0.000e+00, 1.313e-06, 9.644e-04, 0.000e+00 }, // HC
+        { 4.004e+02, 1.459e+01, 2.899e+02, 0.000e+00, 3.052e-02, 4.129e+01, 1.623e+00 }, // FC
+        { 9.240e+00, 1.776e-02, 1.395e+00, 0.000e+00, 1.034e-03, 1.823e-01, 7.293e-02 }, // NOx
+        { 2.772e-02, 2.592e-02, 1.079e-02, 1.217e-04, 7.573e-07, 0.000e+00, 3.005e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // PC_diesel_Euro-5_EA189_before_software_update
-        { 1.246e+03, 1.261e+01, 9.019e+02, 0.000e+00, 2.035e-03, 3.569e+01, 3.896e-01 }, // CO2(total)
+        { 1.246e+03, 4.541e+01, 9.019e+02, 0.000e+00, 9.496e-02, 1.285e+02, 5.049e+00 }, // CO2(total)
         { 3.936e-01, 0.000e+00, 4.226e-01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 1.097e-01, 0.000e+00, 2.103e-02, 0.000e+00, 2.814e-08, 2.679e-04, 0.000e+00 }, // HC
-        { 4.004e+02, 4.054e+00, 2.899e+02, 0.000e+00, 6.541e-04, 1.147e+01, 1.252e-01 }, // FC
-        { 6.822e+00, 3.643e-03, 1.030e+00, 0.000e+00, 1.637e-05, 3.738e-02, 4.154e-03 }, // NOx
-        { 2.772e-02, 7.200e-03, 1.079e-02, 9.390e-06, 1.623e-08, 0.000e+00, 2.319e-06 }, // PM + PM (non-exhaust)
+        { 1.097e-01, 0.000e+00, 2.103e-02, 0.000e+00, 1.313e-06, 9.644e-04, 0.000e+00 }, // HC
+        { 4.004e+02, 1.459e+01, 2.899e+02, 0.000e+00, 3.052e-02, 4.129e+01, 1.623e+00 }, // FC
+        { 6.822e+00, 1.311e-02, 1.030e+00, 0.000e+00, 7.635e-04, 1.346e-01, 5.384e-02 }, // NOx
+        { 2.772e-02, 2.592e-02, 1.079e-02, 1.217e-04, 7.573e-07, 0.000e+00, 3.005e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // PC_diesel_Euro-5_EA189_after_software_update
-        { 1.294e+03, 1.310e+01, 9.367e+02, 0.000e+00, 2.114e-03, 3.706e+01, 4.046e-01 }, // CO2(total)
+        { 1.294e+03, 4.716e+01, 9.367e+02, 0.000e+00, 9.862e-02, 1.334e+02, 5.243e+00 }, // CO2(total)
         { 1.135e-01, 0.000e+00, 2.991e-01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 1.390e-01, 0.000e+00, 0.000e+00, 0.000e+00, 1.676e-08, 0.000e+00, 0.000e+00 }, // HC
-        { 4.159e+02, 4.210e+00, 3.010e+02, 0.000e+00, 6.793e-04, 1.191e+01, 1.300e-01 }, // FC
-        { 2.881e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.754e-05, 0.000e+00, 4.680e-03 }, // NOx
-        { 2.772e-02, 7.200e-03, 3.902e-04, 9.390e-06, 3.096e-09, 0.000e+00, 2.616e-08 }, // PM + PM (non-exhaust)
+        { 1.390e-01, 0.000e+00, 0.000e+00, 0.000e+00, 7.821e-07, 0.000e+00, 0.000e+00 }, // HC
+        { 4.159e+02, 1.516e+01, 3.010e+02, 0.000e+00, 3.170e-02, 4.288e+01, 1.685e+00 }, // FC
+        { 2.881e+00, 0.000e+00, 0.000e+00, 0.000e+00, 8.185e-04, 0.000e+00, 6.065e-02 }, // NOx
+        { 2.772e-02, 2.592e-02, 3.902e-04, 1.217e-04, 1.445e-07, 0.000e+00, 3.391e-07 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // PC_diesel_Euro-5_other_SU_after_software_update
-        { 1.258e+03, 1.275e+01, 9.068e+02, 0.000e+00, 2.055e-03, 3.618e+01, 3.926e-01 }, // CO2(total)
+        { 1.258e+03, 4.589e+01, 9.068e+02, 0.000e+00, 9.586e-02, 1.302e+02, 5.088e+00 }, // CO2(total)
         { 6.694e-01, 0.000e+00, 6.279e-01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 1.098e-01, 0.000e+00, 2.112e-02, 0.000e+00, 2.807e-08, 2.677e-04, 0.000e+00 }, // HC
-        { 4.044e+02, 4.097e+00, 2.914e+02, 0.000e+00, 6.603e-04, 1.163e+01, 1.262e-01 }, // FC
-        { 3.267e+00, 2.380e-03, 0.000e+00, 9.514e-04, 4.972e-06, 1.824e-01, 1.208e-03 }, // NOx
-        { 2.772e-02, 7.200e-03, 1.080e-02, 9.390e-06, 1.620e-08, 0.000e+00, 2.310e-06 }, // PM + PM (non-exhaust)
+        { 1.098e-01, 0.000e+00, 2.112e-02, 0.000e+00, 1.309e-06, 9.638e-04, 0.000e+00 }, // HC
+        { 4.044e+02, 1.475e+01, 2.914e+02, 0.000e+00, 3.081e-02, 4.186e+01, 1.635e+00 }, // FC
+        { 3.267e+00, 8.569e-03, 0.000e+00, 1.233e-02, 2.320e-04, 6.566e-01, 1.565e-02 }, // NOx
+        { 2.772e-02, 2.592e-02, 1.080e-02, 1.217e-04, 7.557e-07, 0.000e+00, 2.994e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // PC_diesel_Euro-6ab
-        { 1.260e+03, 1.338e+01, 8.350e+02, 0.000e+00, 1.950e-03, 3.994e+01, 3.512e-01 }, // CO2(total)
-        { 9.962e-01, 0.000e+00, 4.265e-01, 0.000e+00, 7.300e-07, 0.000e+00, 1.972e-04 }, // CO
-        { 1.659e-01, 1.149e-03, 1.374e-01, 0.000e+00, 1.924e-07, 1.232e-03, 5.617e-05 }, // HC
-        { 4.049e+02, 4.300e+00, 2.684e+02, 0.000e+00, 6.268e-04, 1.284e+01, 1.129e-01 }, // FC
-        { 3.561e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.188e-05, 0.000e+00, 3.373e-03 }, // NOx
-        { 5.706e-03, 7.202e-03, 0.000e+00, 9.359e-06, 1.747e-08, 2.135e-04, 1.411e-06 }, // PM + PM (non-exhaust)
+        { 1.260e+03, 4.817e+01, 8.350e+02, 0.000e+00, 9.099e-02, 1.438e+02, 4.551e+00 }, // CO2(total)
+        { 9.962e-01, 0.000e+00, 4.265e-01, 0.000e+00, 3.406e-05, 0.000e+00, 2.555e-03 }, // CO
+        { 1.659e-01, 4.137e-03, 1.374e-01, 0.000e+00, 8.975e-06, 4.434e-03, 7.280e-04 }, // HC
+        { 4.049e+02, 1.548e+01, 2.684e+02, 0.000e+00, 2.924e-02, 4.621e+01, 1.463e+00 }, // FC
+        { 3.561e+00, 0.000e+00, 0.000e+00, 0.000e+00, 5.544e-04, 0.000e+00, 4.371e-02 }, // NOx
+        { 5.706e-03, 2.593e-02, 0.000e+00, 1.213e-04, 8.150e-07, 7.685e-04, 1.829e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // PC_diesel_Euro-6ab_SU_before_software_update
-        { 1.260e+03, 1.338e+01, 8.350e+02, 0.000e+00, 1.950e-03, 3.994e+01, 3.512e-01 }, // CO2(total)
-        { 9.962e-01, 0.000e+00, 4.265e-01, 0.000e+00, 7.300e-07, 0.000e+00, 1.972e-04 }, // CO
-        { 1.659e-01, 1.149e-03, 1.374e-01, 0.000e+00, 1.924e-07, 1.232e-03, 5.617e-05 }, // HC
-        { 4.049e+02, 4.300e+00, 2.684e+02, 0.000e+00, 6.268e-04, 1.284e+01, 1.129e-01 }, // FC
-        { 1.008e+01, 0.000e+00, 0.000e+00, 0.000e+00, 3.363e-05, 0.000e+00, 9.545e-03 }, // NOx
-        { 5.706e-03, 7.202e-03, 0.000e+00, 9.359e-06, 1.747e-08, 2.135e-04, 1.411e-06 }, // PM + PM (non-exhaust)
+        { 1.260e+03, 4.817e+01, 8.350e+02, 0.000e+00, 9.099e-02, 1.438e+02, 4.551e+00 }, // CO2(total)
+        { 9.962e-01, 0.000e+00, 4.265e-01, 0.000e+00, 3.406e-05, 0.000e+00, 2.555e-03 }, // CO
+        { 1.659e-01, 4.137e-03, 1.374e-01, 0.000e+00, 8.975e-06, 4.434e-03, 7.280e-04 }, // HC
+        { 4.049e+02, 1.548e+01, 2.684e+02, 0.000e+00, 2.924e-02, 4.621e+01, 1.463e+00 }, // FC
+        { 1.008e+01, 0.000e+00, 0.000e+00, 0.000e+00, 1.569e-03, 0.000e+00, 1.237e-01 }, // NOx
+        { 5.706e-03, 2.593e-02, 0.000e+00, 1.213e-04, 8.150e-07, 7.685e-04, 1.829e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // PC_diesel_Euro-6ab_SU_after_software_update
-        { 1.267e+03, 1.343e+01, 8.376e+02, 0.000e+00, 1.959e-03, 4.023e+01, 3.518e-01 }, // CO2(total)
-        { 7.629e-01, 0.000e+00, 2.225e-01, 0.000e+00, 5.736e-07, 0.000e+00, 2.305e-04 }, // CO
-        { 1.659e-01, 1.150e-03, 1.373e-01, 0.000e+00, 1.921e-07, 1.246e-03, 5.597e-05 }, // HC
-        { 4.072e+02, 4.318e+00, 2.692e+02, 0.000e+00, 6.296e-04, 1.293e+01, 1.131e-01 }, // FC
-        { 3.021e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.661e-05, 0.000e+00, 4.558e-03 }, // NOx
-        { 5.707e-03, 7.202e-03, 0.000e+00, 9.359e-06, 1.747e-08, 2.139e-04, 1.405e-06 }, // PM + PM (non-exhaust)
+        { 1.267e+03, 4.837e+01, 8.376e+02, 0.000e+00, 9.141e-02, 1.448e+02, 4.560e+00 }, // CO2(total)
+        { 7.629e-01, 0.000e+00, 2.225e-01, 0.000e+00, 2.676e-05, 0.000e+00, 2.988e-03 }, // CO
+        { 1.659e-01, 4.140e-03, 1.373e-01, 0.000e+00, 8.961e-06, 4.485e-03, 7.253e-04 }, // HC
+        { 4.072e+02, 1.554e+01, 2.692e+02, 0.000e+00, 2.938e-02, 4.655e+01, 1.465e+00 }, // FC
+        { 3.021e+00, 0.000e+00, 0.000e+00, 0.000e+00, 7.751e-04, 0.000e+00, 5.908e-02 }, // NOx
+        { 5.707e-03, 2.593e-02, 0.000e+00, 1.213e-04, 8.149e-07, 7.701e-04, 1.821e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // PC_diesel_Euro-6c
-        { 1.310e+03, 1.404e+01, 8.488e+02, 0.000e+00, 2.008e-03, 4.240e+01, 3.568e-01 }, // CO2(total)
-        { 4.459e-01, 4.662e-04, 1.815e-01, 0.000e+00, 3.610e-07, 0.000e+00, 9.507e-05 }, // CO
-        { 6.953e-03, 3.029e-03, 0.000e+00, 1.320e-05, 0.000e+00, 7.397e-03, 1.284e-05 }, // HC
-        { 4.212e+02, 4.512e+00, 2.728e+02, 0.000e+00, 6.455e-04, 1.363e+01, 1.147e-01 }, // FC
-        { 1.965e+00, 0.000e+00, 0.000e+00, 0.000e+00, 6.527e-06, 0.000e+00, 1.804e-03 }, // NOx
-        { 3.784e-03, 7.202e-03, 0.000e+00, 9.359e-06, 1.677e-08, 0.000e+00, 4.008e-06 }, // PM + PM (non-exhaust)
+        { 1.310e+03, 5.055e+01, 8.488e+02, 0.000e+00, 9.371e-02, 1.527e+02, 4.624e+00 }, // CO2(total)
+        { 4.459e-01, 1.678e-03, 1.815e-01, 0.000e+00, 1.684e-05, 0.000e+00, 1.232e-03 }, // CO
+        { 6.953e-03, 1.090e-02, 0.000e+00, 1.710e-04, 0.000e+00, 2.663e-02, 1.664e-04 }, // HC
+        { 4.212e+02, 1.624e+01, 2.728e+02, 0.000e+00, 3.012e-02, 4.906e+01, 1.486e+00 }, // FC
+        { 1.965e+00, 0.000e+00, 0.000e+00, 0.000e+00, 3.045e-04, 0.000e+00, 2.338e-02 }, // NOx
+        { 3.784e-03, 2.593e-02, 0.000e+00, 1.213e-04, 7.824e-07, 0.000e+00, 5.195e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // PC_diesel_Euro-6d-temp
-        { 1.388e+03, 1.544e+01, 9.061e+02, 0.000e+00, 2.116e-03, 4.660e+01, 3.723e-01 }, // CO2(total)
-        { 1.533e-01, 0.000e+00, 0.000e+00, 2.432e-05, 4.278e-08, 2.018e-03, 3.381e-05 }, // CO
-        { 0.000e+00, 2.756e-03, 0.000e+00, 1.312e-05, 0.000e+00, 8.056e-03, 7.025e-06 }, // HC
-        { 4.462e+02, 4.963e+00, 2.912e+02, 0.000e+00, 6.800e-04, 1.498e+01, 1.197e-01 }, // FC
-        { 3.375e-01, 0.000e+00, 0.000e+00, 0.000e+00, 1.251e-06, 4.122e-03, 2.847e-04 }, // NOx
-        { 2.982e-03, 7.202e-03, 0.000e+00, 9.358e-06, 1.560e-08, 0.000e+00, 4.149e-06 }, // PM + PM (non-exhaust)
+        { 1.388e+03, 5.559e+01, 9.061e+02, 0.000e+00, 9.872e-02, 1.678e+02, 4.825e+00 }, // CO2(total)
+        { 1.533e-01, 0.000e+00, 0.000e+00, 3.152e-04, 1.996e-06, 7.265e-03, 4.382e-04 }, // CO
+        { 0.000e+00, 9.922e-03, 0.000e+00, 1.700e-04, 0.000e+00, 2.900e-02, 9.104e-05 }, // HC
+        { 4.462e+02, 1.787e+01, 2.912e+02, 0.000e+00, 3.173e-02, 5.391e+01, 1.551e+00 }, // FC
+        { 3.375e-01, 0.000e+00, 0.000e+00, 0.000e+00, 5.836e-05, 1.484e-02, 3.690e-03 }, // NOx
+        { 2.982e-03, 2.593e-02, 0.000e+00, 1.213e-04, 7.279e-07, 0.000e+00, 5.376e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // PC_diesel_Euro-6d
-        { 1.299e+03, 1.522e+01, 8.665e+02, 0.000e+00, 1.985e-03, 4.587e+01, 3.446e-01 }, // CO2(total)
-        { 1.402e-01, 0.000e+00, 0.000e+00, 1.926e-05, 5.612e-08, 1.498e-03, 3.286e-05 }, // CO
-        { 0.000e+00, 2.357e-03, 0.000e+00, 1.277e-05, 0.000e+00, 6.802e-03, 1.111e-05 }, // HC
-        { 4.174e+02, 4.892e+00, 2.785e+02, 0.000e+00, 6.378e-04, 1.474e+01, 1.108e-01 }, // FC
-        { 2.819e-01, 0.000e+00, 0.000e+00, 0.000e+00, 1.084e-06, 4.288e-03, 2.411e-04 }, // NOx
-        { 2.851e-03, 7.202e-03, 0.000e+00, 9.357e-06, 1.323e-08, 0.000e+00, 3.509e-06 }, // PM + PM (non-exhaust)
+        { 1.299e+03, 5.480e+01, 8.665e+02, 0.000e+00, 9.259e-02, 1.651e+02, 4.467e+00 }, // CO2(total)
+        { 1.402e-01, 0.000e+00, 0.000e+00, 2.497e-04, 2.618e-06, 5.392e-03, 4.259e-04 }, // CO
+        { 0.000e+00, 8.486e-03, 0.000e+00, 1.655e-04, 0.000e+00, 2.449e-02, 1.440e-04 }, // HC
+        { 4.174e+02, 1.761e+01, 2.785e+02, 0.000e+00, 2.976e-02, 5.307e+01, 1.435e+00 }, // FC
+        { 2.819e-01, 0.000e+00, 0.000e+00, 0.000e+00, 5.057e-05, 1.544e-02, 3.125e-03 }, // NOx
+        { 2.851e-03, 2.593e-02, 0.000e+00, 1.213e-04, 6.171e-07, 0.000e+00, 4.547e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // PC_diesel_Euro-7
-        { 1.150e+03, 1.474e+01, 8.093e+02, 0.000e+00, 1.765e-03, 4.384e+01, 3.022e-01 }, // CO2(total)
+        { 1.150e+03, 5.308e+01, 8.093e+02, 0.000e+00, 8.234e-02, 1.578e+02, 3.917e+00 }, // CO2(total)
         { 1.199e+00, 0.000e+00, 9.974e-01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
         { 5.693e-02, 0.000e+00, 1.082e-02, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // HC
-        { 3.695e+02, 4.738e+00, 2.601e+02, 0.000e+00, 5.672e-04, 1.409e+01, 9.714e-02 }, // FC
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 6.481e-07, 0.000e+00, 1.391e-04 }, // NOx
-        { 2.829e-03, 7.203e-03, 0.000e+00, 9.356e-06, 1.064e-08, 1.201e-07, 2.799e-06 }, // PM + PM (non-exhaust)
+        { 3.695e+02, 1.706e+01, 2.601e+02, 0.000e+00, 2.646e-02, 5.072e+01, 1.259e+00 }, // FC
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 3.024e-05, 0.000e+00, 1.802e-03 }, // NOx
+        { 2.829e-03, 2.593e-02, 0.000e+00, 1.213e-04, 4.966e-07, 4.323e-07, 3.628e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // PC_CNG_petrol_Euro-2_(CNG)
-        { 1.321e+03, 3.871e+00, 5.873e+02, 0.000e+00, 2.375e-03, 3.196e+01, 2.591e-01 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.103e-04, 0.000e+00, 3.097e-02 }, // CO
-        { 0.000e+00, 1.351e-02, 0.000e+00, 6.081e-05, 0.000e+00, 2.759e-02, 1.097e-04 }, // HC
-        { 4.249e+02, 1.246e+00, 1.890e+02, 0.000e+00, 7.643e-04, 1.028e+01, 8.338e-02 }, // FC
-        { 1.586e+00, 0.000e+00, 0.000e+00, 0.000e+00, 3.688e-06, 0.000e+00, 6.785e-04 }, // NOx
-        { 0.000e+00, 7.192e-03, 0.000e+00, 9.477e-06, 9.562e-07, 0.000e+00, 2.475e-04 }, // PM + PM (non-exhaust)
+        { 1.321e+03, 1.394e+01, 5.873e+02, 0.000e+00, 1.108e-01, 1.151e+02, 3.358e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 5.147e-03, 0.000e+00, 4.014e-01 }, // CO
+        { 0.000e+00, 4.865e-02, 0.000e+00, 7.881e-04, 0.000e+00, 9.933e-02, 1.422e-03 }, // HC
+        { 4.249e+02, 4.484e+00, 1.890e+02, 0.000e+00, 3.566e-02, 3.703e+01, 1.081e+00 }, // FC
+        { 1.586e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.721e-04, 0.000e+00, 8.793e-03 }, // NOx
+        { 0.000e+00, 2.589e-02, 0.000e+00, 1.228e-04, 4.461e-05, 0.000e+00, 3.208e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // PC_CNG_petrol_Euro-2_(P)
-        { 1.481e+03, 4.342e+00, 6.587e+02, 0.000e+00, 2.664e-03, 3.585e+01, 2.906e-01 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.003e-04, 0.000e+00, 2.816e-02 }, // CO
-        { 0.000e+00, 9.010e-03, 0.000e+00, 4.054e-05, 0.000e+00, 1.839e-02, 7.316e-05 }, // HC
-        { 4.802e+02, 1.408e+00, 2.135e+02, 0.000e+00, 8.638e-04, 1.162e+01, 9.422e-02 }, // FC
-        { 1.586e+00, 0.000e+00, 0.000e+00, 0.000e+00, 3.688e-06, 0.000e+00, 6.785e-04 }, // NOx
-        { 0.000e+00, 7.192e-03, 0.000e+00, 9.477e-06, 6.375e-07, 0.000e+00, 1.651e-04 }, // PM + PM (non-exhaust)
+        { 1.481e+03, 1.563e+01, 6.587e+02, 0.000e+00, 1.243e-01, 1.291e+02, 3.767e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 4.679e-03, 0.000e+00, 3.649e-01 }, // CO
+        { 0.000e+00, 3.243e-02, 0.000e+00, 5.254e-04, 0.000e+00, 6.622e-02, 9.482e-04 }, // HC
+        { 4.802e+02, 5.067e+00, 2.135e+02, 0.000e+00, 4.030e-02, 4.184e+01, 1.221e+00 }, // FC
+        { 1.586e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.721e-04, 0.000e+00, 8.793e-03 }, // NOx
+        { 0.000e+00, 2.589e-02, 0.000e+00, 1.228e-04, 2.974e-05, 0.000e+00, 2.139e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // PC_CNG_petrol_Euro-3_(CNG)
-        { 1.351e+03, 3.978e+00, 6.162e+02, 0.000e+00, 2.378e-03, 3.223e+01, 2.621e-01 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.047e-04, 0.000e+00, 2.968e-02 }, // CO
-        { 1.110e-01, 0.000e+00, 0.000e+00, 0.000e+00, 1.212e-06, 0.000e+00, 3.178e-04 }, // HC
-        { 4.347e+02, 1.280e+00, 1.983e+02, 0.000e+00, 7.653e-04, 1.037e+01, 8.435e-02 }, // FC
-        { 4.919e-01, 0.000e+00, 0.000e+00, 0.000e+00, 1.120e-06, 0.000e+00, 2.056e-04 }, // NOx
-        { 0.000e+00, 7.193e-03, 0.000e+00, 9.470e-06, 3.382e-07, 0.000e+00, 8.201e-05 }, // PM + PM (non-exhaust)
+        { 1.351e+03, 1.432e+01, 6.162e+02, 0.000e+00, 1.110e-01, 1.160e+02, 3.397e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 4.884e-03, 0.000e+00, 3.846e-01 }, // CO
+        { 1.110e-01, 0.000e+00, 0.000e+00, 0.000e+00, 5.656e-05, 0.000e+00, 4.118e-03 }, // HC
+        { 4.347e+02, 4.608e+00, 1.983e+02, 0.000e+00, 3.570e-02, 3.734e+01, 1.093e+00 }, // FC
+        { 4.919e-01, 0.000e+00, 0.000e+00, 0.000e+00, 5.224e-05, 0.000e+00, 2.665e-03 }, // NOx
+        { 0.000e+00, 2.589e-02, 0.000e+00, 1.227e-04, 1.578e-05, 0.000e+00, 1.063e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // PC_CNG_petrol_Euro-3_(P)
-        { 1.515e+03, 4.462e+00, 6.912e+02, 0.000e+00, 2.668e-03, 3.616e+01, 2.940e-01 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 9.516e-05, 0.000e+00, 2.698e-02 }, // CO
-        { 7.401e-02, 0.000e+00, 0.000e+00, 0.000e+00, 8.081e-07, 0.000e+00, 2.119e-04 }, // HC
-        { 4.912e+02, 1.446e+00, 2.241e+02, 0.000e+00, 8.648e-04, 1.172e+01, 9.532e-02 }, // FC
-        { 4.919e-01, 0.000e+00, 0.000e+00, 0.000e+00, 1.120e-06, 0.000e+00, 2.056e-04 }, // NOx
-        { 0.000e+00, 7.193e-03, 0.000e+00, 9.470e-06, 2.254e-07, 0.000e+00, 5.470e-05 }, // PM + PM (non-exhaust)
+        { 1.515e+03, 1.606e+01, 6.912e+02, 0.000e+00, 1.245e-01, 1.302e+02, 3.811e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 4.440e-03, 0.000e+00, 3.497e-01 }, // CO
+        { 7.401e-02, 0.000e+00, 0.000e+00, 0.000e+00, 3.770e-05, 0.000e+00, 2.746e-03 }, // HC
+        { 4.912e+02, 5.207e+00, 2.241e+02, 0.000e+00, 4.035e-02, 4.220e+01, 1.235e+00 }, // FC
+        { 4.919e-01, 0.000e+00, 0.000e+00, 0.000e+00, 5.224e-05, 0.000e+00, 2.665e-03 }, // NOx
+        { 0.000e+00, 2.589e-02, 0.000e+00, 1.227e-04, 1.052e-05, 0.000e+00, 7.089e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // PC_CNG_petrol_Euro-4_(CNG)
-        { 1.381e+03, 4.346e+00, 6.106e+02, 0.000e+00, 2.331e-03, 3.476e+01, 2.427e-01 }, // CO2(total)
-        { 0.000e+00, 6.934e-02, 2.085e+00, 4.095e-04, 0.000e+00, 9.718e-02, 0.000e+00 }, // CO
-        { 2.862e-01, 0.000e+00, 0.000e+00, 1.019e-04, 8.551e-08, 1.404e-02, 3.116e-05 }, // HC
-        { 4.444e+02, 1.398e+00, 1.965e+02, 0.000e+00, 7.500e-04, 1.119e+01, 7.809e-02 }, // FC
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.091e-05, 0.000e+00, 2.296e-03 }, // NOx
-        { 0.000e+00, 7.191e-03, 0.000e+00, 9.495e-06, 3.448e-07, 9.835e-04, 3.703e-05 }, // PM + PM (non-exhaust)
+        { 1.381e+03, 1.565e+01, 6.106e+02, 0.000e+00, 1.088e-01, 1.251e+02, 3.145e+00 }, // CO2(total)
+        { 0.000e+00, 2.496e-01, 2.085e+00, 5.308e-03, 0.000e+00, 3.498e-01, 0.000e+00 }, // CO
+        { 2.862e-01, 0.000e+00, 0.000e+00, 1.321e-03, 3.989e-06, 5.056e-02, 4.038e-04 }, // HC
+        { 4.444e+02, 5.034e+00, 1.965e+02, 0.000e+00, 3.499e-02, 4.027e+01, 1.012e+00 }, // FC
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 5.088e-04, 0.000e+00, 2.975e-02 }, // NOx
+        { 0.000e+00, 2.589e-02, 0.000e+00, 1.231e-04, 1.609e-05, 3.540e-03, 4.799e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // PC_CNG_petrol_Euro-4_(P)
-        { 1.552e+03, 4.883e+00, 6.861e+02, 0.000e+00, 2.619e-03, 3.906e+01, 2.727e-01 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 6.714e-05, 0.000e+00, 1.470e-02 }, // CO
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 4.651e-07, 0.000e+00, 9.579e-05 }, // HC
-        { 5.031e+02, 1.583e+00, 2.224e+02, 0.000e+00, 8.490e-04, 1.266e+01, 8.840e-02 }, // FC
-        { 6.070e-01, 3.779e-04, 0.000e+00, 0.000e+00, 1.166e-06, 1.258e-02, 2.113e-04 }, // NOx
-        { 0.000e+00, 7.191e-03, 0.000e+00, 9.495e-06, 1.240e-07, 0.000e+00, 2.852e-05 }, // PM + PM (non-exhaust)
+        { 1.552e+03, 1.758e+01, 6.861e+02, 0.000e+00, 1.222e-01, 1.406e+02, 3.534e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 3.132e-03, 0.000e+00, 1.905e-01 }, // CO
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 2.170e-05, 0.000e+00, 1.241e-03 }, // HC
+        { 5.031e+02, 5.699e+00, 2.224e+02, 0.000e+00, 3.961e-02, 4.558e+01, 1.146e+00 }, // FC
+        { 6.070e-01, 1.361e-03, 0.000e+00, 0.000e+00, 5.441e-05, 4.530e-02, 2.739e-03 }, // NOx
+        { 0.000e+00, 2.589e-02, 0.000e+00, 1.231e-04, 5.787e-06, 0.000e+00, 3.696e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // PC_CNG_petrol_Euro-5_(CNG)
-        { 1.206e+03, 4.251e+00, 6.394e+02, 0.000e+00, 1.977e-03, 2.777e+01, 2.272e-01 }, // CO2(total)
-        { 0.000e+00, 6.173e-02, 6.680e-01, 7.762e-04, 0.000e+00, 1.486e-01, 0.000e+00 }, // CO
-        { 3.767e-01, 0.000e+00, 0.000e+00, 1.122e-04, 2.361e-07, 1.377e-02, 8.396e-05 }, // HC
-        { 3.882e+02, 1.368e+00, 2.057e+02, 0.000e+00, 6.362e-04, 8.935e+00, 7.311e-02 }, // FC
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 3.339e-06, 0.000e+00, 8.281e-04 }, // NOx
-        { 0.000e+00, 7.198e-03, 0.000e+00, 9.408e-06, 4.062e-07, 0.000e+00, 6.608e-05 }, // PM + PM (non-exhaust)
+        { 1.206e+03, 1.530e+01, 6.394e+02, 0.000e+00, 9.225e-02, 9.996e+01, 2.945e+00 }, // CO2(total)
+        { 0.000e+00, 2.222e-01, 6.680e-01, 1.006e-02, 0.000e+00, 5.349e-01, 0.000e+00 }, // CO
+        { 3.767e-01, 0.000e+00, 0.000e+00, 1.455e-03, 1.102e-05, 4.956e-02, 1.088e-03 }, // HC
+        { 3.882e+02, 4.925e+00, 2.057e+02, 0.000e+00, 2.968e-02, 3.217e+01, 9.475e-01 }, // FC
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.558e-04, 0.000e+00, 1.073e-02 }, // NOx
+        { 0.000e+00, 2.591e-02, 0.000e+00, 1.219e-04, 1.895e-05, 0.000e+00, 8.564e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // PC_CNG_petrol_Euro-5_(P)
-        { 1.355e+03, 4.778e+00, 7.184e+02, 0.000e+00, 2.222e-03, 3.120e+01, 2.553e-01 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 8.143e-05, 0.000e+00, 2.313e-02 }, // CO
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 5.156e-07, 0.000e+00, 1.254e-04 }, // HC
-        { 4.394e+02, 1.549e+00, 2.329e+02, 0.000e+00, 7.202e-04, 1.011e+01, 8.276e-02 }, // FC
-        { 3.237e-01, 0.000e+00, 1.109e-01, 0.000e+00, 1.322e-07, 0.000e+00, 4.423e-05 }, // NOx
-        { 8.119e-03, 7.198e-03, 0.000e+00, 9.408e-06, 6.710e-08, 2.498e-04, 9.918e-06 }, // PM + PM (non-exhaust)
+        { 1.355e+03, 1.720e+01, 7.184e+02, 0.000e+00, 1.037e-01, 1.123e+02, 3.309e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 3.799e-03, 0.000e+00, 2.998e-01 }, // CO
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 2.406e-05, 0.000e+00, 1.626e-03 }, // HC
+        { 4.394e+02, 5.576e+00, 2.329e+02, 0.000e+00, 3.360e-02, 3.641e+01, 1.073e+00 }, // FC
+        { 3.237e-01, 0.000e+00, 1.109e-01, 0.000e+00, 6.170e-06, 0.000e+00, 5.733e-04 }, // NOx
+        { 8.119e-03, 2.591e-02, 0.000e+00, 1.219e-04, 3.131e-06, 8.992e-04, 1.285e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // PC_CNG_petrol_Euro-6_(CNG)
-        { 1.098e+03, 4.286e+00, 6.995e+02, 0.000e+00, 1.603e-03, 2.124e+01, 2.163e-01 }, // CO2(total)
-        { 1.783e+00, 0.000e+00, 1.357e+00, 0.000e+00, 1.676e-06, 0.000e+00, 2.902e-04 }, // CO
-        { 1.638e-01, 0.000e+00, 0.000e+00, 0.000e+00, 5.229e-07, 0.000e+00, 1.199e-04 }, // HC
-        { 3.532e+02, 1.379e+00, 2.251e+02, 0.000e+00, 5.159e-04, 6.834e+00, 6.961e-02 }, // FC
-        { 8.225e-02, 0.000e+00, 0.000e+00, 0.000e+00, 2.021e-07, 0.000e+00, 4.777e-05 }, // NOx
-        { 5.162e-03, 7.201e-03, 0.000e+00, 9.372e-06, 4.294e-08, 0.000e+00, 6.616e-06 }, // PM + PM (non-exhaust)
+        { 1.098e+03, 1.543e+01, 6.995e+02, 0.000e+00, 7.481e-02, 7.646e+01, 2.804e+00 }, // CO2(total)
+        { 1.783e+00, 0.000e+00, 1.357e+00, 0.000e+00, 7.820e-05, 0.000e+00, 3.762e-03 }, // CO
+        { 1.638e-01, 0.000e+00, 0.000e+00, 0.000e+00, 2.439e-05, 0.000e+00, 1.553e-03 }, // HC
+        { 3.532e+02, 4.964e+00, 2.251e+02, 0.000e+00, 2.407e-02, 2.460e+01, 9.022e-01 }, // FC
+        { 8.225e-02, 0.000e+00, 0.000e+00, 0.000e+00, 9.429e-06, 0.000e+00, 6.191e-04 }, // NOx
+        { 5.162e-03, 2.593e-02, 0.000e+00, 1.215e-04, 2.003e-06, 0.000e+00, 8.574e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // PC_CNG_petrol_Euro-6_(P)
-        { 1.233e+03, 4.815e+00, 7.860e+02, 0.000e+00, 1.801e-03, 2.386e+01, 2.431e-01 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 3.062e-05, 0.000e+00, 7.877e-03 }, // CO
-        { 2.912e-02, 0.000e+00, 0.000e+00, 0.000e+00, 2.230e-07, 0.000e+00, 5.740e-05 }, // HC
-        { 3.998e+02, 1.561e+00, 2.548e+02, 0.000e+00, 5.840e-04, 7.736e+00, 7.880e-02 }, // FC
-        { 4.453e-01, 1.861e-03, 5.629e-01, 0.000e+00, 2.103e-07, 0.000e+00, 6.497e-05 }, // NOx
-        { 1.268e-02, 7.201e-03, 4.616e-03, 9.372e-06, 1.173e-08, 0.000e+00, 1.646e-08 }, // PM + PM (non-exhaust)
+        { 1.233e+03, 1.733e+01, 7.860e+02, 0.000e+00, 8.405e-02, 8.591e+01, 3.150e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.428e-03, 0.000e+00, 1.021e-01 }, // CO
+        { 2.912e-02, 0.000e+00, 0.000e+00, 0.000e+00, 1.041e-05, 0.000e+00, 7.440e-04 }, // HC
+        { 3.998e+02, 5.620e+00, 2.548e+02, 0.000e+00, 2.725e-02, 2.785e+01, 1.021e+00 }, // FC
+        { 4.453e-01, 6.698e-03, 5.629e-01, 0.000e+00, 9.810e-06, 0.000e+00, 8.420e-04 }, // NOx
+        { 1.268e-02, 2.593e-02, 4.616e-03, 1.215e-04, 5.474e-07, 0.000e+00, 2.133e-07 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // PC_FFV_Euro-3__(E85)
-        { 1.550e+03, 4.563e+00, 7.068e+02, 0.000e+00, 2.728e-03, 3.697e+01, 3.007e-01 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 9.516e-05, 0.000e+00, 2.698e-02 }, // CO
-        { 7.401e-02, 0.000e+00, 0.000e+00, 0.000e+00, 8.081e-07, 0.000e+00, 2.119e-04 }, // HC
-        { 7.564e+02, 2.227e+00, 3.450e+02, 0.000e+00, 1.332e-03, 1.805e+01, 1.468e-01 }, // FC
-        { 4.919e-01, 0.000e+00, 0.000e+00, 0.000e+00, 1.120e-06, 0.000e+00, 2.056e-04 }, // NOx
-        { 0.000e+00, 7.193e-03, 0.000e+00, 9.470e-06, 2.254e-07, 0.000e+00, 5.470e-05 }, // PM + PM (non-exhaust)
+        { 1.550e+03, 1.643e+01, 7.068e+02, 0.000e+00, 1.273e-01, 1.331e+02, 3.897e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 4.440e-03, 0.000e+00, 3.497e-01 }, // CO
+        { 7.401e-02, 0.000e+00, 0.000e+00, 0.000e+00, 3.770e-05, 0.000e+00, 2.746e-03 }, // HC
+        { 7.564e+02, 8.018e+00, 3.450e+02, 0.000e+00, 6.212e-02, 6.497e+01, 1.902e+00 }, // FC
+        { 4.919e-01, 0.000e+00, 0.000e+00, 0.000e+00, 5.224e-05, 0.000e+00, 2.665e-03 }, // NOx
+        { 0.000e+00, 2.589e-02, 0.000e+00, 1.227e-04, 1.052e-05, 0.000e+00, 7.089e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // PC_FFV_Euro-3__(P)
-        { 1.515e+03, 4.462e+00, 6.912e+02, 0.000e+00, 2.668e-03, 3.616e+01, 2.940e-01 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 9.516e-05, 0.000e+00, 2.698e-02 }, // CO
-        { 7.401e-02, 0.000e+00, 0.000e+00, 0.000e+00, 8.081e-07, 0.000e+00, 2.119e-04 }, // HC
-        { 4.912e+02, 1.446e+00, 2.241e+02, 0.000e+00, 8.648e-04, 1.172e+01, 9.532e-02 }, // FC
-        { 4.919e-01, 0.000e+00, 0.000e+00, 0.000e+00, 1.120e-06, 0.000e+00, 2.056e-04 }, // NOx
-        { 0.000e+00, 7.193e-03, 0.000e+00, 9.470e-06, 2.254e-07, 0.000e+00, 5.470e-05 }, // PM + PM (non-exhaust)
+        { 1.515e+03, 1.606e+01, 6.912e+02, 0.000e+00, 1.245e-01, 1.302e+02, 3.811e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 4.440e-03, 0.000e+00, 3.497e-01 }, // CO
+        { 7.401e-02, 0.000e+00, 0.000e+00, 0.000e+00, 3.770e-05, 0.000e+00, 2.746e-03 }, // HC
+        { 4.912e+02, 5.207e+00, 2.241e+02, 0.000e+00, 4.035e-02, 4.220e+01, 1.235e+00 }, // FC
+        { 4.919e-01, 0.000e+00, 0.000e+00, 0.000e+00, 5.224e-05, 0.000e+00, 2.665e-03 }, // NOx
+        { 0.000e+00, 2.589e-02, 0.000e+00, 1.227e-04, 1.052e-05, 0.000e+00, 7.089e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // PC_FFV_Euro-4__(E85)
-        { 2.087e+03, 5.941e+00, 9.537e+02, 0.000e+00, 3.526e-03, 5.050e+01, 3.635e-01 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 6.556e-05, 0.000e+00, 1.413e-02 }, // CO
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 4.569e-07, 0.000e+00, 9.278e-05 }, // HC
-        { 1.019e+03, 2.900e+00, 4.655e+02, 0.000e+00, 1.721e-03, 2.465e+01, 1.774e-01 }, // FC
-        { 6.117e-01, 0.000e+00, 0.000e+00, 0.000e+00, 1.176e-06, 1.205e-02, 2.104e-04 }, // NOx
-        { 0.000e+00, 7.192e-03, 0.000e+00, 9.481e-06, 8.557e-08, 0.000e+00, 1.959e-05 }, // PM + PM (non-exhaust)
+        { 2.087e+03, 2.139e+01, 9.537e+02, 0.000e+00, 1.645e-01, 1.818e+02, 4.711e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 3.059e-03, 0.000e+00, 1.832e-01 }, // CO
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 2.132e-05, 0.000e+00, 1.202e-03 }, // HC
+        { 1.019e+03, 1.044e+01, 4.655e+02, 0.000e+00, 8.030e-02, 8.874e+01, 2.299e+00 }, // FC
+        { 6.117e-01, 0.000e+00, 0.000e+00, 0.000e+00, 5.485e-05, 4.339e-02, 2.726e-03 }, // NOx
+        { 0.000e+00, 2.589e-02, 0.000e+00, 1.229e-04, 3.992e-06, 0.000e+00, 2.538e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // PC_FFV_Euro-4__(P)
-        { 1.511e+03, 4.303e+00, 6.908e+02, 0.000e+00, 2.554e-03, 3.658e+01, 2.633e-01 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 6.556e-05, 0.000e+00, 1.413e-02 }, // CO
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 4.569e-07, 0.000e+00, 9.278e-05 }, // HC
-        { 4.900e+02, 1.395e+00, 2.239e+02, 0.000e+00, 8.280e-04, 1.186e+01, 8.536e-02 }, // FC
-        { 6.117e-01, 0.000e+00, 0.000e+00, 0.000e+00, 1.176e-06, 1.205e-02, 2.104e-04 }, // NOx
-        { 0.000e+00, 7.192e-03, 0.000e+00, 9.481e-06, 1.222e-07, 0.000e+00, 2.793e-05 }, // PM + PM (non-exhaust)
+        { 1.511e+03, 1.549e+01, 6.908e+02, 0.000e+00, 1.192e-01, 1.317e+02, 3.412e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 3.059e-03, 0.000e+00, 1.832e-01 }, // CO
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 2.132e-05, 0.000e+00, 1.202e-03 }, // HC
+        { 4.900e+02, 5.022e+00, 2.239e+02, 0.000e+00, 3.863e-02, 4.269e+01, 1.106e+00 }, // FC
+        { 6.117e-01, 0.000e+00, 0.000e+00, 0.000e+00, 5.485e-05, 4.339e-02, 2.726e-03 }, // NOx
+        { 0.000e+00, 2.589e-02, 0.000e+00, 1.229e-04, 5.704e-06, 0.000e+00, 3.620e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // PC_FFV_Euro-5__(E85)
-        { 1.916e+03, 6.639e+00, 9.597e+02, 0.000e+00, 3.151e-03, 4.558e+01, 3.410e-01 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 7.794e-05, 0.000e+00, 2.193e-02 }, // CO
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 5.023e-07, 0.000e+00, 1.208e-04 }, // HC
-        { 9.352e+02, 3.241e+00, 4.684e+02, 0.000e+00, 1.538e-03, 2.225e+01, 1.664e-01 }, // FC
-        { 3.233e-01, 0.000e+00, 1.097e-01, 0.000e+00, 1.309e-07, 0.000e+00, 4.408e-05 }, // NOx
-        { 5.077e-03, 7.196e-03, 0.000e+00, 9.428e-06, 4.715e-08, 1.213e-04, 7.339e-06 }, // PM + PM (non-exhaust)
+        { 1.916e+03, 2.390e+01, 9.597e+02, 0.000e+00, 1.470e-01, 1.641e+02, 4.419e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 3.636e-03, 0.000e+00, 2.842e-01 }, // CO
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 2.343e-05, 0.000e+00, 1.566e-03 }, // HC
+        { 9.352e+02, 1.167e+01, 4.684e+02, 0.000e+00, 7.175e-02, 8.009e+01, 2.157e+00 }, // FC
+        { 3.233e-01, 0.000e+00, 1.097e-01, 0.000e+00, 6.108e-06, 0.000e+00, 5.713e-04 }, // NOx
+        { 5.077e-03, 2.591e-02, 0.000e+00, 1.222e-04, 2.200e-06, 4.367e-04, 9.511e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // PC_FFV_Euro-5__(P)
-        { 1.388e+03, 4.809e+00, 6.952e+02, 0.000e+00, 2.282e-03, 3.302e+01, 2.470e-01 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 7.794e-05, 0.000e+00, 2.193e-02 }, // CO
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 5.023e-07, 0.000e+00, 1.208e-04 }, // HC
-        { 4.499e+02, 1.559e+00, 2.254e+02, 0.000e+00, 7.399e-04, 1.070e+01, 8.007e-02 }, // FC
-        { 3.233e-01, 0.000e+00, 1.097e-01, 0.000e+00, 1.309e-07, 0.000e+00, 4.408e-05 }, // NOx
-        { 7.254e-03, 7.196e-03, 0.000e+00, 9.428e-06, 6.735e-08, 1.733e-04, 1.046e-05 }, // PM + PM (non-exhaust)
+        { 1.388e+03, 1.731e+01, 6.952e+02, 0.000e+00, 1.065e-01, 1.189e+02, 3.201e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 3.636e-03, 0.000e+00, 2.842e-01 }, // CO
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 2.343e-05, 0.000e+00, 1.566e-03 }, // HC
+        { 4.499e+02, 5.613e+00, 2.254e+02, 0.000e+00, 3.452e-02, 3.853e+01, 1.038e+00 }, // FC
+        { 3.233e-01, 0.000e+00, 1.097e-01, 0.000e+00, 6.108e-06, 0.000e+00, 5.713e-04 }, // NOx
+        { 7.254e-03, 2.591e-02, 0.000e+00, 1.222e-04, 3.142e-06, 6.239e-04, 1.355e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // PC_FFV_Euro-6__(E85)
-        { 1.949e+03, 7.516e+00, 1.195e+03, 0.000e+00, 2.852e-03, 3.892e+01, 3.667e-01 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 3.017e-05, 0.000e+00, 7.738e-03 }, // CO
-        { 2.848e-02, 0.000e+00, 0.000e+00, 0.000e+00, 2.194e-07, 0.000e+00, 5.598e-05 }, // HC
-        { 9.511e+02, 3.669e+00, 5.835e+02, 0.000e+00, 1.392e-03, 1.900e+01, 1.790e-01 }, // FC
-        { 4.354e-01, 1.959e-03, 5.637e-01, 0.000e+00, 2.008e-07, 0.000e+00, 6.136e-05 }, // NOx
-        { 8.787e-03, 7.201e-03, 3.144e-03, 9.372e-06, 8.305e-09, 8.487e-07, 1.596e-08 }, // PM + PM (non-exhaust)
+        { 1.949e+03, 2.706e+01, 1.195e+03, 0.000e+00, 1.331e-01, 1.401e+02, 4.752e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.408e-03, 0.000e+00, 1.003e-01 }, // CO
+        { 2.848e-02, 0.000e+00, 0.000e+00, 0.000e+00, 1.024e-05, 0.000e+00, 7.255e-04 }, // HC
+        { 9.511e+02, 1.321e+01, 5.835e+02, 0.000e+00, 6.495e-02, 6.839e+01, 2.319e+00 }, // FC
+        { 4.354e-01, 7.053e-03, 5.637e-01, 0.000e+00, 9.367e-06, 0.000e+00, 7.952e-04 }, // NOx
+        { 8.787e-03, 2.592e-02, 3.144e-03, 1.215e-04, 3.875e-07, 3.055e-06, 2.068e-07 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // PC_FFV_Euro-6__(P)
-        { 1.411e+03, 5.444e+00, 8.660e+02, 0.000e+00, 2.066e-03, 2.819e+01, 2.656e-01 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 3.017e-05, 0.000e+00, 7.738e-03 }, // CO
-        { 2.848e-02, 0.000e+00, 0.000e+00, 0.000e+00, 2.194e-07, 0.000e+00, 5.598e-05 }, // HC
-        { 4.576e+02, 1.765e+00, 2.807e+02, 0.000e+00, 6.698e-04, 9.140e+00, 8.610e-02 }, // FC
-        { 4.354e-01, 1.959e-03, 5.637e-01, 0.000e+00, 2.008e-07, 0.000e+00, 6.136e-05 }, // NOx
-        { 1.255e-02, 7.201e-03, 4.491e-03, 9.372e-06, 1.186e-08, 1.212e-06, 1.596e-08 }, // PM + PM (non-exhaust)
+        { 1.411e+03, 1.960e+01, 8.660e+02, 0.000e+00, 9.639e-02, 1.015e+02, 3.442e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.408e-03, 0.000e+00, 1.003e-01 }, // CO
+        { 2.848e-02, 0.000e+00, 0.000e+00, 0.000e+00, 1.024e-05, 0.000e+00, 7.255e-04 }, // HC
+        { 4.576e+02, 6.354e+00, 2.807e+02, 0.000e+00, 3.125e-02, 3.290e+01, 1.116e+00 }, // FC
+        { 4.354e-01, 7.053e-03, 5.637e-01, 0.000e+00, 9.367e-06, 0.000e+00, 7.952e-04 }, // NOx
+        { 1.255e-02, 2.592e-02, 4.491e-03, 1.215e-04, 5.535e-07, 4.365e-06, 2.068e-07 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
@@ -631,8 +631,8 @@
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // HC
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // NOx
-        { 0.000e+00, 7.202e-03, 0.000e+00, 9.357e-06, 0.000e+00, 5.815e-19, 0.000e+00 }, // PM + PM (non-exhaust)
-        { 8.055e-01, 1.188e-02, 7.606e-01, 0.000e+00, 2.115e-06, 6.836e-02, 1.471e-04 }, // FC_MJ
+        { 0.000e+00, 2.593e-02, 0.000e+00, 1.213e-04, 0.000e+00, 4.941e-18, 0.000e+00 }, // PM + PM (non-exhaust)
+        { 8.055e-01, 4.277e-02, 7.606e-01, 0.000e+00, 9.867e-05, 2.461e-01, 1.906e-03 }, // FC_MJ
     },
     {
         // PC_PHEV_petrol_Euro-4_(El)
@@ -641,17 +641,17 @@
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // HC
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // NOx
-        { 0.000e+00, 7.133e-03, 0.000e+00, 1.026e-05, 0.000e+00, 0.000e+00, 8.921e-07 }, // PM + PM (non-exhaust)
-        { 6.658e-01, 1.690e-02, 0.000e+00, 0.000e+00, 2.766e-06, 9.887e-02, 1.364e-04 }, // FC_MJ
+        { 0.000e+00, 2.568e-02, 0.000e+00, 1.330e-04, 0.000e+00, 0.000e+00, 1.156e-05 }, // PM + PM (non-exhaust)
+        { 6.658e-01, 6.083e-02, 0.000e+00, 0.000e+00, 1.291e-04, 3.559e-01, 1.768e-03 }, // FC_MJ
     },
     {
         // PC_PHEV_petrol_Euro-4_(P)
-        { 1.095e+03, 1.806e+01, 1.458e+02, 0.000e+00, 2.129e-03, 4.811e+01, 3.270e-01 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 6.000e-05, 0.000e+00, 1.274e-02 }, // CO
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 4.406e-07, 0.000e+00, 8.973e-05 }, // HC
-        { 3.551e+02, 5.853e+00, 4.727e+01, 0.000e+00, 6.902e-04, 1.559e+01, 1.060e-01 }, // FC
-        { 5.298e-01, 1.899e-03, 0.000e+00, 0.000e+00, 1.136e-06, 1.303e-02, 2.180e-04 }, // NOx
-        { 0.000e+00, 7.133e-03, 0.000e+00, 1.026e-05, 1.191e-07, 0.000e+00, 2.797e-05 }, // PM + PM (non-exhaust)
+        { 1.095e+03, 6.500e+01, 1.458e+02, 0.000e+00, 9.933e-02, 1.732e+02, 4.238e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 2.799e-03, 0.000e+00, 1.651e-01 }, // CO
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 2.056e-05, 0.000e+00, 1.163e-03 }, // HC
+        { 3.551e+02, 2.107e+01, 4.727e+01, 0.000e+00, 3.220e-02, 5.614e+01, 1.374e+00 }, // FC
+        { 5.298e-01, 6.836e-03, 0.000e+00, 0.000e+00, 5.301e-05, 4.691e-02, 2.826e-03 }, // NOx
+        { 0.000e+00, 2.568e-02, 0.000e+00, 1.330e-04, 5.555e-06, 0.000e+00, 3.625e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
@@ -661,17 +661,17 @@
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // HC
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // NOx
-        { 0.000e+00, 7.150e-03, 0.000e+00, 1.005e-05, 0.000e+00, 0.000e+00, 7.588e-07 }, // PM + PM (non-exhaust)
-        { 6.031e-01, 1.745e-02, 0.000e+00, 0.000e+00, 2.767e-06, 9.797e-02, 1.613e-04 }, // FC_MJ
+        { 0.000e+00, 2.574e-02, 0.000e+00, 1.302e-04, 0.000e+00, 0.000e+00, 9.834e-06 }, // PM + PM (non-exhaust)
+        { 6.031e-01, 6.283e-02, 0.000e+00, 0.000e+00, 1.291e-04, 3.527e-01, 2.090e-03 }, // FC_MJ
     },
     {
         // PC_PHEV_petrol_Euro-5_(P)
-        { 7.748e+02, 1.798e+01, 1.818e+02, 0.000e+00, 1.972e-03, 4.135e+01, 3.470e-01 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 6.987e-05, 0.000e+00, 1.970e-02 }, // CO
-        { 1.843e-02, 0.000e+00, 0.000e+00, 0.000e+00, 4.797e-07, 0.000e+00, 1.191e-04 }, // HC
-        { 2.512e+02, 5.828e+00, 5.895e+01, 0.000e+00, 6.394e-04, 1.340e+01, 1.125e-01 }, // FC
-        { 2.800e-01, 9.094e-04, 1.047e-01, 0.000e+00, 9.333e-08, 0.000e+00, 4.444e-05 }, // NOx
-        { 6.752e-03, 7.150e-03, 0.000e+00, 1.005e-05, 7.069e-08, 5.404e-05, 1.338e-05 }, // PM + PM (non-exhaust)
+        { 7.748e+02, 6.472e+01, 1.818e+02, 0.000e+00, 9.202e-02, 1.488e+02, 4.497e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 3.260e-03, 0.000e+00, 2.553e-01 }, // CO
+        { 1.843e-02, 0.000e+00, 0.000e+00, 0.000e+00, 2.238e-05, 0.000e+00, 1.544e-03 }, // HC
+        { 2.512e+02, 2.098e+01, 5.895e+01, 0.000e+00, 2.983e-02, 4.825e+01, 1.458e+00 }, // FC
+        { 2.800e-01, 3.274e-03, 1.047e-01, 0.000e+00, 4.355e-06, 0.000e+00, 5.759e-04 }, // NOx
+        { 6.752e-03, 2.574e-02, 0.000e+00, 1.302e-04, 3.298e-06, 1.945e-04, 1.734e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
@@ -681,17 +681,17 @@
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // HC
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // NOx
-        { 0.000e+00, 7.164e-03, 0.000e+00, 9.823e-06, 0.000e+00, 0.000e+00, 4.241e-07 }, // PM + PM (non-exhaust)
-        { 8.915e-01, 1.502e-02, 0.000e+00, 0.000e+00, 2.846e-06, 9.764e-02, 2.099e-04 }, // FC_MJ
+        { 0.000e+00, 2.579e-02, 0.000e+00, 1.273e-04, 0.000e+00, 0.000e+00, 5.496e-06 }, // PM + PM (non-exhaust)
+        { 8.915e-01, 5.406e-02, 0.000e+00, 0.000e+00, 1.328e-04, 3.515e-01, 2.720e-03 }, // FC_MJ
     },
     {
         // PC_PHEV_petrol_Euro-6d_(P)
-        { 9.793e+02, 1.220e+01, 0.000e+00, 0.000e+00, 1.911e-03, 5.150e+01, 2.176e-01 }, // CO2(total)
-        { 3.151e+00, 0.000e+00, 1.327e-01, 0.000e+00, 8.908e-06, 0.000e+00, 2.445e-03 }, // CO
-        { 2.247e-02, 3.108e-04, 0.000e+00, 0.000e+00, 1.408e-07, 2.838e-03, 0.000e+00 }, // HC
-        { 3.175e+02, 3.956e+00, 0.000e+00, 0.000e+00, 6.194e-04, 1.670e+01, 7.055e-02 }, // FC
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.352e-06, 0.000e+00, 3.429e-04 }, // NOx
-        { 0.000e+00, 7.291e-03, 2.272e-03, 1.254e-05, 0.000e+00, 4.505e-04, 4.241e-07 }, // PM + PM (non-exhaust)
+        { 9.793e+02, 4.393e+01, 0.000e+00, 0.000e+00, 8.914e-02, 1.854e+02, 2.821e+00 }, // CO2(total)
+        { 3.151e+00, 0.000e+00, 1.327e-01, 0.000e+00, 4.156e-04, 0.000e+00, 3.169e-02 }, // CO
+        { 2.247e-02, 1.119e-03, 0.000e+00, 0.000e+00, 6.569e-06, 1.022e-02, 0.000e+00 }, // HC
+        { 3.175e+02, 1.424e+01, 0.000e+00, 0.000e+00, 2.890e-02, 6.010e+01, 9.144e-01 }, // FC
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 6.309e-05, 0.000e+00, 4.444e-03 }, // NOx
+        { 0.000e+00, 2.625e-02, 2.272e-03, 1.625e-04, 0.000e+00, 1.622e-03, 5.496e-06 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
@@ -701,17 +701,17 @@
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // HC
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // NOx
-        { 0.000e+00, 7.163e-03, 0.000e+00, 9.890e-06, 0.000e+00, 0.000e+00, 6.332e-07 }, // PM + PM (non-exhaust)
-        { 7.792e-01, 1.648e-02, 0.000e+00, 0.000e+00, 2.798e-06, 9.760e-02, 1.966e-04 }, // FC_MJ
+        { 0.000e+00, 2.579e-02, 0.000e+00, 1.282e-04, 0.000e+00, 0.000e+00, 8.206e-06 }, // PM + PM (non-exhaust)
+        { 7.792e-01, 5.934e-02, 0.000e+00, 0.000e+00, 1.306e-04, 3.514e-01, 2.548e-03 }, // FC_MJ
     },
     {
         // PC_PHEV_petrol_Euro-6ab_(P)
-        { 1.015e+03, 1.297e+01, 0.000e+00, 0.000e+00, 1.953e-03, 4.497e+01, 3.291e-01 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 2.965e-05, 0.000e+00, 7.685e-03 }, // CO
-        { 3.990e-02, 0.000e+00, 0.000e+00, 0.000e+00, 2.113e-07, 0.000e+00, 5.640e-05 }, // HC
-        { 3.290e+02, 4.205e+00, 0.000e+00, 0.000e+00, 6.332e-04, 1.458e+01, 1.067e-01 }, // FC
-        { 2.791e-01, 5.622e-03, 3.231e-01, 0.000e+00, 2.044e-08, 8.481e-03, 0.000e+00 }, // NOx
-        { 1.178e-02, 7.163e-03, 0.000e+00, 9.890e-06, 1.309e-08, 6.764e-05, 6.332e-07 }, // PM + PM (non-exhaust)
+        { 1.015e+03, 4.670e+01, 0.000e+00, 0.000e+00, 9.112e-02, 1.619e+02, 4.265e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.384e-03, 0.000e+00, 9.960e-02 }, // CO
+        { 3.990e-02, 0.000e+00, 0.000e+00, 0.000e+00, 9.858e-06, 0.000e+00, 7.310e-04 }, // HC
+        { 3.290e+02, 1.514e+01, 0.000e+00, 0.000e+00, 2.954e-02, 5.248e+01, 1.383e+00 }, // FC
+        { 2.791e-01, 2.024e-02, 3.231e-01, 0.000e+00, 9.536e-07, 3.053e-02, 0.000e+00 }, // NOx
+        { 1.178e-02, 2.579e-02, 0.000e+00, 1.282e-04, 6.106e-07, 2.435e-04, 8.206e-06 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
@@ -721,17 +721,17 @@
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // HC
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // NOx
-        { 0.000e+00, 7.152e-03, 0.000e+00, 9.958e-06, 0.000e+00, 0.000e+00, 5.158e-07 }, // PM + PM (non-exhaust)
-        { 9.204e-01, 2.265e-02, 0.000e+00, 0.000e+00, 2.932e-06, 1.308e-01, 1.237e-04 }, // FC_MJ
+        { 0.000e+00, 2.575e-02, 0.000e+00, 1.290e-04, 0.000e+00, 0.000e+00, 6.685e-06 }, // PM + PM (non-exhaust)
+        { 9.204e-01, 8.152e-02, 0.000e+00, 0.000e+00, 1.368e-04, 4.708e-01, 1.603e-03 }, // FC_MJ
     },
     {
         // PC_PHEV_diesel_Euro-4_(D)
-        { 1.020e+03, 2.678e+01, 2.399e+02, 0.000e+00, 1.958e-03, 6.612e+01, 3.102e-01 }, // CO2(total)
+        { 1.020e+03, 9.640e+01, 2.399e+02, 0.000e+00, 9.136e-02, 2.380e+02, 4.020e+00 }, // CO2(total)
         { 5.083e-01, 0.000e+00, 4.543e-01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 1.218e-01, 4.420e-04, 2.149e-02, 0.000e+00, 4.674e-08, 1.125e-03, 0.000e+00 }, // HC
-        { 3.278e+02, 8.606e+00, 7.711e+01, 0.000e+00, 6.293e-04, 2.125e+01, 9.969e-02 }, // FC
-        { 4.376e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.944e-05, 0.000e+00, 4.942e-03 }, // NOx
-        { 3.316e-01, 1.015e-02, 6.366e-02, 9.958e-06, 2.982e-07, 9.977e-03, 5.158e-07 }, // PM + PM (non-exhaust)
+        { 1.218e-01, 1.591e-03, 2.149e-02, 0.000e+00, 2.181e-06, 4.050e-03, 0.000e+00 }, // HC
+        { 3.278e+02, 3.098e+01, 7.711e+01, 0.000e+00, 2.936e-02, 7.650e+01, 1.292e+00 }, // FC
+        { 4.376e+00, 0.000e+00, 0.000e+00, 0.000e+00, 9.071e-04, 0.000e+00, 6.405e-02 }, // NOx
+        { 3.316e-01, 3.653e-02, 6.366e-02, 1.290e-04, 1.391e-05, 3.592e-02, 6.685e-06 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
@@ -741,17 +741,17 @@
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // HC
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // NOx
-        { 0.000e+00, 7.153e-03, 0.000e+00, 9.950e-06, 0.000e+00, 0.000e+00, 5.119e-07 }, // PM + PM (non-exhaust)
-        { 1.042e+00, 2.161e-02, 0.000e+00, 0.000e+00, 3.226e-06, 1.310e-01, 1.838e-04 }, // FC_MJ
+        { 0.000e+00, 2.575e-02, 0.000e+00, 1.290e-04, 0.000e+00, 0.000e+00, 6.634e-06 }, // PM + PM (non-exhaust)
+        { 1.042e+00, 7.780e-02, 0.000e+00, 0.000e+00, 1.505e-04, 4.715e-01, 2.382e-03 }, // FC_MJ
     },
     {
         // PC_PHEV_diesel_Euro-5_(D)
-        { 1.089e+03, 2.430e+01, 1.004e+01, 0.000e+00, 1.897e-03, 6.421e+01, 2.844e-01 }, // CO2(total)
+        { 1.089e+03, 8.747e+01, 1.004e+01, 0.000e+00, 8.849e-02, 2.311e+02, 3.686e+00 }, // CO2(total)
         { 3.928e-01, 0.000e+00, 4.199e-01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 1.105e-01, 0.000e+00, 2.499e-02, 0.000e+00, 2.697e-08, 2.126e-04, 0.000e+00 }, // HC
-        { 3.499e+02, 7.808e+00, 3.228e+00, 0.000e+00, 6.095e-04, 2.063e+01, 9.141e-02 }, // FC
-        { 6.837e+00, 2.661e-03, 1.302e+00, 0.000e+00, 1.715e-05, 9.017e-03, 4.628e-03 }, // NOx
-        { 2.517e-02, 7.227e-03, 3.787e-03, 9.950e-06, 1.192e-08, 3.027e-04, 5.119e-07 }, // PM + PM (non-exhaust)
+        { 1.105e-01, 0.000e+00, 2.499e-02, 0.000e+00, 1.258e-06, 7.655e-04, 0.000e+00 }, // HC
+        { 3.499e+02, 2.811e+01, 3.228e+00, 0.000e+00, 2.844e-02, 7.429e+01, 1.185e+00 }, // FC
+        { 6.837e+00, 9.580e-03, 1.302e+00, 0.000e+00, 8.001e-04, 3.246e-02, 5.998e-02 }, // NOx
+        { 2.517e-02, 2.602e-02, 3.787e-03, 1.290e-04, 5.561e-07, 1.090e-03, 6.634e-06 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
@@ -761,17 +761,17 @@
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // HC
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // NOx
-        { 0.000e+00, 7.181e-03, 0.000e+00, 9.606e-06, 0.000e+00, 0.000e+00, 1.970e-07 }, // PM + PM (non-exhaust)
-        { 1.094e+00, 2.248e-02, 0.000e+00, 0.000e+00, 3.175e-06, 1.323e-01, 2.368e-04 }, // FC_MJ
+        { 0.000e+00, 2.585e-02, 0.000e+00, 1.245e-04, 0.000e+00, 0.000e+00, 2.553e-06 }, // PM + PM (non-exhaust)
+        { 1.094e+00, 8.091e-02, 0.000e+00, 0.000e+00, 1.481e-04, 4.762e-01, 3.069e-03 }, // FC_MJ
     },
     {
         // PC_PHEV_diesel_Euro-6d_(D)
-        { 1.097e+03, 2.519e+01, 0.000e+00, 0.000e+00, 1.662e-03, 6.000e+01, 3.288e-01 }, // CO2(total)
-        { 1.723e-01, 0.000e+00, 0.000e+00, 1.172e-05, 1.407e-07, 9.839e-04, 4.496e-05 }, // CO
-        { 0.000e+00, 2.431e-03, 0.000e+00, 1.650e-05, 0.000e+00, 6.883e-03, 1.923e-05 }, // HC
-        { 3.526e+02, 8.096e+00, 0.000e+00, 0.000e+00, 5.342e-04, 1.928e+01, 1.057e-01 }, // FC
-        { 3.237e-01, 0.000e+00, 0.000e+00, 0.000e+00, 1.264e-06, 2.429e-03, 3.034e-04 }, // NOx
-        { 3.504e-03, 7.181e-03, 0.000e+00, 9.606e-06, 1.504e-08, 0.000e+00, 4.286e-06 }, // PM + PM (non-exhaust)
+        { 1.097e+03, 9.069e+01, 0.000e+00, 0.000e+00, 7.755e-02, 2.160e+02, 4.262e+00 }, // CO2(total)
+        { 1.723e-01, 0.000e+00, 0.000e+00, 1.519e-04, 6.563e-06, 3.542e-03, 5.827e-04 }, // CO
+        { 0.000e+00, 8.752e-03, 0.000e+00, 2.138e-04, 0.000e+00, 2.478e-02, 2.492e-04 }, // HC
+        { 3.526e+02, 2.914e+01, 0.000e+00, 0.000e+00, 2.492e-02, 6.942e+01, 1.370e+00 }, // FC
+        { 3.237e-01, 0.000e+00, 0.000e+00, 0.000e+00, 5.898e-05, 8.745e-03, 3.932e-03 }, // NOx
+        { 3.504e-03, 2.585e-02, 0.000e+00, 1.245e-04, 7.016e-07, 0.000e+00, 5.555e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
@@ -781,117 +781,117 @@
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // HC
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // NOx
-        { 0.000e+00, 7.177e-03, 0.000e+00, 9.647e-06, 0.000e+00, 0.000e+00, 2.350e-07 }, // PM + PM (non-exhaust)
-        { 1.017e+00, 2.301e-02, 0.000e+00, 0.000e+00, 3.098e-06, 1.334e-01, 1.943e-04 }, // FC_MJ
+        { 0.000e+00, 2.584e-02, 0.000e+00, 1.250e-04, 0.000e+00, 0.000e+00, 3.045e-06 }, // PM + PM (non-exhaust)
+        { 1.017e+00, 8.283e-02, 0.000e+00, 0.000e+00, 1.445e-04, 4.803e-01, 2.518e-03 }, // FC_MJ
     },
     {
         // PC_PHEV_diesel_Euro-6ab_(D)
-        { 1.123e+03, 2.575e+01, 0.000e+00, 0.000e+00, 1.794e-03, 6.135e+01, 3.365e-01 }, // CO2(total)
-        { 1.011e+00, 0.000e+00, 4.723e-01, 0.000e+00, 7.163e-07, 0.000e+00, 1.930e-04 }, // CO
-        { 1.679e-01, 1.084e-03, 1.639e-01, 0.000e+00, 1.986e-07, 2.630e-04, 6.376e-05 }, // HC
-        { 3.611e+02, 8.274e+00, 0.000e+00, 0.000e+00, 5.767e-04, 1.972e+01, 1.081e-01 }, // FC
-        { 3.519e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.159e-05, 0.000e+00, 3.321e-03 }, // NOx
-        { 5.705e-03, 7.177e-03, 0.000e+00, 9.647e-06, 1.762e-08, 2.127e-04, 1.710e-06 }, // PM + PM (non-exhaust)
+        { 1.123e+03, 9.269e+01, 0.000e+00, 0.000e+00, 8.372e-02, 2.208e+02, 4.361e+00 }, // CO2(total)
+        { 1.011e+00, 0.000e+00, 4.723e-01, 0.000e+00, 3.342e-05, 0.000e+00, 2.501e-03 }, // CO
+        { 1.679e-01, 3.903e-03, 1.639e-01, 0.000e+00, 9.265e-06, 9.468e-04, 8.263e-04 }, // HC
+        { 3.611e+02, 2.979e+01, 0.000e+00, 0.000e+00, 2.691e-02, 7.098e+01, 1.401e+00 }, // FC
+        { 3.519e+00, 0.000e+00, 0.000e+00, 0.000e+00, 5.409e-04, 0.000e+00, 4.304e-02 }, // NOx
+        { 5.705e-03, 2.584e-02, 0.000e+00, 1.250e-04, 8.220e-07, 7.659e-04, 2.216e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // PC_LPG_petrol_Euro-2_(LPG)
-        { 1.412e+03, 4.138e+00, 6.278e+02, 0.000e+00, 2.539e-03, 3.417e+01, 2.770e-01 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.003e-04, 0.000e+00, 2.816e-02 }, // CO
-        { 0.000e+00, 9.010e-03, 0.000e+00, 4.054e-05, 0.000e+00, 1.839e-02, 7.316e-05 }, // HC
-        { 4.570e+02, 1.339e+00, 2.032e+02, 0.000e+00, 8.220e-04, 1.106e+01, 8.966e-02 }, // FC
-        { 1.586e+00, 0.000e+00, 0.000e+00, 0.000e+00, 3.688e-06, 0.000e+00, 6.785e-04 }, // NOx
-        { 0.000e+00, 7.192e-03, 0.000e+00, 9.477e-06, 0.000e+00, 0.000e+00, 1.009e-07 }, // PM + PM (non-exhaust)
+        { 1.412e+03, 1.490e+01, 6.278e+02, 0.000e+00, 1.185e-01, 1.230e+02, 3.590e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 4.679e-03, 0.000e+00, 3.649e-01 }, // CO
+        { 0.000e+00, 3.243e-02, 0.000e+00, 5.254e-04, 0.000e+00, 6.622e-02, 9.482e-04 }, // HC
+        { 4.570e+02, 4.822e+00, 2.032e+02, 0.000e+00, 3.835e-02, 3.982e+01, 1.162e+00 }, // FC
+        { 1.586e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.721e-04, 0.000e+00, 8.793e-03 }, // NOx
+        { 0.000e+00, 2.589e-02, 0.000e+00, 1.228e-04, 0.000e+00, 0.000e+00, 1.308e-06 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // PC_LPG_petrol_Euro-2_(P)
-        { 1.487e+03, 4.358e+00, 6.612e+02, 0.000e+00, 2.675e-03, 3.599e+01, 2.917e-01 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.003e-04, 0.000e+00, 2.816e-02 }, // CO
-        { 0.000e+00, 9.010e-03, 0.000e+00, 4.054e-05, 0.000e+00, 1.839e-02, 7.316e-05 }, // HC
-        { 4.820e+02, 1.413e+00, 2.144e+02, 0.000e+00, 8.670e-04, 1.167e+01, 9.458e-02 }, // FC
-        { 1.586e+00, 0.000e+00, 0.000e+00, 0.000e+00, 3.688e-06, 0.000e+00, 6.785e-04 }, // NOx
-        { 0.000e+00, 7.192e-03, 0.000e+00, 9.477e-06, 6.375e-07, 0.000e+00, 1.651e-04 }, // PM + PM (non-exhaust)
+        { 1.487e+03, 1.569e+01, 6.612e+02, 0.000e+00, 1.248e-01, 1.296e+02, 3.781e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 4.679e-03, 0.000e+00, 3.649e-01 }, // CO
+        { 0.000e+00, 3.243e-02, 0.000e+00, 5.254e-04, 0.000e+00, 6.622e-02, 9.482e-04 }, // HC
+        { 4.820e+02, 5.086e+00, 2.144e+02, 0.000e+00, 4.045e-02, 4.200e+01, 1.226e+00 }, // FC
+        { 1.586e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.721e-04, 0.000e+00, 8.793e-03 }, // NOx
+        { 0.000e+00, 2.589e-02, 0.000e+00, 1.228e-04, 2.974e-05, 0.000e+00, 2.139e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // PC_LPG_petrol_Euro-3_(LPG)
-        { 1.439e+03, 4.237e+00, 6.562e+02, 0.000e+00, 2.533e-03, 3.433e+01, 2.792e-01 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 9.516e-05, 0.000e+00, 2.698e-02 }, // CO
-        { 7.401e-02, 0.000e+00, 0.000e+00, 0.000e+00, 8.081e-07, 0.000e+00, 2.119e-04 }, // HC
-        { 4.657e+02, 1.371e+00, 2.124e+02, 0.000e+00, 8.199e-04, 1.111e+01, 9.037e-02 }, // FC
-        { 4.919e-01, 0.000e+00, 0.000e+00, 0.000e+00, 1.120e-06, 0.000e+00, 2.056e-04 }, // NOx
-        { 0.000e+00, 7.193e-03, 0.000e+00, 9.470e-06, 0.000e+00, 0.000e+00, 9.526e-08 }, // PM + PM (non-exhaust)
+        { 1.439e+03, 1.525e+01, 6.562e+02, 0.000e+00, 1.182e-01, 1.236e+02, 3.618e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 4.440e-03, 0.000e+00, 3.497e-01 }, // CO
+        { 7.401e-02, 0.000e+00, 0.000e+00, 0.000e+00, 3.770e-05, 0.000e+00, 2.746e-03 }, // HC
+        { 4.657e+02, 4.937e+00, 2.124e+02, 0.000e+00, 3.825e-02, 4.000e+01, 1.171e+00 }, // FC
+        { 4.919e-01, 0.000e+00, 0.000e+00, 0.000e+00, 5.224e-05, 0.000e+00, 2.665e-03 }, // NOx
+        { 0.000e+00, 2.589e-02, 0.000e+00, 1.227e-04, 0.000e+00, 0.000e+00, 1.235e-06 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // PC_LPG_petrol_Euro-3_(P)
-        { 1.515e+03, 4.462e+00, 6.912e+02, 0.000e+00, 2.668e-03, 3.616e+01, 2.940e-01 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 9.516e-05, 0.000e+00, 2.698e-02 }, // CO
-        { 7.401e-02, 0.000e+00, 0.000e+00, 0.000e+00, 8.081e-07, 0.000e+00, 2.119e-04 }, // HC
-        { 4.912e+02, 1.446e+00, 2.241e+02, 0.000e+00, 8.648e-04, 1.172e+01, 9.532e-02 }, // FC
-        { 4.919e-01, 0.000e+00, 0.000e+00, 0.000e+00, 1.120e-06, 0.000e+00, 2.056e-04 }, // NOx
-        { 0.000e+00, 7.193e-03, 0.000e+00, 9.470e-06, 2.254e-07, 0.000e+00, 5.470e-05 }, // PM + PM (non-exhaust)
+        { 1.515e+03, 1.606e+01, 6.912e+02, 0.000e+00, 1.245e-01, 1.302e+02, 3.811e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 4.440e-03, 0.000e+00, 3.497e-01 }, // CO
+        { 7.401e-02, 0.000e+00, 0.000e+00, 0.000e+00, 3.770e-05, 0.000e+00, 2.746e-03 }, // HC
+        { 4.912e+02, 5.207e+00, 2.241e+02, 0.000e+00, 4.035e-02, 4.220e+01, 1.235e+00 }, // FC
+        { 4.919e-01, 0.000e+00, 0.000e+00, 0.000e+00, 5.224e-05, 0.000e+00, 2.665e-03 }, // NOx
+        { 0.000e+00, 2.589e-02, 0.000e+00, 1.227e-04, 1.052e-05, 0.000e+00, 7.089e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // PC_LPG_petrol_Euro-4_(LPG)
-        { 1.434e+03, 4.082e+00, 6.552e+02, 0.000e+00, 2.423e-03, 3.470e+01, 2.497e-01 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 6.556e-05, 0.000e+00, 1.413e-02 }, // CO
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 4.569e-07, 0.000e+00, 9.278e-05 }, // HC
-        { 4.640e+02, 1.321e+00, 2.121e+02, 0.000e+00, 7.842e-04, 1.123e+01, 8.084e-02 }, // FC
-        { 6.117e-01, 0.000e+00, 0.000e+00, 0.000e+00, 1.176e-06, 1.205e-02, 2.104e-04 }, // NOx
-        { 0.000e+00, 7.192e-03, 0.000e+00, 9.481e-06, 0.000e+00, 0.000e+00, 1.084e-07 }, // PM + PM (non-exhaust)
+        { 1.434e+03, 1.469e+01, 6.552e+02, 0.000e+00, 1.130e-01, 1.249e+02, 3.237e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 3.059e-03, 0.000e+00, 1.832e-01 }, // CO
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 2.132e-05, 0.000e+00, 1.202e-03 }, // HC
+        { 4.640e+02, 4.756e+00, 2.121e+02, 0.000e+00, 3.659e-02, 4.043e+01, 1.048e+00 }, // FC
+        { 6.117e-01, 0.000e+00, 0.000e+00, 0.000e+00, 5.485e-05, 4.339e-02, 2.726e-03 }, // NOx
+        { 0.000e+00, 2.589e-02, 0.000e+00, 1.229e-04, 0.000e+00, 0.000e+00, 1.405e-06 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // PC_LPG_petrol_Euro-4_(P)
-        { 1.510e+03, 4.299e+00, 6.901e+02, 0.000e+00, 2.552e-03, 3.654e+01, 2.630e-01 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 6.556e-05, 0.000e+00, 1.413e-02 }, // CO
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 4.569e-07, 0.000e+00, 9.278e-05 }, // HC
-        { 4.895e+02, 1.394e+00, 2.237e+02, 0.000e+00, 8.272e-04, 1.185e+01, 8.527e-02 }, // FC
-        { 6.117e-01, 0.000e+00, 0.000e+00, 0.000e+00, 1.176e-06, 1.205e-02, 2.104e-04 }, // NOx
-        { 0.000e+00, 7.192e-03, 0.000e+00, 9.481e-06, 1.222e-07, 0.000e+00, 2.793e-05 }, // PM + PM (non-exhaust)
+        { 1.510e+03, 1.548e+01, 6.901e+02, 0.000e+00, 1.190e-01, 1.316e+02, 3.409e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 3.059e-03, 0.000e+00, 1.832e-01 }, // CO
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 2.132e-05, 0.000e+00, 1.202e-03 }, // HC
+        { 4.895e+02, 5.017e+00, 2.237e+02, 0.000e+00, 3.859e-02, 4.265e+01, 1.105e+00 }, // FC
+        { 6.117e-01, 0.000e+00, 0.000e+00, 0.000e+00, 5.485e-05, 4.339e-02, 2.726e-03 }, // NOx
+        { 0.000e+00, 2.589e-02, 0.000e+00, 1.229e-04, 5.704e-06, 0.000e+00, 3.620e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // PC_LPG_petrol_Euro-5_(LPG)
-        { 1.280e+03, 4.436e+00, 6.412e+02, 0.000e+00, 2.105e-03, 3.045e+01, 2.278e-01 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 7.794e-05, 0.000e+00, 2.193e-02 }, // CO
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 5.023e-07, 0.000e+00, 1.208e-04 }, // HC
-        { 4.143e+02, 1.436e+00, 2.075e+02, 0.000e+00, 6.814e-04, 9.857e+00, 7.374e-02 }, // FC
-        { 3.233e-01, 0.000e+00, 1.097e-01, 0.000e+00, 1.309e-07, 0.000e+00, 4.408e-05 }, // NOx
-        { 0.000e+00, 7.196e-03, 0.000e+00, 9.428e-06, 0.000e+00, 0.000e+00, 6.190e-08 }, // PM + PM (non-exhaust)
+        { 1.280e+03, 1.597e+01, 6.412e+02, 0.000e+00, 9.821e-02, 1.096e+02, 2.952e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 3.636e-03, 0.000e+00, 2.842e-01 }, // CO
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 2.343e-05, 0.000e+00, 1.566e-03 }, // HC
+        { 4.143e+02, 5.169e+00, 2.075e+02, 0.000e+00, 3.179e-02, 3.549e+01, 9.557e-01 }, // FC
+        { 3.233e-01, 0.000e+00, 1.097e-01, 0.000e+00, 6.108e-06, 0.000e+00, 5.713e-04 }, // NOx
+        { 0.000e+00, 2.591e-02, 0.000e+00, 1.222e-04, 0.000e+00, 0.000e+00, 8.023e-07 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // PC_LPG_petrol_Euro-5_(P)
-        { 1.348e+03, 4.672e+00, 6.753e+02, 0.000e+00, 2.217e-03, 3.207e+01, 2.399e-01 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 7.794e-05, 0.000e+00, 2.193e-02 }, // CO
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 5.023e-07, 0.000e+00, 1.208e-04 }, // HC
-        { 4.370e+02, 1.514e+00, 2.189e+02, 0.000e+00, 7.187e-04, 1.040e+01, 7.778e-02 }, // FC
-        { 3.233e-01, 0.000e+00, 1.097e-01, 0.000e+00, 1.309e-07, 0.000e+00, 4.408e-05 }, // NOx
-        { 7.254e-03, 7.196e-03, 0.000e+00, 9.428e-06, 6.735e-08, 1.733e-04, 1.046e-05 }, // PM + PM (non-exhaust)
+        { 1.348e+03, 1.682e+01, 6.753e+02, 0.000e+00, 1.034e-01, 1.155e+02, 3.109e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 3.636e-03, 0.000e+00, 2.842e-01 }, // CO
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 2.343e-05, 0.000e+00, 1.566e-03 }, // HC
+        { 4.370e+02, 5.452e+00, 2.189e+02, 0.000e+00, 3.353e-02, 3.743e+01, 1.008e+00 }, // FC
+        { 3.233e-01, 0.000e+00, 1.097e-01, 0.000e+00, 6.108e-06, 0.000e+00, 5.713e-04 }, // NOx
+        { 7.254e-03, 2.591e-02, 0.000e+00, 1.222e-04, 3.142e-06, 6.239e-04, 1.355e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // PC_LPG_petrol_Euro-6_(LPG)
-        { 1.373e+03, 5.298e+00, 8.427e+02, 0.000e+00, 2.010e-03, 2.744e+01, 2.585e-01 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 3.017e-05, 0.000e+00, 7.738e-03 }, // CO
-        { 2.848e-02, 0.000e+00, 0.000e+00, 0.000e+00, 2.194e-07, 0.000e+00, 5.598e-05 }, // HC
-        { 4.446e+02, 1.715e+00, 2.728e+02, 0.000e+00, 6.507e-04, 8.881e+00, 8.366e-02 }, // FC
-        { 4.354e-01, 1.959e-03, 5.637e-01, 0.000e+00, 2.008e-07, 0.000e+00, 6.136e-05 }, // NOx
-        { 0.000e+00, 7.201e-03, 0.000e+00, 9.372e-06, 0.000e+00, 0.000e+00, 1.596e-08 }, // PM + PM (non-exhaust)
+        { 1.373e+03, 1.907e+01, 8.427e+02, 0.000e+00, 9.380e-02, 9.877e+01, 3.350e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.408e-03, 0.000e+00, 1.003e-01 }, // CO
+        { 2.848e-02, 0.000e+00, 0.000e+00, 0.000e+00, 1.024e-05, 0.000e+00, 7.255e-04 }, // HC
+        { 4.446e+02, 6.173e+00, 2.728e+02, 0.000e+00, 3.036e-02, 3.197e+01, 1.084e+00 }, // FC
+        { 4.354e-01, 7.053e-03, 5.637e-01, 0.000e+00, 9.367e-06, 0.000e+00, 7.952e-04 }, // NOx
+        { 0.000e+00, 2.592e-02, 0.000e+00, 1.215e-04, 0.000e+00, 0.000e+00, 2.068e-07 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // PC_LPG_petrol_Euro-6_(P)
-        { 1.447e+03, 5.580e+00, 8.875e+02, 0.000e+00, 2.117e-03, 2.890e+01, 2.722e-01 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 3.017e-05, 0.000e+00, 7.738e-03 }, // CO
-        { 2.848e-02, 0.000e+00, 0.000e+00, 0.000e+00, 2.194e-07, 0.000e+00, 5.598e-05 }, // HC
-        { 4.689e+02, 1.809e+00, 2.877e+02, 0.000e+00, 6.864e-04, 9.367e+00, 8.824e-02 }, // FC
-        { 4.354e-01, 1.959e-03, 5.637e-01, 0.000e+00, 2.008e-07, 0.000e+00, 6.136e-05 }, // NOx
-        { 1.255e-02, 7.201e-03, 4.491e-03, 9.372e-06, 1.186e-08, 1.212e-06, 1.596e-08 }, // PM + PM (non-exhaust)
+        { 1.447e+03, 2.009e+01, 8.875e+02, 0.000e+00, 9.879e-02, 1.040e+02, 3.528e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.408e-03, 0.000e+00, 1.003e-01 }, // CO
+        { 2.848e-02, 0.000e+00, 0.000e+00, 0.000e+00, 1.024e-05, 0.000e+00, 7.255e-04 }, // HC
+        { 4.689e+02, 6.512e+00, 2.877e+02, 0.000e+00, 3.203e-02, 3.372e+01, 1.144e+00 }, // FC
+        { 4.354e-01, 7.053e-03, 5.637e-01, 0.000e+00, 9.367e-06, 0.000e+00, 7.952e-04 }, // NOx
+        { 1.255e-02, 2.592e-02, 4.491e-03, 1.215e-04, 5.535e-07, 4.365e-06, 2.068e-07 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
@@ -899,1329 +899,1329 @@
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO2(total)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // HC
-        { 5.948e+01, 8.773e-01, 5.617e+01, 0.000e+00, 1.562e-04, 5.048e+00, 1.086e-02 }, // FC
+        { 5.948e+01, 3.158e+00, 5.617e+01, 0.000e+00, 7.286e-03, 1.817e+01, 1.408e-01 }, // FC
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // NOx
-        { 0.000e+00, 7.202e-03, 0.000e+00, 9.357e-06, 0.000e+00, 5.815e-19, 0.000e+00 }, // PM + PM (non-exhaust)
+        { 0.000e+00, 2.593e-02, 0.000e+00, 1.213e-04, 0.000e+00, 4.941e-18, 0.000e+00 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // PC_2S_EE
-        { 1.516e+03, 3.797e+00, 9.276e+02, 0.000e+00, 2.965e-03, 2.923e+01, 4.081e-01 }, // CO2(total)
-        { 2.438e+01, 0.000e+00, 0.000e+00, 0.000e+00, 5.185e-04, 0.000e+00, 1.175e-01 }, // CO
-        { 5.426e+01, 0.000e+00, 0.000e+00, 0.000e+00, 1.951e-04, 0.000e+00, 2.118e-02 }, // HC
-        { 4.782e+02, 1.197e+00, 2.925e+02, 0.000e+00, 9.350e-04, 9.217e+00, 1.287e-01 }, // FC
-        { 0.000e+00, 5.623e-01, 1.467e+01, 0.000e+00, 0.000e+00, 6.991e-01, 0.000e+00 }, // NOx
-        { 0.000e+00, 7.185e-03, 0.000e+00, 9.561e-06, 6.294e-07, 0.000e+00, 1.752e-04 }, // PM + PM (non-exhaust)
+        { 1.516e+03, 1.367e+01, 9.276e+02, 0.000e+00, 1.383e-01, 1.052e+02, 5.289e+00 }, // CO2(total)
+        { 2.438e+01, 0.000e+00, 0.000e+00, 0.000e+00, 2.419e-02, 0.000e+00, 1.523e+00 }, // CO
+        { 5.426e+01, 0.000e+00, 0.000e+00, 0.000e+00, 9.102e-03, 0.000e+00, 2.746e-01 }, // HC
+        { 4.782e+02, 4.310e+00, 2.925e+02, 0.000e+00, 4.362e-02, 3.318e+01, 1.668e+00 }, // FC
+        { 0.000e+00, 2.024e+00, 1.467e+01, 0.000e+00, 0.000e+00, 2.517e+00, 0.000e+00 }, // NOx
+        { 0.000e+00, 2.587e-02, 0.000e+00, 1.239e-04, 2.936e-05, 0.000e+00, 2.271e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // PC_4S_EE
-        { 1.474e+03, 3.690e+00, 9.016e+02, 0.000e+00, 2.882e-03, 2.841e+01, 3.967e-01 }, // CO2(total)
-        { 3.120e+01, 0.000e+00, 0.000e+00, 0.000e+00, 7.421e-04, 0.000e+00, 1.695e-01 }, // CO
-        { 1.763e+01, 0.000e+00, 0.000e+00, 0.000e+00, 1.969e-05, 0.000e+00, 2.756e-03 }, // HC
-        { 4.778e+02, 1.196e+00, 2.923e+02, 0.000e+00, 9.342e-04, 9.210e+00, 1.286e-01 }, // FC
-        { 1.184e+00, 1.036e+00, 4.500e+01, 0.000e+00, 0.000e+00, 1.119e+00, 0.000e+00 }, // NOx
-        { 0.000e+00, 7.185e-03, 0.000e+00, 9.561e-06, 6.294e-07, 0.000e+00, 1.752e-04 }, // PM + PM (non-exhaust)
+        { 1.474e+03, 1.328e+01, 9.016e+02, 0.000e+00, 1.344e-01, 1.023e+02, 5.141e+00 }, // CO2(total)
+        { 3.120e+01, 0.000e+00, 0.000e+00, 0.000e+00, 3.462e-02, 0.000e+00, 2.197e+00 }, // CO
+        { 1.763e+01, 0.000e+00, 0.000e+00, 0.000e+00, 9.188e-04, 0.000e+00, 3.571e-02 }, // HC
+        { 4.778e+02, 4.307e+00, 2.923e+02, 0.000e+00, 4.359e-02, 3.315e+01, 1.666e+00 }, // FC
+        { 1.184e+00, 3.728e+00, 4.500e+01, 0.000e+00, 0.000e+00, 4.028e+00, 0.000e+00 }, // NOx
+        { 0.000e+00, 2.587e-02, 0.000e+00, 1.239e-04, 2.936e-05, 0.000e+00, 2.271e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // LCV_petrol_M+N1-I_Conv_lt1981
-        { 1.439e+03, 1.026e+01, 4.867e+01, 0.000e+00, 3.599e-03, 6.525e+01, 3.509e-01 }, // CO2(total)
-        { 1.341e+02, 0.000e+00, 0.000e+00, 0.000e+00, 5.842e-04, 0.000e+00, 1.609e-01 }, // CO
-        { 1.394e+01, 0.000e+00, 0.000e+00, 0.000e+00, 1.162e-05, 4.693e-02, 2.676e-03 }, // HC
-        { 4.664e+02, 3.326e+00, 1.578e+01, 0.000e+00, 1.167e-03, 2.115e+01, 1.137e-01 }, // FC
-        { 3.472e+00, 3.512e-01, 3.950e+01, 0.000e+00, 4.387e-06, 4.324e-02, 0.000e+00 }, // NOx
-        { 0.000e+00, 7.125e-03, 0.000e+00, 1.030e-05, 1.031e-06, 0.000e+00, 2.707e-04 }, // PM + PM (non-exhaust)
+        { 1.439e+03, 3.693e+01, 4.867e+01, 0.000e+00, 1.679e-01, 2.349e+02, 4.547e+00 }, // CO2(total)
+        { 1.341e+02, 0.000e+00, 0.000e+00, 0.000e+00, 2.726e-02, 0.000e+00, 2.085e+00 }, // CO
+        { 1.394e+01, 0.000e+00, 0.000e+00, 0.000e+00, 5.420e-04, 1.690e-01, 3.468e-02 }, // HC
+        { 4.664e+02, 1.197e+01, 1.578e+01, 0.000e+00, 5.443e-02, 7.615e+01, 1.474e+00 }, // FC
+        { 3.472e+00, 1.264e+00, 3.950e+01, 0.000e+00, 2.047e-04, 1.557e-01, 0.000e+00 }, // NOx
+        { 0.000e+00, 2.565e-02, 0.000e+00, 1.334e-04, 4.811e-05, 0.000e+00, 3.508e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // LCV_petrol_M+N1-I_Conv_gt1981
-        { 1.439e+03, 1.026e+01, 4.867e+01, 0.000e+00, 3.599e-03, 6.525e+01, 3.509e-01 }, // CO2(total)
-        { 1.341e+02, 0.000e+00, 0.000e+00, 0.000e+00, 5.842e-04, 0.000e+00, 1.609e-01 }, // CO
-        { 1.394e+01, 0.000e+00, 0.000e+00, 0.000e+00, 1.162e-05, 4.693e-02, 2.676e-03 }, // HC
-        { 4.664e+02, 3.326e+00, 1.578e+01, 0.000e+00, 1.167e-03, 2.115e+01, 1.137e-01 }, // FC
-        { 3.472e+00, 3.512e-01, 3.950e+01, 0.000e+00, 4.387e-06, 4.324e-02, 0.000e+00 }, // NOx
-        { 0.000e+00, 7.125e-03, 0.000e+00, 1.030e-05, 1.031e-06, 0.000e+00, 2.707e-04 }, // PM + PM (non-exhaust)
+        { 1.439e+03, 3.693e+01, 4.867e+01, 0.000e+00, 1.679e-01, 2.349e+02, 4.547e+00 }, // CO2(total)
+        { 1.341e+02, 0.000e+00, 0.000e+00, 0.000e+00, 2.726e-02, 0.000e+00, 2.085e+00 }, // CO
+        { 1.394e+01, 0.000e+00, 0.000e+00, 0.000e+00, 5.420e-04, 1.690e-01, 3.468e-02 }, // HC
+        { 4.664e+02, 1.197e+01, 1.578e+01, 0.000e+00, 5.443e-02, 7.615e+01, 1.474e+00 }, // FC
+        { 3.472e+00, 1.264e+00, 3.950e+01, 0.000e+00, 2.047e-04, 1.557e-01, 0.000e+00 }, // NOx
+        { 0.000e+00, 2.565e-02, 0.000e+00, 1.334e-04, 4.811e-05, 0.000e+00, 3.508e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // LCV_petrol_M+N1-I_Euro-1
-        { 1.219e+03, 1.227e+01, 0.000e+00, 0.000e+00, 2.885e-03, 6.404e+01, 2.656e-01 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 6.138e-04, 0.000e+00, 1.635e-01 }, // CO
-        { 7.146e-01, 0.000e+00, 0.000e+00, 0.000e+00, 9.426e-06, 0.000e+00, 2.410e-03 }, // HC
-        { 3.953e+02, 3.977e+00, 0.000e+00, 0.000e+00, 9.351e-04, 2.076e+01, 8.610e-02 }, // FC
-        { 4.706e+00, 0.000e+00, 1.741e+00, 6.914e-04, 2.548e-06, 1.632e-01, 0.000e+00 }, // NOx
-        { 0.000e+00, 7.126e-03, 0.000e+00, 1.031e-05, 6.285e-07, 0.000e+00, 1.661e-04 }, // PM + PM (non-exhaust)
+        { 1.219e+03, 4.417e+01, 0.000e+00, 0.000e+00, 1.346e-01, 2.305e+02, 3.442e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 2.864e-02, 0.000e+00, 2.119e+00 }, // CO
+        { 7.146e-01, 0.000e+00, 0.000e+00, 0.000e+00, 4.398e-04, 0.000e+00, 3.123e-02 }, // HC
+        { 3.953e+02, 1.432e+01, 0.000e+00, 0.000e+00, 4.363e-02, 7.474e+01, 1.116e+00 }, // FC
+        { 4.706e+00, 0.000e+00, 1.741e+00, 8.961e-03, 1.189e-04, 5.874e-01, 0.000e+00 }, // NOx
+        { 0.000e+00, 2.565e-02, 0.000e+00, 1.336e-04, 2.932e-05, 0.000e+00, 2.153e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // LCV_petrol_M+N1-I_3WCat_1987-1990
-        { 1.188e+03, 1.195e+01, 0.000e+00, 0.000e+00, 2.811e-03, 6.240e+01, 2.588e-01 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 6.138e-04, 0.000e+00, 1.635e-01 }, // CO
-        { 7.146e-01, 0.000e+00, 0.000e+00, 0.000e+00, 9.426e-06, 0.000e+00, 2.410e-03 }, // HC
-        { 3.852e+02, 3.875e+00, 0.000e+00, 0.000e+00, 9.112e-04, 2.023e+01, 8.390e-02 }, // FC
-        { 4.706e+00, 0.000e+00, 1.741e+00, 6.914e-04, 2.548e-06, 1.632e-01, 0.000e+00 }, // NOx
-        { 0.000e+00, 7.126e-03, 0.000e+00, 1.031e-05, 6.285e-07, 0.000e+00, 1.661e-04 }, // PM + PM (non-exhaust)
+        { 1.188e+03, 4.303e+01, 0.000e+00, 0.000e+00, 1.311e-01, 2.246e+02, 3.354e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 2.864e-02, 0.000e+00, 2.119e+00 }, // CO
+        { 7.146e-01, 0.000e+00, 0.000e+00, 0.000e+00, 4.398e-04, 0.000e+00, 3.123e-02 }, // HC
+        { 3.852e+02, 1.395e+01, 0.000e+00, 0.000e+00, 4.251e-02, 7.282e+01, 1.087e+00 }, // FC
+        { 4.706e+00, 0.000e+00, 1.741e+00, 8.961e-03, 1.189e-04, 5.874e-01, 0.000e+00 }, // NOx
+        { 0.000e+00, 2.565e-02, 0.000e+00, 1.336e-04, 2.932e-05, 0.000e+00, 2.153e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // LCV_petrol_M+N1-I_Euro-2
-        { 1.214e+03, 1.268e+01, 0.000e+00, 0.000e+00, 2.944e-03, 6.397e+01, 3.034e-01 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 3.653e-04, 0.000e+00, 9.717e-02 }, // CO
-        { 3.661e-01, 0.000e+00, 0.000e+00, 0.000e+00, 3.589e-06, 0.000e+00, 9.190e-04 }, // HC
-        { 3.934e+02, 4.111e+00, 0.000e+00, 0.000e+00, 9.544e-04, 2.074e+01, 9.837e-02 }, // FC
-        { 1.742e+00, 0.000e+00, 1.203e+00, 2.747e-04, 6.032e-07, 5.067e-02, 0.000e+00 }, // NOx
-        { 0.000e+00, 7.123e-03, 0.000e+00, 1.034e-05, 1.266e-06, 0.000e+00, 3.479e-04 }, // PM + PM (non-exhaust)
+        { 1.214e+03, 4.565e+01, 0.000e+00, 0.000e+00, 1.374e-01, 2.303e+02, 3.932e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.704e-02, 0.000e+00, 1.259e+00 }, // CO
+        { 3.661e-01, 0.000e+00, 0.000e+00, 0.000e+00, 1.675e-04, 0.000e+00, 1.191e-02 }, // HC
+        { 3.934e+02, 1.480e+01, 0.000e+00, 0.000e+00, 4.453e-02, 7.466e+01, 1.275e+00 }, // FC
+        { 1.742e+00, 0.000e+00, 1.203e+00, 3.560e-03, 2.814e-05, 1.824e-01, 0.000e+00 }, // NOx
+        { 0.000e+00, 2.564e-02, 0.000e+00, 1.340e-04, 5.907e-05, 0.000e+00, 4.509e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // LCV_petrol_M+N1-I_Euro-3
-        { 9.984e+02, 1.014e+01, 2.324e+01, 0.000e+00, 2.307e-03, 5.115e+01, 2.416e-01 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 2.149e-04, 0.000e+00, 5.820e-02 }, // CO
-        { 8.573e-02, 0.000e+00, 0.000e+00, 0.000e+00, 1.193e-06, 0.000e+00, 3.112e-04 }, // HC
-        { 3.236e+02, 3.286e+00, 7.535e+00, 0.000e+00, 7.478e-04, 1.658e+01, 7.832e-02 }, // FC
-        { 6.569e-01, 0.000e+00, 1.493e-01, 5.768e-05, 2.656e-07, 1.604e-02, 0.000e+00 }, // NOx
-        { 0.000e+00, 7.138e-03, 0.000e+00, 1.014e-05, 4.564e-07, 0.000e+00, 1.250e-04 }, // PM + PM (non-exhaust)
+        { 9.984e+02, 3.649e+01, 2.324e+01, 0.000e+00, 1.076e-01, 1.841e+02, 3.131e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.002e-02, 0.000e+00, 7.543e-01 }, // CO
+        { 8.573e-02, 0.000e+00, 0.000e+00, 0.000e+00, 5.564e-05, 0.000e+00, 4.033e-03 }, // HC
+        { 3.236e+02, 1.183e+01, 7.535e+00, 0.000e+00, 3.489e-02, 5.969e+01, 1.015e+00 }, // FC
+        { 6.569e-01, 0.000e+00, 1.493e-01, 7.475e-04, 1.239e-05, 5.773e-02, 0.000e+00 }, // NOx
+        { 0.000e+00, 2.570e-02, 0.000e+00, 1.314e-04, 2.130e-05, 0.000e+00, 1.620e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // LCV_petrol_M+N1-I_Euro-4
-        { 1.031e+03, 1.002e+01, 7.863e+01, 0.000e+00, 2.295e-03, 5.055e+01, 2.432e-01 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.327e-04, 0.000e+00, 3.339e-02 }, // CO
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 6.651e-07, 0.000e+00, 1.527e-04 }, // HC
-        { 3.343e+02, 3.247e+00, 2.549e+01, 0.000e+00, 7.441e-04, 1.639e+01, 7.884e-02 }, // FC
-        { 4.235e-01, 2.544e-03, 3.564e-01, 0.000e+00, 2.153e-07, 8.073e-03, 0.000e+00 }, // NOx
-        { 0.000e+00, 7.147e-03, 0.000e+00, 1.004e-05, 2.619e-07, 0.000e+00, 6.870e-05 }, // PM + PM (non-exhaust)
+        { 1.031e+03, 3.606e+01, 7.863e+01, 0.000e+00, 1.071e-01, 1.820e+02, 3.152e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 6.191e-03, 0.000e+00, 4.327e-01 }, // CO
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 3.103e-05, 0.000e+00, 1.979e-03 }, // HC
+        { 3.343e+02, 1.169e+01, 2.549e+01, 0.000e+00, 3.472e-02, 5.899e+01, 1.022e+00 }, // FC
+        { 4.235e-01, 9.159e-03, 3.564e-01, 0.000e+00, 1.005e-05, 2.906e-02, 0.000e+00 }, // NOx
+        { 0.000e+00, 2.573e-02, 0.000e+00, 1.302e-04, 1.222e-05, 0.000e+00, 8.904e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // LCV_petrol_M+N1-I_Euro-5
-        { 9.718e+02, 8.162e+00, 2.978e+02, 0.000e+00, 2.149e-03, 3.828e+01, 2.741e-01 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.371e-04, 0.000e+00, 3.517e-02 }, // CO
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 6.922e-07, 0.000e+00, 1.617e-04 }, // HC
-        { 3.150e+02, 2.646e+00, 9.655e+01, 0.000e+00, 6.968e-04, 1.241e+01, 8.887e-02 }, // FC
-        { 1.583e-01, 8.026e-04, 1.552e-01, 0.000e+00, 7.554e-08, 2.423e-03, 0.000e+00 }, // NOx
-        { 0.000e+00, 7.164e-03, 0.000e+00, 9.819e-06, 2.723e-07, 0.000e+00, 7.313e-05 }, // PM + PM (non-exhaust)
+        { 9.718e+02, 2.938e+01, 2.978e+02, 0.000e+00, 1.003e-01, 1.378e+02, 3.553e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 6.394e-03, 0.000e+00, 4.558e-01 }, // CO
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 3.229e-05, 0.000e+00, 2.096e-03 }, // HC
+        { 3.150e+02, 9.526e+00, 9.655e+01, 0.000e+00, 3.251e-02, 4.468e+01, 1.152e+00 }, // FC
+        { 1.583e-01, 2.889e-03, 1.552e-01, 0.000e+00, 3.524e-06, 8.723e-03, 0.000e+00 }, // NOx
+        { 0.000e+00, 2.579e-02, 0.000e+00, 1.273e-04, 1.271e-05, 0.000e+00, 9.478e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // LCV_petrol_M+N1-I_Euro-6ab
-        { 9.843e+02, 7.618e+00, 1.887e+02, 0.000e+00, 2.342e-03, 4.145e+01, 2.623e-01 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.530e-04, 0.000e+00, 3.852e-02 }, // CO
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 7.435e-07, 0.000e+00, 1.710e-04 }, // HC
-        { 3.191e+02, 2.470e+00, 6.119e+01, 0.000e+00, 7.593e-04, 1.344e+01, 8.504e-02 }, // FC
-        { 1.753e-01, 9.148e-04, 1.699e-01, 0.000e+00, 9.181e-08, 2.759e-03, 0.000e+00 }, // NOx
-        { 0.000e+00, 7.156e-03, 0.000e+00, 9.918e-06, 2.955e-07, 0.000e+00, 7.754e-05 }, // PM + PM (non-exhaust)
+        { 9.843e+02, 2.742e+01, 1.887e+02, 0.000e+00, 1.093e-01, 1.492e+02, 3.400e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 7.137e-03, 0.000e+00, 4.992e-01 }, // CO
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 3.469e-05, 0.000e+00, 2.216e-03 }, // HC
+        { 3.191e+02, 8.890e+00, 6.119e+01, 0.000e+00, 3.542e-02, 4.838e+01, 1.102e+00 }, // FC
+        { 1.753e-01, 3.293e-03, 1.699e-01, 0.000e+00, 4.284e-06, 9.932e-03, 0.000e+00 }, // NOx
+        { 0.000e+00, 2.576e-02, 0.000e+00, 1.285e-04, 1.379e-05, 0.000e+00, 1.005e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // LCV_petrol_M+N1-I_Euro-6c
-        { 8.979e+02, 6.927e+00, 1.821e+02, 0.000e+00, 2.128e-03, 3.751e+01, 2.401e-01 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.526e-04, 0.000e+00, 3.848e-02 }, // CO
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 7.418e-07, 0.000e+00, 1.708e-04 }, // HC
-        { 2.911e+02, 2.245e+00, 5.904e+01, 0.000e+00, 6.899e-04, 1.216e+01, 7.784e-02 }, // FC
-        { 1.753e-01, 9.134e-04, 1.701e-01, 0.000e+00, 9.147e-08, 2.753e-03, 0.000e+00 }, // NOx
-        { 0.000e+00, 7.156e-03, 0.000e+00, 9.915e-06, 2.943e-07, 0.000e+00, 7.728e-05 }, // PM + PM (non-exhaust)
+        { 8.979e+02, 2.494e+01, 1.821e+02, 0.000e+00, 9.929e-02, 1.350e+02, 3.112e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 7.120e-03, 0.000e+00, 4.987e-01 }, // CO
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 3.461e-05, 0.000e+00, 2.213e-03 }, // HC
+        { 2.911e+02, 8.084e+00, 5.904e+01, 0.000e+00, 3.219e-02, 4.377e+01, 1.009e+00 }, // FC
+        { 1.753e-01, 3.288e-03, 1.701e-01, 0.000e+00, 4.268e-06, 9.911e-03, 0.000e+00 }, // NOx
+        { 0.000e+00, 2.576e-02, 0.000e+00, 1.285e-04, 1.373e-05, 0.000e+00, 1.002e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // LCV_petrol_M+N1-I_Euro-6d-temp
-        { 9.201e+02, 7.137e+00, 1.911e+02, 0.000e+00, 2.167e-03, 3.839e+01, 2.456e-01 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.515e-04, 0.000e+00, 3.823e-02 }, // CO
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 7.368e-07, 0.000e+00, 1.698e-04 }, // HC
-        { 2.983e+02, 2.314e+00, 6.194e+01, 0.000e+00, 7.025e-04, 1.244e+01, 7.962e-02 }, // FC
-        { 1.751e-01, 9.187e-04, 1.705e-01, 0.000e+00, 9.047e-08, 2.747e-03, 0.000e+00 }, // NOx
-        { 0.000e+00, 7.156e-03, 0.000e+00, 9.909e-06, 2.923e-07, 0.000e+00, 7.687e-05 }, // PM + PM (non-exhaust)
+        { 9.201e+02, 2.569e+01, 1.911e+02, 0.000e+00, 1.011e-01, 1.382e+02, 3.183e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 7.067e-03, 0.000e+00, 4.955e-01 }, // CO
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 3.438e-05, 0.000e+00, 2.200e-03 }, // HC
+        { 2.983e+02, 8.329e+00, 6.194e+01, 0.000e+00, 3.277e-02, 4.480e+01, 1.032e+00 }, // FC
+        { 1.751e-01, 3.307e-03, 1.705e-01, 0.000e+00, 4.221e-06, 9.888e-03, 0.000e+00 }, // NOx
+        { 0.000e+00, 2.576e-02, 0.000e+00, 1.284e-04, 1.364e-05, 0.000e+00, 9.963e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // LCV_petrol_M+N1-I_Euro-6d
-        { 8.697e+02, 6.811e+00, 1.895e+02, 0.000e+00, 2.040e-03, 3.605e+01, 2.348e-01 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.505e-04, 0.000e+00, 3.806e-02 }, // CO
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 7.326e-07, 0.000e+00, 1.691e-04 }, // HC
-        { 2.819e+02, 2.208e+00, 6.144e+01, 0.000e+00, 6.613e-04, 1.169e+01, 7.610e-02 }, // FC
-        { 1.751e-01, 9.155e-04, 1.705e-01, 0.000e+00, 8.995e-08, 2.747e-03, 0.000e+00 }, // NOx
-        { 0.000e+00, 7.157e-03, 0.000e+00, 9.904e-06, 2.908e-07, 0.000e+00, 7.666e-05 }, // PM + PM (non-exhaust)
+        { 8.697e+02, 2.452e+01, 1.895e+02, 0.000e+00, 9.518e-02, 1.298e+02, 3.042e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 7.022e-03, 0.000e+00, 4.932e-01 }, // CO
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 3.418e-05, 0.000e+00, 2.191e-03 }, // HC
+        { 2.819e+02, 7.948e+00, 6.144e+01, 0.000e+00, 3.086e-02, 4.207e+01, 9.863e-01 }, // FC
+        { 1.751e-01, 3.296e-03, 1.705e-01, 0.000e+00, 4.197e-06, 9.888e-03, 0.000e+00 }, // NOx
+        { 0.000e+00, 2.576e-02, 0.000e+00, 1.284e-04, 1.357e-05, 0.000e+00, 9.935e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // LCV_petrol_N1-II_Conv_lt1981
-        { 2.139e+03, 8.648e+00, 0.000e+00, 0.000e+00, 6.701e-03, 9.513e+01, 4.500e-01 }, // CO2(total)
-        { 1.180e+02, 0.000e+00, 0.000e+00, 0.000e+00, 1.114e-03, 0.000e+00, 2.487e-01 }, // CO
-        { 1.872e+01, 0.000e+00, 0.000e+00, 0.000e+00, 2.149e-05, 9.605e-02, 3.477e-03 }, // HC
-        { 6.935e+02, 2.803e+00, 0.000e+00, 0.000e+00, 2.172e-03, 3.084e+01, 1.459e-01 }, // FC
-        { 1.425e+00, 5.797e-01, 4.935e+01, 0.000e+00, 6.570e-06, 0.000e+00, 0.000e+00 }, // NOx
-        { 0.000e+00, 7.083e-03, 0.000e+00, 1.083e-05, 1.806e-06, 0.000e+00, 4.097e-04 }, // PM + PM (non-exhaust)
+        { 2.139e+03, 3.113e+01, 0.000e+00, 0.000e+00, 3.127e-01, 3.425e+02, 5.832e+00 }, // CO2(total)
+        { 1.180e+02, 0.000e+00, 0.000e+00, 0.000e+00, 5.196e-02, 0.000e+00, 3.224e+00 }, // CO
+        { 1.872e+01, 0.000e+00, 0.000e+00, 0.000e+00, 1.002e-03, 3.458e-01, 4.507e-02 }, // HC
+        { 6.935e+02, 1.009e+01, 0.000e+00, 0.000e+00, 1.014e-01, 1.110e+02, 1.891e+00 }, // FC
+        { 1.425e+00, 2.087e+00, 4.935e+01, 0.000e+00, 3.065e-04, 0.000e+00, 0.000e+00 }, // NOx
+        { 0.000e+00, 2.550e-02, 0.000e+00, 1.403e-04, 8.426e-05, 0.000e+00, 5.310e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // LCV_petrol_N1-II_Conv_gt1981
-        { 2.139e+03, 8.648e+00, 0.000e+00, 0.000e+00, 6.701e-03, 9.513e+01, 4.500e-01 }, // CO2(total)
-        { 1.180e+02, 0.000e+00, 0.000e+00, 0.000e+00, 1.114e-03, 0.000e+00, 2.487e-01 }, // CO
-        { 1.872e+01, 0.000e+00, 0.000e+00, 0.000e+00, 2.149e-05, 9.605e-02, 3.477e-03 }, // HC
-        { 6.935e+02, 2.803e+00, 0.000e+00, 0.000e+00, 2.172e-03, 3.084e+01, 1.459e-01 }, // FC
-        { 1.425e+00, 5.797e-01, 4.935e+01, 0.000e+00, 6.570e-06, 0.000e+00, 0.000e+00 }, // NOx
-        { 0.000e+00, 7.083e-03, 0.000e+00, 1.083e-05, 1.806e-06, 0.000e+00, 4.097e-04 }, // PM + PM (non-exhaust)
+        { 2.139e+03, 3.113e+01, 0.000e+00, 0.000e+00, 3.127e-01, 3.425e+02, 5.832e+00 }, // CO2(total)
+        { 1.180e+02, 0.000e+00, 0.000e+00, 0.000e+00, 5.196e-02, 0.000e+00, 3.224e+00 }, // CO
+        { 1.872e+01, 0.000e+00, 0.000e+00, 0.000e+00, 1.002e-03, 3.458e-01, 4.507e-02 }, // HC
+        { 6.935e+02, 1.009e+01, 0.000e+00, 0.000e+00, 1.014e-01, 1.110e+02, 1.891e+00 }, // FC
+        { 1.425e+00, 2.087e+00, 4.935e+01, 0.000e+00, 3.065e-04, 0.000e+00, 0.000e+00 }, // NOx
+        { 0.000e+00, 2.550e-02, 0.000e+00, 1.403e-04, 8.426e-05, 0.000e+00, 5.310e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // LCV_petrol_N1-II_Euro-1
-        { 1.936e+03, 1.034e+01, 0.000e+00, 0.000e+00, 6.399e-03, 9.342e+01, 4.182e-01 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.327e-03, 0.000e+00, 2.876e-01 }, // CO
-        { 5.560e-02, 0.000e+00, 0.000e+00, 0.000e+00, 2.066e-05, 0.000e+00, 4.204e-03 }, // HC
-        { 6.276e+02, 3.354e+00, 0.000e+00, 0.000e+00, 2.074e-03, 3.029e+01, 1.356e-01 }, // FC
-        { 7.310e+00, 0.000e+00, 6.469e+00, 6.280e-04, 8.733e-06, 1.553e-01, 0.000e+00 }, // NOx
-        { 0.000e+00, 7.056e-03, 0.000e+00, 1.119e-05, 1.338e-06, 0.000e+00, 3.045e-04 }, // PM + PM (non-exhaust)
+        { 1.936e+03, 3.724e+01, 0.000e+00, 0.000e+00, 2.985e-01, 3.363e+02, 5.420e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 6.192e-02, 0.000e+00, 3.727e+00 }, // CO
+        { 5.560e-02, 0.000e+00, 0.000e+00, 0.000e+00, 9.641e-04, 0.000e+00, 5.448e-02 }, // HC
+        { 6.276e+02, 1.207e+01, 0.000e+00, 0.000e+00, 9.678e-02, 1.090e+02, 1.757e+00 }, // FC
+        { 7.310e+00, 0.000e+00, 6.469e+00, 8.140e-03, 4.075e-04, 5.593e-01, 0.000e+00 }, // NOx
+        { 0.000e+00, 2.540e-02, 0.000e+00, 1.450e-04, 6.244e-05, 0.000e+00, 3.947e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // LCV_petrol_N1-II_3WCat_1987-1990
-        { 1.893e+03, 1.012e+01, 0.000e+00, 0.000e+00, 6.257e-03, 9.135e+01, 4.089e-01 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.327e-03, 0.000e+00, 2.876e-01 }, // CO
-        { 5.560e-02, 0.000e+00, 0.000e+00, 0.000e+00, 2.066e-05, 0.000e+00, 4.204e-03 }, // HC
-        { 6.137e+02, 3.279e+00, 0.000e+00, 0.000e+00, 2.028e-03, 2.961e+01, 1.326e-01 }, // FC
-        { 7.310e+00, 0.000e+00, 6.469e+00, 6.280e-04, 8.733e-06, 1.553e-01, 0.000e+00 }, // NOx
-        { 0.000e+00, 7.056e-03, 0.000e+00, 1.119e-05, 1.338e-06, 0.000e+00, 3.045e-04 }, // PM + PM (non-exhaust)
+        { 1.893e+03, 3.642e+01, 0.000e+00, 0.000e+00, 2.919e-01, 3.289e+02, 5.300e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 6.192e-02, 0.000e+00, 3.727e+00 }, // CO
+        { 5.560e-02, 0.000e+00, 0.000e+00, 0.000e+00, 9.641e-04, 0.000e+00, 5.448e-02 }, // HC
+        { 6.137e+02, 1.181e+01, 0.000e+00, 0.000e+00, 9.464e-02, 1.066e+02, 1.718e+00 }, // FC
+        { 7.310e+00, 0.000e+00, 6.469e+00, 8.140e-03, 4.075e-04, 5.593e-01, 0.000e+00 }, // NOx
+        { 0.000e+00, 2.540e-02, 0.000e+00, 1.450e-04, 6.244e-05, 0.000e+00, 3.947e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // LCV_petrol_N1-II_Euro-2
-        { 1.890e+03, 7.219e+00, 0.000e+00, 0.000e+00, 5.708e-03, 8.147e+01, 4.151e-01 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 6.065e-04, 0.000e+00, 1.378e-01 }, // CO
-        { 1.153e-02, 0.000e+00, 0.000e+00, 0.000e+00, 6.256e-06, 0.000e+00, 1.257e-03 }, // HC
-        { 6.129e+02, 2.340e+00, 0.000e+00, 0.000e+00, 1.851e-03, 2.641e+01, 1.346e-01 }, // FC
-        { 2.327e+00, 0.000e+00, 2.280e+00, 3.480e-04, 1.809e-06, 5.431e-02, 0.000e+00 }, // NOx
-        { 0.000e+00, 7.095e-03, 0.000e+00, 1.067e-05, 2.087e-06, 0.000e+00, 5.016e-04 }, // PM + PM (non-exhaust)
+        { 1.890e+03, 2.599e+01, 0.000e+00, 0.000e+00, 2.663e-01, 2.933e+02, 5.380e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 2.830e-02, 0.000e+00, 1.786e+00 }, // CO
+        { 1.153e-02, 0.000e+00, 0.000e+00, 0.000e+00, 2.919e-04, 0.000e+00, 1.629e-02 }, // HC
+        { 6.129e+02, 8.424e+00, 0.000e+00, 0.000e+00, 8.634e-02, 9.508e+01, 1.744e+00 }, // FC
+        { 2.327e+00, 0.000e+00, 2.280e+00, 4.510e-03, 8.440e-05, 1.955e-01, 0.000e+00 }, // NOx
+        { 0.000e+00, 2.554e-02, 0.000e+00, 1.383e-04, 9.738e-05, 0.000e+00, 6.500e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // LCV_petrol_N1-II_Euro-3
-        { 1.545e+03, 5.620e+00, 6.433e+01, 0.000e+00, 4.217e-03, 6.357e+01, 2.982e-01 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 3.160e-04, 0.000e+00, 7.369e-02 }, // CO
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.872e-06, 0.000e+00, 4.021e-04 }, // HC
-        { 5.008e+02, 1.822e+00, 2.086e+01, 0.000e+00, 1.367e-03, 2.061e+01, 9.667e-02 }, // FC
-        { 9.082e-01, 0.000e+00, 2.649e-01, 5.779e-05, 7.175e-07, 1.965e-02, 0.000e+00 }, // NOx
-        { 0.000e+00, 7.132e-03, 0.000e+00, 1.021e-05, 6.354e-07, 0.000e+00, 1.511e-04 }, // PM + PM (non-exhaust)
+        { 1.545e+03, 2.023e+01, 6.433e+01, 0.000e+00, 1.968e-01, 2.288e+02, 3.864e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.474e-02, 0.000e+00, 9.551e-01 }, // CO
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 8.733e-05, 0.000e+00, 5.211e-03 }, // HC
+        { 5.008e+02, 6.559e+00, 2.086e+01, 0.000e+00, 6.379e-02, 7.419e+01, 1.253e+00 }, // FC
+        { 9.082e-01, 0.000e+00, 2.649e-01, 7.490e-04, 3.348e-05, 7.073e-02, 0.000e+00 }, // NOx
+        { 0.000e+00, 2.567e-02, 0.000e+00, 1.323e-04, 2.964e-05, 0.000e+00, 1.959e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // LCV_petrol_N1-II_Euro-4
-        { 1.359e+03, 7.323e+00, 0.000e+00, 0.000e+00, 3.898e-03, 6.381e+01, 2.777e-01 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 2.191e-04, 0.000e+00, 5.041e-02 }, // CO
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.048e-06, 0.000e+00, 2.197e-04 }, // HC
-        { 4.407e+02, 2.374e+00, 0.000e+00, 0.000e+00, 1.264e-03, 2.068e+01, 9.004e-02 }, // FC
-        { 4.970e-01, 3.180e-03, 4.322e-01, 0.000e+00, 3.676e-07, 9.350e-03, 0.000e+00 }, // NOx
-        { 0.000e+00, 7.108e-03, 0.000e+00, 1.050e-05, 4.717e-07, 0.000e+00, 1.163e-04 }, // PM + PM (non-exhaust)
+        { 1.359e+03, 2.636e+01, 0.000e+00, 0.000e+00, 1.819e-01, 2.297e+02, 3.599e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.022e-02, 0.000e+00, 6.533e-01 }, // CO
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 4.888e-05, 0.000e+00, 2.847e-03 }, // HC
+        { 4.407e+02, 8.547e+00, 0.000e+00, 0.000e+00, 5.896e-02, 7.446e+01, 1.167e+00 }, // FC
+        { 4.970e-01, 1.145e-02, 4.322e-01, 0.000e+00, 1.715e-05, 3.366e-02, 0.000e+00 }, // NOx
+        { 0.000e+00, 2.559e-02, 0.000e+00, 1.361e-04, 2.201e-05, 0.000e+00, 1.507e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // LCV_petrol_N1-II_Euro-5
-        { 1.267e+03, 5.718e+00, 0.000e+00, 0.000e+00, 3.630e-03, 5.637e+01, 2.732e-01 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 2.148e-04, 0.000e+00, 4.853e-02 }, // CO
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.055e-06, 0.000e+00, 2.177e-04 }, // HC
-        { 4.107e+02, 1.854e+00, 0.000e+00, 0.000e+00, 1.177e-03, 1.828e+01, 8.858e-02 }, // FC
-        { 1.830e-01, 1.064e-03, 1.808e-01, 0.000e+00, 1.269e-07, 2.912e-03, 0.000e+00 }, // NOx
-        { 0.000e+00, 7.130e-03, 0.000e+00, 1.027e-05, 4.461e-07, 0.000e+00, 1.084e-04 }, // PM + PM (non-exhaust)
+        { 1.267e+03, 2.059e+01, 0.000e+00, 0.000e+00, 1.694e-01, 2.029e+02, 3.541e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.002e-02, 0.000e+00, 6.289e-01 }, // CO
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 4.924e-05, 0.000e+00, 2.822e-03 }, // HC
+        { 4.107e+02, 6.673e+00, 0.000e+00, 0.000e+00, 5.491e-02, 6.579e+01, 1.148e+00 }, // FC
+        { 1.830e-01, 3.831e-03, 1.808e-01, 0.000e+00, 5.918e-06, 1.048e-02, 0.000e+00 }, // NOx
+        { 0.000e+00, 2.567e-02, 0.000e+00, 1.331e-04, 2.081e-05, 0.000e+00, 1.404e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // LCV_petrol_N1-II_Euro-6ab
-        { 1.243e+03, 4.903e+00, 1.751e+02, 0.000e+00, 3.364e-03, 4.769e+01, 2.902e-01 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.977e-04, 0.000e+00, 4.606e-02 }, // CO
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 9.557e-07, 0.000e+00, 2.021e-04 }, // HC
-        { 4.029e+02, 1.590e+00, 5.677e+01, 0.000e+00, 1.091e-03, 1.546e+01, 9.407e-02 }, // FC
-        { 2.005e-01, 1.117e-03, 2.060e-01, 0.000e+00, 1.305e-07, 2.974e-03, 0.000e+00 }, // NOx
-        { 0.000e+00, 7.147e-03, 0.000e+00, 1.002e-05, 3.821e-07, 0.000e+00, 9.421e-05 }, // PM + PM (non-exhaust)
+        { 1.243e+03, 1.765e+01, 1.751e+02, 0.000e+00, 1.569e-01, 1.717e+02, 3.761e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 9.225e-03, 0.000e+00, 5.970e-01 }, // CO
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 4.459e-05, 0.000e+00, 2.620e-03 }, // HC
+        { 4.029e+02, 5.722e+00, 5.677e+01, 0.000e+00, 5.088e-02, 5.565e+01, 1.219e+00 }, // FC
+        { 2.005e-01, 4.022e-03, 2.060e-01, 0.000e+00, 6.089e-06, 1.071e-02, 0.000e+00 }, // NOx
+        { 0.000e+00, 2.573e-02, 0.000e+00, 1.299e-04, 1.783e-05, 0.000e+00, 1.221e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // LCV_petrol_N1-II_Euro-6c
-        { 1.132e+03, 4.477e+00, 1.676e+02, 0.000e+00, 3.056e-03, 4.319e+01, 2.658e-01 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.971e-04, 0.000e+00, 4.599e-02 }, // CO
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 9.531e-07, 0.000e+00, 2.019e-04 }, // HC
-        { 3.670e+02, 1.451e+00, 5.432e+01, 0.000e+00, 9.908e-04, 1.400e+01, 8.618e-02 }, // FC
-        { 2.007e-01, 1.110e-03, 2.057e-01, 0.000e+00, 1.304e-07, 2.977e-03, 0.000e+00 }, // NOx
-        { 0.000e+00, 7.147e-03, 0.000e+00, 1.002e-05, 3.808e-07, 0.000e+00, 9.398e-05 }, // PM + PM (non-exhaust)
+        { 1.132e+03, 1.612e+01, 1.676e+02, 0.000e+00, 1.426e-01, 1.555e+02, 3.445e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 9.197e-03, 0.000e+00, 5.961e-01 }, // CO
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 4.447e-05, 0.000e+00, 2.616e-03 }, // HC
+        { 3.670e+02, 5.225e+00, 5.432e+01, 0.000e+00, 4.622e-02, 5.041e+01, 1.117e+00 }, // FC
+        { 2.007e-01, 3.997e-03, 2.057e-01, 0.000e+00, 6.082e-06, 1.072e-02, 0.000e+00 }, // NOx
+        { 0.000e+00, 2.573e-02, 0.000e+00, 1.298e-04, 1.777e-05, 0.000e+00, 1.218e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // LCV_petrol_N1-II_Euro-6d-temp
-        { 1.163e+03, 4.550e+00, 1.894e+02, 0.000e+00, 3.119e-03, 4.372e+01, 2.761e-01 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.959e-04, 0.000e+00, 4.585e-02 }, // CO
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 9.478e-07, 0.000e+00, 2.014e-04 }, // HC
-        { 3.771e+02, 1.475e+00, 6.141e+01, 0.000e+00, 1.011e-03, 1.417e+01, 8.949e-02 }, // FC
-        { 2.008e-01, 1.105e-03, 2.051e-01, 0.000e+00, 1.297e-07, 2.987e-03, 0.000e+00 }, // NOx
-        { 0.000e+00, 7.148e-03, 0.000e+00, 1.001e-05, 3.784e-07, 0.000e+00, 9.364e-05 }, // PM + PM (non-exhaust)
+        { 1.163e+03, 1.638e+01, 1.894e+02, 0.000e+00, 1.455e-01, 1.574e+02, 3.578e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 9.140e-03, 0.000e+00, 5.943e-01 }, // CO
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 4.422e-05, 0.000e+00, 2.610e-03 }, // HC
+        { 3.771e+02, 5.310e+00, 6.141e+01, 0.000e+00, 4.717e-02, 5.103e+01, 1.160e+00 }, // FC
+        { 2.008e-01, 3.979e-03, 2.051e-01, 0.000e+00, 6.052e-06, 1.075e-02, 0.000e+00 }, // NOx
+        { 0.000e+00, 2.573e-02, 0.000e+00, 1.297e-04, 1.765e-05, 0.000e+00, 1.214e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // LCV_petrol_N1-II_Euro-6d
-        { 1.100e+03, 4.374e+00, 1.840e+02, 0.000e+00, 2.934e-03, 4.125e+01, 2.623e-01 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.944e-04, 0.000e+00, 4.562e-02 }, // CO
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 9.415e-07, 0.000e+00, 2.006e-04 }, // HC
-        { 3.565e+02, 1.418e+00, 5.966e+01, 0.000e+00, 9.512e-04, 1.337e+01, 8.502e-02 }, // FC
-        { 2.010e-01, 1.096e-03, 2.045e-01, 0.000e+00, 1.292e-07, 2.994e-03, 0.000e+00 }, // NOx
-        { 0.000e+00, 7.149e-03, 0.000e+00, 9.999e-06, 3.750e-07, 0.000e+00, 9.304e-05 }, // PM + PM (non-exhaust)
+        { 1.100e+03, 1.575e+01, 1.840e+02, 0.000e+00, 1.369e-01, 1.485e+02, 3.399e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 9.068e-03, 0.000e+00, 5.912e-01 }, // CO
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 4.393e-05, 0.000e+00, 2.600e-03 }, // HC
+        { 3.565e+02, 5.105e+00, 5.966e+01, 0.000e+00, 4.438e-02, 4.814e+01, 1.102e+00 }, // FC
+        { 2.010e-01, 3.945e-03, 2.045e-01, 0.000e+00, 6.027e-06, 1.078e-02, 0.000e+00 }, // NOx
+        { 0.000e+00, 2.574e-02, 0.000e+00, 1.296e-04, 1.750e-05, 0.000e+00, 1.206e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // LCV_petrol_N1-III_Conv_lt1981
-        { 2.539e+03, 1.341e+01, 0.000e+00, 0.000e+00, 6.862e-03, 1.124e+02, 5.826e-01 }, // CO2(total)
-        { 1.996e+02, 0.000e+00, 0.000e+00, 0.000e+00, 1.079e-03, 0.000e+00, 2.782e-01 }, // CO
-        { 2.324e+01, 0.000e+00, 0.000e+00, 0.000e+00, 2.147e-05, 8.758e-02, 4.409e-03 }, // HC
-        { 8.230e+02, 4.346e+00, 0.000e+00, 0.000e+00, 2.224e-03, 3.645e+01, 1.889e-01 }, // FC
-        { 4.812e+00, 6.121e-01, 6.924e+01, 0.000e+00, 9.388e-06, 0.000e+00, 0.000e+00 }, // NOx
-        { 0.000e+00, 7.111e-03, 0.000e+00, 1.046e-05, 1.852e-06, 0.000e+00, 4.748e-04 }, // PM + PM (non-exhaust)
+        { 2.539e+03, 4.826e+01, 0.000e+00, 0.000e+00, 3.201e-01, 4.048e+02, 7.550e+00 }, // CO2(total)
+        { 1.996e+02, 0.000e+00, 0.000e+00, 0.000e+00, 5.034e-02, 0.000e+00, 3.605e+00 }, // CO
+        { 2.324e+01, 0.000e+00, 0.000e+00, 0.000e+00, 1.002e-03, 3.153e-01, 5.713e-02 }, // HC
+        { 8.230e+02, 1.564e+01, 0.000e+00, 0.000e+00, 1.038e-01, 1.312e+02, 2.448e+00 }, // FC
+        { 4.812e+00, 2.204e+00, 6.924e+01, 0.000e+00, 4.380e-04, 0.000e+00, 0.000e+00 }, // NOx
+        { 0.000e+00, 2.560e-02, 0.000e+00, 1.356e-04, 8.642e-05, 0.000e+00, 6.154e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // LCV_petrol_N1-III_Conv_gt1981
-        { 2.539e+03, 1.341e+01, 0.000e+00, 0.000e+00, 6.862e-03, 1.124e+02, 5.826e-01 }, // CO2(total)
-        { 1.996e+02, 0.000e+00, 0.000e+00, 0.000e+00, 1.079e-03, 0.000e+00, 2.782e-01 }, // CO
-        { 2.324e+01, 0.000e+00, 0.000e+00, 0.000e+00, 2.147e-05, 8.758e-02, 4.409e-03 }, // HC
-        { 8.230e+02, 4.346e+00, 0.000e+00, 0.000e+00, 2.224e-03, 3.645e+01, 1.889e-01 }, // FC
-        { 4.812e+00, 6.121e-01, 6.924e+01, 0.000e+00, 9.388e-06, 0.000e+00, 0.000e+00 }, // NOx
-        { 0.000e+00, 7.111e-03, 0.000e+00, 1.046e-05, 1.852e-06, 0.000e+00, 4.748e-04 }, // PM + PM (non-exhaust)
+        { 2.539e+03, 4.826e+01, 0.000e+00, 0.000e+00, 3.201e-01, 4.048e+02, 7.550e+00 }, // CO2(total)
+        { 1.996e+02, 0.000e+00, 0.000e+00, 0.000e+00, 5.034e-02, 0.000e+00, 3.605e+00 }, // CO
+        { 2.324e+01, 0.000e+00, 0.000e+00, 0.000e+00, 1.002e-03, 3.153e-01, 5.713e-02 }, // HC
+        { 8.230e+02, 1.564e+01, 0.000e+00, 0.000e+00, 1.038e-01, 1.312e+02, 2.448e+00 }, // FC
+        { 4.812e+00, 2.204e+00, 6.924e+01, 0.000e+00, 4.380e-04, 0.000e+00, 0.000e+00 }, // NOx
+        { 0.000e+00, 2.560e-02, 0.000e+00, 1.356e-04, 8.642e-05, 0.000e+00, 6.154e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // LCV_petrol_N1-III_Euro-1
-        { 2.249e+03, 1.658e+01, 0.000e+00, 0.000e+00, 6.481e-03, 1.124e+02, 5.223e-01 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.356e-03, 0.000e+00, 3.298e-01 }, // CO
-        { 8.224e-01, 0.000e+00, 0.000e+00, 0.000e+00, 2.086e-05, 0.000e+00, 4.801e-03 }, // HC
-        { 7.290e+02, 5.375e+00, 0.000e+00, 0.000e+00, 2.101e-03, 3.644e+01, 1.693e-01 }, // FC
-        { 8.616e+00, 0.000e+00, 5.768e+00, 9.416e-04, 7.657e-06, 2.325e-01, 0.000e+00 }, // NOx
-        { 0.000e+00, 7.091e-03, 0.000e+00, 1.076e-05, 1.338e-06, 0.000e+00, 3.243e-04 }, // PM + PM (non-exhaust)
+        { 2.249e+03, 5.969e+01, 0.000e+00, 0.000e+00, 3.024e-01, 4.047e+02, 6.770e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 6.327e-02, 0.000e+00, 4.274e+00 }, // CO
+        { 8.224e-01, 0.000e+00, 0.000e+00, 0.000e+00, 9.731e-04, 0.000e+00, 6.222e-02 }, // HC
+        { 7.290e+02, 1.935e+01, 0.000e+00, 0.000e+00, 9.803e-02, 1.312e+02, 2.195e+00 }, // FC
+        { 8.616e+00, 0.000e+00, 5.768e+00, 1.220e-02, 3.572e-04, 8.371e-01, 0.000e+00 }, // NOx
+        { 0.000e+00, 2.553e-02, 0.000e+00, 1.394e-04, 6.244e-05, 0.000e+00, 4.203e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // LCV_petrol_N1-III_3WCat_1987-1990
-        { 2.210e+03, 1.630e+01, 0.000e+00, 0.000e+00, 6.370e-03, 1.105e+02, 5.134e-01 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.356e-03, 0.000e+00, 3.298e-01 }, // CO
-        { 8.224e-01, 0.000e+00, 0.000e+00, 0.000e+00, 2.086e-05, 0.000e+00, 4.801e-03 }, // HC
-        { 7.165e+02, 5.283e+00, 0.000e+00, 0.000e+00, 2.065e-03, 3.582e+01, 1.664e-01 }, // FC
-        { 8.616e+00, 0.000e+00, 5.768e+00, 9.416e-04, 7.657e-06, 2.325e-01, 0.000e+00 }, // NOx
-        { 0.000e+00, 7.091e-03, 0.000e+00, 1.076e-05, 1.338e-06, 0.000e+00, 3.243e-04 }, // PM + PM (non-exhaust)
+        { 2.210e+03, 5.867e+01, 0.000e+00, 0.000e+00, 2.972e-01, 3.978e+02, 6.654e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 6.327e-02, 0.000e+00, 4.274e+00 }, // CO
+        { 8.224e-01, 0.000e+00, 0.000e+00, 0.000e+00, 9.731e-04, 0.000e+00, 6.222e-02 }, // HC
+        { 7.165e+02, 1.902e+01, 0.000e+00, 0.000e+00, 9.635e-02, 1.290e+02, 2.157e+00 }, // FC
+        { 8.616e+00, 0.000e+00, 5.768e+00, 1.220e-02, 3.572e-04, 8.371e-01, 0.000e+00 }, // NOx
+        { 0.000e+00, 2.553e-02, 0.000e+00, 1.394e-04, 6.244e-05, 0.000e+00, 4.203e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // LCV_petrol_N1-III_Euro-2
-        { 2.294e+03, 1.427e+01, 0.000e+00, 0.000e+00, 6.252e-03, 1.076e+02, 5.083e-01 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 6.853e-04, 0.000e+00, 1.668e-01 }, // CO
-        { 2.097e-01, 0.000e+00, 0.000e+00, 0.000e+00, 7.137e-06, 0.000e+00, 1.607e-03 }, // HC
-        { 7.436e+02, 4.626e+00, 0.000e+00, 0.000e+00, 2.027e-03, 3.489e+01, 1.648e-01 }, // FC
-        { 3.009e+00, 0.000e+00, 2.169e+00, 4.364e-04, 1.984e-06, 8.475e-02, 0.000e+00 }, // NOx
-        { 0.000e+00, 7.114e-03, 0.000e+00, 1.043e-05, 2.396e-06, 0.000e+00, 6.090e-04 }, // PM + PM (non-exhaust)
+        { 2.294e+03, 5.137e+01, 0.000e+00, 0.000e+00, 2.917e-01, 3.874e+02, 6.587e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 3.197e-02, 0.000e+00, 2.161e+00 }, // CO
+        { 2.097e-01, 0.000e+00, 0.000e+00, 0.000e+00, 3.330e-04, 0.000e+00, 2.082e-02 }, // HC
+        { 7.436e+02, 1.665e+01, 0.000e+00, 0.000e+00, 9.457e-02, 1.256e+02, 2.135e+00 }, // FC
+        { 3.009e+00, 0.000e+00, 2.169e+00, 5.656e-03, 9.258e-05, 3.051e-01, 0.000e+00 }, // NOx
+        { 0.000e+00, 2.561e-02, 0.000e+00, 1.352e-04, 1.118e-04, 0.000e+00, 7.893e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // LCV_petrol_N1-III_Euro-3
-        { 1.951e+03, 1.185e+01, 3.867e+01, 0.000e+00, 5.000e-03, 8.874e+01, 4.187e-01 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 3.124e-04, 0.000e+00, 7.841e-02 }, // CO
-        { 4.528e-03, 0.000e+00, 0.000e+00, 0.000e+00, 1.832e-06, 0.000e+00, 4.236e-04 }, // HC
-        { 6.324e+02, 3.841e+00, 1.254e+01, 0.000e+00, 1.621e-03, 2.877e+01, 1.357e-01 }, // FC
-        { 9.219e-01, 0.000e+00, 2.187e-01, 6.810e-05, 5.688e-07, 2.159e-02, 0.000e+00 }, // NOx
-        { 0.000e+00, 7.135e-03, 0.000e+00, 1.017e-05, 6.434e-07, 0.000e+00, 1.637e-04 }, // PM + PM (non-exhaust)
+        { 1.951e+03, 4.266e+01, 3.867e+01, 0.000e+00, 2.333e-01, 3.195e+02, 5.427e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.458e-02, 0.000e+00, 1.016e+00 }, // CO
+        { 4.528e-03, 0.000e+00, 0.000e+00, 0.000e+00, 8.545e-05, 0.000e+00, 5.490e-03 }, // HC
+        { 6.324e+02, 1.383e+01, 1.254e+01, 0.000e+00, 7.562e-02, 1.036e+02, 1.759e+00 }, // FC
+        { 9.219e-01, 0.000e+00, 2.187e-01, 8.826e-04, 2.654e-05, 7.771e-02, 0.000e+00 }, // NOx
+        { 0.000e+00, 2.569e-02, 0.000e+00, 1.318e-04, 3.002e-05, 0.000e+00, 2.122e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // LCV_petrol_N1-III_Euro-4
-        { 1.905e+03, 1.276e+01, 0.000e+00, 0.000e+00, 4.930e-03, 9.019e+01, 4.216e-01 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 2.736e-04, 0.000e+00, 6.575e-02 }, // CO
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.331e-06, 0.000e+00, 2.914e-04 }, // HC
-        { 6.177e+02, 4.137e+00, 0.000e+00, 0.000e+00, 1.598e-03, 2.924e+01, 1.367e-01 }, // FC
-        { 7.238e-01, 4.488e-03, 6.296e-01, 0.000e+00, 4.602e-07, 1.370e-02, 0.000e+00 }, // NOx
-        { 0.000e+00, 7.132e-03, 0.000e+00, 1.021e-05, 5.387e-07, 0.000e+00, 1.348e-04 }, // PM + PM (non-exhaust)
+        { 1.905e+03, 4.594e+01, 0.000e+00, 0.000e+00, 2.300e-01, 3.247e+02, 5.464e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.276e-02, 0.000e+00, 8.521e-01 }, // CO
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 6.212e-05, 0.000e+00, 3.776e-03 }, // HC
+        { 6.177e+02, 1.489e+01, 0.000e+00, 0.000e+00, 7.456e-02, 1.053e+02, 1.771e+00 }, // FC
+        { 7.238e-01, 1.616e-02, 6.296e-01, 0.000e+00, 2.147e-05, 4.931e-02, 0.000e+00 }, // NOx
+        { 0.000e+00, 2.567e-02, 0.000e+00, 1.324e-04, 2.513e-05, 0.000e+00, 1.748e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // LCV_petrol_N1-III_Euro-5
-        { 1.775e+03, 1.040e+01, 1.447e+02, 0.000e+00, 4.618e-03, 7.709e+01, 4.186e-01 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 2.766e-04, 0.000e+00, 6.653e-02 }, // CO
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.377e-06, 0.000e+00, 3.023e-04 }, // HC
-        { 5.754e+02, 3.371e+00, 4.692e+01, 0.000e+00, 1.497e-03, 2.499e+01, 1.357e-01 }, // FC
-        { 2.699e-01, 1.426e-03, 2.621e-01, 0.000e+00, 1.652e-07, 4.293e-03, 0.000e+00 }, // NOx
-        { 0.000e+00, 7.147e-03, 0.000e+00, 1.004e-05, 5.550e-07, 0.000e+00, 1.415e-04 }, // PM + PM (non-exhaust)
+        { 1.775e+03, 3.743e+01, 1.447e+02, 0.000e+00, 2.154e-01, 2.775e+02, 5.425e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.290e-02, 0.000e+00, 8.622e-01 }, // CO
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 6.425e-05, 0.000e+00, 3.918e-03 }, // HC
+        { 5.754e+02, 1.214e+01, 4.692e+01, 0.000e+00, 6.984e-02, 8.997e+01, 1.759e+00 }, // FC
+        { 2.699e-01, 5.134e-03, 2.621e-01, 0.000e+00, 7.707e-06, 1.545e-02, 0.000e+00 }, // NOx
+        { 0.000e+00, 2.573e-02, 0.000e+00, 1.301e-04, 2.589e-05, 0.000e+00, 1.834e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // LCV_petrol_N1-III_Euro-6ab
-        { 1.766e+03, 1.029e+01, 1.700e+02, 0.000e+00, 4.597e-03, 7.572e+01, 4.258e-01 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 2.850e-04, 0.000e+00, 6.877e-02 }, // CO
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.376e-06, 0.000e+00, 3.027e-04 }, // HC
-        { 5.725e+02, 3.335e+00, 5.511e+01, 0.000e+00, 1.490e-03, 2.455e+01, 1.380e-01 }, // FC
-        { 2.997e-01, 1.584e-03, 2.945e-01, 0.000e+00, 1.825e-07, 4.730e-03, 0.000e+00 }, // NOx
-        { 0.000e+00, 7.147e-03, 0.000e+00, 1.003e-05, 5.557e-07, 0.000e+00, 1.418e-04 }, // PM + PM (non-exhaust)
+        { 1.766e+03, 3.703e+01, 1.700e+02, 0.000e+00, 2.145e-01, 2.726e+02, 5.519e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.330e-02, 0.000e+00, 8.913e-01 }, // CO
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 6.418e-05, 0.000e+00, 3.923e-03 }, // HC
+        { 5.725e+02, 1.200e+01, 5.511e+01, 0.000e+00, 6.953e-02, 8.837e+01, 1.789e+00 }, // FC
+        { 2.997e-01, 5.703e-03, 2.945e-01, 0.000e+00, 8.512e-06, 1.703e-02, 0.000e+00 }, // NOx
+        { 0.000e+00, 2.573e-02, 0.000e+00, 1.300e-04, 2.593e-05, 0.000e+00, 1.838e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // LCV_petrol_N1-III_Euro-6c
-        { 1.595e+03, 9.740e+00, 1.124e+02, 0.000e+00, 4.155e-03, 7.048e+01, 3.767e-01 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 2.837e-04, 0.000e+00, 6.837e-02 }, // CO
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.371e-06, 0.000e+00, 3.016e-04 }, // HC
-        { 5.172e+02, 3.158e+00, 3.642e+01, 0.000e+00, 1.347e-03, 2.285e+01, 1.221e-01 }, // FC
-        { 2.995e-01, 1.588e-03, 2.936e-01, 0.000e+00, 1.816e-07, 4.743e-03, 0.000e+00 }, // NOx
-        { 0.000e+00, 7.147e-03, 0.000e+00, 1.004e-05, 5.532e-07, 0.000e+00, 1.408e-04 }, // PM + PM (non-exhaust)
+        { 1.595e+03, 3.506e+01, 1.124e+02, 0.000e+00, 1.939e-01, 2.537e+02, 4.882e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.324e-02, 0.000e+00, 8.860e-01 }, // CO
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 6.398e-05, 0.000e+00, 3.909e-03 }, // HC
+        { 5.172e+02, 1.137e+01, 3.642e+01, 0.000e+00, 6.285e-02, 8.226e+01, 1.583e+00 }, // FC
+        { 2.995e-01, 5.717e-03, 2.936e-01, 0.000e+00, 8.474e-06, 1.708e-02, 0.000e+00 }, // NOx
+        { 0.000e+00, 2.573e-02, 0.000e+00, 1.301e-04, 2.581e-05, 0.000e+00, 1.824e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // LCV_petrol_N1-III_Euro-6d-temp
-        { 1.628e+03, 1.019e+01, 1.256e+02, 0.000e+00, 4.226e-03, 7.192e+01, 3.880e-01 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 2.831e-04, 0.000e+00, 6.855e-02 }, // CO
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.367e-06, 0.000e+00, 3.021e-04 }, // HC
-        { 5.279e+02, 3.303e+00, 4.072e+01, 0.000e+00, 1.370e-03, 2.332e+01, 1.258e-01 }, // FC
-        { 2.994e-01, 1.589e-03, 2.954e-01, 0.000e+00, 1.796e-07, 4.707e-03, 0.000e+00 }, // NOx
-        { 0.000e+00, 7.146e-03, 0.000e+00, 1.004e-05, 5.518e-07, 0.000e+00, 1.408e-04 }, // PM + PM (non-exhaust)
+        { 1.628e+03, 3.668e+01, 1.256e+02, 0.000e+00, 1.972e-01, 2.589e+02, 5.028e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.321e-02, 0.000e+00, 8.884e-01 }, // CO
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 6.380e-05, 0.000e+00, 3.915e-03 }, // HC
+        { 5.279e+02, 1.189e+01, 4.072e+01, 0.000e+00, 6.392e-02, 8.394e+01, 1.630e+00 }, // FC
+        { 2.994e-01, 5.721e-03, 2.954e-01, 0.000e+00, 8.379e-06, 1.695e-02, 0.000e+00 }, // NOx
+        { 0.000e+00, 2.573e-02, 0.000e+00, 1.301e-04, 2.574e-05, 0.000e+00, 1.825e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // LCV_petrol_N1-III_Euro-6d
-        { 1.542e+03, 9.669e+00, 1.433e+02, 0.000e+00, 3.979e-03, 6.733e+01, 3.718e-01 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 2.815e-04, 0.000e+00, 6.833e-02 }, // CO
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.360e-06, 0.000e+00, 3.012e-04 }, // HC
-        { 5.000e+02, 3.135e+00, 4.645e+01, 0.000e+00, 1.290e-03, 2.183e+01, 1.205e-01 }, // FC
-        { 2.995e-01, 1.587e-03, 2.957e-01, 0.000e+00, 1.783e-07, 4.705e-03, 0.000e+00 }, // NOx
-        { 0.000e+00, 7.147e-03, 0.000e+00, 1.003e-05, 5.484e-07, 0.000e+00, 1.403e-04 }, // PM + PM (non-exhaust)
+        { 1.542e+03, 3.481e+01, 1.433e+02, 0.000e+00, 1.856e-01, 2.424e+02, 4.819e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.313e-02, 0.000e+00, 8.856e-01 }, // CO
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 6.346e-05, 0.000e+00, 3.903e-03 }, // HC
+        { 5.000e+02, 1.128e+01, 4.645e+01, 0.000e+00, 6.018e-02, 7.857e+01, 1.562e+00 }, // FC
+        { 2.995e-01, 5.712e-03, 2.957e-01, 0.000e+00, 8.318e-06, 1.694e-02, 0.000e+00 }, // NOx
+        { 0.000e+00, 2.573e-02, 0.000e+00, 1.300e-04, 2.559e-05, 0.000e+00, 1.818e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // LCV_diesel_M+N1-I_convlt_1986
-        { 1.639e+03, 4.465e+00, 0.000e+00, 0.000e+00, 4.386e-03, 8.166e+01, 1.797e-01 }, // CO2(total)
-        { 4.785e+00, 0.000e+00, 3.411e+00, 1.028e-03, 2.969e-06, 0.000e+00, 1.856e-03 }, // CO
-        { 9.792e-01, 8.284e-03, 5.278e-01, 5.731e-05, 0.000e+00, 0.000e+00, 0.000e+00 }, // HC
-        { 5.268e+02, 1.435e+00, 0.000e+00, 0.000e+00, 1.410e-03, 2.624e+01, 5.774e-02 }, // FC
-        { 4.015e+00, 6.217e-02, 0.000e+00, 5.912e-04, 1.362e-05, 2.555e-01, 2.122e-03 }, // NOx
-        { 0.000e+00, 2.397e-02, 1.205e-01, 3.657e-04, 0.000e+00, 4.158e-02, 5.765e-05 }, // PM + PM (non-exhaust)
+        { 1.639e+03, 1.607e+01, 0.000e+00, 0.000e+00, 2.047e-01, 2.940e+02, 2.328e+00 }, // CO2(total)
+        { 4.785e+00, 0.000e+00, 3.411e+00, 1.333e-02, 1.385e-04, 0.000e+00, 2.406e-02 }, // CO
+        { 9.792e-01, 2.982e-02, 5.278e-01, 7.428e-04, 0.000e+00, 0.000e+00, 0.000e+00 }, // HC
+        { 5.268e+02, 5.166e+00, 0.000e+00, 0.000e+00, 6.577e-02, 9.448e+01, 7.483e-01 }, // FC
+        { 4.015e+00, 2.238e-01, 0.000e+00, 7.662e-03, 6.352e-04, 9.196e-01, 2.750e-02 }, // NOx
+        { 0.000e+00, 8.628e-02, 1.205e-01, 4.740e-03, 0.000e+00, 1.497e-01, 7.472e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // LCV_diesel_M+N1-I_Euro-1
-        { 1.541e+03, 7.920e+00, 0.000e+00, 0.000e+00, 4.049e-03, 8.399e+01, 1.873e-01 }, // CO2(total)
-        { 4.263e+00, 0.000e+00, 2.858e+00, 2.574e-04, 5.097e-06, 0.000e+00, 7.815e-04 }, // CO
-        { 7.001e-01, 4.546e-03, 2.920e-01, 2.220e-05, 0.000e+00, 0.000e+00, 0.000e+00 }, // HC
-        { 4.953e+02, 2.545e+00, 0.000e+00, 0.000e+00, 1.301e-03, 2.699e+01, 6.018e-02 }, // FC
-        { 2.096e+00, 1.625e-01, 0.000e+00, 0.000e+00, 1.665e-05, 3.316e-01, 2.679e-03 }, // NOx
-        { 0.000e+00, 3.790e-02, 3.815e-01, 2.107e-04, 0.000e+00, 3.420e-02, 8.668e-05 }, // PM + PM (non-exhaust)
+        { 1.541e+03, 2.851e+01, 0.000e+00, 0.000e+00, 1.889e-01, 3.024e+02, 2.427e+00 }, // CO2(total)
+        { 4.263e+00, 0.000e+00, 2.858e+00, 3.336e-03, 2.378e-04, 0.000e+00, 1.013e-02 }, // CO
+        { 7.001e-01, 1.637e-02, 2.920e-01, 2.877e-04, 0.000e+00, 0.000e+00, 0.000e+00 }, // HC
+        { 4.953e+02, 9.163e+00, 0.000e+00, 0.000e+00, 6.071e-02, 9.718e+01, 7.799e-01 }, // FC
+        { 2.096e+00, 5.849e-01, 0.000e+00, 0.000e+00, 7.767e-04, 1.194e+00, 3.472e-02 }, // NOx
+        { 0.000e+00, 1.364e-01, 3.815e-01, 2.730e-03, 0.000e+00, 1.231e-01, 1.123e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // LCV_diesel_M+N1-I_XXIII
-        { 1.682e+03, 4.582e+00, 0.000e+00, 0.000e+00, 4.501e-03, 8.380e+01, 1.844e-01 }, // CO2(total)
-        { 4.785e+00, 0.000e+00, 3.411e+00, 1.028e-03, 2.969e-06, 0.000e+00, 1.856e-03 }, // CO
-        { 9.792e-01, 8.284e-03, 5.278e-01, 5.731e-05, 0.000e+00, 0.000e+00, 0.000e+00 }, // HC
-        { 5.406e+02, 1.473e+00, 0.000e+00, 0.000e+00, 1.447e-03, 2.693e+01, 5.925e-02 }, // FC
-        { 4.015e+00, 6.217e-02, 0.000e+00, 5.912e-04, 1.362e-05, 2.555e-01, 2.122e-03 }, // NOx
-        { 0.000e+00, 2.397e-02, 1.205e-01, 3.657e-04, 0.000e+00, 4.158e-02, 5.765e-05 }, // PM + PM (non-exhaust)
+        { 1.682e+03, 1.650e+01, 0.000e+00, 0.000e+00, 2.100e-01, 3.017e+02, 2.390e+00 }, // CO2(total)
+        { 4.785e+00, 0.000e+00, 3.411e+00, 1.333e-02, 1.385e-04, 0.000e+00, 2.406e-02 }, // CO
+        { 9.792e-01, 2.982e-02, 5.278e-01, 7.428e-04, 0.000e+00, 0.000e+00, 0.000e+00 }, // HC
+        { 5.406e+02, 5.302e+00, 0.000e+00, 0.000e+00, 6.750e-02, 9.696e+01, 7.679e-01 }, // FC
+        { 4.015e+00, 2.238e-01, 0.000e+00, 7.662e-03, 6.352e-04, 9.196e-01, 2.750e-02 }, // NOx
+        { 0.000e+00, 8.628e-02, 1.205e-01, 4.740e-03, 0.000e+00, 1.497e-01, 7.472e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // LCV_diesel_M+N1-I_Euro-2
-        { 1.353e+03, 9.243e+00, 0.000e+00, 0.000e+00, 3.561e-03, 7.171e+01, 2.781e-01 }, // CO2(total)
-        { 2.045e+00, 0.000e+00, 5.138e-01, 0.000e+00, 7.485e-07, 0.000e+00, 9.673e-05 }, // CO
-        { 4.651e-01, 1.083e-03, 6.874e-02, 9.285e-06, 0.000e+00, 0.000e+00, 0.000e+00 }, // HC
-        { 4.348e+02, 2.970e+00, 0.000e+00, 0.000e+00, 1.144e-03, 2.305e+01, 8.937e-02 }, // FC
-        { 3.178e+00, 1.738e-01, 0.000e+00, 1.540e-04, 2.276e-05, 3.785e-01, 4.005e-03 }, // NOx
-        { 5.977e-02, 3.108e-02, 6.148e-01, 7.598e-05, 0.000e+00, 1.281e-02, 5.031e-05 }, // PM + PM (non-exhaust)
+        { 1.353e+03, 3.327e+01, 0.000e+00, 0.000e+00, 1.661e-01, 2.582e+02, 3.604e+00 }, // CO2(total)
+        { 2.045e+00, 0.000e+00, 5.138e-01, 0.000e+00, 3.492e-05, 0.000e+00, 1.254e-03 }, // CO
+        { 4.651e-01, 3.900e-03, 6.874e-02, 1.203e-04, 0.000e+00, 0.000e+00, 0.000e+00 }, // HC
+        { 4.348e+02, 1.069e+01, 0.000e+00, 0.000e+00, 5.339e-02, 8.297e+01, 1.158e+00 }, // FC
+        { 3.178e+00, 6.258e-01, 0.000e+00, 1.995e-03, 1.062e-03, 1.363e+00, 5.190e-02 }, // NOx
+        { 5.977e-02, 1.119e-01, 6.148e-01, 9.846e-04, 0.000e+00, 4.610e-02, 6.521e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // LCV_diesel_M+N1-I_Euro-3
-        { 7.963e+02, 1.069e+01, 0.000e+00, 0.000e+00, 2.172e-03, 4.864e+01, 2.467e-01 }, // CO2(total)
+        { 7.963e+02, 3.848e+01, 0.000e+00, 0.000e+00, 1.013e-01, 1.751e+02, 3.198e+00 }, // CO2(total)
         { 7.683e-01, 0.000e+00, 6.516e-01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 2.985e-01, 0.000e+00, 1.315e-01, 0.000e+00, 2.343e-07, 3.774e-03, 0.000e+00 }, // HC
-        { 2.559e+02, 3.436e+00, 0.000e+00, 0.000e+00, 6.980e-04, 1.563e+01, 7.930e-02 }, // FC
-        { 3.829e+00, 2.730e-01, 0.000e+00, 0.000e+00, 3.936e-05, 5.211e-01, 8.130e-03 }, // NOx
-        { 2.239e-01, 1.502e-02, 0.000e+00, 1.040e-05, 8.191e-07, 2.439e-02, 2.248e-05 }, // PM + PM (non-exhaust)
+        { 2.985e-01, 0.000e+00, 1.315e-01, 0.000e+00, 1.093e-05, 1.359e-02, 0.000e+00 }, // HC
+        { 2.559e+02, 1.237e+01, 0.000e+00, 0.000e+00, 3.257e-02, 5.627e+01, 1.028e+00 }, // FC
+        { 3.829e+00, 9.829e-01, 0.000e+00, 0.000e+00, 1.836e-03, 1.876e+00, 1.054e-01 }, // NOx
+        { 2.239e-01, 5.406e-02, 0.000e+00, 1.348e-04, 3.822e-05, 8.779e-02, 2.914e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // LCV_diesel_M+N1-I_Euro-3_(DPF)
-        { 8.043e+02, 1.080e+01, 0.000e+00, 0.000e+00, 2.194e-03, 4.912e+01, 2.492e-01 }, // CO2(total)
+        { 8.043e+02, 3.887e+01, 0.000e+00, 0.000e+00, 1.023e-01, 1.768e+02, 3.230e+00 }, // CO2(total)
         { 7.683e-01, 0.000e+00, 6.516e-01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 2.985e-01, 0.000e+00, 1.315e-01, 0.000e+00, 2.343e-07, 3.774e-03, 0.000e+00 }, // HC
-        { 2.585e+02, 3.470e+00, 0.000e+00, 0.000e+00, 7.050e-04, 1.579e+01, 8.009e-02 }, // FC
-        { 3.829e+00, 2.730e-01, 0.000e+00, 0.000e+00, 3.936e-05, 5.211e-01, 8.130e-03 }, // NOx
-        { 1.567e-01, 1.265e-02, 0.000e+00, 1.040e-05, 5.734e-07, 1.707e-02, 1.605e-05 }, // PM + PM (non-exhaust)
+        { 2.985e-01, 0.000e+00, 1.315e-01, 0.000e+00, 1.093e-05, 1.359e-02, 0.000e+00 }, // HC
+        { 2.585e+02, 1.249e+01, 0.000e+00, 0.000e+00, 3.289e-02, 5.683e+01, 1.038e+00 }, // FC
+        { 3.829e+00, 9.829e-01, 0.000e+00, 0.000e+00, 1.836e-03, 1.876e+00, 1.054e-01 }, // NOx
+        { 1.567e-01, 4.553e-02, 0.000e+00, 1.348e-04, 2.675e-05, 6.146e-02, 2.080e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // LCV_diesel_M+N1-I_Euro-4
-        { 9.648e+02, 7.898e+00, 4.683e+02, 0.000e+00, 2.288e-03, 3.103e+01, 3.826e-01 }, // CO2(total)
+        { 9.648e+02, 2.843e+01, 4.683e+02, 0.000e+00, 1.068e-01, 1.117e+02, 4.959e+00 }, // CO2(total)
         { 5.395e-01, 0.000e+00, 4.476e-01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 1.336e-01, 9.918e-05, 2.331e-02, 7.778e-06, 5.166e-08, 1.514e-03, 0.000e+00 }, // HC
-        { 3.101e+02, 2.538e+00, 1.505e+02, 0.000e+00, 7.354e-04, 9.971e+00, 1.230e-01 }, // FC
-        { 7.716e+00, 0.000e+00, 0.000e+00, 0.000e+00, 5.111e-05, 1.185e-01, 9.544e-03 }, // NOx
-        { 3.279e-01, 1.204e-02, 1.415e-01, 9.834e-06, 4.405e-07, 1.150e-02, 3.740e-07 }, // PM + PM (non-exhaust)
+        { 1.336e-01, 3.571e-04, 2.331e-02, 1.008e-04, 2.410e-06, 5.449e-03, 0.000e+00 }, // HC
+        { 3.101e+02, 9.138e+00, 1.505e+02, 0.000e+00, 3.431e-02, 3.590e+01, 1.594e+00 }, // FC
+        { 7.716e+00, 0.000e+00, 0.000e+00, 0.000e+00, 2.385e-03, 4.265e-01, 1.237e-01 }, // NOx
+        { 3.279e-01, 4.336e-02, 1.415e-01, 1.274e-04, 2.055e-05, 4.141e-02, 4.848e-06 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // LCV_diesel_M+N1-I_Euro-4_(DPF)
-        { 9.648e+02, 7.898e+00, 4.683e+02, 0.000e+00, 2.288e-03, 3.103e+01, 3.826e-01 }, // CO2(total)
+        { 9.648e+02, 2.843e+01, 4.683e+02, 0.000e+00, 1.068e-01, 1.117e+02, 4.959e+00 }, // CO2(total)
         { 5.422e-01, 0.000e+00, 4.498e-01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 1.368e-01, 1.016e-04, 2.387e-02, 7.964e-06, 5.290e-08, 1.550e-03, 0.000e+00 }, // HC
-        { 3.101e+02, 2.538e+00, 1.505e+02, 0.000e+00, 7.354e-04, 9.971e+00, 1.230e-01 }, // FC
-        { 8.078e+00, 0.000e+00, 0.000e+00, 0.000e+00, 5.351e-05, 1.240e-01, 9.992e-03 }, // NOx
-        { 0.000e+00, 7.162e-03, 0.000e+00, 9.834e-06, 5.042e-07, 0.000e+00, 1.216e-04 }, // PM + PM (non-exhaust)
+        { 1.368e-01, 3.656e-04, 2.387e-02, 1.032e-04, 2.468e-06, 5.580e-03, 0.000e+00 }, // HC
+        { 3.101e+02, 9.138e+00, 1.505e+02, 0.000e+00, 3.431e-02, 3.590e+01, 1.594e+00 }, // FC
+        { 8.078e+00, 0.000e+00, 0.000e+00, 0.000e+00, 2.497e-03, 4.466e-01, 1.295e-01 }, // NOx
+        { 0.000e+00, 2.578e-02, 0.000e+00, 1.274e-04, 2.352e-05, 0.000e+00, 1.575e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // LCV_diesel_M+N1-I_Euro-5
-        { 9.039e+02, 7.087e+00, 5.255e+02, 0.000e+00, 2.085e-03, 2.597e+01, 3.647e-01 }, // CO2(total)
+        { 9.039e+02, 2.551e+01, 5.255e+02, 0.000e+00, 9.728e-02, 9.351e+01, 4.726e+00 }, // CO2(total)
         { 3.858e-01, 0.000e+00, 3.001e-01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 1.118e-01, 0.000e+00, 4.954e-02, 0.000e+00, 7.383e-08, 1.770e-05, 0.000e+00 }, // HC
-        { 2.905e+02, 2.278e+00, 1.689e+02, 0.000e+00, 6.701e-04, 8.348e+00, 1.172e-01 }, // FC
-        { 4.221e+00, 2.175e-01, 0.000e+00, 0.000e+00, 2.623e-05, 5.599e-01, 3.173e-03 }, // NOx
-        { 2.594e-02, 7.167e-03, 9.889e-03, 9.766e-06, 4.255e-08, 0.000e+00, 5.206e-06 }, // PM + PM (non-exhaust)
+        { 1.118e-01, 0.000e+00, 4.954e-02, 0.000e+00, 3.445e-06, 6.373e-05, 0.000e+00 }, // HC
+        { 2.905e+02, 8.200e+00, 1.689e+02, 0.000e+00, 3.126e-02, 3.005e+01, 1.519e+00 }, // FC
+        { 4.221e+00, 7.830e-01, 0.000e+00, 0.000e+00, 1.224e-03, 2.016e+00, 4.113e-02 }, // NOx
+        { 2.594e-02, 2.580e-02, 9.889e-03, 1.266e-04, 1.985e-06, 0.000e+00, 6.747e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // LCV_diesel_M+N1-I_Euro-6ab
-        { 9.862e+02, 5.503e+00, 3.312e+02, 0.000e+00, 2.539e-03, 3.279e+01, 3.500e-01 }, // CO2(total)
-        { 1.029e+00, 4.082e-03, 6.801e-01, 0.000e+00, 1.380e-06, 0.000e+00, 3.569e-04 }, // CO
-        { 1.936e-01, 1.908e-03, 0.000e+00, 0.000e+00, 3.739e-07, 9.605e-03, 2.687e-05 }, // HC
-        { 3.169e+02, 1.769e+00, 1.065e+02, 0.000e+00, 8.160e-04, 1.054e+01, 1.125e-01 }, // FC
-        { 3.446e+00, 7.819e-02, 1.299e+00, 0.000e+00, 2.473e-05, 0.000e+00, 6.933e-03 }, // NOx
-        { 5.056e-02, 7.154e-03, 0.000e+00, 9.922e-06, 2.510e-07, 0.000e+00, 5.507e-05 }, // PM + PM (non-exhaust)
+        { 9.862e+02, 1.981e+01, 3.312e+02, 0.000e+00, 1.185e-01, 1.180e+02, 4.536e+00 }, // CO2(total)
+        { 1.029e+00, 1.469e-02, 6.801e-01, 0.000e+00, 6.438e-05, 0.000e+00, 4.626e-03 }, // CO
+        { 1.936e-01, 6.870e-03, 0.000e+00, 0.000e+00, 1.744e-05, 3.458e-02, 3.482e-04 }, // HC
+        { 3.169e+02, 6.367e+00, 1.065e+02, 0.000e+00, 3.807e-02, 3.793e+01, 1.458e+00 }, // FC
+        { 3.446e+00, 2.815e-01, 1.299e+00, 0.000e+00, 1.154e-03, 0.000e+00, 8.985e-02 }, // NOx
+        { 5.056e-02, 2.575e-02, 0.000e+00, 1.286e-04, 1.171e-05, 0.000e+00, 7.137e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // LCV_diesel_M+N1-I_Euro-6c
-        { 9.654e+02, 5.361e+00, 3.384e+02, 0.000e+00, 2.477e-03, 3.159e+01, 3.450e-01 }, // CO2(total)
-        { 3.595e-01, 3.612e-03, 0.000e+00, 6.366e-05, 0.000e+00, 1.684e-02, 0.000e+00 }, // CO
-        { 3.889e-02, 5.478e-03, 3.568e-01, 0.000e+00, 0.000e+00, 4.883e-03, 0.000e+00 }, // HC
-        { 3.102e+02, 1.723e+00, 1.087e+02, 0.000e+00, 7.959e-04, 1.015e+01, 1.109e-01 }, // FC
-        { 1.472e+00, 3.377e-02, 0.000e+00, 0.000e+00, 9.879e-06, 1.053e-02, 2.710e-03 }, // NOx
-        { 0.000e+00, 7.155e-03, 1.224e-01, 9.916e-06, 7.651e-07, 4.324e-03, 4.206e-07 }, // PM + PM (non-exhaust)
+        { 9.654e+02, 1.930e+01, 3.384e+02, 0.000e+00, 1.155e-01, 1.137e+02, 4.471e+00 }, // CO2(total)
+        { 3.595e-01, 1.300e-02, 0.000e+00, 8.250e-04, 0.000e+00, 6.061e-02, 0.000e+00 }, // CO
+        { 3.889e-02, 1.972e-02, 3.568e-01, 0.000e+00, 0.000e+00, 1.758e-02, 0.000e+00 }, // HC
+        { 3.102e+02, 6.203e+00, 1.087e+02, 0.000e+00, 3.713e-02, 3.655e+01, 1.437e+00 }, // FC
+        { 1.472e+00, 1.216e-01, 0.000e+00, 0.000e+00, 4.609e-04, 3.792e-02, 3.512e-02 }, // NOx
+        { 0.000e+00, 2.576e-02, 1.224e-01, 1.285e-04, 3.570e-05, 1.557e-02, 5.451e-06 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // LCV_diesel_M+N1-I_Euro-6d-temp
-        { 9.450e+02, 5.235e+00, 3.399e+02, 0.000e+00, 2.400e-03, 3.057e+01, 3.370e-01 }, // CO2(total)
-        { 1.438e-01, 4.173e-03, 3.573e-01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 1.405e-01, 3.223e-03, 5.916e-01, 0.000e+00, 0.000e+00, 6.789e-04, 0.000e+00 }, // HC
-        { 3.037e+02, 1.682e+00, 1.092e+02, 0.000e+00, 7.712e-04, 9.826e+00, 1.083e-01 }, // FC
-        { 2.531e-01, 9.124e-03, 0.000e+00, 0.000e+00, 2.246e-06, 1.965e-02, 4.403e-04 }, // NOx
-        { 0.000e+00, 7.155e-03, 3.746e-01, 9.914e-06, 9.828e-07, 9.856e-04, 4.221e-07 }, // PM + PM (non-exhaust)
+        { 9.450e+02, 1.885e+01, 3.399e+02, 0.000e+00, 1.120e-01, 1.101e+02, 4.368e+00 }, // CO2(total)
+        { 1.438e-01, 1.502e-02, 3.573e-01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
+        { 1.405e-01, 1.160e-02, 5.916e-01, 0.000e+00, 0.000e+00, 2.444e-03, 0.000e+00 }, // HC
+        { 3.037e+02, 6.057e+00, 1.092e+02, 0.000e+00, 3.598e-02, 3.537e+01, 1.404e+00 }, // FC
+        { 2.531e-01, 3.285e-02, 0.000e+00, 0.000e+00, 1.048e-04, 7.073e-02, 5.706e-03 }, // NOx
+        { 0.000e+00, 2.576e-02, 3.746e-01, 1.285e-04, 4.585e-05, 3.548e-03, 5.470e-06 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // LCV_diesel_M+N1-I_Euro-6d
-        { 8.900e+02, 5.028e+00, 3.398e+02, 0.000e+00, 2.258e-03, 2.835e+01, 3.229e-01 }, // CO2(total)
-        { 1.287e-01, 3.763e-03, 3.224e-01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 1.244e-01, 2.940e-03, 5.278e-01, 0.000e+00, 0.000e+00, 7.485e-04, 0.000e+00 }, // HC
-        { 2.860e+02, 1.616e+00, 1.092e+02, 0.000e+00, 7.257e-04, 9.112e+00, 1.038e-01 }, // FC
-        { 1.731e-01, 8.642e-03, 0.000e+00, 0.000e+00, 1.968e-06, 2.076e-02, 3.617e-04 }, // NOx
-        { 0.000e+00, 7.156e-03, 2.864e-01, 9.896e-06, 8.829e-07, 1.521e-03, 4.066e-07 }, // PM + PM (non-exhaust)
+        { 8.900e+02, 1.810e+01, 3.398e+02, 0.000e+00, 1.054e-01, 1.021e+02, 4.185e+00 }, // CO2(total)
+        { 1.287e-01, 1.355e-02, 3.224e-01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
+        { 1.244e-01, 1.058e-02, 5.278e-01, 0.000e+00, 0.000e+00, 2.695e-03, 0.000e+00 }, // HC
+        { 2.860e+02, 5.818e+00, 1.092e+02, 0.000e+00, 3.386e-02, 3.280e+01, 1.345e+00 }, // FC
+        { 1.731e-01, 3.111e-02, 0.000e+00, 0.000e+00, 9.184e-05, 7.472e-02, 4.688e-03 }, // NOx
+        { 0.000e+00, 2.576e-02, 2.864e-01, 1.283e-04, 4.119e-05, 5.475e-03, 5.269e-06 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // LCV_diesel_N1-II_convlt_1986
-        { 2.118e+03, 5.756e+00, 0.000e+00, 0.000e+00, 7.101e-03, 1.206e+02, 1.234e-01 }, // CO2(total)
-        { 9.860e+00, 0.000e+00, 4.480e+00, 0.000e+00, 1.120e-05, 0.000e+00, 1.319e-03 }, // CO
-        { 2.110e+00, 1.699e-02, 1.231e+00, 1.318e-04, 0.000e+00, 0.000e+00, 0.000e+00 }, // HC
-        { 6.807e+02, 1.850e+00, 0.000e+00, 0.000e+00, 2.282e-03, 3.876e+01, 3.966e-02 }, // FC
-        { 6.847e+00, 1.125e-01, 0.000e+00, 0.000e+00, 4.508e-05, 4.286e-01, 5.343e-03 }, // NOx
-        { 8.071e-01, 5.132e-02, 8.587e-01, 4.322e-04, 0.000e+00, 6.226e-02, 1.624e-06 }, // PM + PM (non-exhaust)
+        { 2.118e+03, 2.072e+01, 0.000e+00, 0.000e+00, 3.313e-01, 4.342e+02, 1.599e+00 }, // CO2(total)
+        { 9.860e+00, 0.000e+00, 4.480e+00, 0.000e+00, 5.227e-04, 0.000e+00, 1.709e-02 }, // CO
+        { 2.110e+00, 6.115e-02, 1.231e+00, 1.708e-03, 0.000e+00, 0.000e+00, 0.000e+00 }, // HC
+        { 6.807e+02, 6.660e+00, 0.000e+00, 0.000e+00, 1.065e-01, 1.395e+02, 5.140e-01 }, // FC
+        { 6.847e+00, 4.052e-01, 0.000e+00, 0.000e+00, 2.103e-03, 1.543e+00, 6.924e-02 }, // NOx
+        { 8.071e-01, 1.848e-01, 8.587e-01, 5.602e-03, 0.000e+00, 2.241e-01, 2.104e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // LCV_diesel_N1-II_Euro-1
-        { 2.162e+03, 3.298e+00, 0.000e+00, 0.000e+00, 6.980e-03, 1.151e+02, 1.430e-01 }, // CO2(total)
-        { 7.277e+00, 0.000e+00, 3.336e+00, 0.000e+00, 7.792e-06, 0.000e+00, 8.968e-04 }, // CO
-        { 1.065e+00, 8.109e-03, 5.655e-01, 6.815e-05, 0.000e+00, 0.000e+00, 0.000e+00 }, // HC
-        { 6.948e+02, 1.060e+00, 0.000e+00, 0.000e+00, 2.243e-03, 3.698e+01, 4.597e-02 }, // FC
-        { 5.667e+00, 1.013e-01, 0.000e+00, 0.000e+00, 3.827e-05, 3.493e-01, 4.829e-03 }, // NOx
-        { 1.154e-01, 2.983e-02, 3.561e-01, 3.595e-04, 0.000e+00, 3.124e-02, 1.467e-04 }, // PM + PM (non-exhaust)
+        { 2.162e+03, 1.187e+01, 0.000e+00, 0.000e+00, 3.257e-01, 4.142e+02, 1.854e+00 }, // CO2(total)
+        { 7.277e+00, 0.000e+00, 3.336e+00, 0.000e+00, 3.636e-04, 0.000e+00, 1.162e-02 }, // CO
+        { 1.065e+00, 2.919e-02, 5.655e-01, 8.833e-04, 0.000e+00, 0.000e+00, 0.000e+00 }, // HC
+        { 6.948e+02, 3.815e+00, 0.000e+00, 0.000e+00, 1.047e-01, 1.331e+02, 5.957e-01 }, // FC
+        { 5.667e+00, 3.646e-01, 0.000e+00, 0.000e+00, 1.785e-03, 1.258e+00, 6.258e-02 }, // NOx
+        { 1.154e-01, 1.074e-01, 3.561e-01, 4.659e-03, 0.000e+00, 1.125e-01, 1.901e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // LCV_diesel_N1-II_XXIII
-        { 2.172e+03, 5.903e+00, 0.000e+00, 0.000e+00, 7.282e-03, 1.237e+02, 1.265e-01 }, // CO2(total)
-        { 9.860e+00, 0.000e+00, 4.480e+00, 0.000e+00, 1.120e-05, 0.000e+00, 1.319e-03 }, // CO
-        { 2.110e+00, 1.699e-02, 1.231e+00, 1.318e-04, 0.000e+00, 0.000e+00, 0.000e+00 }, // HC
-        { 6.980e+02, 1.897e+00, 0.000e+00, 0.000e+00, 2.340e-03, 3.975e+01, 4.067e-02 }, // FC
-        { 6.847e+00, 1.125e-01, 0.000e+00, 0.000e+00, 4.508e-05, 4.286e-01, 5.343e-03 }, // NOx
-        { 8.071e-01, 5.132e-02, 8.587e-01, 4.322e-04, 0.000e+00, 6.226e-02, 1.624e-06 }, // PM + PM (non-exhaust)
+        { 2.172e+03, 2.125e+01, 0.000e+00, 0.000e+00, 3.398e-01, 4.453e+02, 1.640e+00 }, // CO2(total)
+        { 9.860e+00, 0.000e+00, 4.480e+00, 0.000e+00, 5.227e-04, 0.000e+00, 1.709e-02 }, // CO
+        { 2.110e+00, 6.115e-02, 1.231e+00, 1.708e-03, 0.000e+00, 0.000e+00, 0.000e+00 }, // HC
+        { 6.980e+02, 6.829e+00, 0.000e+00, 0.000e+00, 1.092e-01, 1.431e+02, 5.271e-01 }, // FC
+        { 6.847e+00, 4.052e-01, 0.000e+00, 0.000e+00, 2.103e-03, 1.543e+00, 6.924e-02 }, // NOx
+        { 8.071e-01, 1.848e-01, 8.587e-01, 5.602e-03, 0.000e+00, 2.241e-01, 2.104e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // LCV_diesel_N1-II_Euro-2
-        { 2.014e+03, 2.657e+00, 0.000e+00, 0.000e+00, 6.383e-03, 9.647e+01, 3.008e-01 }, // CO2(total)
-        { 2.077e+00, 0.000e+00, 9.243e-01, 0.000e+00, 2.201e-06, 0.000e+00, 2.666e-04 }, // CO
-        { 5.513e-01, 3.782e-03, 2.839e-01, 3.749e-05, 0.000e+00, 0.000e+00, 0.000e+00 }, // HC
-        { 6.473e+02, 8.539e-01, 0.000e+00, 0.000e+00, 2.051e-03, 3.100e+01, 9.669e-02 }, // FC
-        { 5.158e+00, 8.910e-02, 0.000e+00, 0.000e+00, 3.359e-05, 3.025e-01, 4.348e-03 }, // NOx
-        { 2.554e-01, 2.040e-02, 4.760e-01, 1.467e-04, 0.000e+00, 1.069e-02, 5.732e-05 }, // PM + PM (non-exhaust)
+        { 2.014e+03, 9.565e+00, 0.000e+00, 0.000e+00, 2.978e-01, 3.473e+02, 3.899e+00 }, // CO2(total)
+        { 2.077e+00, 0.000e+00, 9.243e-01, 0.000e+00, 1.027e-04, 0.000e+00, 3.455e-03 }, // CO
+        { 5.513e-01, 1.362e-02, 2.839e-01, 4.859e-04, 0.000e+00, 0.000e+00, 0.000e+00 }, // HC
+        { 6.473e+02, 3.074e+00, 0.000e+00, 0.000e+00, 9.570e-02, 1.116e+02, 1.253e+00 }, // FC
+        { 5.158e+00, 3.208e-01, 0.000e+00, 0.000e+00, 1.567e-03, 1.089e+00, 5.635e-02 }, // NOx
+        { 2.554e-01, 7.345e-02, 4.760e-01, 1.901e-03, 0.000e+00, 3.847e-02, 7.429e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // LCV_diesel_N1-II_Euro-3
-        { 1.318e+03, 5.019e+00, 0.000e+00, 0.000e+00, 4.079e-03, 6.257e+01, 3.117e-01 }, // CO2(total)
+        { 1.318e+03, 1.807e+01, 0.000e+00, 0.000e+00, 1.903e-01, 2.252e+02, 4.040e+00 }, // CO2(total)
         { 3.595e-01, 0.000e+00, 3.079e-01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 2.053e-01, 4.870e-06, 1.911e-01, 0.000e+00, 2.069e-07, 1.082e-03, 0.000e+00 }, // HC
-        { 4.237e+02, 1.613e+00, 0.000e+00, 0.000e+00, 1.311e-03, 2.011e+01, 1.002e-01 }, // FC
-        { 6.017e+00, 1.372e-01, 0.000e+00, 0.000e+00, 3.088e-05, 4.858e-01, 2.980e-03 }, // NOx
-        { 2.734e-01, 1.054e-02, 0.000e+00, 1.706e-05, 7.802e-07, 1.769e-02, 9.786e-07 }, // PM + PM (non-exhaust)
+        { 2.053e-01, 1.753e-05, 1.911e-01, 0.000e+00, 9.652e-06, 3.897e-03, 0.000e+00 }, // HC
+        { 4.237e+02, 5.807e+00, 0.000e+00, 0.000e+00, 6.117e-02, 7.239e+01, 1.298e+00 }, // FC
+        { 6.017e+00, 4.940e-01, 0.000e+00, 0.000e+00, 1.441e-03, 1.749e+00, 3.862e-02 }, // NOx
+        { 2.734e-01, 3.794e-02, 0.000e+00, 2.211e-04, 3.640e-05, 6.368e-02, 1.268e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // LCV_diesel_N1-II_Euro-3_(DPF)
-        { 1.331e+03, 5.069e+00, 0.000e+00, 0.000e+00, 4.120e-03, 6.319e+01, 3.148e-01 }, // CO2(total)
+        { 1.331e+03, 1.825e+01, 0.000e+00, 0.000e+00, 1.922e-01, 2.275e+02, 4.080e+00 }, // CO2(total)
         { 3.595e-01, 0.000e+00, 3.079e-01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 2.053e-01, 4.870e-06, 1.911e-01, 0.000e+00, 2.069e-07, 1.082e-03, 0.000e+00 }, // HC
-        { 4.279e+02, 1.629e+00, 0.000e+00, 0.000e+00, 1.324e-03, 2.031e+01, 1.012e-01 }, // FC
-        { 6.017e+00, 1.372e-01, 0.000e+00, 0.000e+00, 3.088e-05, 4.858e-01, 2.980e-03 }, // NOx
-        { 1.914e-01, 9.511e-03, 0.000e+00, 1.508e-05, 5.461e-07, 1.238e-02, 9.786e-07 }, // PM + PM (non-exhaust)
+        { 2.053e-01, 1.753e-05, 1.911e-01, 0.000e+00, 9.652e-06, 3.897e-03, 0.000e+00 }, // HC
+        { 4.279e+02, 5.865e+00, 0.000e+00, 0.000e+00, 6.178e-02, 7.311e+01, 1.311e+00 }, // FC
+        { 6.017e+00, 4.940e-01, 0.000e+00, 0.000e+00, 1.441e-03, 1.749e+00, 3.862e-02 }, // NOx
+        { 1.914e-01, 3.424e-02, 0.000e+00, 1.955e-04, 2.548e-05, 4.457e-02, 1.268e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // LCV_diesel_N1-II_Euro-4
-        { 1.381e+03, 3.836e+00, 1.632e+02, 0.000e+00, 4.143e-03, 5.141e+01, 4.381e-01 }, // CO2(total)
+        { 1.381e+03, 1.381e+01, 1.632e+02, 0.000e+00, 1.933e-01, 1.851e+02, 5.678e+00 }, // CO2(total)
         { 2.985e-01, 0.000e+00, 2.479e-01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 1.616e-01, 9.014e-04, 1.170e-02, 0.000e+00, 1.423e-07, 2.771e-03, 0.000e+00 }, // HC
-        { 4.438e+02, 1.233e+00, 5.245e+01, 0.000e+00, 1.331e-03, 1.652e+01, 1.408e-01 }, // FC
-        { 7.678e+00, 4.526e-02, 0.000e+00, 0.000e+00, 4.200e-05, 4.444e-01, 3.914e-03 }, // NOx
-        { 2.942e-01, 7.130e-03, 4.288e-02, 1.074e-04, 4.438e-08, 1.061e-02, 6.365e-07 }, // PM + PM (non-exhaust)
+        { 1.616e-01, 3.245e-03, 1.170e-02, 0.000e+00, 6.641e-06, 9.974e-03, 0.000e+00 }, // HC
+        { 4.438e+02, 4.438e+00, 5.245e+01, 0.000e+00, 6.212e-02, 5.947e+01, 1.825e+00 }, // FC
+        { 7.678e+00, 1.629e-01, 0.000e+00, 0.000e+00, 1.960e-03, 1.600e+00, 5.072e-02 }, // NOx
+        { 2.942e-01, 2.567e-02, 4.288e-02, 1.392e-03, 2.071e-06, 3.818e-02, 8.249e-06 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // LCV_diesel_N1-II_Euro-4_(DPF)
-        { 1.381e+03, 3.836e+00, 1.632e+02, 0.000e+00, 4.143e-03, 5.141e+01, 4.381e-01 }, // CO2(total)
+        { 1.381e+03, 1.381e+01, 1.632e+02, 0.000e+00, 1.933e-01, 1.851e+02, 5.678e+00 }, // CO2(total)
         { 2.985e-01, 0.000e+00, 2.479e-01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 1.616e-01, 9.014e-04, 1.170e-02, 0.000e+00, 1.423e-07, 2.771e-03, 0.000e+00 }, // HC
-        { 4.438e+02, 1.233e+00, 5.245e+01, 0.000e+00, 1.331e-03, 1.652e+01, 1.408e-01 }, // FC
-        { 7.678e+00, 4.526e-02, 0.000e+00, 0.000e+00, 4.200e-05, 4.444e-01, 3.914e-03 }, // NOx
-        { 6.314e-03, 7.130e-03, 0.000e+00, 1.021e-05, 2.241e-08, 4.210e-05, 3.026e-06 }, // PM + PM (non-exhaust)
+        { 1.616e-01, 3.245e-03, 1.170e-02, 0.000e+00, 6.641e-06, 9.974e-03, 0.000e+00 }, // HC
+        { 4.438e+02, 4.438e+00, 5.245e+01, 0.000e+00, 6.212e-02, 5.947e+01, 1.825e+00 }, // FC
+        { 7.678e+00, 1.629e-01, 0.000e+00, 0.000e+00, 1.960e-03, 1.600e+00, 5.072e-02 }, // NOx
+        { 6.314e-03, 2.567e-02, 0.000e+00, 1.324e-04, 1.046e-06, 1.516e-04, 3.921e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // LCV_diesel_N1-II_Euro-5
-        { 1.365e+03, 5.110e+00, 1.533e+02, 0.000e+00, 3.613e-03, 5.164e+01, 3.407e-01 }, // CO2(total)
+        { 1.365e+03, 1.840e+01, 1.533e+02, 0.000e+00, 1.686e-01, 1.859e+02, 4.416e+00 }, // CO2(total)
         { 6.250e-02, 0.000e+00, 5.304e-02, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 1.755e-01, 0.000e+00, 3.929e-02, 5.847e-07, 4.452e-08, 0.000e+00, 1.365e-06 }, // HC
-        { 4.387e+02, 1.642e+00, 4.926e+01, 0.000e+00, 1.161e-03, 1.660e+01, 1.095e-01 }, // FC
-        { 7.055e+00, 1.048e-01, 0.000e+00, 0.000e+00, 3.216e-05, 3.895e-01, 5.415e-03 }, // NOx
-        { 3.129e-03, 7.290e-03, 4.905e-03, 1.075e-05, 0.000e+00, 1.759e-04, 6.197e-07 }, // PM + PM (non-exhaust)
+        { 1.755e-01, 0.000e+00, 3.929e-02, 7.578e-06, 2.077e-06, 0.000e+00, 1.769e-05 }, // HC
+        { 4.387e+02, 5.912e+00, 4.926e+01, 0.000e+00, 5.418e-02, 5.975e+01, 1.419e+00 }, // FC
+        { 7.055e+00, 3.774e-01, 0.000e+00, 0.000e+00, 1.500e-03, 1.402e+00, 7.017e-02 }, // NOx
+        { 3.129e-03, 2.624e-02, 4.905e-03, 1.393e-04, 0.000e+00, 6.331e-04, 8.031e-06 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // LCV_diesel_N1-II_Euro-6ab
-        { 1.438e+03, 5.588e+00, 2.170e+02, 0.000e+00, 3.929e-03, 5.368e+01, 4.074e-01 }, // CO2(total)
-        { 1.095e+00, 1.190e-03, 5.914e-01, 0.000e+00, 1.693e-06, 0.000e+00, 3.650e-04 }, // CO
-        { 2.338e-01, 6.033e-04, 0.000e+00, 0.000e+00, 4.985e-07, 8.907e-03, 3.432e-05 }, // HC
-        { 4.621e+02, 1.796e+00, 6.975e+01, 0.000e+00, 1.263e-03, 1.725e+01, 1.309e-01 }, // FC
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 2.090e-05, 0.000e+00, 4.188e-03 }, // NOx
-        { 4.603e-02, 7.145e-03, 0.000e+00, 1.003e-05, 2.639e-07, 0.000e+00, 5.543e-05 }, // PM + PM (non-exhaust)
+        { 1.438e+03, 2.012e+01, 2.170e+02, 0.000e+00, 1.833e-01, 1.932e+02, 5.280e+00 }, // CO2(total)
+        { 1.095e+00, 4.285e-03, 5.914e-01, 0.000e+00, 7.900e-05, 0.000e+00, 4.730e-03 }, // CO
+        { 2.338e-01, 2.172e-03, 0.000e+00, 0.000e+00, 2.326e-05, 3.206e-02, 4.448e-04 }, // HC
+        { 4.621e+02, 6.466e+00, 6.975e+01, 0.000e+00, 5.891e-02, 6.210e+01, 1.697e+00 }, // FC
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 9.750e-04, 0.000e+00, 5.428e-02 }, // NOx
+        { 4.603e-02, 2.572e-02, 0.000e+00, 1.300e-04, 1.231e-05, 0.000e+00, 7.183e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // LCV_diesel_N1-II_Euro-6c
-        { 1.405e+03, 5.500e+00, 2.219e+02, 0.000e+00, 3.829e-03, 5.216e+01, 4.004e-01 }, // CO2(total)
-        { 2.962e-01, 5.982e-03, 0.000e+00, 2.531e-05, 2.339e-07, 1.661e-02, 0.000e+00 }, // CO
-        { 0.000e+00, 6.174e-03, 3.422e-01, 0.000e+00, 0.000e+00, 4.946e-03, 0.000e+00 }, // HC
-        { 4.514e+02, 1.767e+00, 7.131e+01, 0.000e+00, 1.230e-03, 1.676e+01, 1.287e-01 }, // FC
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.892e-05, 0.000e+00, 3.811e-03 }, // NOx
-        { 0.000e+00, 7.146e-03, 3.413e-01, 1.002e-05, 7.297e-07, 1.252e-04, 4.832e-07 }, // PM + PM (non-exhaust)
+        { 1.405e+03, 1.980e+01, 2.219e+02, 0.000e+00, 1.786e-01, 1.878e+02, 5.189e+00 }, // CO2(total)
+        { 2.962e-01, 2.153e-02, 0.000e+00, 3.280e-04, 1.091e-05, 5.979e-02, 0.000e+00 }, // CO
+        { 0.000e+00, 2.223e-02, 3.422e-01, 0.000e+00, 0.000e+00, 1.780e-02, 0.000e+00 }, // HC
+        { 4.514e+02, 6.363e+00, 7.131e+01, 0.000e+00, 5.741e-02, 6.034e+01, 1.668e+00 }, // FC
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 8.826e-04, 0.000e+00, 4.939e-02 }, // NOx
+        { 0.000e+00, 2.572e-02, 3.413e-01, 1.299e-04, 3.405e-05, 4.508e-04, 6.262e-06 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // LCV_diesel_N1-II_Euro-6d-temp
-        { 1.367e+03, 5.474e+00, 2.284e+02, 0.000e+00, 3.708e-03, 5.053e+01, 3.923e-01 }, // CO2(total)
-        { 1.357e-01, 4.212e-03, 3.419e-01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 1.145e-01, 3.617e-03, 5.814e-01, 0.000e+00, 0.000e+00, 6.229e-04, 0.000e+00 }, // HC
-        { 4.394e+02, 1.759e+00, 7.340e+01, 0.000e+00, 1.192e-03, 1.624e+01, 1.261e-01 }, // FC
-        { 4.804e-01, 1.397e-03, 0.000e+00, 0.000e+00, 2.873e-06, 9.742e-03, 5.577e-04 }, // NOx
-        { 0.000e+00, 7.146e-03, 3.174e-01, 1.001e-05, 9.491e-07, 0.000e+00, 4.747e-07 }, // PM + PM (non-exhaust)
+        { 1.367e+03, 1.971e+01, 2.284e+02, 0.000e+00, 1.730e-01, 1.819e+02, 5.084e+00 }, // CO2(total)
+        { 1.357e-01, 1.516e-02, 3.419e-01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
+        { 1.145e-01, 1.302e-02, 5.814e-01, 0.000e+00, 0.000e+00, 2.242e-03, 0.000e+00 }, // HC
+        { 4.394e+02, 6.333e+00, 7.340e+01, 0.000e+00, 5.560e-02, 5.846e+01, 1.634e+00 }, // FC
+        { 4.804e-01, 5.028e-03, 0.000e+00, 0.000e+00, 1.341e-04, 3.507e-02, 7.228e-03 }, // NOx
+        { 0.000e+00, 2.573e-02, 3.174e-01, 1.297e-04, 4.428e-05, 0.000e+00, 6.152e-06 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // LCV_diesel_N1-II_Euro-6d
-        { 1.292e+03, 5.268e+00, 2.316e+02, 0.000e+00, 3.487e-03, 4.735e+01, 3.741e-01 }, // CO2(total)
-        { 1.221e-01, 3.788e-03, 3.081e-01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 1.039e-01, 3.234e-03, 5.234e-01, 0.000e+00, 0.000e+00, 5.698e-04, 0.000e+00 }, // HC
-        { 4.152e+02, 1.693e+00, 7.444e+01, 0.000e+00, 1.120e-03, 1.522e+01, 1.202e-01 }, // FC
-        { 3.688e-01, 2.219e-03, 0.000e+00, 0.000e+00, 2.495e-06, 1.180e-02, 4.626e-04 }, // NOx
-        { 0.000e+00, 7.148e-03, 2.848e-01, 9.996e-06, 8.441e-07, 0.000e+00, 4.642e-07 }, // PM + PM (non-exhaust)
+        { 1.292e+03, 1.897e+01, 2.316e+02, 0.000e+00, 1.627e-01, 1.705e+02, 4.849e+00 }, // CO2(total)
+        { 1.221e-01, 1.364e-02, 3.081e-01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
+        { 1.039e-01, 1.164e-02, 5.234e-01, 0.000e+00, 0.000e+00, 2.051e-03, 0.000e+00 }, // HC
+        { 4.152e+02, 6.095e+00, 7.444e+01, 0.000e+00, 5.228e-02, 5.479e+01, 1.558e+00 }, // FC
+        { 3.688e-01, 7.987e-03, 0.000e+00, 0.000e+00, 1.164e-04, 4.247e-02, 5.995e-03 }, // NOx
+        { 0.000e+00, 2.573e-02, 2.848e-01, 1.296e-04, 3.938e-05, 0.000e+00, 6.016e-06 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // LCV_diesel_N1-III_convlt_1986
-        { 2.467e+03, 1.985e+01, 0.000e+00, 0.000e+00, 8.663e-03, 1.644e+02, 3.838e-01 }, // CO2(total)
-        { 1.267e+01, 0.000e+00, 6.527e+00, 2.609e-04, 1.318e-05, 0.000e+00, 2.084e-03 }, // CO
-        { 1.191e-01, 1.263e-03, 9.172e-02, 6.631e-06, 0.000e+00, 0.000e+00, 0.000e+00 }, // HC
-        { 7.929e+02, 6.378e+00, 0.000e+00, 0.000e+00, 2.784e-03, 5.282e+01, 1.234e-01 }, // FC
-        { 5.148e+00, 1.835e-01, 0.000e+00, 0.000e+00, 3.828e-05, 5.122e-01, 4.944e-03 }, // NOx
-        { 7.241e-01, 6.832e-02, 1.116e+00, 4.115e-04, 0.000e+00, 8.027e-02, 1.864e-06 }, // PM + PM (non-exhaust)
+        { 2.467e+03, 7.145e+01, 0.000e+00, 0.000e+00, 4.042e-01, 5.917e+02, 4.975e+00 }, // CO2(total)
+        { 1.267e+01, 0.000e+00, 6.527e+00, 3.381e-03, 6.148e-04, 0.000e+00, 2.700e-02 }, // CO
+        { 1.191e-01, 4.545e-03, 9.172e-02, 8.593e-05, 0.000e+00, 0.000e+00, 0.000e+00 }, // HC
+        { 7.929e+02, 2.296e+01, 0.000e+00, 0.000e+00, 1.299e-01, 1.902e+02, 1.599e+00 }, // FC
+        { 5.148e+00, 6.606e-01, 0.000e+00, 0.000e+00, 1.786e-03, 1.844e+00, 6.407e-02 }, // NOx
+        { 7.241e-01, 2.460e-01, 1.116e+00, 5.333e-03, 0.000e+00, 2.890e-01, 2.416e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // LCV_diesel_N1-III_Euro-1
-        { 2.429e+03, 1.687e+01, 0.000e+00, 0.000e+00, 8.337e-03, 1.546e+02, 3.887e-01 }, // CO2(total)
-        { 7.938e+00, 0.000e+00, 3.795e+00, 1.320e-04, 8.172e-06, 0.000e+00, 1.258e-03 }, // CO
-        { 7.642e-02, 7.630e-04, 5.480e-02, 4.424e-06, 0.000e+00, 0.000e+00, 0.000e+00 }, // HC
-        { 7.805e+02, 5.421e+00, 0.000e+00, 0.000e+00, 2.679e-03, 4.967e+01, 1.249e-01 }, // FC
-        { 4.978e+00, 1.602e-01, 0.000e+00, 0.000e+00, 3.532e-05, 4.481e-01, 4.697e-03 }, // NOx
-        { 0.000e+00, 4.098e-02, 1.352e-01, 3.468e-04, 0.000e+00, 5.460e-02, 8.582e-05 }, // PM + PM (non-exhaust)
+        { 2.429e+03, 6.073e+01, 0.000e+00, 0.000e+00, 3.890e-01, 5.564e+02, 5.037e+00 }, // CO2(total)
+        { 7.938e+00, 0.000e+00, 3.795e+00, 1.711e-03, 3.813e-04, 0.000e+00, 1.631e-02 }, // CO
+        { 7.642e-02, 2.747e-03, 5.480e-02, 5.733e-05, 0.000e+00, 0.000e+00, 0.000e+00 }, // HC
+        { 7.805e+02, 1.952e+01, 0.000e+00, 0.000e+00, 1.250e-01, 1.788e+02, 1.619e+00 }, // FC
+        { 4.978e+00, 5.766e-01, 0.000e+00, 0.000e+00, 1.648e-03, 1.613e+00, 6.087e-02 }, // NOx
+        { 0.000e+00, 1.475e-01, 1.352e-01, 4.495e-03, 0.000e+00, 1.965e-01, 1.112e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // LCV_diesel_N1-III_XXIII
-        { 2.511e+03, 2.020e+01, 0.000e+00, 0.000e+00, 8.818e-03, 1.673e+02, 3.907e-01 }, // CO2(total)
-        { 1.267e+01, 0.000e+00, 6.527e+00, 2.609e-04, 1.318e-05, 0.000e+00, 2.084e-03 }, // CO
-        { 1.191e-01, 1.263e-03, 9.172e-02, 6.631e-06, 0.000e+00, 0.000e+00, 0.000e+00 }, // HC
-        { 8.071e+02, 6.493e+00, 0.000e+00, 0.000e+00, 2.834e-03, 5.377e+01, 1.256e-01 }, // FC
-        { 5.148e+00, 1.835e-01, 0.000e+00, 0.000e+00, 3.828e-05, 5.122e-01, 4.944e-03 }, // NOx
-        { 7.241e-01, 6.832e-02, 1.116e+00, 4.115e-04, 0.000e+00, 8.027e-02, 1.864e-06 }, // PM + PM (non-exhaust)
+        { 2.511e+03, 7.273e+01, 0.000e+00, 0.000e+00, 4.114e-01, 6.023e+02, 5.064e+00 }, // CO2(total)
+        { 1.267e+01, 0.000e+00, 6.527e+00, 3.381e-03, 6.148e-04, 0.000e+00, 2.700e-02 }, // CO
+        { 1.191e-01, 4.545e-03, 9.172e-02, 8.593e-05, 0.000e+00, 0.000e+00, 0.000e+00 }, // HC
+        { 8.071e+02, 2.337e+01, 0.000e+00, 0.000e+00, 1.322e-01, 1.936e+02, 1.627e+00 }, // FC
+        { 5.148e+00, 6.606e-01, 0.000e+00, 0.000e+00, 1.786e-03, 1.844e+00, 6.407e-02 }, // NOx
+        { 7.241e-01, 2.460e-01, 1.116e+00, 5.333e-03, 0.000e+00, 2.890e-01, 2.416e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // LCV_diesel_N1-III_Euro-2
-        { 2.475e+03, 1.156e+01, 0.000e+00, 0.000e+00, 7.625e-03, 1.329e+02, 4.514e-01 }, // CO2(total)
-        { 2.558e+00, 0.000e+00, 1.297e+00, 2.999e-05, 2.411e-06, 0.000e+00, 3.357e-04 }, // CO
-        { 2.935e-02, 2.606e-04, 1.785e-02, 1.809e-06, 0.000e+00, 0.000e+00, 0.000e+00 }, // HC
-        { 7.953e+02, 3.714e+00, 0.000e+00, 0.000e+00, 2.451e-03, 4.272e+01, 1.451e-01 }, // FC
-        { 2.469e+00, 9.546e-02, 0.000e+00, 0.000e+00, 1.926e-05, 2.388e-01, 2.763e-03 }, // NOx
-        { 2.947e-01, 3.987e-02, 7.855e-01, 2.052e-04, 0.000e+00, 2.901e-02, 5.871e-05 }, // PM + PM (non-exhaust)
+        { 2.475e+03, 4.161e+01, 0.000e+00, 0.000e+00, 3.558e-01, 4.786e+02, 5.851e+00 }, // CO2(total)
+        { 2.558e+00, 0.000e+00, 1.297e+00, 3.886e-04, 1.125e-04, 0.000e+00, 4.350e-03 }, // CO
+        { 2.935e-02, 9.380e-04, 1.785e-02, 2.345e-05, 0.000e+00, 0.000e+00, 0.000e+00 }, // HC
+        { 7.953e+02, 1.337e+01, 0.000e+00, 0.000e+00, 1.143e-01, 1.538e+02, 1.880e+00 }, // FC
+        { 2.469e+00, 3.437e-01, 0.000e+00, 0.000e+00, 8.986e-04, 8.597e-01, 3.581e-02 }, // NOx
+        { 2.947e-01, 1.435e-01, 7.855e-01, 2.660e-03, 0.000e+00, 1.044e-01, 7.609e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // LCV_diesel_N1-III_Euro-3
-        { 1.626e+03, 1.199e+01, 0.000e+00, 0.000e+00, 4.954e-03, 8.656e+01, 4.490e-01 }, // CO2(total)
+        { 1.626e+03, 4.318e+01, 0.000e+00, 0.000e+00, 2.311e-01, 3.116e+02, 5.820e+00 }, // CO2(total)
         { 4.254e-01, 0.000e+00, 3.713e-01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 1.206e-02, 0.000e+00, 9.543e-03, 0.000e+00, 1.169e-08, 1.027e-04, 0.000e+00 }, // HC
-        { 5.225e+02, 3.855e+00, 0.000e+00, 0.000e+00, 1.592e-03, 2.782e+01, 1.443e-01 }, // FC
-        { 5.423e+00, 1.607e-01, 0.000e+00, 0.000e+00, 2.669e-05, 4.897e-01, 2.955e-03 }, // NOx
-        { 6.342e-01, 1.852e-02, 0.000e+00, 1.050e-05, 1.868e-06, 4.756e-02, 1.049e-06 }, // PM + PM (non-exhaust)
+        { 1.206e-02, 0.000e+00, 9.543e-03, 0.000e+00, 5.455e-07, 3.697e-04, 0.000e+00 }, // HC
+        { 5.225e+02, 1.388e+01, 0.000e+00, 0.000e+00, 7.428e-02, 1.001e+02, 1.870e+00 }, // FC
+        { 5.423e+00, 5.786e-01, 0.000e+00, 0.000e+00, 1.245e-03, 1.763e+00, 3.829e-02 }, // NOx
+        { 6.342e-01, 6.668e-02, 0.000e+00, 1.361e-04, 8.715e-05, 1.712e-01, 1.359e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // LCV_diesel_N1-III_Euro-3_(DPF)
-        { 1.642e+03, 1.211e+01, 0.000e+00, 0.000e+00, 5.004e-03, 8.742e+01, 4.535e-01 }, // CO2(total)
+        { 1.642e+03, 4.361e+01, 0.000e+00, 0.000e+00, 2.334e-01, 3.147e+02, 5.878e+00 }, // CO2(total)
         { 4.254e-01, 0.000e+00, 3.713e-01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 1.206e-02, 0.000e+00, 9.543e-03, 0.000e+00, 1.169e-08, 1.027e-04, 0.000e+00 }, // HC
-        { 5.278e+02, 3.893e+00, 0.000e+00, 0.000e+00, 1.608e-03, 2.810e+01, 1.458e-01 }, // FC
-        { 5.423e+00, 1.607e-01, 0.000e+00, 0.000e+00, 2.669e-05, 4.897e-01, 2.955e-03 }, // NOx
-        { 4.439e-01, 1.510e-02, 0.000e+00, 1.050e-05, 1.308e-06, 3.330e-02, 1.049e-06 }, // PM + PM (non-exhaust)
+        { 1.206e-02, 0.000e+00, 9.543e-03, 0.000e+00, 5.455e-07, 3.697e-04, 0.000e+00 }, // HC
+        { 5.278e+02, 1.402e+01, 0.000e+00, 0.000e+00, 7.503e-02, 1.011e+02, 1.889e+00 }, // FC
+        { 5.423e+00, 5.786e-01, 0.000e+00, 0.000e+00, 1.245e-03, 1.763e+00, 3.829e-02 }, // NOx
+        { 4.439e-01, 5.436e-02, 0.000e+00, 1.361e-04, 6.100e-05, 1.199e-01, 1.359e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // LCV_diesel_N1-III_Euro-4
-        { 1.801e+03, 9.568e+00, 3.695e+02, 0.000e+00, 5.003e-03, 6.938e+01, 6.044e-01 }, // CO2(total)
+        { 1.801e+03, 3.445e+01, 3.695e+02, 0.000e+00, 2.334e-01, 2.498e+02, 7.833e+00 }, // CO2(total)
         { 5.861e-01, 0.000e+00, 4.974e-01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 5.729e-03, 3.307e-05, 5.834e-04, 0.000e+00, 4.614e-09, 9.339e-05, 0.000e+00 }, // HC
-        { 5.789e+02, 3.075e+00, 1.187e+02, 0.000e+00, 1.608e-03, 2.230e+01, 1.942e-01 }, // FC
-        { 8.012e+00, 6.151e-02, 0.000e+00, 0.000e+00, 4.205e-05, 4.509e-01, 4.514e-03 }, // NOx
-        { 3.313e-01, 7.147e-03, 8.114e-02, 1.196e-04, 0.000e+00, 1.096e-02, 4.932e-07 }, // PM + PM (non-exhaust)
+        { 5.729e-03, 1.190e-04, 5.834e-04, 0.000e+00, 2.153e-07, 3.362e-04, 0.000e+00 }, // HC
+        { 5.789e+02, 1.107e+01, 1.187e+02, 0.000e+00, 7.501e-02, 8.027e+01, 2.517e+00 }, // FC
+        { 8.012e+00, 2.215e-01, 0.000e+00, 0.000e+00, 1.962e-03, 1.623e+00, 5.850e-02 }, // NOx
+        { 3.313e-01, 2.573e-02, 8.114e-02, 1.550e-03, 0.000e+00, 3.945e-02, 6.391e-06 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // LCV_diesel_N1-III_Euro-4_(DPF)
-        { 1.801e+03, 9.568e+00, 3.695e+02, 0.000e+00, 5.003e-03, 6.938e+01, 6.044e-01 }, // CO2(total)
+        { 1.801e+03, 3.445e+01, 3.695e+02, 0.000e+00, 2.334e-01, 2.498e+02, 7.833e+00 }, // CO2(total)
         { 5.861e-01, 0.000e+00, 4.974e-01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 5.729e-03, 3.307e-05, 5.834e-04, 0.000e+00, 4.614e-09, 9.339e-05, 0.000e+00 }, // HC
-        { 5.789e+02, 3.075e+00, 1.187e+02, 0.000e+00, 1.608e-03, 2.230e+01, 1.942e-01 }, // FC
-        { 8.012e+00, 6.151e-02, 0.000e+00, 0.000e+00, 4.205e-05, 4.509e-01, 4.514e-03 }, // NOx
-        { 2.264e-02, 7.147e-03, 0.000e+00, 1.001e-05, 7.427e-08, 1.597e-04, 7.742e-06 }, // PM + PM (non-exhaust)
+        { 5.729e-03, 1.190e-04, 5.834e-04, 0.000e+00, 2.153e-07, 3.362e-04, 0.000e+00 }, // HC
+        { 5.789e+02, 1.107e+01, 1.187e+02, 0.000e+00, 7.501e-02, 8.027e+01, 2.517e+00 }, // FC
+        { 8.012e+00, 2.215e-01, 0.000e+00, 0.000e+00, 1.962e-03, 1.623e+00, 5.850e-02 }, // NOx
+        { 2.264e-02, 2.573e-02, 0.000e+00, 1.297e-04, 3.465e-06, 5.750e-04, 1.003e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // LCV_diesel_N1-III_Euro-5
-        { 1.933e+03, 1.073e+01, 4.370e+02, 0.000e+00, 4.803e-03, 7.196e+01, 5.469e-01 }, // CO2(total)
-        { 1.090e-01, 0.000e+00, 7.874e-02, 0.000e+00, 8.603e-08, 0.000e+00, 2.257e-05 }, // CO
-        { 7.305e-02, 1.731e-04, 9.088e-03, 1.451e-06, 0.000e+00, 0.000e+00, 0.000e+00 }, // HC
-        { 6.211e+02, 3.450e+00, 1.404e+02, 0.000e+00, 1.543e-03, 2.313e+01, 1.758e-01 }, // FC
-        { 8.498e+00, 0.000e+00, 1.572e+00, 0.000e+00, 4.294e-05, 0.000e+00, 9.915e-03 }, // NOx
-        { 2.166e-02, 7.187e-03, 2.492e-03, 1.176e-05, 3.809e-09, 1.583e-04, 5.138e-07 }, // PM + PM (non-exhaust)
+        { 1.933e+03, 3.865e+01, 4.370e+02, 0.000e+00, 2.241e-01, 2.590e+02, 7.088e+00 }, // CO2(total)
+        { 1.090e-01, 0.000e+00, 7.874e-02, 0.000e+00, 4.014e-06, 0.000e+00, 2.926e-04 }, // CO
+        { 7.305e-02, 6.232e-04, 9.088e-03, 1.881e-05, 0.000e+00, 0.000e+00, 0.000e+00 }, // HC
+        { 6.211e+02, 1.242e+01, 1.404e+02, 0.000e+00, 7.201e-02, 8.325e+01, 2.278e+00 }, // FC
+        { 8.498e+00, 0.000e+00, 1.572e+00, 0.000e+00, 2.003e-03, 0.000e+00, 1.285e-01 }, // NOx
+        { 2.166e-02, 2.587e-02, 2.492e-03, 1.523e-04, 1.777e-07, 5.700e-04, 6.659e-06 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // LCV_diesel_N1-III_Euro-6ab
-        { 1.949e+03, 9.463e+00, 6.596e+02, 0.000e+00, 4.998e-03, 6.405e+01, 6.361e-01 }, // CO2(total)
+        { 1.949e+03, 3.407e+01, 6.596e+02, 0.000e+00, 2.332e-01, 2.306e+02, 8.244e+00 }, // CO2(total)
         { 2.952e+00, 0.000e+00, 3.952e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 1.523e-02, 0.000e+00, 0.000e+00, 0.000e+00, 1.519e-08, 0.000e+00, 0.000e+00 }, // HC
-        { 6.265e+02, 3.041e+00, 2.120e+02, 0.000e+00, 1.606e-03, 2.058e+01, 2.044e-01 }, // FC
-        { 3.352e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.457e-05, 7.333e-02, 2.788e-03 }, // NOx
-        { 1.009e-02, 7.160e-03, 0.000e+00, 1.111e-05, 2.821e-08, 0.000e+00, 8.172e-06 }, // PM + PM (non-exhaust)
+        { 1.523e-02, 0.000e+00, 0.000e+00, 0.000e+00, 7.089e-07, 0.000e+00, 0.000e+00 }, // HC
+        { 6.265e+02, 1.095e+01, 2.120e+02, 0.000e+00, 7.494e-02, 7.410e+01, 2.649e+00 }, // FC
+        { 3.352e+00, 0.000e+00, 0.000e+00, 0.000e+00, 6.798e-04, 2.640e-01, 3.613e-02 }, // NOx
+        { 1.009e-02, 2.578e-02, 0.000e+00, 1.440e-04, 1.316e-06, 0.000e+00, 1.059e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // LCV_diesel_N1-III_Euro-6c
-        { 1.904e+03, 9.326e+00, 6.518e+02, 0.000e+00, 4.868e-03, 6.244e+01, 6.224e-01 }, // CO2(total)
-        { 3.644e-01, 2.368e-03, 0.000e+00, 7.388e-05, 0.000e+00, 1.657e-02, 0.000e+00 }, // CO
-        { 8.782e-03, 5.851e-03, 3.100e-01, 0.000e+00, 0.000e+00, 5.614e-03, 0.000e+00 }, // HC
-        { 6.119e+02, 2.997e+00, 2.095e+02, 0.000e+00, 1.565e-03, 2.007e+01, 2.000e-01 }, // FC
-        { 1.310e+00, 2.761e-02, 0.000e+00, 0.000e+00, 1.002e-05, 1.784e-02, 2.530e-03 }, // NOx
-        { 0.000e+00, 7.160e-03, 3.058e-01, 9.844e-06, 7.167e-07, 0.000e+00, 3.546e-07 }, // PM + PM (non-exhaust)
+        { 1.904e+03, 3.357e+01, 6.518e+02, 0.000e+00, 2.271e-01, 2.248e+02, 8.066e+00 }, // CO2(total)
+        { 3.644e-01, 8.524e-03, 0.000e+00, 9.575e-04, 0.000e+00, 5.964e-02, 0.000e+00 }, // CO
+        { 8.782e-03, 2.106e-02, 3.100e-01, 0.000e+00, 0.000e+00, 2.021e-02, 0.000e+00 }, // HC
+        { 6.119e+02, 1.079e+01, 2.095e+02, 0.000e+00, 7.300e-02, 7.224e+01, 2.592e+00 }, // FC
+        { 1.310e+00, 9.940e-02, 0.000e+00, 0.000e+00, 4.676e-04, 6.424e-02, 3.279e-02 }, // NOx
+        { 0.000e+00, 2.578e-02, 3.058e-01, 1.276e-04, 3.344e-05, 0.000e+00, 4.596e-06 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // LCV_diesel_N1-III_Euro-6d-temp
-        { 1.854e+03, 9.236e+00, 6.531e+02, 0.000e+00, 4.716e-03, 6.042e+01, 6.093e-01 }, // CO2(total)
-        { 1.140e-01, 4.545e-03, 3.751e-01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 1.043e-01, 3.737e-03, 5.189e-01, 0.000e+00, 0.000e+00, 2.010e-03, 0.000e+00 }, // HC
-        { 5.957e+02, 2.968e+00, 2.099e+02, 0.000e+00, 1.515e-03, 1.942e+01, 1.958e-01 }, // FC
-        { 2.171e-01, 8.006e-03, 0.000e+00, 0.000e+00, 2.247e-06, 1.953e-02, 4.040e-04 }, // NOx
-        { 0.000e+00, 7.161e-03, 2.835e-01, 9.837e-06, 9.438e-07, 0.000e+00, 3.493e-07 }, // PM + PM (non-exhaust)
+        { 1.854e+03, 3.325e+01, 6.531e+02, 0.000e+00, 2.200e-01, 2.175e+02, 7.896e+00 }, // CO2(total)
+        { 1.140e-01, 1.636e-02, 3.751e-01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
+        { 1.043e-01, 1.345e-02, 5.189e-01, 0.000e+00, 0.000e+00, 7.235e-03, 0.000e+00 }, // HC
+        { 5.957e+02, 1.069e+01, 2.099e+02, 0.000e+00, 7.071e-02, 6.991e+01, 2.538e+00 }, // FC
+        { 2.171e-01, 2.882e-02, 0.000e+00, 0.000e+00, 1.048e-04, 7.030e-02, 5.236e-03 }, // NOx
+        { 0.000e+00, 2.578e-02, 2.835e-01, 1.275e-04, 4.403e-05, 0.000e+00, 4.527e-06 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // LCV_diesel_N1-III_Euro-6d
-        { 1.754e+03, 8.807e+00, 6.500e+02, 0.000e+00, 4.438e-03, 5.618e+01, 5.833e-01 }, // CO2(total)
-        { 1.019e-01, 4.098e-03, 3.386e-01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 9.206e-02, 3.387e-03, 4.587e-01, 0.000e+00, 0.000e+00, 1.955e-03, 0.000e+00 }, // HC
-        { 5.636e+02, 2.830e+00, 2.089e+02, 0.000e+00, 1.426e-03, 1.806e+01, 1.875e-01 }, // FC
-        { 1.608e-01, 7.601e-03, 0.000e+00, 0.000e+00, 1.973e-06, 1.904e-02, 3.446e-04 }, // NOx
-        { 0.000e+00, 7.162e-03, 2.750e-01, 9.828e-06, 8.523e-07, 0.000e+00, 3.424e-07 }, // PM + PM (non-exhaust)
+        { 1.754e+03, 3.171e+01, 6.500e+02, 0.000e+00, 2.070e-01, 2.022e+02, 7.559e+00 }, // CO2(total)
+        { 1.019e-01, 1.475e-02, 3.386e-01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
+        { 9.206e-02, 1.219e-02, 4.587e-01, 0.000e+00, 0.000e+00, 7.039e-03, 0.000e+00 }, // HC
+        { 5.636e+02, 1.019e+01, 2.089e+02, 0.000e+00, 6.654e-02, 6.500e+01, 2.429e+00 }, // FC
+        { 1.608e-01, 2.736e-02, 0.000e+00, 0.000e+00, 9.206e-05, 6.855e-02, 4.466e-03 }, // NOx
+        { 0.000e+00, 2.578e-02, 2.750e-01, 1.274e-04, 3.976e-05, 0.000e+00, 4.438e-06 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // LCV_2S_EE
-        { 1.218e+03, 8.681e+00, 4.118e+01, 0.000e+00, 3.045e-03, 5.521e+01, 2.969e-01 }, // CO2(total)
-        { 9.194e+01, 0.000e+00, 0.000e+00, 0.000e+00, 6.658e-04, 0.000e+00, 1.709e-01 }, // CO
-        { 7.900e+01, 0.000e+00, 0.000e+00, 0.000e+00, 2.448e-04, 0.000e+00, 3.806e-02 }, // HC
-        { 3.840e+02, 2.738e+00, 1.299e+01, 0.000e+00, 9.604e-04, 1.741e+01, 9.363e-02 }, // FC
-        { 0.000e+00, 4.258e-01, 2.801e+01, 2.559e-04, 0.000e+00, 2.057e-01, 0.000e+00 }, // NOx
-        { 0.000e+00, 7.125e-03, 0.000e+00, 1.030e-05, 1.031e-06, 0.000e+00, 2.707e-04 }, // PM + PM (non-exhaust)
+        { 1.218e+03, 3.125e+01, 4.118e+01, 0.000e+00, 1.421e-01, 1.988e+02, 3.848e+00 }, // CO2(total)
+        { 9.194e+01, 0.000e+00, 0.000e+00, 0.000e+00, 3.106e-02, 0.000e+00, 2.215e+00 }, // CO
+        { 7.900e+01, 0.000e+00, 0.000e+00, 0.000e+00, 1.142e-02, 0.000e+00, 4.932e-01 }, // HC
+        { 3.840e+02, 9.856e+00, 1.299e+01, 0.000e+00, 4.481e-02, 6.268e+01, 1.213e+00 }, // FC
+        { 0.000e+00, 1.533e+00, 2.801e+01, 3.316e-03, 0.000e+00, 7.407e-01, 0.000e+00 }, // NOx
+        { 0.000e+00, 2.565e-02, 0.000e+00, 1.334e-04, 4.811e-05, 0.000e+00, 3.508e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // LCV_CNG_petrol_M+N1-I_Euro-2_(CNG)
-        { 1.202e+03, 1.256e+01, 0.000e+00, 0.000e+00, 2.916e-03, 6.337e+01, 3.006e-01 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 3.653e-04, 0.000e+00, 9.717e-02 }, // CO
-        { 3.661e-01, 0.000e+00, 0.000e+00, 0.000e+00, 3.589e-06, 0.000e+00, 9.190e-04 }, // HC
-        { 3.868e+02, 4.042e+00, 0.000e+00, 0.000e+00, 9.384e-04, 2.039e+01, 9.671e-02 }, // FC
-        { 1.742e+00, 0.000e+00, 1.203e+00, 2.747e-04, 6.032e-07, 5.067e-02, 0.000e+00 }, // NOx
-        { 0.000e+00, 7.123e-03, 0.000e+00, 1.034e-05, 1.266e-06, 0.000e+00, 3.479e-04 }, // PM + PM (non-exhaust)
+        { 1.202e+03, 4.522e+01, 0.000e+00, 0.000e+00, 1.361e-01, 2.281e+02, 3.895e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.704e-02, 0.000e+00, 1.259e+00 }, // CO
+        { 3.661e-01, 0.000e+00, 0.000e+00, 0.000e+00, 1.675e-04, 0.000e+00, 1.191e-02 }, // HC
+        { 3.868e+02, 1.455e+01, 0.000e+00, 0.000e+00, 4.378e-02, 7.341e+01, 1.253e+00 }, // FC
+        { 1.742e+00, 0.000e+00, 1.203e+00, 3.560e-03, 2.814e-05, 1.824e-01, 0.000e+00 }, // NOx
+        { 0.000e+00, 2.564e-02, 0.000e+00, 1.340e-04, 5.907e-05, 0.000e+00, 4.509e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // LCV_CNG_petrol_M+N1-I_Euro-2_(P)
-        { 1.214e+03, 1.268e+01, 0.000e+00, 0.000e+00, 2.944e-03, 6.397e+01, 3.034e-01 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 3.653e-04, 0.000e+00, 9.717e-02 }, // CO
-        { 3.661e-01, 0.000e+00, 0.000e+00, 0.000e+00, 3.589e-06, 0.000e+00, 9.190e-04 }, // HC
-        { 3.934e+02, 4.111e+00, 0.000e+00, 0.000e+00, 9.544e-04, 2.074e+01, 9.837e-02 }, // FC
-        { 1.742e+00, 0.000e+00, 1.203e+00, 2.747e-04, 6.032e-07, 5.067e-02, 0.000e+00 }, // NOx
-        { 0.000e+00, 7.123e-03, 0.000e+00, 1.034e-05, 1.266e-06, 0.000e+00, 3.479e-04 }, // PM + PM (non-exhaust)
+        { 1.214e+03, 4.565e+01, 0.000e+00, 0.000e+00, 1.374e-01, 2.303e+02, 3.932e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.704e-02, 0.000e+00, 1.259e+00 }, // CO
+        { 3.661e-01, 0.000e+00, 0.000e+00, 0.000e+00, 1.675e-04, 0.000e+00, 1.191e-02 }, // HC
+        { 3.934e+02, 1.480e+01, 0.000e+00, 0.000e+00, 4.453e-02, 7.466e+01, 1.275e+00 }, // FC
+        { 1.742e+00, 0.000e+00, 1.203e+00, 3.560e-03, 2.814e-05, 1.824e-01, 0.000e+00 }, // NOx
+        { 0.000e+00, 2.564e-02, 0.000e+00, 1.340e-04, 5.907e-05, 0.000e+00, 4.509e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // LCV_CNG_petrol_M+N1-I_Euro-3_(CNG)
-        { 9.889e+02, 1.004e+01, 2.302e+01, 0.000e+00, 2.285e-03, 5.066e+01, 2.393e-01 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 2.149e-04, 0.000e+00, 5.820e-02 }, // CO
-        { 8.573e-02, 0.000e+00, 0.000e+00, 0.000e+00, 1.193e-06, 0.000e+00, 3.112e-04 }, // HC
-        { 3.182e+02, 3.231e+00, 7.408e+00, 0.000e+00, 7.352e-04, 1.630e+01, 7.701e-02 }, // FC
-        { 6.569e-01, 0.000e+00, 1.493e-01, 5.768e-05, 2.656e-07, 1.604e-02, 0.000e+00 }, // NOx
-        { 0.000e+00, 7.138e-03, 0.000e+00, 1.014e-05, 4.564e-07, 0.000e+00, 1.250e-04 }, // PM + PM (non-exhaust)
+        { 9.889e+02, 3.615e+01, 2.302e+01, 0.000e+00, 1.066e-01, 1.824e+02, 3.102e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.002e-02, 0.000e+00, 7.543e-01 }, // CO
+        { 8.573e-02, 0.000e+00, 0.000e+00, 0.000e+00, 5.564e-05, 0.000e+00, 4.033e-03 }, // HC
+        { 3.182e+02, 1.163e+01, 7.408e+00, 0.000e+00, 3.430e-02, 5.869e+01, 9.981e-01 }, // FC
+        { 6.569e-01, 0.000e+00, 1.493e-01, 7.475e-04, 1.239e-05, 5.773e-02, 0.000e+00 }, // NOx
+        { 0.000e+00, 2.570e-02, 0.000e+00, 1.314e-04, 2.130e-05, 0.000e+00, 1.620e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // LCV_CNG_petrol_M+N1-I_Euro-3_(P)
-        { 9.984e+02, 1.014e+01, 2.324e+01, 0.000e+00, 2.307e-03, 5.115e+01, 2.416e-01 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 2.149e-04, 0.000e+00, 5.820e-02 }, // CO
-        { 8.573e-02, 0.000e+00, 0.000e+00, 0.000e+00, 1.193e-06, 0.000e+00, 3.112e-04 }, // HC
-        { 3.236e+02, 3.286e+00, 7.535e+00, 0.000e+00, 7.478e-04, 1.658e+01, 7.832e-02 }, // FC
-        { 6.569e-01, 0.000e+00, 1.493e-01, 5.768e-05, 2.656e-07, 1.604e-02, 0.000e+00 }, // NOx
-        { 0.000e+00, 7.138e-03, 0.000e+00, 1.014e-05, 4.564e-07, 0.000e+00, 1.250e-04 }, // PM + PM (non-exhaust)
+        { 9.984e+02, 3.649e+01, 2.324e+01, 0.000e+00, 1.076e-01, 1.841e+02, 3.131e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.002e-02, 0.000e+00, 7.543e-01 }, // CO
+        { 8.573e-02, 0.000e+00, 0.000e+00, 0.000e+00, 5.564e-05, 0.000e+00, 4.033e-03 }, // HC
+        { 3.236e+02, 1.183e+01, 7.535e+00, 0.000e+00, 3.489e-02, 5.969e+01, 1.015e+00 }, // FC
+        { 6.569e-01, 0.000e+00, 1.493e-01, 7.475e-04, 1.239e-05, 5.773e-02, 0.000e+00 }, // NOx
+        { 0.000e+00, 2.570e-02, 0.000e+00, 1.314e-04, 2.130e-05, 0.000e+00, 1.620e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // LCV_CNG_petrol_M+N1-I_Euro-4_(CNG)
-        { 1.021e+03, 9.922e+00, 7.788e+01, 0.000e+00, 2.274e-03, 5.007e+01, 2.409e-01 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.327e-04, 0.000e+00, 3.339e-02 }, // CO
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 6.651e-07, 0.000e+00, 1.527e-04 }, // HC
-        { 3.287e+02, 3.193e+00, 2.506e+01, 0.000e+00, 7.316e-04, 1.611e+01, 7.752e-02 }, // FC
-        { 4.235e-01, 2.544e-03, 3.564e-01, 0.000e+00, 2.153e-07, 8.073e-03, 0.000e+00 }, // NOx
-        { 0.000e+00, 7.147e-03, 0.000e+00, 1.004e-05, 2.619e-07, 0.000e+00, 6.870e-05 }, // PM + PM (non-exhaust)
+        { 1.021e+03, 3.572e+01, 7.788e+01, 0.000e+00, 1.061e-01, 1.803e+02, 3.122e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 6.191e-03, 0.000e+00, 4.327e-01 }, // CO
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 3.103e-05, 0.000e+00, 1.979e-03 }, // HC
+        { 3.287e+02, 1.149e+01, 2.506e+01, 0.000e+00, 3.413e-02, 5.801e+01, 1.005e+00 }, // FC
+        { 4.235e-01, 9.159e-03, 3.564e-01, 0.000e+00, 1.005e-05, 2.906e-02, 0.000e+00 }, // NOx
+        { 0.000e+00, 2.573e-02, 0.000e+00, 1.302e-04, 1.222e-05, 0.000e+00, 8.904e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // LCV_CNG_petrol_M+N1-I_Euro-4_(P)
-        { 1.031e+03, 1.002e+01, 7.863e+01, 0.000e+00, 2.295e-03, 5.055e+01, 2.432e-01 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.327e-04, 0.000e+00, 3.339e-02 }, // CO
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 6.651e-07, 0.000e+00, 1.527e-04 }, // HC
-        { 3.343e+02, 3.247e+00, 2.549e+01, 0.000e+00, 7.441e-04, 1.639e+01, 7.884e-02 }, // FC
-        { 4.235e-01, 2.544e-03, 3.564e-01, 0.000e+00, 2.153e-07, 8.073e-03, 0.000e+00 }, // NOx
-        { 0.000e+00, 7.147e-03, 0.000e+00, 1.004e-05, 2.619e-07, 0.000e+00, 6.870e-05 }, // PM + PM (non-exhaust)
+        { 1.031e+03, 3.606e+01, 7.863e+01, 0.000e+00, 1.071e-01, 1.820e+02, 3.152e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 6.191e-03, 0.000e+00, 4.327e-01 }, // CO
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 3.103e-05, 0.000e+00, 1.979e-03 }, // HC
+        { 3.343e+02, 1.169e+01, 2.549e+01, 0.000e+00, 3.472e-02, 5.899e+01, 1.022e+00 }, // FC
+        { 4.235e-01, 9.159e-03, 3.564e-01, 0.000e+00, 1.005e-05, 2.906e-02, 0.000e+00 }, // NOx
+        { 0.000e+00, 2.573e-02, 0.000e+00, 1.302e-04, 1.222e-05, 0.000e+00, 8.904e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // LCV_CNG_petrol_M+N1-I_Euro-5_(CNG)
-        { 9.626e+02, 8.085e+00, 2.950e+02, 0.000e+00, 2.129e-03, 3.792e+01, 2.716e-01 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.371e-04, 0.000e+00, 3.517e-02 }, // CO
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 6.922e-07, 0.000e+00, 1.617e-04 }, // HC
-        { 3.097e+02, 2.602e+00, 9.493e+01, 0.000e+00, 6.851e-04, 1.220e+01, 8.738e-02 }, // FC
-        { 1.583e-01, 8.026e-04, 1.552e-01, 0.000e+00, 7.554e-08, 2.423e-03, 0.000e+00 }, // NOx
-        { 0.000e+00, 7.164e-03, 0.000e+00, 9.819e-06, 2.723e-07, 0.000e+00, 7.313e-05 }, // PM + PM (non-exhaust)
+        { 9.626e+02, 2.911e+01, 2.950e+02, 0.000e+00, 9.933e-02, 1.365e+02, 3.519e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 6.394e-03, 0.000e+00, 4.558e-01 }, // CO
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 3.229e-05, 0.000e+00, 2.096e-03 }, // HC
+        { 3.097e+02, 9.366e+00, 9.493e+01, 0.000e+00, 3.196e-02, 4.393e+01, 1.132e+00 }, // FC
+        { 1.583e-01, 2.889e-03, 1.552e-01, 0.000e+00, 3.524e-06, 8.723e-03, 0.000e+00 }, // NOx
+        { 0.000e+00, 2.579e-02, 0.000e+00, 1.273e-04, 1.271e-05, 0.000e+00, 9.478e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // LCV_CNG_petrol_M+N1-I_Euro-5_(P)
-        { 9.718e+02, 8.162e+00, 2.978e+02, 0.000e+00, 2.149e-03, 3.828e+01, 2.741e-01 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.371e-04, 0.000e+00, 3.517e-02 }, // CO
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 6.922e-07, 0.000e+00, 1.617e-04 }, // HC
-        { 3.150e+02, 2.646e+00, 9.655e+01, 0.000e+00, 6.968e-04, 1.241e+01, 8.887e-02 }, // FC
-        { 1.583e-01, 8.026e-04, 1.552e-01, 0.000e+00, 7.554e-08, 2.423e-03, 0.000e+00 }, // NOx
-        { 0.000e+00, 7.164e-03, 0.000e+00, 9.819e-06, 2.723e-07, 0.000e+00, 7.313e-05 }, // PM + PM (non-exhaust)
+        { 9.718e+02, 2.938e+01, 2.978e+02, 0.000e+00, 1.003e-01, 1.378e+02, 3.553e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 6.394e-03, 0.000e+00, 4.558e-01 }, // CO
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 3.229e-05, 0.000e+00, 2.096e-03 }, // HC
+        { 3.150e+02, 9.526e+00, 9.655e+01, 0.000e+00, 3.251e-02, 4.468e+01, 1.152e+00 }, // FC
+        { 1.583e-01, 2.889e-03, 1.552e-01, 0.000e+00, 3.524e-06, 8.723e-03, 0.000e+00 }, // NOx
+        { 0.000e+00, 2.579e-02, 0.000e+00, 1.273e-04, 1.271e-05, 0.000e+00, 9.478e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // LCV_CNG_petrol_M+N1-I_Euro-6_(CNG)
-        { 9.240e+02, 7.237e+00, 2.014e+02, 0.000e+00, 2.168e-03, 3.830e+01, 2.494e-01 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.505e-04, 0.000e+00, 3.806e-02 }, // CO
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 7.326e-07, 0.000e+00, 1.691e-04 }, // HC
-        { 2.973e+02, 2.329e+00, 6.480e+01, 0.000e+00, 6.975e-04, 1.232e+01, 8.026e-02 }, // FC
-        { 1.751e-01, 9.155e-04, 1.705e-01, 0.000e+00, 8.995e-08, 2.747e-03, 0.000e+00 }, // NOx
-        { 0.000e+00, 7.157e-03, 0.000e+00, 9.904e-06, 2.908e-07, 0.000e+00, 7.666e-05 }, // PM + PM (non-exhaust)
+        { 9.240e+02, 2.605e+01, 2.014e+02, 0.000e+00, 1.011e-01, 1.379e+02, 3.233e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 7.022e-03, 0.000e+00, 4.932e-01 }, // CO
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 3.418e-05, 0.000e+00, 2.191e-03 }, // HC
+        { 2.973e+02, 8.383e+00, 6.480e+01, 0.000e+00, 3.254e-02, 4.437e+01, 1.040e+00 }, // FC
+        { 1.751e-01, 3.296e-03, 1.705e-01, 0.000e+00, 4.197e-06, 9.888e-03, 0.000e+00 }, // NOx
+        { 0.000e+00, 2.576e-02, 0.000e+00, 1.284e-04, 1.357e-05, 0.000e+00, 9.935e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // LCV_CNG_petrol_M+N1-I_Euro-6_(P)
-        { 9.328e+02, 7.306e+00, 2.033e+02, 0.000e+00, 2.188e-03, 3.867e+01, 2.518e-01 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.505e-04, 0.000e+00, 3.806e-02 }, // CO
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 7.326e-07, 0.000e+00, 1.691e-04 }, // HC
-        { 3.024e+02, 2.368e+00, 6.591e+01, 0.000e+00, 7.094e-04, 1.253e+01, 8.163e-02 }, // FC
-        { 1.751e-01, 9.155e-04, 1.705e-01, 0.000e+00, 8.995e-08, 2.747e-03, 0.000e+00 }, // NOx
-        { 0.000e+00, 7.157e-03, 0.000e+00, 9.904e-06, 2.908e-07, 0.000e+00, 7.666e-05 }, // PM + PM (non-exhaust)
+        { 9.328e+02, 2.630e+01, 2.033e+02, 0.000e+00, 1.021e-01, 1.392e+02, 3.263e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 7.022e-03, 0.000e+00, 4.932e-01 }, // CO
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 3.418e-05, 0.000e+00, 2.191e-03 }, // HC
+        { 3.024e+02, 8.526e+00, 6.591e+01, 0.000e+00, 3.310e-02, 4.513e+01, 1.058e+00 }, // FC
+        { 1.751e-01, 3.296e-03, 1.705e-01, 0.000e+00, 4.197e-06, 9.888e-03, 0.000e+00 }, // NOx
+        { 0.000e+00, 2.576e-02, 0.000e+00, 1.284e-04, 1.357e-05, 0.000e+00, 9.935e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // LCV_CNG_petrol_N1-II_Euro-2_(CNG)
-        { 1.873e+03, 7.151e+00, 0.000e+00, 0.000e+00, 5.655e-03, 8.070e+01, 4.112e-01 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 6.065e-04, 0.000e+00, 1.378e-01 }, // CO
-        { 1.153e-02, 0.000e+00, 0.000e+00, 0.000e+00, 6.256e-06, 0.000e+00, 1.257e-03 }, // HC
-        { 6.026e+02, 2.301e+00, 0.000e+00, 0.000e+00, 1.820e-03, 2.597e+01, 1.323e-01 }, // FC
-        { 2.327e+00, 0.000e+00, 2.280e+00, 3.480e-04, 1.809e-06, 5.431e-02, 0.000e+00 }, // NOx
-        { 0.000e+00, 7.095e-03, 0.000e+00, 1.067e-05, 2.087e-06, 0.000e+00, 5.016e-04 }, // PM + PM (non-exhaust)
+        { 1.873e+03, 2.574e+01, 0.000e+00, 0.000e+00, 2.638e-01, 2.905e+02, 5.329e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 2.830e-02, 0.000e+00, 1.786e+00 }, // CO
+        { 1.153e-02, 0.000e+00, 0.000e+00, 0.000e+00, 2.919e-04, 0.000e+00, 1.629e-02 }, // HC
+        { 6.026e+02, 8.283e+00, 0.000e+00, 0.000e+00, 8.489e-02, 9.349e+01, 1.715e+00 }, // FC
+        { 2.327e+00, 0.000e+00, 2.280e+00, 4.510e-03, 8.440e-05, 1.955e-01, 0.000e+00 }, // NOx
+        { 0.000e+00, 2.554e-02, 0.000e+00, 1.383e-04, 9.738e-05, 0.000e+00, 6.500e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // LCV_CNG_petrol_N1-II_Euro-2_(P)
-        { 1.890e+03, 7.219e+00, 0.000e+00, 0.000e+00, 5.708e-03, 8.147e+01, 4.151e-01 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 6.065e-04, 0.000e+00, 1.378e-01 }, // CO
-        { 1.153e-02, 0.000e+00, 0.000e+00, 0.000e+00, 6.256e-06, 0.000e+00, 1.257e-03 }, // HC
-        { 6.129e+02, 2.340e+00, 0.000e+00, 0.000e+00, 1.851e-03, 2.641e+01, 1.346e-01 }, // FC
-        { 2.327e+00, 0.000e+00, 2.280e+00, 3.480e-04, 1.809e-06, 5.431e-02, 0.000e+00 }, // NOx
-        { 0.000e+00, 7.095e-03, 0.000e+00, 1.067e-05, 2.087e-06, 0.000e+00, 5.016e-04 }, // PM + PM (non-exhaust)
+        { 1.890e+03, 2.599e+01, 0.000e+00, 0.000e+00, 2.663e-01, 2.933e+02, 5.380e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 2.830e-02, 0.000e+00, 1.786e+00 }, // CO
+        { 1.153e-02, 0.000e+00, 0.000e+00, 0.000e+00, 2.919e-04, 0.000e+00, 1.629e-02 }, // HC
+        { 6.129e+02, 8.424e+00, 0.000e+00, 0.000e+00, 8.634e-02, 9.508e+01, 1.744e+00 }, // FC
+        { 2.327e+00, 0.000e+00, 2.280e+00, 4.510e-03, 8.440e-05, 1.955e-01, 0.000e+00 }, // NOx
+        { 0.000e+00, 2.554e-02, 0.000e+00, 1.383e-04, 9.738e-05, 0.000e+00, 6.500e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // LCV_CNG_petrol_N1-II_Euro-3_(CNG)
-        { 1.530e+03, 5.567e+00, 6.373e+01, 0.000e+00, 4.178e-03, 6.297e+01, 2.954e-01 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 3.160e-04, 0.000e+00, 7.369e-02 }, // CO
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.872e-06, 0.000e+00, 4.021e-04 }, // HC
-        { 4.924e+02, 1.791e+00, 2.051e+01, 0.000e+00, 1.344e-03, 2.026e+01, 9.504e-02 }, // FC
-        { 9.082e-01, 0.000e+00, 2.649e-01, 5.779e-05, 7.175e-07, 1.965e-02, 0.000e+00 }, // NOx
-        { 0.000e+00, 7.132e-03, 0.000e+00, 1.021e-05, 6.354e-07, 0.000e+00, 1.511e-04 }, // PM + PM (non-exhaust)
+        { 1.530e+03, 2.004e+01, 6.373e+01, 0.000e+00, 1.949e-01, 2.267e+02, 3.828e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.474e-02, 0.000e+00, 9.551e-01 }, // CO
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 8.733e-05, 0.000e+00, 5.211e-03 }, // HC
+        { 4.924e+02, 6.449e+00, 2.051e+01, 0.000e+00, 6.272e-02, 7.294e+01, 1.232e+00 }, // FC
+        { 9.082e-01, 0.000e+00, 2.649e-01, 7.490e-04, 3.348e-05, 7.073e-02, 0.000e+00 }, // NOx
+        { 0.000e+00, 2.567e-02, 0.000e+00, 1.323e-04, 2.964e-05, 0.000e+00, 1.959e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // LCV_CNG_petrol_N1-II_Euro-3_(P)
-        { 1.545e+03, 5.620e+00, 6.433e+01, 0.000e+00, 4.217e-03, 6.357e+01, 2.982e-01 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 3.160e-04, 0.000e+00, 7.369e-02 }, // CO
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.872e-06, 0.000e+00, 4.021e-04 }, // HC
-        { 5.008e+02, 1.822e+00, 2.086e+01, 0.000e+00, 1.367e-03, 2.061e+01, 9.667e-02 }, // FC
-        { 9.082e-01, 0.000e+00, 2.649e-01, 5.779e-05, 7.175e-07, 1.965e-02, 0.000e+00 }, // NOx
-        { 0.000e+00, 7.132e-03, 0.000e+00, 1.021e-05, 6.354e-07, 0.000e+00, 1.511e-04 }, // PM + PM (non-exhaust)
+        { 1.545e+03, 2.023e+01, 6.433e+01, 0.000e+00, 1.968e-01, 2.288e+02, 3.864e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.474e-02, 0.000e+00, 9.551e-01 }, // CO
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 8.733e-05, 0.000e+00, 5.211e-03 }, // HC
+        { 5.008e+02, 6.559e+00, 2.086e+01, 0.000e+00, 6.379e-02, 7.419e+01, 1.253e+00 }, // FC
+        { 9.082e-01, 0.000e+00, 2.649e-01, 7.490e-04, 3.348e-05, 7.073e-02, 0.000e+00 }, // NOx
+        { 0.000e+00, 2.567e-02, 0.000e+00, 1.323e-04, 2.964e-05, 0.000e+00, 1.959e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // LCV_CNG_petrol_N1-II_Euro-4_(CNG)
-        { 1.347e+03, 7.254e+00, 0.000e+00, 0.000e+00, 3.861e-03, 6.320e+01, 2.751e-01 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 2.191e-04, 0.000e+00, 5.041e-02 }, // CO
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.048e-06, 0.000e+00, 2.197e-04 }, // HC
-        { 4.333e+02, 2.334e+00, 0.000e+00, 0.000e+00, 1.242e-03, 2.034e+01, 8.852e-02 }, // FC
-        { 4.970e-01, 3.180e-03, 4.322e-01, 0.000e+00, 3.676e-07, 9.350e-03, 0.000e+00 }, // NOx
-        { 0.000e+00, 7.108e-03, 0.000e+00, 1.050e-05, 4.717e-07, 0.000e+00, 1.163e-04 }, // PM + PM (non-exhaust)
+        { 1.347e+03, 2.611e+01, 0.000e+00, 0.000e+00, 1.802e-01, 2.275e+02, 3.565e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.022e-02, 0.000e+00, 6.533e-01 }, // CO
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 4.888e-05, 0.000e+00, 2.847e-03 }, // HC
+        { 4.333e+02, 8.403e+00, 0.000e+00, 0.000e+00, 5.797e-02, 7.321e+01, 1.147e+00 }, // FC
+        { 4.970e-01, 1.145e-02, 4.322e-01, 0.000e+00, 1.715e-05, 3.366e-02, 0.000e+00 }, // NOx
+        { 0.000e+00, 2.559e-02, 0.000e+00, 1.361e-04, 2.201e-05, 0.000e+00, 1.507e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // LCV_CNG_petrol_N1-II_Euro-4_(P)
-        { 1.359e+03, 7.323e+00, 0.000e+00, 0.000e+00, 3.898e-03, 6.381e+01, 2.777e-01 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 2.191e-04, 0.000e+00, 5.041e-02 }, // CO
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.048e-06, 0.000e+00, 2.197e-04 }, // HC
-        { 4.407e+02, 2.374e+00, 0.000e+00, 0.000e+00, 1.264e-03, 2.068e+01, 9.004e-02 }, // FC
-        { 4.970e-01, 3.180e-03, 4.322e-01, 0.000e+00, 3.676e-07, 9.350e-03, 0.000e+00 }, // NOx
-        { 0.000e+00, 7.108e-03, 0.000e+00, 1.050e-05, 4.717e-07, 0.000e+00, 1.163e-04 }, // PM + PM (non-exhaust)
+        { 1.359e+03, 2.636e+01, 0.000e+00, 0.000e+00, 1.819e-01, 2.297e+02, 3.599e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.022e-02, 0.000e+00, 6.533e-01 }, // CO
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 4.888e-05, 0.000e+00, 2.847e-03 }, // HC
+        { 4.407e+02, 8.547e+00, 0.000e+00, 0.000e+00, 5.896e-02, 7.446e+01, 1.167e+00 }, // FC
+        { 4.970e-01, 1.145e-02, 4.322e-01, 0.000e+00, 1.715e-05, 3.366e-02, 0.000e+00 }, // NOx
+        { 0.000e+00, 2.559e-02, 0.000e+00, 1.361e-04, 2.201e-05, 0.000e+00, 1.507e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // LCV_CNG_petrol_N1-II_Euro-5_(CNG)
-        { 1.255e+03, 5.664e+00, 0.000e+00, 0.000e+00, 3.596e-03, 5.584e+01, 2.707e-01 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 2.148e-04, 0.000e+00, 4.853e-02 }, // CO
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.055e-06, 0.000e+00, 2.177e-04 }, // HC
-        { 4.038e+02, 1.823e+00, 0.000e+00, 0.000e+00, 1.157e-03, 1.797e+01, 8.709e-02 }, // FC
-        { 1.830e-01, 1.064e-03, 1.808e-01, 0.000e+00, 1.269e-07, 2.912e-03, 0.000e+00 }, // NOx
-        { 0.000e+00, 7.130e-03, 0.000e+00, 1.027e-05, 4.461e-07, 0.000e+00, 1.084e-04 }, // PM + PM (non-exhaust)
+        { 1.255e+03, 2.039e+01, 0.000e+00, 0.000e+00, 1.678e-01, 2.010e+02, 3.508e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.002e-02, 0.000e+00, 6.289e-01 }, // CO
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 4.924e-05, 0.000e+00, 2.822e-03 }, // HC
+        { 4.038e+02, 6.562e+00, 0.000e+00, 0.000e+00, 5.398e-02, 6.469e+01, 1.129e+00 }, // FC
+        { 1.830e-01, 3.831e-03, 1.808e-01, 0.000e+00, 5.918e-06, 1.048e-02, 0.000e+00 }, // NOx
+        { 0.000e+00, 2.567e-02, 0.000e+00, 1.331e-04, 2.081e-05, 0.000e+00, 1.404e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // LCV_CNG_petrol_N1-II_Euro-5_(P)
-        { 1.267e+03, 5.718e+00, 0.000e+00, 0.000e+00, 3.630e-03, 5.637e+01, 2.732e-01 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 2.148e-04, 0.000e+00, 4.853e-02 }, // CO
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.055e-06, 0.000e+00, 2.177e-04 }, // HC
-        { 4.107e+02, 1.854e+00, 0.000e+00, 0.000e+00, 1.177e-03, 1.828e+01, 8.858e-02 }, // FC
-        { 1.830e-01, 1.064e-03, 1.808e-01, 0.000e+00, 1.269e-07, 2.912e-03, 0.000e+00 }, // NOx
-        { 0.000e+00, 7.130e-03, 0.000e+00, 1.027e-05, 4.461e-07, 0.000e+00, 1.084e-04 }, // PM + PM (non-exhaust)
+        { 1.267e+03, 2.059e+01, 0.000e+00, 0.000e+00, 1.694e-01, 2.029e+02, 3.541e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.002e-02, 0.000e+00, 6.289e-01 }, // CO
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 4.924e-05, 0.000e+00, 2.822e-03 }, // HC
+        { 4.107e+02, 6.673e+00, 0.000e+00, 0.000e+00, 5.491e-02, 6.579e+01, 1.148e+00 }, // FC
+        { 1.830e-01, 3.831e-03, 1.808e-01, 0.000e+00, 5.918e-06, 1.048e-02, 0.000e+00 }, // NOx
+        { 0.000e+00, 2.567e-02, 0.000e+00, 1.331e-04, 2.081e-05, 0.000e+00, 1.404e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // LCV_CNG_petrol_N1-II_Euro-6_(CNG)
-        { 1.169e+03, 4.647e+00, 1.955e+02, 0.000e+00, 3.118e-03, 4.383e+01, 2.787e-01 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.944e-04, 0.000e+00, 4.562e-02 }, // CO
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 9.415e-07, 0.000e+00, 2.006e-04 }, // HC
-        { 3.760e+02, 1.495e+00, 6.292e+01, 0.000e+00, 1.003e-03, 1.410e+01, 8.967e-02 }, // FC
-        { 2.010e-01, 1.096e-03, 2.045e-01, 0.000e+00, 1.292e-07, 2.994e-03, 0.000e+00 }, // NOx
-        { 0.000e+00, 7.149e-03, 0.000e+00, 9.999e-06, 3.750e-07, 0.000e+00, 9.304e-05 }, // PM + PM (non-exhaust)
+        { 1.169e+03, 1.673e+01, 1.955e+02, 0.000e+00, 1.455e-01, 1.578e+02, 3.612e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 9.068e-03, 0.000e+00, 5.912e-01 }, // CO
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 4.393e-05, 0.000e+00, 2.600e-03 }, // HC
+        { 3.760e+02, 5.384e+00, 6.292e+01, 0.000e+00, 4.680e-02, 5.077e+01, 1.162e+00 }, // FC
+        { 2.010e-01, 3.945e-03, 2.045e-01, 0.000e+00, 6.027e-06, 1.078e-02, 0.000e+00 }, // NOx
+        { 0.000e+00, 2.574e-02, 0.000e+00, 1.296e-04, 1.750e-05, 0.000e+00, 1.206e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // LCV_CNG_petrol_N1-II_Euro-6_(P)
-        { 1.180e+03, 4.692e+00, 1.974e+02, 0.000e+00, 3.147e-03, 4.425e+01, 2.813e-01 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.944e-04, 0.000e+00, 4.562e-02 }, // CO
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 9.415e-07, 0.000e+00, 2.006e-04 }, // HC
-        { 3.824e+02, 1.521e+00, 6.399e+01, 0.000e+00, 1.020e-03, 1.434e+01, 9.120e-02 }, // FC
-        { 2.010e-01, 1.096e-03, 2.045e-01, 0.000e+00, 1.292e-07, 2.994e-03, 0.000e+00 }, // NOx
-        { 0.000e+00, 7.149e-03, 0.000e+00, 9.999e-06, 3.750e-07, 0.000e+00, 9.304e-05 }, // PM + PM (non-exhaust)
+        { 1.180e+03, 1.689e+01, 1.974e+02, 0.000e+00, 1.468e-01, 1.593e+02, 3.646e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 9.068e-03, 0.000e+00, 5.912e-01 }, // CO
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 4.393e-05, 0.000e+00, 2.600e-03 }, // HC
+        { 3.824e+02, 5.475e+00, 6.399e+01, 0.000e+00, 4.760e-02, 5.164e+01, 1.182e+00 }, // FC
+        { 2.010e-01, 3.945e-03, 2.045e-01, 0.000e+00, 6.027e-06, 1.078e-02, 0.000e+00 }, // NOx
+        { 0.000e+00, 2.574e-02, 0.000e+00, 1.296e-04, 1.750e-05, 0.000e+00, 1.206e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // LCV_CNG_petrol_N1-III_Euro-2_(CNG)
-        { 2.272e+03, 1.414e+01, 0.000e+00, 0.000e+00, 6.193e-03, 1.066e+02, 5.035e-01 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 6.853e-04, 0.000e+00, 1.668e-01 }, // CO
-        { 2.097e-01, 0.000e+00, 0.000e+00, 0.000e+00, 7.137e-06, 0.000e+00, 1.607e-03 }, // HC
-        { 7.311e+02, 4.548e+00, 0.000e+00, 0.000e+00, 1.993e-03, 3.430e+01, 1.620e-01 }, // FC
-        { 3.009e+00, 0.000e+00, 2.169e+00, 4.364e-04, 1.984e-06, 8.475e-02, 0.000e+00 }, // NOx
-        { 0.000e+00, 7.114e-03, 0.000e+00, 1.043e-05, 2.396e-06, 0.000e+00, 6.090e-04 }, // PM + PM (non-exhaust)
+        { 2.272e+03, 5.089e+01, 0.000e+00, 0.000e+00, 2.890e-01, 3.838e+02, 6.525e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 3.197e-02, 0.000e+00, 2.161e+00 }, // CO
+        { 2.097e-01, 0.000e+00, 0.000e+00, 0.000e+00, 3.330e-04, 0.000e+00, 2.082e-02 }, // HC
+        { 7.311e+02, 1.637e+01, 0.000e+00, 0.000e+00, 9.298e-02, 1.235e+02, 2.100e+00 }, // FC
+        { 3.009e+00, 0.000e+00, 2.169e+00, 5.656e-03, 9.258e-05, 3.051e-01, 0.000e+00 }, // NOx
+        { 0.000e+00, 2.561e-02, 0.000e+00, 1.352e-04, 1.118e-04, 0.000e+00, 7.893e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // LCV_CNG_petrol_N1-III_Euro-2_(P)
-        { 2.294e+03, 1.427e+01, 0.000e+00, 0.000e+00, 6.252e-03, 1.076e+02, 5.083e-01 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 6.853e-04, 0.000e+00, 1.668e-01 }, // CO
-        { 2.097e-01, 0.000e+00, 0.000e+00, 0.000e+00, 7.137e-06, 0.000e+00, 1.607e-03 }, // HC
-        { 7.436e+02, 4.626e+00, 0.000e+00, 0.000e+00, 2.027e-03, 3.489e+01, 1.648e-01 }, // FC
-        { 3.009e+00, 0.000e+00, 2.169e+00, 4.364e-04, 1.984e-06, 8.475e-02, 0.000e+00 }, // NOx
-        { 0.000e+00, 7.114e-03, 0.000e+00, 1.043e-05, 2.396e-06, 0.000e+00, 6.090e-04 }, // PM + PM (non-exhaust)
+        { 2.294e+03, 5.137e+01, 0.000e+00, 0.000e+00, 2.917e-01, 3.874e+02, 6.587e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 3.197e-02, 0.000e+00, 2.161e+00 }, // CO
+        { 2.097e-01, 0.000e+00, 0.000e+00, 0.000e+00, 3.330e-04, 0.000e+00, 2.082e-02 }, // HC
+        { 7.436e+02, 1.665e+01, 0.000e+00, 0.000e+00, 9.457e-02, 1.256e+02, 2.135e+00 }, // FC
+        { 3.009e+00, 0.000e+00, 2.169e+00, 5.656e-03, 9.258e-05, 3.051e-01, 0.000e+00 }, // NOx
+        { 0.000e+00, 2.561e-02, 0.000e+00, 1.352e-04, 1.118e-04, 0.000e+00, 7.893e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // LCV_CNG_petrol_N1-III_Euro-3_(CNG)
-        { 1.932e+03, 1.174e+01, 3.830e+01, 0.000e+00, 4.952e-03, 8.791e+01, 4.148e-01 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 3.124e-04, 0.000e+00, 7.841e-02 }, // CO
-        { 4.528e-03, 0.000e+00, 0.000e+00, 0.000e+00, 1.832e-06, 0.000e+00, 4.236e-04 }, // HC
-        { 6.218e+02, 3.777e+00, 1.233e+01, 0.000e+00, 1.594e-03, 2.829e+01, 1.335e-01 }, // FC
-        { 9.219e-01, 0.000e+00, 2.187e-01, 6.810e-05, 5.688e-07, 2.159e-02, 0.000e+00 }, // NOx
-        { 0.000e+00, 7.135e-03, 0.000e+00, 1.017e-05, 6.434e-07, 0.000e+00, 1.637e-04 }, // PM + PM (non-exhaust)
+        { 1.932e+03, 4.225e+01, 3.830e+01, 0.000e+00, 2.311e-01, 3.165e+02, 5.376e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.458e-02, 0.000e+00, 1.016e+00 }, // CO
+        { 4.528e-03, 0.000e+00, 0.000e+00, 0.000e+00, 8.545e-05, 0.000e+00, 5.490e-03 }, // HC
+        { 6.218e+02, 1.360e+01, 1.233e+01, 0.000e+00, 7.435e-02, 1.018e+02, 1.730e+00 }, // FC
+        { 9.219e-01, 0.000e+00, 2.187e-01, 8.826e-04, 2.654e-05, 7.771e-02, 0.000e+00 }, // NOx
+        { 0.000e+00, 2.569e-02, 0.000e+00, 1.318e-04, 3.002e-05, 0.000e+00, 2.122e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // LCV_CNG_petrol_N1-III_Euro-3_(P)
-        { 1.951e+03, 1.185e+01, 3.867e+01, 0.000e+00, 5.000e-03, 8.874e+01, 4.187e-01 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 3.124e-04, 0.000e+00, 7.841e-02 }, // CO
-        { 4.528e-03, 0.000e+00, 0.000e+00, 0.000e+00, 1.832e-06, 0.000e+00, 4.236e-04 }, // HC
-        { 6.324e+02, 3.841e+00, 1.254e+01, 0.000e+00, 1.621e-03, 2.877e+01, 1.357e-01 }, // FC
-        { 9.219e-01, 0.000e+00, 2.187e-01, 6.810e-05, 5.688e-07, 2.159e-02, 0.000e+00 }, // NOx
-        { 0.000e+00, 7.135e-03, 0.000e+00, 1.017e-05, 6.434e-07, 0.000e+00, 1.637e-04 }, // PM + PM (non-exhaust)
+        { 1.951e+03, 4.266e+01, 3.867e+01, 0.000e+00, 2.333e-01, 3.195e+02, 5.427e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.458e-02, 0.000e+00, 1.016e+00 }, // CO
+        { 4.528e-03, 0.000e+00, 0.000e+00, 0.000e+00, 8.545e-05, 0.000e+00, 5.490e-03 }, // HC
+        { 6.324e+02, 1.383e+01, 1.254e+01, 0.000e+00, 7.562e-02, 1.036e+02, 1.759e+00 }, // FC
+        { 9.219e-01, 0.000e+00, 2.187e-01, 8.826e-04, 2.654e-05, 7.771e-02, 0.000e+00 }, // NOx
+        { 0.000e+00, 2.569e-02, 0.000e+00, 1.318e-04, 3.002e-05, 0.000e+00, 2.122e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // LCV_CNG_petrol_N1-III_Euro-4_(CNG)
-        { 1.887e+03, 1.264e+01, 0.000e+00, 0.000e+00, 4.883e-03, 8.934e+01, 4.176e-01 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 2.736e-04, 0.000e+00, 6.575e-02 }, // CO
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.331e-06, 0.000e+00, 2.914e-04 }, // HC
-        { 6.073e+02, 4.068e+00, 0.000e+00, 0.000e+00, 1.571e-03, 2.875e+01, 1.344e-01 }, // FC
-        { 7.238e-01, 4.488e-03, 6.296e-01, 0.000e+00, 4.602e-07, 1.370e-02, 0.000e+00 }, // NOx
-        { 0.000e+00, 7.132e-03, 0.000e+00, 1.021e-05, 5.387e-07, 0.000e+00, 1.348e-04 }, // PM + PM (non-exhaust)
+        { 1.887e+03, 4.551e+01, 0.000e+00, 0.000e+00, 2.278e-01, 3.216e+02, 5.412e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.276e-02, 0.000e+00, 8.521e-01 }, // CO
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 6.212e-05, 0.000e+00, 3.776e-03 }, // HC
+        { 6.073e+02, 1.464e+01, 0.000e+00, 0.000e+00, 7.331e-02, 1.035e+02, 1.742e+00 }, // FC
+        { 7.238e-01, 1.616e-02, 6.296e-01, 0.000e+00, 2.147e-05, 4.931e-02, 0.000e+00 }, // NOx
+        { 0.000e+00, 2.567e-02, 0.000e+00, 1.324e-04, 2.513e-05, 0.000e+00, 1.748e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // LCV_CNG_petrol_N1-III_Euro-4_(P)
-        { 1.905e+03, 1.276e+01, 0.000e+00, 0.000e+00, 4.930e-03, 9.019e+01, 4.216e-01 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 2.736e-04, 0.000e+00, 6.575e-02 }, // CO
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.331e-06, 0.000e+00, 2.914e-04 }, // HC
-        { 6.177e+02, 4.137e+00, 0.000e+00, 0.000e+00, 1.598e-03, 2.924e+01, 1.367e-01 }, // FC
-        { 7.238e-01, 4.488e-03, 6.296e-01, 0.000e+00, 4.602e-07, 1.370e-02, 0.000e+00 }, // NOx
-        { 0.000e+00, 7.132e-03, 0.000e+00, 1.021e-05, 5.387e-07, 0.000e+00, 1.348e-04 }, // PM + PM (non-exhaust)
+        { 1.905e+03, 4.594e+01, 0.000e+00, 0.000e+00, 2.300e-01, 3.247e+02, 5.464e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.276e-02, 0.000e+00, 8.521e-01 }, // CO
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 6.212e-05, 0.000e+00, 3.776e-03 }, // HC
+        { 6.177e+02, 1.489e+01, 0.000e+00, 0.000e+00, 7.456e-02, 1.053e+02, 1.771e+00 }, // FC
+        { 7.238e-01, 1.616e-02, 6.296e-01, 0.000e+00, 2.147e-05, 4.931e-02, 0.000e+00 }, // NOx
+        { 0.000e+00, 2.567e-02, 0.000e+00, 1.324e-04, 2.513e-05, 0.000e+00, 1.748e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // LCV_CNG_petrol_N1-III_Euro-5_(CNG)
-        { 1.758e+03, 1.030e+01, 1.434e+02, 0.000e+00, 4.574e-03, 7.636e+01, 4.146e-01 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 2.766e-04, 0.000e+00, 6.653e-02 }, // CO
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.377e-06, 0.000e+00, 3.023e-04 }, // HC
-        { 5.658e+02, 3.314e+00, 4.613e+01, 0.000e+00, 1.472e-03, 2.457e+01, 1.334e-01 }, // FC
-        { 2.699e-01, 1.426e-03, 2.621e-01, 0.000e+00, 1.652e-07, 4.293e-03, 0.000e+00 }, // NOx
-        { 0.000e+00, 7.147e-03, 0.000e+00, 1.004e-05, 5.550e-07, 0.000e+00, 1.415e-04 }, // PM + PM (non-exhaust)
+        { 1.758e+03, 3.708e+01, 1.434e+02, 0.000e+00, 2.134e-01, 2.749e+02, 5.374e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.290e-02, 0.000e+00, 8.622e-01 }, // CO
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 6.425e-05, 0.000e+00, 3.918e-03 }, // HC
+        { 5.658e+02, 1.193e+01, 4.613e+01, 0.000e+00, 6.867e-02, 8.846e+01, 1.729e+00 }, // FC
+        { 2.699e-01, 5.134e-03, 2.621e-01, 0.000e+00, 7.707e-06, 1.545e-02, 0.000e+00 }, // NOx
+        { 0.000e+00, 2.573e-02, 0.000e+00, 1.301e-04, 2.589e-05, 0.000e+00, 1.834e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // LCV_CNG_petrol_N1-III_Euro-5_(P)
-        { 1.775e+03, 1.040e+01, 1.447e+02, 0.000e+00, 4.618e-03, 7.709e+01, 4.186e-01 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 2.766e-04, 0.000e+00, 6.653e-02 }, // CO
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.377e-06, 0.000e+00, 3.023e-04 }, // HC
-        { 5.754e+02, 3.371e+00, 4.692e+01, 0.000e+00, 1.497e-03, 2.499e+01, 1.357e-01 }, // FC
-        { 2.699e-01, 1.426e-03, 2.621e-01, 0.000e+00, 1.652e-07, 4.293e-03, 0.000e+00 }, // NOx
-        { 0.000e+00, 7.147e-03, 0.000e+00, 1.004e-05, 5.550e-07, 0.000e+00, 1.415e-04 }, // PM + PM (non-exhaust)
+        { 1.775e+03, 3.743e+01, 1.447e+02, 0.000e+00, 2.154e-01, 2.775e+02, 5.425e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.290e-02, 0.000e+00, 8.622e-01 }, // CO
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 6.425e-05, 0.000e+00, 3.918e-03 }, // HC
+        { 5.754e+02, 1.214e+01, 4.692e+01, 0.000e+00, 6.984e-02, 8.997e+01, 1.759e+00 }, // FC
+        { 2.699e-01, 5.134e-03, 2.621e-01, 0.000e+00, 7.707e-06, 1.545e-02, 0.000e+00 }, // NOx
+        { 0.000e+00, 2.573e-02, 0.000e+00, 1.301e-04, 2.589e-05, 0.000e+00, 1.834e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // LCV_CNG_petrol_N1-III_Euro-6_(CNG)
-        { 1.639e+03, 1.027e+01, 1.522e+02, 0.000e+00, 4.228e-03, 7.154e+01, 3.951e-01 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 2.815e-04, 0.000e+00, 6.833e-02 }, // CO
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.360e-06, 0.000e+00, 3.012e-04 }, // HC
-        { 5.274e+02, 3.306e+00, 4.899e+01, 0.000e+00, 1.360e-03, 2.302e+01, 1.271e-01 }, // FC
-        { 2.995e-01, 1.587e-03, 2.957e-01, 0.000e+00, 1.783e-07, 4.705e-03, 0.000e+00 }, // NOx
-        { 0.000e+00, 7.147e-03, 0.000e+00, 1.003e-05, 5.484e-07, 0.000e+00, 1.403e-04 }, // PM + PM (non-exhaust)
+        { 1.639e+03, 3.699e+01, 1.522e+02, 0.000e+00, 1.973e-01, 2.575e+02, 5.120e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.313e-02, 0.000e+00, 8.856e-01 }, // CO
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 6.346e-05, 0.000e+00, 3.903e-03 }, // HC
+        { 5.274e+02, 1.190e+01, 4.899e+01, 0.000e+00, 6.347e-02, 8.287e+01, 1.647e+00 }, // FC
+        { 2.995e-01, 5.712e-03, 2.957e-01, 0.000e+00, 8.318e-06, 1.694e-02, 0.000e+00 }, // NOx
+        { 0.000e+00, 2.573e-02, 0.000e+00, 1.300e-04, 2.559e-05, 0.000e+00, 1.818e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // LCV_CNG_petrol_N1-III_Euro-6_(P)
-        { 1.655e+03, 1.037e+01, 1.537e+02, 0.000e+00, 4.268e-03, 7.222e+01, 3.988e-01 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 2.815e-04, 0.000e+00, 6.833e-02 }, // CO
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.360e-06, 0.000e+00, 3.012e-04 }, // HC
-        { 5.364e+02, 3.362e+00, 4.982e+01, 0.000e+00, 1.384e-03, 2.341e+01, 1.293e-01 }, // FC
-        { 2.995e-01, 1.587e-03, 2.957e-01, 0.000e+00, 1.783e-07, 4.705e-03, 0.000e+00 }, // NOx
-        { 0.000e+00, 7.147e-03, 0.000e+00, 1.003e-05, 5.484e-07, 0.000e+00, 1.403e-04 }, // PM + PM (non-exhaust)
+        { 1.655e+03, 3.734e+01, 1.537e+02, 0.000e+00, 1.991e-01, 2.600e+02, 5.169e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.313e-02, 0.000e+00, 8.856e-01 }, // CO
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 6.346e-05, 0.000e+00, 3.903e-03 }, // HC
+        { 5.364e+02, 1.210e+01, 4.982e+01, 0.000e+00, 6.455e-02, 8.428e+01, 1.676e+00 }, // FC
+        { 2.995e-01, 5.712e-03, 2.957e-01, 0.000e+00, 8.318e-06, 1.694e-02, 0.000e+00 }, // NOx
+        { 0.000e+00, 2.573e-02, 0.000e+00, 1.300e-04, 2.559e-05, 0.000e+00, 1.818e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // LCV_FFV_M+N1-I_Euro-3__(E85)
-        { 1.021e+03, 1.037e+01, 2.377e+01, 0.000e+00, 2.359e-03, 5.230e+01, 2.471e-01 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 2.149e-04, 0.000e+00, 5.820e-02 }, // CO
-        { 8.573e-02, 0.000e+00, 0.000e+00, 0.000e+00, 1.193e-06, 0.000e+00, 3.112e-04 }, // HC
-        { 4.983e+02, 5.060e+00, 1.160e+01, 0.000e+00, 1.151e-03, 2.553e+01, 1.206e-01 }, // FC
-        { 6.569e-01, 0.000e+00, 1.493e-01, 5.768e-05, 2.656e-07, 1.604e-02, 0.000e+00 }, // NOx
-        { 0.000e+00, 7.138e-03, 0.000e+00, 1.014e-05, 4.564e-07, 0.000e+00, 1.250e-04 }, // PM + PM (non-exhaust)
+        { 1.021e+03, 3.732e+01, 2.377e+01, 0.000e+00, 1.101e-01, 1.883e+02, 3.202e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.002e-02, 0.000e+00, 7.543e-01 }, // CO
+        { 8.573e-02, 0.000e+00, 0.000e+00, 0.000e+00, 5.564e-05, 0.000e+00, 4.033e-03 }, // HC
+        { 4.983e+02, 1.822e+01, 1.160e+01, 0.000e+00, 5.372e-02, 9.191e+01, 1.563e+00 }, // FC
+        { 6.569e-01, 0.000e+00, 1.493e-01, 7.475e-04, 1.239e-05, 5.773e-02, 0.000e+00 }, // NOx
+        { 0.000e+00, 2.570e-02, 0.000e+00, 1.314e-04, 2.130e-05, 0.000e+00, 1.620e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // LCV_FFV_M+N1-I_Euro-3__(P)
-        { 9.984e+02, 1.014e+01, 2.324e+01, 0.000e+00, 2.307e-03, 5.115e+01, 2.416e-01 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 2.149e-04, 0.000e+00, 5.820e-02 }, // CO
-        { 8.573e-02, 0.000e+00, 0.000e+00, 0.000e+00, 1.193e-06, 0.000e+00, 3.112e-04 }, // HC
-        { 3.236e+02, 3.286e+00, 7.535e+00, 0.000e+00, 7.478e-04, 1.658e+01, 7.832e-02 }, // FC
-        { 6.569e-01, 0.000e+00, 1.493e-01, 5.768e-05, 2.656e-07, 1.604e-02, 0.000e+00 }, // NOx
-        { 0.000e+00, 7.138e-03, 0.000e+00, 1.014e-05, 4.564e-07, 0.000e+00, 1.250e-04 }, // PM + PM (non-exhaust)
+        { 9.984e+02, 3.649e+01, 2.324e+01, 0.000e+00, 1.076e-01, 1.841e+02, 3.131e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.002e-02, 0.000e+00, 7.543e-01 }, // CO
+        { 8.573e-02, 0.000e+00, 0.000e+00, 0.000e+00, 5.564e-05, 0.000e+00, 4.033e-03 }, // HC
+        { 3.236e+02, 1.183e+01, 7.535e+00, 0.000e+00, 3.489e-02, 5.969e+01, 1.015e+00 }, // FC
+        { 6.569e-01, 0.000e+00, 1.493e-01, 7.475e-04, 1.239e-05, 5.773e-02, 0.000e+00 }, // NOx
+        { 0.000e+00, 2.570e-02, 0.000e+00, 1.314e-04, 2.130e-05, 0.000e+00, 1.620e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // LCV_FFV_M+N1-I_Euro-4__(E85)
-        { 1.028e+03, 9.985e+00, 7.838e+01, 0.000e+00, 2.288e-03, 5.039e+01, 2.424e-01 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 6.635e-05, 0.000e+00, 1.669e-02 }, // CO
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 8.646e-07, 0.000e+00, 1.985e-04 }, // HC
-        { 5.017e+02, 4.874e+00, 3.826e+01, 0.000e+00, 1.117e-03, 2.460e+01, 1.183e-01 }, // FC
-        { 4.235e-01, 2.544e-03, 3.564e-01, 0.000e+00, 2.153e-07, 8.073e-03, 0.000e+00 }, // NOx
-        { 0.000e+00, 7.147e-03, 0.000e+00, 1.004e-05, 2.619e-07, 0.000e+00, 6.870e-05 }, // PM + PM (non-exhaust)
+        { 1.028e+03, 3.595e+01, 7.838e+01, 0.000e+00, 1.068e-01, 1.814e+02, 3.142e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 3.096e-03, 0.000e+00, 2.163e-01 }, // CO
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 4.034e-05, 0.000e+00, 2.572e-03 }, // HC
+        { 5.017e+02, 1.755e+01, 3.826e+01, 0.000e+00, 5.211e-02, 8.855e+01, 1.534e+00 }, // FC
+        { 4.235e-01, 9.159e-03, 3.564e-01, 0.000e+00, 1.005e-05, 2.906e-02, 0.000e+00 }, // NOx
+        { 0.000e+00, 2.573e-02, 0.000e+00, 1.302e-04, 1.222e-05, 0.000e+00, 8.904e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // LCV_FFV_M+N1-I_Euro-4__(P)
-        { 1.005e+03, 9.765e+00, 7.665e+01, 0.000e+00, 2.238e-03, 4.928e+01, 2.371e-01 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.327e-04, 0.000e+00, 3.339e-02 }, // CO
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 6.651e-07, 0.000e+00, 1.527e-04 }, // HC
-        { 3.259e+02, 3.166e+00, 2.485e+01, 0.000e+00, 7.254e-04, 1.598e+01, 7.686e-02 }, // FC
-        { 4.235e-01, 2.544e-03, 3.564e-01, 0.000e+00, 2.153e-07, 8.073e-03, 0.000e+00 }, // NOx
-        { 0.000e+00, 7.147e-03, 0.000e+00, 1.004e-05, 2.619e-07, 0.000e+00, 6.870e-05 }, // PM + PM (non-exhaust)
+        { 1.005e+03, 3.515e+01, 7.665e+01, 0.000e+00, 1.044e-01, 1.774e+02, 3.073e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 6.191e-03, 0.000e+00, 4.327e-01 }, // CO
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 3.103e-05, 0.000e+00, 1.979e-03 }, // HC
+        { 3.259e+02, 1.140e+01, 2.485e+01, 0.000e+00, 3.384e-02, 5.751e+01, 9.961e-01 }, // FC
+        { 4.235e-01, 9.159e-03, 3.564e-01, 0.000e+00, 1.005e-05, 2.906e-02, 0.000e+00 }, // NOx
+        { 0.000e+00, 2.573e-02, 0.000e+00, 1.302e-04, 1.222e-05, 0.000e+00, 8.904e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // LCV_FFV_M+N1-I_Euro-5__(E85)
-        { 9.663e+02, 8.117e+00, 2.962e+02, 0.000e+00, 2.137e-03, 3.807e+01, 2.726e-01 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 6.853e-05, 0.000e+00, 1.759e-02 }, // CO
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 8.998e-07, 0.000e+00, 2.102e-04 }, // HC
-        { 4.717e+02, 3.962e+00, 1.446e+02, 0.000e+00, 1.043e-03, 1.858e+01, 1.331e-01 }, // FC
-        { 1.583e-01, 8.026e-04, 1.552e-01, 0.000e+00, 7.554e-08, 2.423e-03, 0.000e+00 }, // NOx
-        { 0.000e+00, 7.164e-03, 0.000e+00, 9.819e-06, 2.723e-07, 0.000e+00, 7.313e-05 }, // PM + PM (non-exhaust)
+        { 9.663e+02, 2.922e+01, 2.962e+02, 0.000e+00, 9.972e-02, 1.371e+02, 3.533e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 3.197e-03, 0.000e+00, 2.279e-01 }, // CO
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 4.198e-05, 0.000e+00, 2.725e-03 }, // HC
+        { 4.717e+02, 1.426e+01, 1.446e+02, 0.000e+00, 4.867e-02, 6.690e+01, 1.725e+00 }, // FC
+        { 1.583e-01, 2.889e-03, 1.552e-01, 0.000e+00, 3.524e-06, 8.723e-03, 0.000e+00 }, // NOx
+        { 0.000e+00, 2.579e-02, 0.000e+00, 1.273e-04, 1.271e-05, 0.000e+00, 9.478e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // LCV_FFV_M+N1-I_Euro-5__(P)
-        { 9.450e+02, 7.937e+00, 2.896e+02, 0.000e+00, 2.090e-03, 3.723e+01, 2.666e-01 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.371e-04, 0.000e+00, 3.517e-02 }, // CO
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 6.922e-07, 0.000e+00, 1.617e-04 }, // HC
-        { 3.064e+02, 2.573e+00, 9.390e+01, 0.000e+00, 6.776e-04, 1.207e+01, 8.643e-02 }, // FC
-        { 1.583e-01, 8.026e-04, 1.552e-01, 0.000e+00, 7.554e-08, 2.423e-03, 0.000e+00 }, // NOx
-        { 0.000e+00, 7.164e-03, 0.000e+00, 9.819e-06, 2.723e-07, 0.000e+00, 7.313e-05 }, // PM + PM (non-exhaust)
+        { 9.450e+02, 2.857e+01, 2.896e+02, 0.000e+00, 9.752e-02, 1.340e+02, 3.455e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 6.394e-03, 0.000e+00, 4.558e-01 }, // CO
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 3.229e-05, 0.000e+00, 2.096e-03 }, // HC
+        { 3.064e+02, 9.263e+00, 9.390e+01, 0.000e+00, 3.161e-02, 4.345e+01, 1.120e+00 }, // FC
+        { 1.583e-01, 2.889e-03, 1.552e-01, 0.000e+00, 3.524e-06, 8.723e-03, 0.000e+00 }, // NOx
+        { 0.000e+00, 2.579e-02, 0.000e+00, 1.273e-04, 1.271e-05, 0.000e+00, 9.478e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // LCV_FFV_M+N1-I_Euro-6__(E85)
-        { 9.483e+02, 7.339e+00, 1.818e+02, 0.000e+00, 2.256e-03, 3.994e+01, 2.527e-01 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 7.649e-05, 0.000e+00, 1.926e-02 }, // CO
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 9.666e-07, 0.000e+00, 2.223e-04 }, // HC
-        { 4.629e+02, 3.582e+00, 8.876e+01, 0.000e+00, 1.101e-03, 1.949e+01, 1.234e-01 }, // FC
-        { 1.753e-01, 9.148e-04, 1.699e-01, 0.000e+00, 9.181e-08, 2.759e-03, 0.000e+00 }, // NOx
-        { 0.000e+00, 7.156e-03, 0.000e+00, 9.918e-06, 2.955e-07, 0.000e+00, 7.754e-05 }, // PM + PM (non-exhaust)
+        { 9.483e+02, 2.642e+01, 1.818e+02, 0.000e+00, 1.053e-01, 1.438e+02, 3.275e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 3.569e-03, 0.000e+00, 2.496e-01 }, // CO
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 4.510e-05, 0.000e+00, 2.880e-03 }, // HC
+        { 4.629e+02, 1.290e+01, 8.876e+01, 0.000e+00, 5.139e-02, 7.018e+01, 1.599e+00 }, // FC
+        { 1.753e-01, 3.293e-03, 1.699e-01, 0.000e+00, 4.284e-06, 9.932e-03, 0.000e+00 }, // NOx
+        { 0.000e+00, 2.576e-02, 0.000e+00, 1.285e-04, 1.379e-05, 0.000e+00, 1.005e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // LCV_FFV_M+N1-I_Euro-6__(P)
-        { 9.273e+02, 7.177e+00, 1.778e+02, 0.000e+00, 2.207e-03, 3.906e+01, 2.472e-01 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.530e-04, 0.000e+00, 3.852e-02 }, // CO
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 7.435e-07, 0.000e+00, 1.710e-04 }, // HC
-        { 3.006e+02, 2.327e+00, 5.764e+01, 0.000e+00, 7.153e-04, 1.266e+01, 8.012e-02 }, // FC
-        { 1.753e-01, 9.148e-04, 1.699e-01, 0.000e+00, 9.181e-08, 2.759e-03, 0.000e+00 }, // NOx
-        { 0.000e+00, 7.156e-03, 0.000e+00, 9.918e-06, 2.955e-07, 0.000e+00, 7.754e-05 }, // PM + PM (non-exhaust)
+        { 9.273e+02, 2.584e+01, 1.778e+02, 0.000e+00, 1.029e-01, 1.406e+02, 3.203e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 7.137e-03, 0.000e+00, 4.992e-01 }, // CO
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 3.469e-05, 0.000e+00, 2.216e-03 }, // HC
+        { 3.006e+02, 8.376e+00, 5.764e+01, 0.000e+00, 3.337e-02, 4.558e+01, 1.038e+00 }, // FC
+        { 1.753e-01, 3.293e-03, 1.699e-01, 0.000e+00, 4.284e-06, 9.932e-03, 0.000e+00 }, // NOx
+        { 0.000e+00, 2.576e-02, 0.000e+00, 1.285e-04, 1.379e-05, 0.000e+00, 1.005e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // LCV_FFV_N1-II_Euro-3__(E85)
-        { 1.580e+03, 5.747e+00, 6.579e+01, 0.000e+00, 4.313e-03, 6.501e+01, 3.049e-01 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 3.160e-04, 0.000e+00, 7.369e-02 }, // CO
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.872e-06, 0.000e+00, 4.021e-04 }, // HC
-        { 7.710e+02, 2.805e+00, 3.211e+01, 0.000e+00, 2.105e-03, 3.173e+01, 1.488e-01 }, // FC
-        { 9.082e-01, 0.000e+00, 2.649e-01, 5.779e-05, 7.175e-07, 1.965e-02, 0.000e+00 }, // NOx
-        { 0.000e+00, 7.132e-03, 0.000e+00, 1.021e-05, 6.354e-07, 0.000e+00, 1.511e-04 }, // PM + PM (non-exhaust)
+        { 1.580e+03, 2.069e+01, 6.579e+01, 0.000e+00, 2.012e-01, 2.340e+02, 3.952e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.474e-02, 0.000e+00, 9.551e-01 }, // CO
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 8.733e-05, 0.000e+00, 5.211e-03 }, // HC
+        { 7.710e+02, 1.010e+01, 3.211e+01, 0.000e+00, 9.822e-02, 1.142e+02, 1.929e+00 }, // FC
+        { 9.082e-01, 0.000e+00, 2.649e-01, 7.490e-04, 3.348e-05, 7.073e-02, 0.000e+00 }, // NOx
+        { 0.000e+00, 2.567e-02, 0.000e+00, 1.323e-04, 2.964e-05, 0.000e+00, 1.959e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // LCV_FFV_N1-II_Euro-3__(P)
-        { 1.545e+03, 5.620e+00, 6.433e+01, 0.000e+00, 4.217e-03, 6.357e+01, 2.982e-01 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 3.160e-04, 0.000e+00, 7.369e-02 }, // CO
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.872e-06, 0.000e+00, 4.021e-04 }, // HC
-        { 5.008e+02, 1.822e+00, 2.086e+01, 0.000e+00, 1.367e-03, 2.061e+01, 9.667e-02 }, // FC
-        { 9.082e-01, 0.000e+00, 2.649e-01, 5.779e-05, 7.175e-07, 1.965e-02, 0.000e+00 }, // NOx
-        { 0.000e+00, 7.132e-03, 0.000e+00, 1.021e-05, 6.354e-07, 0.000e+00, 1.511e-04 }, // PM + PM (non-exhaust)
+        { 1.545e+03, 2.023e+01, 6.433e+01, 0.000e+00, 1.968e-01, 2.288e+02, 3.864e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.474e-02, 0.000e+00, 9.551e-01 }, // CO
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 8.733e-05, 0.000e+00, 5.211e-03 }, // HC
+        { 5.008e+02, 6.559e+00, 2.086e+01, 0.000e+00, 6.379e-02, 7.419e+01, 1.253e+00 }, // FC
+        { 9.082e-01, 0.000e+00, 2.649e-01, 7.490e-04, 3.348e-05, 7.073e-02, 0.000e+00 }, // NOx
+        { 0.000e+00, 2.567e-02, 0.000e+00, 1.323e-04, 2.964e-05, 0.000e+00, 1.959e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // LCV_FFV_N1-II_Euro-4__(E85)
-        { 1.355e+03, 7.301e+00, 0.000e+00, 0.000e+00, 3.886e-03, 6.361e+01, 2.769e-01 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.095e-04, 0.000e+00, 2.520e-02 }, // CO
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.362e-06, 0.000e+00, 2.856e-04 }, // HC
-        { 6.615e+02, 3.563e+00, 0.000e+00, 0.000e+00, 1.897e-03, 3.105e+01, 1.351e-01 }, // FC
-        { 4.970e-01, 3.180e-03, 4.322e-01, 0.000e+00, 3.676e-07, 9.350e-03, 0.000e+00 }, // NOx
-        { 0.000e+00, 7.108e-03, 0.000e+00, 1.050e-05, 4.717e-07, 0.000e+00, 1.163e-04 }, // PM + PM (non-exhaust)
+        { 1.355e+03, 2.628e+01, 0.000e+00, 0.000e+00, 1.813e-01, 2.290e+02, 3.588e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 5.111e-03, 0.000e+00, 3.267e-01 }, // CO
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 6.354e-05, 0.000e+00, 3.701e-03 }, // HC
+        { 6.615e+02, 1.283e+01, 0.000e+00, 0.000e+00, 8.850e-02, 1.118e+02, 1.751e+00 }, // FC
+        { 4.970e-01, 1.145e-02, 4.322e-01, 0.000e+00, 1.715e-05, 3.366e-02, 0.000e+00 }, // NOx
+        { 0.000e+00, 2.559e-02, 0.000e+00, 1.361e-04, 2.201e-05, 0.000e+00, 1.507e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // LCV_FFV_N1-II_Euro-4__(P)
-        { 1.325e+03, 7.139e+00, 0.000e+00, 0.000e+00, 3.800e-03, 6.220e+01, 2.708e-01 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 2.191e-04, 0.000e+00, 5.041e-02 }, // CO
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.048e-06, 0.000e+00, 2.197e-04 }, // HC
-        { 4.296e+02, 2.314e+00, 0.000e+00, 0.000e+00, 1.232e-03, 2.016e+01, 8.777e-02 }, // FC
-        { 4.970e-01, 3.180e-03, 4.322e-01, 0.000e+00, 3.676e-07, 9.350e-03, 0.000e+00 }, // NOx
-        { 0.000e+00, 7.108e-03, 0.000e+00, 1.050e-05, 4.717e-07, 0.000e+00, 1.163e-04 }, // PM + PM (non-exhaust)
+        { 1.325e+03, 2.570e+01, 0.000e+00, 0.000e+00, 1.773e-01, 2.239e+02, 3.509e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.022e-02, 0.000e+00, 6.533e-01 }, // CO
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 4.888e-05, 0.000e+00, 2.847e-03 }, // HC
+        { 4.296e+02, 8.332e+00, 0.000e+00, 0.000e+00, 5.748e-02, 7.259e+01, 1.138e+00 }, // FC
+        { 4.970e-01, 1.145e-02, 4.322e-01, 0.000e+00, 1.715e-05, 3.366e-02, 0.000e+00 }, // NOx
+        { 0.000e+00, 2.559e-02, 0.000e+00, 1.361e-04, 2.201e-05, 0.000e+00, 1.507e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // LCV_FFV_N1-II_Euro-5__(E85)
-        { 1.260e+03, 5.686e+00, 0.000e+00, 0.000e+00, 3.610e-03, 5.606e+01, 2.717e-01 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.074e-04, 0.000e+00, 2.426e-02 }, // CO
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.372e-06, 0.000e+00, 2.830e-04 }, // HC
-        { 6.150e+02, 2.776e+00, 0.000e+00, 0.000e+00, 1.762e-03, 2.736e+01, 1.326e-01 }, // FC
-        { 1.830e-01, 1.064e-03, 1.808e-01, 0.000e+00, 1.269e-07, 2.912e-03, 0.000e+00 }, // NOx
-        { 0.000e+00, 7.130e-03, 0.000e+00, 1.027e-05, 4.461e-07, 0.000e+00, 1.084e-04 }, // PM + PM (non-exhaust)
+        { 1.260e+03, 2.047e+01, 0.000e+00, 0.000e+00, 1.684e-01, 2.018e+02, 3.521e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 5.012e-03, 0.000e+00, 3.145e-01 }, // CO
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 6.402e-05, 0.000e+00, 3.668e-03 }, // HC
+        { 6.150e+02, 9.992e+00, 0.000e+00, 0.000e+00, 8.221e-02, 9.851e+01, 1.719e+00 }, // FC
+        { 1.830e-01, 3.831e-03, 1.808e-01, 0.000e+00, 5.918e-06, 1.048e-02, 0.000e+00 }, // NOx
+        { 0.000e+00, 2.567e-02, 0.000e+00, 1.331e-04, 2.081e-05, 0.000e+00, 1.404e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // LCV_FFV_N1-II_Euro-5__(P)
-        { 1.232e+03, 5.561e+00, 0.000e+00, 0.000e+00, 3.530e-03, 5.482e+01, 2.657e-01 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 2.148e-04, 0.000e+00, 4.853e-02 }, // CO
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.055e-06, 0.000e+00, 2.177e-04 }, // HC
-        { 3.994e+02, 1.803e+00, 0.000e+00, 0.000e+00, 1.144e-03, 1.777e+01, 8.614e-02 }, // FC
-        { 1.830e-01, 1.064e-03, 1.808e-01, 0.000e+00, 1.269e-07, 2.912e-03, 0.000e+00 }, // NOx
-        { 0.000e+00, 7.130e-03, 0.000e+00, 1.027e-05, 4.461e-07, 0.000e+00, 1.084e-04 }, // PM + PM (non-exhaust)
+        { 1.232e+03, 2.002e+01, 0.000e+00, 0.000e+00, 1.647e-01, 1.974e+02, 3.444e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.002e-02, 0.000e+00, 6.289e-01 }, // CO
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 4.924e-05, 0.000e+00, 2.822e-03 }, // HC
+        { 3.994e+02, 6.490e+00, 0.000e+00, 0.000e+00, 5.339e-02, 6.398e+01, 1.116e+00 }, // FC
+        { 1.830e-01, 3.831e-03, 1.808e-01, 0.000e+00, 5.918e-06, 1.048e-02, 0.000e+00 }, // NOx
+        { 0.000e+00, 2.567e-02, 0.000e+00, 1.331e-04, 2.081e-05, 0.000e+00, 1.404e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // LCV_FFV_N1-II_Euro-6__(E85)
-        { 1.197e+03, 4.724e+00, 1.687e+02, 0.000e+00, 3.241e-03, 4.594e+01, 2.796e-01 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 9.886e-05, 0.000e+00, 2.303e-02 }, // CO
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.242e-06, 0.000e+00, 2.628e-04 }, // HC
-        { 5.845e+02, 2.306e+00, 8.235e+01, 0.000e+00, 1.582e-03, 2.242e+01, 1.365e-01 }, // FC
-        { 2.005e-01, 1.117e-03, 2.060e-01, 0.000e+00, 1.305e-07, 2.974e-03, 0.000e+00 }, // NOx
-        { 0.000e+00, 7.147e-03, 0.000e+00, 1.002e-05, 3.821e-07, 0.000e+00, 9.421e-05 }, // PM + PM (non-exhaust)
+        { 1.197e+03, 1.701e+01, 1.687e+02, 0.000e+00, 1.512e-01, 1.654e+02, 3.623e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 4.612e-03, 0.000e+00, 2.985e-01 }, // CO
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 5.797e-05, 0.000e+00, 3.406e-03 }, // HC
+        { 5.845e+02, 8.301e+00, 8.235e+01, 0.000e+00, 7.380e-02, 8.073e+01, 1.769e+00 }, // FC
+        { 2.005e-01, 4.022e-03, 2.060e-01, 0.000e+00, 6.089e-06, 1.071e-02, 0.000e+00 }, // NOx
+        { 0.000e+00, 2.573e-02, 0.000e+00, 1.299e-04, 1.783e-05, 0.000e+00, 1.221e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // LCV_FFV_N1-II_Euro-6__(P)
-        { 1.171e+03, 4.619e+00, 1.650e+02, 0.000e+00, 3.169e-03, 4.493e+01, 2.734e-01 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.977e-04, 0.000e+00, 4.606e-02 }, // CO
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 9.557e-07, 0.000e+00, 2.021e-04 }, // HC
-        { 3.796e+02, 1.498e+00, 5.349e+01, 0.000e+00, 1.027e-03, 1.456e+01, 8.863e-02 }, // FC
-        { 2.005e-01, 1.117e-03, 2.060e-01, 0.000e+00, 1.305e-07, 2.974e-03, 0.000e+00 }, // NOx
-        { 0.000e+00, 7.147e-03, 0.000e+00, 1.002e-05, 3.821e-07, 0.000e+00, 9.421e-05 }, // PM + PM (non-exhaust)
+        { 1.171e+03, 1.663e+01, 1.650e+02, 0.000e+00, 1.479e-01, 1.617e+02, 3.543e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 9.225e-03, 0.000e+00, 5.970e-01 }, // CO
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 4.459e-05, 0.000e+00, 2.620e-03 }, // HC
+        { 3.796e+02, 5.391e+00, 5.349e+01, 0.000e+00, 4.793e-02, 5.243e+01, 1.149e+00 }, // FC
+        { 2.005e-01, 4.022e-03, 2.060e-01, 0.000e+00, 6.089e-06, 1.071e-02, 0.000e+00 }, // NOx
+        { 0.000e+00, 2.573e-02, 0.000e+00, 1.299e-04, 1.783e-05, 0.000e+00, 1.221e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // LCV_FFV_N1-III_Euro-3__(E85)
-        { 1.995e+03, 1.212e+01, 3.954e+01, 0.000e+00, 5.112e-03, 9.075e+01, 4.282e-01 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 3.124e-04, 0.000e+00, 7.841e-02 }, // CO
-        { 4.528e-03, 0.000e+00, 0.000e+00, 0.000e+00, 1.832e-06, 0.000e+00, 4.236e-04 }, // HC
-        { 9.737e+02, 5.914e+00, 1.930e+01, 0.000e+00, 2.495e-03, 4.429e+01, 2.090e-01 }, // FC
-        { 9.219e-01, 0.000e+00, 2.187e-01, 6.810e-05, 5.688e-07, 2.159e-02, 0.000e+00 }, // NOx
-        { 0.000e+00, 7.135e-03, 0.000e+00, 1.017e-05, 6.434e-07, 0.000e+00, 1.637e-04 }, // PM + PM (non-exhaust)
+        { 1.995e+03, 4.362e+01, 3.954e+01, 0.000e+00, 2.385e-01, 3.267e+02, 5.549e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.458e-02, 0.000e+00, 1.016e+00 }, // CO
+        { 4.528e-03, 0.000e+00, 0.000e+00, 0.000e+00, 8.545e-05, 0.000e+00, 5.490e-03 }, // HC
+        { 9.737e+02, 2.129e+01, 1.930e+01, 0.000e+00, 1.164e-01, 1.595e+02, 2.709e+00 }, // FC
+        { 9.219e-01, 0.000e+00, 2.187e-01, 8.826e-04, 2.654e-05, 7.771e-02, 0.000e+00 }, // NOx
+        { 0.000e+00, 2.569e-02, 0.000e+00, 1.318e-04, 3.002e-05, 0.000e+00, 2.122e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // LCV_FFV_N1-III_Euro-3__(P)
-        { 1.951e+03, 1.185e+01, 3.867e+01, 0.000e+00, 5.000e-03, 8.874e+01, 4.187e-01 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 3.124e-04, 0.000e+00, 7.841e-02 }, // CO
-        { 4.528e-03, 0.000e+00, 0.000e+00, 0.000e+00, 1.832e-06, 0.000e+00, 4.236e-04 }, // HC
-        { 6.324e+02, 3.841e+00, 1.254e+01, 0.000e+00, 1.621e-03, 2.877e+01, 1.357e-01 }, // FC
-        { 9.219e-01, 0.000e+00, 2.187e-01, 6.810e-05, 5.688e-07, 2.159e-02, 0.000e+00 }, // NOx
-        { 0.000e+00, 7.135e-03, 0.000e+00, 1.017e-05, 6.434e-07, 0.000e+00, 1.637e-04 }, // PM + PM (non-exhaust)
+        { 1.951e+03, 4.266e+01, 3.867e+01, 0.000e+00, 2.333e-01, 3.195e+02, 5.427e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.458e-02, 0.000e+00, 1.016e+00 }, // CO
+        { 4.528e-03, 0.000e+00, 0.000e+00, 0.000e+00, 8.545e-05, 0.000e+00, 5.490e-03 }, // HC
+        { 6.324e+02, 1.383e+01, 1.254e+01, 0.000e+00, 7.562e-02, 1.036e+02, 1.759e+00 }, // FC
+        { 9.219e-01, 0.000e+00, 2.187e-01, 8.826e-04, 2.654e-05, 7.771e-02, 0.000e+00 }, // NOx
+        { 0.000e+00, 2.569e-02, 0.000e+00, 1.318e-04, 3.002e-05, 0.000e+00, 2.122e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // LCV_FFV_N1-III_Euro-4__(E85)
-        { 1.899e+03, 1.272e+01, 0.000e+00, 0.000e+00, 4.914e-03, 8.991e+01, 4.203e-01 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.368e-04, 0.000e+00, 3.288e-02 }, // CO
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.731e-06, 0.000e+00, 3.788e-04 }, // HC
-        { 9.271e+02, 6.210e+00, 0.000e+00, 0.000e+00, 2.399e-03, 4.389e+01, 2.052e-01 }, // FC
-        { 7.238e-01, 4.488e-03, 6.296e-01, 0.000e+00, 4.602e-07, 1.370e-02, 0.000e+00 }, // NOx
-        { 0.000e+00, 7.132e-03, 0.000e+00, 1.021e-05, 5.387e-07, 0.000e+00, 1.348e-04 }, // PM + PM (non-exhaust)
+        { 1.899e+03, 4.580e+01, 0.000e+00, 0.000e+00, 2.293e-01, 3.237e+02, 5.447e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 6.382e-03, 0.000e+00, 4.261e-01 }, // CO
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 8.075e-05, 0.000e+00, 4.909e-03 }, // HC
+        { 9.271e+02, 2.236e+01, 0.000e+00, 0.000e+00, 1.119e-01, 1.580e+02, 2.659e+00 }, // FC
+        { 7.238e-01, 1.616e-02, 6.296e-01, 0.000e+00, 2.147e-05, 4.931e-02, 0.000e+00 }, // NOx
+        { 0.000e+00, 2.567e-02, 0.000e+00, 1.324e-04, 2.513e-05, 0.000e+00, 1.748e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // LCV_FFV_N1-III_Euro-4__(P)
-        { 1.857e+03, 1.244e+01, 0.000e+00, 0.000e+00, 4.806e-03, 8.792e+01, 4.110e-01 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 2.736e-04, 0.000e+00, 6.575e-02 }, // CO
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.331e-06, 0.000e+00, 2.914e-04 }, // HC
-        { 6.022e+02, 4.033e+00, 0.000e+00, 0.000e+00, 1.558e-03, 2.850e+01, 1.332e-01 }, // FC
-        { 7.238e-01, 4.488e-03, 6.296e-01, 0.000e+00, 4.602e-07, 1.370e-02, 0.000e+00 }, // NOx
-        { 0.000e+00, 7.132e-03, 0.000e+00, 1.021e-05, 5.387e-07, 0.000e+00, 1.348e-04 }, // PM + PM (non-exhaust)
+        { 1.857e+03, 4.479e+01, 0.000e+00, 0.000e+00, 2.242e-01, 3.165e+02, 5.327e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.276e-02, 0.000e+00, 8.521e-01 }, // CO
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 6.212e-05, 0.000e+00, 3.776e-03 }, // HC
+        { 6.022e+02, 1.452e+01, 0.000e+00, 0.000e+00, 7.269e-02, 1.026e+02, 1.727e+00 }, // FC
+        { 7.238e-01, 1.616e-02, 6.296e-01, 0.000e+00, 2.147e-05, 4.931e-02, 0.000e+00 }, // NOx
+        { 0.000e+00, 2.567e-02, 0.000e+00, 1.324e-04, 2.513e-05, 0.000e+00, 1.748e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // LCV_FFV_N1-III_Euro-5__(E85)
-        { 1.765e+03, 1.034e+01, 1.439e+02, 0.000e+00, 4.592e-03, 7.666e+01, 4.163e-01 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.383e-04, 0.000e+00, 3.326e-02 }, // CO
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.790e-06, 0.000e+00, 3.930e-04 }, // HC
-        { 8.616e+02, 5.047e+00, 7.025e+01, 0.000e+00, 2.241e-03, 3.742e+01, 2.032e-01 }, // FC
-        { 2.699e-01, 1.426e-03, 2.621e-01, 0.000e+00, 1.652e-07, 4.293e-03, 0.000e+00 }, // NOx
-        { 0.000e+00, 7.147e-03, 0.000e+00, 1.004e-05, 5.550e-07, 0.000e+00, 1.415e-04 }, // PM + PM (non-exhaust)
+        { 1.765e+03, 3.723e+01, 1.439e+02, 0.000e+00, 2.142e-01, 2.760e+02, 5.395e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 6.451e-03, 0.000e+00, 4.311e-01 }, // CO
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 8.353e-05, 0.000e+00, 5.094e-03 }, // HC
+        { 8.616e+02, 1.817e+01, 7.025e+01, 0.000e+00, 1.046e-01, 1.347e+02, 2.633e+00 }, // FC
+        { 2.699e-01, 5.134e-03, 2.621e-01, 0.000e+00, 7.707e-06, 1.545e-02, 0.000e+00 }, // NOx
+        { 0.000e+00, 2.573e-02, 0.000e+00, 1.301e-04, 2.589e-05, 0.000e+00, 1.834e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // LCV_FFV_N1-III_Euro-5__(P)
-        { 1.726e+03, 1.011e+01, 1.407e+02, 0.000e+00, 4.491e-03, 7.497e+01, 4.071e-01 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 2.766e-04, 0.000e+00, 6.653e-02 }, // CO
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.377e-06, 0.000e+00, 3.023e-04 }, // HC
-        { 5.596e+02, 3.278e+00, 4.563e+01, 0.000e+00, 1.456e-03, 2.430e+01, 1.320e-01 }, // FC
-        { 2.699e-01, 1.426e-03, 2.621e-01, 0.000e+00, 1.652e-07, 4.293e-03, 0.000e+00 }, // NOx
-        { 0.000e+00, 7.147e-03, 0.000e+00, 1.004e-05, 5.550e-07, 0.000e+00, 1.415e-04 }, // PM + PM (non-exhaust)
+        { 1.726e+03, 3.640e+01, 1.407e+02, 0.000e+00, 2.095e-01, 2.699e+02, 5.276e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.290e-02, 0.000e+00, 8.622e-01 }, // CO
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 6.425e-05, 0.000e+00, 3.918e-03 }, // HC
+        { 5.596e+02, 1.180e+01, 4.563e+01, 0.000e+00, 6.792e-02, 8.749e+01, 1.710e+00 }, // FC
+        { 2.699e-01, 5.134e-03, 2.621e-01, 0.000e+00, 7.707e-06, 1.545e-02, 0.000e+00 }, // NOx
+        { 0.000e+00, 2.573e-02, 0.000e+00, 1.301e-04, 2.589e-05, 0.000e+00, 1.834e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // LCV_FFV_N1-III_Euro-6__(E85)
-        { 1.702e+03, 9.910e+00, 1.638e+02, 0.000e+00, 4.429e-03, 7.295e+01, 4.102e-01 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.425e-04, 0.000e+00, 3.439e-02 }, // CO
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.788e-06, 0.000e+00, 3.935e-04 }, // HC
-        { 8.305e+02, 4.837e+00, 7.994e+01, 0.000e+00, 2.162e-03, 3.561e+01, 2.002e-01 }, // FC
-        { 2.997e-01, 1.584e-03, 2.945e-01, 0.000e+00, 1.825e-07, 4.730e-03, 0.000e+00 }, // NOx
-        { 0.000e+00, 7.147e-03, 0.000e+00, 1.003e-05, 5.557e-07, 0.000e+00, 1.418e-04 }, // PM + PM (non-exhaust)
+        { 1.702e+03, 3.567e+01, 1.638e+02, 0.000e+00, 2.066e-01, 2.626e+02, 5.317e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 6.649e-03, 0.000e+00, 4.456e-01 }, // CO
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 8.343e-05, 0.000e+00, 5.100e-03 }, // HC
+        { 8.305e+02, 1.741e+01, 7.994e+01, 0.000e+00, 1.009e-01, 1.282e+02, 2.595e+00 }, // FC
+        { 2.997e-01, 5.703e-03, 2.945e-01, 0.000e+00, 8.512e-06, 1.703e-02, 0.000e+00 }, // NOx
+        { 0.000e+00, 2.573e-02, 0.000e+00, 1.300e-04, 2.593e-05, 0.000e+00, 1.838e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // LCV_FFV_N1-III_Euro-6__(P)
-        { 1.664e+03, 9.691e+00, 1.602e+02, 0.000e+00, 4.331e-03, 7.134e+01, 4.012e-01 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 2.850e-04, 0.000e+00, 6.877e-02 }, // CO
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.376e-06, 0.000e+00, 3.027e-04 }, // HC
-        { 5.394e+02, 3.142e+00, 5.192e+01, 0.000e+00, 1.404e-03, 2.313e+01, 1.301e-01 }, // FC
-        { 2.997e-01, 1.584e-03, 2.945e-01, 0.000e+00, 1.825e-07, 4.730e-03, 0.000e+00 }, // NOx
-        { 0.000e+00, 7.147e-03, 0.000e+00, 1.003e-05, 5.557e-07, 0.000e+00, 1.418e-04 }, // PM + PM (non-exhaust)
+        { 1.664e+03, 3.489e+01, 1.602e+02, 0.000e+00, 2.021e-01, 2.568e+02, 5.199e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.330e-02, 0.000e+00, 8.913e-01 }, // CO
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 6.418e-05, 0.000e+00, 3.923e-03 }, // HC
+        { 5.394e+02, 1.131e+01, 5.192e+01, 0.000e+00, 6.551e-02, 8.326e+01, 1.686e+00 }, // FC
+        { 2.997e-01, 5.703e-03, 2.945e-01, 0.000e+00, 8.512e-06, 1.703e-02, 0.000e+00 }, // NOx
+        { 0.000e+00, 2.573e-02, 0.000e+00, 1.300e-04, 2.593e-05, 0.000e+00, 1.838e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
@@ -2231,8 +2231,8 @@
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // HC
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // NOx
-        { 0.000e+00, 7.200e-03, 0.000e+00, 9.387e-06, 0.000e+00, 0.000e+00, 2.206e-08 }, // PM + PM (non-exhaust)
-        { 1.013e+00, 1.824e-02, 1.220e+00, 0.000e+00, 4.206e-06, 7.637e-02, 3.698e-04 }, // FC_MJ
+        { 0.000e+00, 2.592e-02, 0.000e+00, 1.217e-04, 0.000e+00, 0.000e+00, 2.860e-07 }, // PM + PM (non-exhaust)
+        { 1.013e+00, 6.565e-02, 1.220e+00, 0.000e+00, 1.963e-04, 2.749e-01, 4.792e-03 }, // FC_MJ
     },
     {
         // LCV_BEV_N1-II
@@ -2241,8 +2241,8 @@
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // HC
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // NOx
-        { 0.000e+00, 7.182e-03, 0.000e+00, 9.591e-06, 0.000e+00, 0.000e+00, 1.620e-07 }, // PM + PM (non-exhaust)
-        { 1.165e+00, 1.911e-02, 1.282e+00, 0.000e+00, 5.841e-06, 9.309e-02, 5.148e-04 }, // FC_MJ
+        { 0.000e+00, 2.585e-02, 0.000e+00, 1.243e-04, 0.000e+00, 0.000e+00, 2.099e-06 }, // PM + PM (non-exhaust)
+        { 1.165e+00, 6.878e-02, 1.282e+00, 0.000e+00, 2.725e-04, 3.351e-01, 6.672e-03 }, // FC_MJ
     },
     {
         // LCV_BEV_N1-IIII
@@ -2251,8 +2251,8 @@
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // HC
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // NOx
-        { 0.000e+00, 7.159e-03, 0.000e+00, 9.859e-06, 0.000e+00, 0.000e+00, 3.744e-07 }, // PM + PM (non-exhaust)
-        { 1.284e+00, 2.966e-02, 1.271e+00, 0.000e+00, 7.376e-06, 1.429e-01, 6.750e-04 }, // FC_MJ
+        { 0.000e+00, 2.577e-02, 0.000e+00, 1.278e-04, 0.000e+00, 0.000e+00, 4.852e-06 }, // PM + PM (non-exhaust)
+        { 1.284e+00, 1.068e-01, 1.271e+00, 0.000e+00, 3.441e-04, 5.144e-01, 8.748e-03 }, // FC_MJ
     },
     {
         // LCV_PHEV_petrol_M+N1-I_Euro-5_(El)
@@ -2261,17 +2261,17 @@
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // HC
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // NOx
-        { 0.000e+00, 7.093e-03, 0.000e+00, 1.091e-05, 0.000e+00, 0.000e+00, 1.722e-06 }, // PM + PM (non-exhaust)
-        { 2.732e-01, 2.984e-02, 0.000e+00, 0.000e+00, 2.143e-06, 1.160e-01, 5.205e-05 }, // FC_MJ
+        { 0.000e+00, 2.553e-02, 0.000e+00, 1.415e-04, 0.000e+00, 0.000e+00, 2.232e-05 }, // PM + PM (non-exhaust)
+        { 2.732e-01, 1.074e-01, 0.000e+00, 0.000e+00, 9.997e-05, 4.178e-01, 6.746e-04 }, // FC_MJ
     },
     {
         // LCV_PHEV_petrol_M+N1-I_Euro-5_(P)
-        { 3.598e+02, 2.158e+01, 0.000e+00, 0.000e+00, 1.698e-03, 7.044e+01, 1.670e-01 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 2.484e-04, 1.325e-04, 0.000e+00, 3.476e-02 }, // CO
-        { 4.830e-03, 0.000e+00, 0.000e+00, 1.856e-05, 5.419e-07, 0.000e+00, 1.651e-04 }, // HC
-        { 1.166e+02, 6.996e+00, 0.000e+00, 0.000e+00, 5.504e-04, 2.284e+01, 5.415e-02 }, // FC
-        { 1.615e-01, 7.108e-04, 1.481e-01, 0.000e+00, 8.060e-08, 2.494e-03, 0.000e+00 }, // NOx
-        { 0.000e+00, 7.093e-03, 0.000e+00, 3.057e-05, 9.587e-08, 6.083e-04, 6.489e-05 }, // PM + PM (non-exhaust)
+        { 3.598e+02, 7.769e+01, 0.000e+00, 0.000e+00, 7.921e-02, 2.536e+02, 2.165e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 3.219e-03, 6.181e-03, 0.000e+00, 4.505e-01 }, // CO
+        { 4.830e-03, 0.000e+00, 0.000e+00, 2.405e-04, 2.528e-05, 0.000e+00, 2.140e-03 }, // HC
+        { 1.166e+02, 2.519e+01, 0.000e+00, 0.000e+00, 2.568e-02, 8.221e+01, 7.018e-01 }, // FC
+        { 1.615e-01, 2.559e-03, 1.481e-01, 0.000e+00, 3.761e-06, 8.979e-03, 0.000e+00 }, // NOx
+        { 0.000e+00, 2.553e-02, 0.000e+00, 3.962e-04, 4.473e-06, 2.190e-03, 8.410e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
@@ -2281,17 +2281,17 @@
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // HC
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // NOx
-        { 0.000e+00, 7.085e-03, 0.000e+00, 1.103e-05, 0.000e+00, 0.000e+00, 1.843e-06 }, // PM + PM (non-exhaust)
-        { 3.142e-01, 2.886e-02, 0.000e+00, 0.000e+00, 2.415e-06, 1.170e-01, 5.095e-05 }, // FC_MJ
+        { 0.000e+00, 2.551e-02, 0.000e+00, 1.429e-04, 0.000e+00, 0.000e+00, 2.388e-05 }, // PM + PM (non-exhaust)
+        { 3.142e-01, 1.039e-01, 0.000e+00, 0.000e+00, 1.127e-04, 4.212e-01, 6.603e-04 }, // FC_MJ
     },
     {
         // LCV_PHEV_petrol_M+N1-I_Euro-6_(P)
-        { 5.399e+02, 1.578e+01, 1.212e+03, 0.000e+00, 5.734e-04, 3.481e+01, 0.000e+00 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.493e-04, 0.000e+00, 3.800e-02 }, // CO
-        { 1.079e-02, 0.000e+00, 0.000e+00, 1.383e-05, 6.256e-07, 0.000e+00, 1.744e-04 }, // HC
-        { 1.750e+02, 5.117e+00, 3.929e+02, 0.000e+00, 1.859e-04, 1.128e+01, 0.000e+00 }, // FC
-        { 1.796e-01, 7.860e-04, 1.640e-01, 0.000e+00, 9.862e-08, 2.733e-03, 1.009e-06 }, // NOx
-        { 0.000e+00, 7.085e-03, 0.000e+00, 2.895e-05, 1.321e-07, 2.849e-04, 7.265e-05 }, // PM + PM (non-exhaust)
+        { 5.399e+02, 5.682e+01, 1.212e+03, 0.000e+00, 2.675e-02, 1.253e+02, 0.000e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 6.966e-03, 0.000e+00, 4.925e-01 }, // CO
+        { 1.079e-02, 0.000e+00, 0.000e+00, 1.792e-04, 2.919e-05, 0.000e+00, 2.261e-03 }, // HC
+        { 1.750e+02, 1.842e+01, 3.929e+02, 0.000e+00, 8.673e-03, 4.062e+01, 0.000e+00 }, // FC
+        { 1.796e-01, 2.830e-03, 1.640e-01, 0.000e+00, 4.601e-06, 9.839e-03, 1.308e-05 }, // NOx
+        { 0.000e+00, 2.551e-02, 0.000e+00, 3.752e-04, 6.165e-06, 1.026e-03, 9.415e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
@@ -2301,17 +2301,17 @@
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // HC
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // NOx
-        { 0.000e+00, 7.034e-03, 0.000e+00, 1.165e-05, 0.000e+00, 0.000e+00, 2.094e-06 }, // PM + PM (non-exhaust)
-        { 5.809e-01, 2.641e-02, 0.000e+00, 0.000e+00, 4.188e-06, 1.312e-01, 5.931e-05 }, // FC_MJ
+        { 0.000e+00, 2.532e-02, 0.000e+00, 1.509e-04, 0.000e+00, 0.000e+00, 2.714e-05 }, // PM + PM (non-exhaust)
+        { 5.809e-01, 9.509e-02, 0.000e+00, 0.000e+00, 1.954e-04, 4.722e-01, 7.686e-04 }, // FC_MJ
     },
     {
         // LCV_PHEV_petrol_N1-II_Euro-5_(P)
-        { 7.025e+02, 1.491e+01, 0.000e+00, 0.000e+00, 3.477e-03, 7.880e+01, 2.239e-01 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 2.205e-04, 0.000e+00, 5.069e-02 }, // CO
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.110e-06, 0.000e+00, 2.354e-04 }, // HC
-        { 2.277e+02, 4.832e+00, 0.000e+00, 0.000e+00, 1.127e-03, 2.555e+01, 7.257e-02 }, // FC
-        { 1.925e-01, 7.939e-04, 1.709e-01, 0.000e+00, 1.465e-07, 2.864e-03, 2.813e-06 }, // NOx
-        { 0.000e+00, 7.034e-03, 0.000e+00, 1.401e-05, 4.358e-07, 0.000e+00, 1.130e-04 }, // PM + PM (non-exhaust)
+        { 7.025e+02, 5.366e+01, 0.000e+00, 0.000e+00, 1.622e-01, 2.837e+02, 2.901e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.029e-02, 0.000e+00, 6.569e-01 }, // CO
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 5.181e-05, 0.000e+00, 3.051e-03 }, // HC
+        { 2.277e+02, 1.740e+01, 0.000e+00, 0.000e+00, 5.259e-02, 9.197e+01, 9.405e-01 }, // FC
+        { 1.925e-01, 2.858e-03, 1.709e-01, 0.000e+00, 6.837e-06, 1.031e-02, 3.646e-05 }, // NOx
+        { 0.000e+00, 2.532e-02, 0.000e+00, 1.816e-04, 2.033e-05, 0.000e+00, 1.464e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
@@ -2321,17 +2321,17 @@
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // HC
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // NOx
-        { 0.000e+00, 7.054e-03, 0.000e+00, 1.137e-05, 0.000e+00, 0.000e+00, 1.921e-06 }, // PM + PM (non-exhaust)
-        { 5.136e-01, 2.782e-02, 0.000e+00, 0.000e+00, 3.753e-06, 1.283e-01, 8.219e-05 }, // FC_MJ
+        { 0.000e+00, 2.539e-02, 0.000e+00, 1.474e-04, 0.000e+00, 0.000e+00, 2.490e-05 }, // PM + PM (non-exhaust)
+        { 5.136e-01, 1.001e-01, 0.000e+00, 0.000e+00, 1.751e-04, 4.619e-01, 1.065e-03 }, // FC_MJ
     },
     {
         // LCV_PHEV_petrol_N1-II_Euro-6_(P)
-        { 6.586e+02, 1.747e+01, 1.363e+03, 0.000e+00, 8.346e-04, 3.792e+01, 0.000e+00 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.967e-04, 0.000e+00, 4.664e-02 }, // CO
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 9.845e-07, 0.000e+00, 2.144e-04 }, // HC
-        { 2.135e+02, 5.664e+00, 4.420e+02, 0.000e+00, 2.706e-04, 1.229e+01, 0.000e+00 }, // FC
-        { 2.075e-01, 9.029e-04, 1.874e-01, 0.000e+00, 1.451e-07, 3.168e-03, 1.282e-06 }, // NOx
-        { 0.000e+00, 7.054e-03, 0.000e+00, 1.754e-05, 3.278e-07, 0.000e+00, 9.613e-05 }, // PM + PM (non-exhaust)
+        { 6.586e+02, 6.290e+01, 1.363e+03, 0.000e+00, 3.894e-02, 1.365e+02, 0.000e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 9.179e-03, 0.000e+00, 6.045e-01 }, // CO
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 4.593e-05, 0.000e+00, 2.779e-03 }, // HC
+        { 2.135e+02, 2.039e+01, 4.420e+02, 0.000e+00, 1.262e-02, 4.426e+01, 0.000e+00 }, // FC
+        { 2.075e-01, 3.250e-03, 1.874e-01, 0.000e+00, 6.768e-06, 1.140e-02, 1.661e-05 }, // NOx
+        { 0.000e+00, 2.539e-02, 0.000e+00, 2.273e-04, 1.529e-05, 0.000e+00, 1.246e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
@@ -2341,17 +2341,17 @@
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // HC
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // NOx
-        { 0.000e+00, 7.061e-03, 0.000e+00, 1.129e-05, 0.000e+00, 0.000e+00, 1.897e-06 }, // PM + PM (non-exhaust)
-        { 6.050e-01, 4.633e-02, 0.000e+00, 0.000e+00, 5.182e-06, 1.849e-01, 2.054e-04 }, // FC_MJ
+        { 0.000e+00, 2.542e-02, 0.000e+00, 1.464e-04, 0.000e+00, 0.000e+00, 2.459e-05 }, // PM + PM (non-exhaust)
+        { 6.050e-01, 1.668e-01, 0.000e+00, 0.000e+00, 2.418e-04, 6.658e-01, 2.662e-03 }, // FC_MJ
     },
     {
         // LCV_PHEV_petrol_N1-III_Euro-5_(P)
-        { 9.913e+02, 2.466e+01, 0.000e+00, 0.000e+00, 4.284e-03, 1.121e+02, 3.289e-01 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 2.796e-04, 0.000e+00, 6.807e-02 }, // CO
-        { 4.732e-03, 0.000e+00, 0.000e+00, 0.000e+00, 1.431e-06, 0.000e+00, 3.219e-04 }, // HC
-        { 3.214e+02, 7.993e+00, 0.000e+00, 0.000e+00, 1.389e-03, 3.634e+01, 1.066e-01 }, // FC
-        { 2.791e-01, 1.158e-03, 2.547e-01, 0.000e+00, 1.845e-07, 4.117e-03, 3.762e-06 }, // NOx
-        { 0.000e+00, 7.061e-03, 0.000e+00, 2.867e-05, 4.095e-07, 0.000e+00, 1.429e-04 }, // PM + PM (non-exhaust)
+        { 9.913e+02, 8.876e+01, 0.000e+00, 0.000e+00, 1.999e-01, 4.035e+02, 4.262e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.305e-02, 0.000e+00, 8.822e-01 }, // CO
+        { 4.732e-03, 0.000e+00, 0.000e+00, 0.000e+00, 6.678e-05, 0.000e+00, 4.172e-03 }, // HC
+        { 3.214e+02, 2.877e+01, 0.000e+00, 0.000e+00, 6.479e-02, 1.308e+02, 1.382e+00 }, // FC
+        { 2.791e-01, 4.170e-03, 2.547e-01, 0.000e+00, 8.608e-06, 1.482e-02, 4.875e-05 }, // NOx
+        { 0.000e+00, 2.542e-02, 0.000e+00, 3.716e-04, 1.911e-05, 0.000e+00, 1.853e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
@@ -2361,17 +2361,17 @@
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // HC
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // NOx
-        { 0.000e+00, 7.060e-03, 0.000e+00, 1.130e-05, 0.000e+00, 0.000e+00, 1.920e-06 }, // PM + PM (non-exhaust)
-        { 6.126e-01, 4.592e-02, 0.000e+00, 0.000e+00, 5.190e-06, 1.842e-01, 2.147e-04 }, // FC_MJ
+        { 0.000e+00, 2.542e-02, 0.000e+00, 1.465e-04, 0.000e+00, 0.000e+00, 2.489e-05 }, // PM + PM (non-exhaust)
+        { 6.126e-01, 1.653e-01, 0.000e+00, 0.000e+00, 2.422e-04, 6.630e-01, 2.782e-03 }, // FC_MJ
     },
     {
         // LCV_PHEV_petrol_N1-III_Euro-6_(P)
-        { 1.046e+03, 2.401e+01, 2.285e+03, 0.000e+00, 1.199e-03, 4.977e+01, 0.000e+00 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 2.842e-04, 0.000e+00, 6.968e-02 }, // CO
-        { 1.252e-02, 0.000e+00, 0.000e+00, 0.000e+00, 1.409e-06, 0.000e+00, 3.201e-04 }, // HC
-        { 3.392e+02, 7.783e+00, 7.408e+02, 0.000e+00, 3.887e-04, 1.613e+01, 0.000e+00 }, // FC
-        { 3.083e-01, 1.330e-03, 2.765e-01, 0.000e+00, 1.981e-07, 4.857e-03, 1.700e-06 }, // NOx
-        { 0.000e+00, 7.060e-03, 0.000e+00, 3.062e-05, 3.857e-07, 0.000e+00, 1.414e-04 }, // PM + PM (non-exhaust)
+        { 1.046e+03, 8.643e+01, 2.285e+03, 0.000e+00, 5.594e-02, 1.792e+02, 0.000e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.326e-02, 0.000e+00, 9.031e-01 }, // CO
+        { 1.252e-02, 0.000e+00, 0.000e+00, 0.000e+00, 6.575e-05, 0.000e+00, 4.148e-03 }, // HC
+        { 3.392e+02, 2.802e+01, 7.408e+02, 0.000e+00, 1.813e-02, 5.809e+01, 0.000e+00 }, // FC
+        { 3.083e-01, 4.788e-03, 2.765e-01, 0.000e+00, 9.244e-06, 1.748e-02, 2.203e-05 }, // NOx
+        { 0.000e+00, 2.542e-02, 0.000e+00, 3.969e-04, 1.799e-05, 0.000e+00, 1.833e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
@@ -2381,17 +2381,17 @@
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // HC
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // NOx
-        { 0.000e+00, 7.099e-03, 0.000e+00, 1.075e-05, 0.000e+00, 0.000e+00, 1.424e-06 }, // PM + PM (non-exhaust)
-        { 4.963e-01, 2.786e-02, 0.000e+00, 0.000e+00, 2.150e-06, 1.199e-01, 0.000e+00 }, // FC_MJ
+        { 0.000e+00, 2.556e-02, 0.000e+00, 1.393e-04, 0.000e+00, 0.000e+00, 1.846e-05 }, // PM + PM (non-exhaust)
+        { 4.963e-01, 1.003e-01, 0.000e+00, 0.000e+00, 1.003e-04, 4.316e-01, 0.000e+00 }, // FC_MJ
     },
     {
         // LCV_PHEV_diesel_M+N1-I_Euro-5_(D)
-        { 4.164e+02, 1.951e+01, 0.000e+00, 0.000e+00, 1.682e-03, 6.774e+01, 1.596e-01 }, // CO2(total)
+        { 4.164e+02, 7.024e+01, 0.000e+00, 0.000e+00, 7.850e-02, 2.439e+02, 2.068e+00 }, // CO2(total)
         { 3.836e-01, 0.000e+00, 2.930e-01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 1.125e-01, 0.000e+00, 5.217e-02, 0.000e+00, 7.387e-08, 0.000e+00, 0.000e+00 }, // HC
-        { 1.338e+02, 6.270e+00, 0.000e+00, 0.000e+00, 5.407e-04, 2.177e+01, 5.128e-02 }, // FC
-        { 3.627e+00, 1.501e-01, 0.000e+00, 0.000e+00, 2.265e-05, 3.571e-01, 3.674e-03 }, // NOx
-        { 2.819e-02, 7.099e-03, 0.000e+00, 1.075e-05, 4.074e-08, 5.737e-04, 1.960e-06 }, // PM + PM (non-exhaust)
+        { 1.125e-01, 0.000e+00, 5.217e-02, 0.000e+00, 3.446e-06, 0.000e+00, 0.000e+00 }, // HC
+        { 1.338e+02, 2.257e+01, 0.000e+00, 0.000e+00, 2.523e-02, 7.838e+01, 6.646e-01 }, // FC
+        { 3.627e+00, 5.404e-01, 0.000e+00, 0.000e+00, 1.057e-03, 1.286e+00, 4.761e-02 }, // NOx
+        { 2.819e-02, 2.556e-02, 0.000e+00, 1.393e-04, 1.901e-06, 2.065e-03, 2.540e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
@@ -2401,17 +2401,17 @@
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // HC
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // NOx
-        { 0.000e+00, 7.079e-03, 0.000e+00, 1.103e-05, 0.000e+00, 0.000e+00, 1.659e-06 }, // PM + PM (non-exhaust)
-        { 5.930e-01, 2.602e-02, 4.886e-02, 0.000e+00, 2.707e-06, 1.212e-01, 0.000e+00 }, // FC_MJ
+        { 0.000e+00, 2.548e-02, 0.000e+00, 1.429e-04, 0.000e+00, 0.000e+00, 2.151e-05 }, // PM + PM (non-exhaust)
+        { 5.930e-01, 9.368e-02, 4.886e-02, 0.000e+00, 1.263e-04, 4.364e-01, 0.000e+00 }, // FC_MJ
     },
     {
         // LCV_PHEV_diesel_M+N1-I_Euro-6_(D)
-        { 5.308e+02, 1.661e+01, 0.000e+00, 0.000e+00, 2.098e-03, 6.813e+01, 1.616e-01 }, // CO2(total)
-        { 7.494e-02, 5.082e-03, 3.344e-01, 0.000e+00, 0.000e+00, 4.752e-04, 0.000e+00 }, // CO
-        { 8.660e-02, 3.918e-03, 4.193e-01, 0.000e+00, 0.000e+00, 2.898e-03, 0.000e+00 }, // HC
-        { 1.706e+02, 5.337e+00, 0.000e+00, 0.000e+00, 6.742e-04, 2.190e+01, 5.193e-02 }, // FC
-        { 0.000e+00, 1.070e-02, 0.000e+00, 1.771e-04, 7.334e-07, 4.896e-02, 1.464e-04 }, // NOx
-        { 0.000e+00, 7.079e-03, 0.000e+00, 1.103e-05, 1.101e-06, 8.342e-03, 1.659e-06 }, // PM + PM (non-exhaust)
+        { 5.308e+02, 5.979e+01, 0.000e+00, 0.000e+00, 9.788e-02, 2.453e+02, 2.094e+00 }, // CO2(total)
+        { 7.494e-02, 1.830e-02, 3.344e-01, 0.000e+00, 0.000e+00, 1.711e-03, 0.000e+00 }, // CO
+        { 8.660e-02, 1.410e-02, 4.193e-01, 0.000e+00, 0.000e+00, 1.043e-02, 0.000e+00 }, // HC
+        { 1.706e+02, 1.921e+01, 0.000e+00, 0.000e+00, 3.146e-02, 7.882e+01, 6.730e-01 }, // FC
+        { 0.000e+00, 3.850e-02, 0.000e+00, 2.295e-03, 3.422e-05, 1.762e-01, 1.897e-03 }, // NOx
+        { 0.000e+00, 2.548e-02, 0.000e+00, 1.429e-04, 5.139e-05, 3.003e-02, 2.151e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
@@ -2421,17 +2421,17 @@
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // HC
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // NOx
-        { 0.000e+00, 7.045e-03, 0.000e+00, 1.146e-05, 0.000e+00, 0.000e+00, 1.900e-06 }, // PM + PM (non-exhaust)
-        { 7.460e-01, 3.121e-02, 4.248e-01, 0.000e+00, 3.957e-06, 1.395e-01, 0.000e+00 }, // FC_MJ
+        { 0.000e+00, 2.536e-02, 0.000e+00, 1.486e-04, 0.000e+00, 0.000e+00, 2.462e-05 }, // PM + PM (non-exhaust)
+        { 7.460e-01, 1.123e-01, 4.248e-01, 0.000e+00, 1.846e-04, 5.023e-01, 0.000e+00 }, // FC_MJ
     },
     {
         // LCV_PHEV_diesel_N1-II_Euro-5_(D)
-        { 8.222e+02, 1.606e+01, 0.000e+00, 0.000e+00, 3.330e-03, 8.802e+01, 1.613e-01 }, // CO2(total)
+        { 8.222e+02, 5.781e+01, 0.000e+00, 0.000e+00, 1.554e-01, 3.169e+02, 2.090e+00 }, // CO2(total)
         { 6.252e-02, 0.000e+00, 5.307e-02, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 1.699e-01, 6.182e-05, 3.693e-02, 4.854e-06, 0.000e+00, 0.000e+00, 0.000e+00 }, // HC
-        { 2.643e+02, 5.160e+00, 0.000e+00, 0.000e+00, 1.070e-03, 2.829e+01, 5.182e-02 }, // FC
-        { 6.916e+00, 2.974e-02, 0.000e+00, 0.000e+00, 3.041e-05, 1.524e-01, 6.480e-03 }, // NOx
-        { 7.422e-03, 7.101e-03, 5.025e-03, 1.146e-05, 1.149e-08, 0.000e+00, 4.181e-06 }, // PM + PM (non-exhaust)
+        { 1.699e-01, 2.225e-04, 3.693e-02, 6.291e-05, 0.000e+00, 0.000e+00, 0.000e+00 }, // HC
+        { 2.643e+02, 1.858e+01, 0.000e+00, 0.000e+00, 4.994e-02, 1.018e+02, 6.716e-01 }, // FC
+        { 6.916e+00, 1.071e-01, 0.000e+00, 0.000e+00, 1.419e-03, 5.488e-01, 8.398e-02 }, // NOx
+        { 7.422e-03, 2.556e-02, 5.025e-03, 1.486e-04, 5.360e-07, 0.000e+00, 5.419e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
@@ -2441,17 +2441,17 @@
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // HC
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // NOx
-        { 0.000e+00, 7.061e-03, 0.000e+00, 1.122e-05, 0.000e+00, 0.000e+00, 1.693e-06 }, // PM + PM (non-exhaust)
-        { 9.103e-01, 2.682e-02, 3.682e-01, 0.000e+00, 4.056e-06, 1.378e-01, 0.000e+00 }, // FC_MJ
+        { 0.000e+00, 2.542e-02, 0.000e+00, 1.455e-04, 0.000e+00, 0.000e+00, 2.195e-05 }, // PM + PM (non-exhaust)
+        { 9.103e-01, 9.656e-02, 3.682e-01, 0.000e+00, 1.893e-04, 4.959e-01, 0.000e+00 }, // FC_MJ
     },
     {
         // LCV_PHEV_diesel_N1-II_Euro-6_(D)
-        { 8.890e+02, 1.741e+01, 0.000e+00, 0.000e+00, 3.465e-03, 9.306e+01, 1.817e-01 }, // CO2(total)
-        { 7.321e-02, 5.033e-03, 3.483e-01, 0.000e+00, 0.000e+00, 7.812e-05, 0.000e+00 }, // CO
-        { 7.019e-02, 4.182e-03, 4.471e-01, 0.000e+00, 0.000e+00, 2.329e-03, 0.000e+00 }, // HC
-        { 2.857e+02, 5.596e+00, 0.000e+00, 0.000e+00, 1.114e-03, 2.991e+01, 5.838e-02 }, // FC
-        { 0.000e+00, 1.043e-02, 0.000e+00, 1.176e-04, 1.489e-06, 4.122e-02, 2.506e-04 }, // NOx
-        { 0.000e+00, 7.061e-03, 3.044e-01, 1.122e-05, 1.035e-06, 1.981e-03, 1.693e-06 }, // PM + PM (non-exhaust)
+        { 8.890e+02, 6.269e+01, 0.000e+00, 0.000e+00, 1.617e-01, 3.350e+02, 2.354e+00 }, // CO2(total)
+        { 7.321e-02, 1.812e-02, 3.483e-01, 0.000e+00, 0.000e+00, 2.812e-04, 0.000e+00 }, // CO
+        { 7.019e-02, 1.506e-02, 4.471e-01, 0.000e+00, 0.000e+00, 8.384e-03, 0.000e+00 }, // HC
+        { 2.857e+02, 2.015e+01, 0.000e+00, 0.000e+00, 5.195e-02, 1.077e+02, 7.567e-01 }, // FC
+        { 0.000e+00, 3.755e-02, 0.000e+00, 1.524e-03, 6.949e-05, 1.484e-01, 3.247e-03 }, // NOx
+        { 0.000e+00, 2.542e-02, 3.044e-01, 1.455e-04, 4.831e-05, 7.130e-03, 2.195e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
@@ -2461,17 +2461,17 @@
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // HC
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // NOx
-        { 0.000e+00, 7.072e-03, 0.000e+00, 1.109e-05, 0.000e+00, 0.000e+00, 1.633e-06 }, // PM + PM (non-exhaust)
-        { 1.059e+00, 4.242e-02, 1.420e-01, 0.000e+00, 5.102e-06, 1.962e-01, 0.000e+00 }, // FC_MJ
+        { 0.000e+00, 2.546e-02, 0.000e+00, 1.437e-04, 0.000e+00, 0.000e+00, 2.116e-05 }, // PM + PM (non-exhaust)
+        { 1.059e+00, 1.527e-01, 1.420e-01, 0.000e+00, 2.380e-04, 7.064e-01, 0.000e+00 }, // FC_MJ
     },
     {
         // LCV_PHEV_diesel_N1-III_Euro-5_(D)
-        { 1.216e+03, 2.592e+01, 0.000e+00, 0.000e+00, 4.351e-03, 1.281e+02, 2.279e-01 }, // CO2(total)
-        { 1.194e-01, 0.000e+00, 1.070e-01, 0.000e+00, 7.340e-08, 0.000e+00, 1.896e-05 }, // CO
-        { 7.199e-02, 2.273e-04, 5.651e-03, 8.849e-07, 0.000e+00, 0.000e+00, 0.000e+00 }, // HC
-        { 3.909e+02, 8.330e+00, 0.000e+00, 0.000e+00, 1.398e-03, 4.116e+01, 7.326e-02 }, // FC
-        { 7.420e+00, 0.000e+00, 0.000e+00, 0.000e+00, 3.365e-05, 1.446e-01, 6.897e-03 }, // NOx
-        { 2.252e-02, 7.147e-03, 0.000e+00, 1.109e-05, 1.655e-08, 1.955e-04, 1.841e-06 }, // PM + PM (non-exhaust)
+        { 1.216e+03, 9.331e+01, 0.000e+00, 0.000e+00, 2.030e-01, 4.611e+02, 2.954e+00 }, // CO2(total)
+        { 1.194e-01, 0.000e+00, 1.070e-01, 0.000e+00, 3.424e-06, 0.000e+00, 2.457e-04 }, // CO
+        { 7.199e-02, 8.182e-04, 5.651e-03, 1.147e-05, 0.000e+00, 0.000e+00, 0.000e+00 }, // HC
+        { 3.909e+02, 2.999e+01, 0.000e+00, 0.000e+00, 6.525e-02, 1.482e+02, 9.494e-01 }, // FC
+        { 7.420e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.570e-03, 5.207e-01, 8.938e-02 }, // NOx
+        { 2.252e-02, 2.573e-02, 0.000e+00, 1.437e-04, 7.723e-07, 7.039e-04, 2.387e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
@@ -2481,17 +2481,17 @@
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // HC
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // NOx
-        { 0.000e+00, 7.084e-03, 0.000e+00, 1.090e-05, 0.000e+00, 0.000e+00, 1.439e-06 }, // PM + PM (non-exhaust)
-        { 9.580e-01, 4.371e-02, 0.000e+00, 0.000e+00, 5.030e-06, 1.986e-01, 2.200e-06 }, // FC_MJ
+        { 0.000e+00, 2.550e-02, 0.000e+00, 1.412e-04, 0.000e+00, 0.000e+00, 1.865e-05 }, // PM + PM (non-exhaust)
+        { 9.580e-01, 1.574e-01, 0.000e+00, 0.000e+00, 2.347e-04, 7.151e-01, 2.851e-05 }, // FC_MJ
     },
     {
         // LCV_PHEV_diesel_N1-III_Euro-6_(D)
-        { 1.277e+03, 2.470e+01, 0.000e+00, 0.000e+00, 4.374e-03, 1.266e+02, 2.351e-01 }, // CO2(total)
-        { 5.373e-02, 5.344e-03, 3.012e-01, 0.000e+00, 0.000e+00, 1.093e-03, 0.000e+00 }, // CO
-        { 6.316e-02, 4.267e-03, 3.936e-01, 0.000e+00, 0.000e+00, 3.616e-03, 0.000e+00 }, // HC
-        { 4.102e+02, 7.938e+00, 0.000e+00, 0.000e+00, 1.406e-03, 4.070e+01, 7.557e-02 }, // FC
-        { 0.000e+00, 8.233e-03, 0.000e+00, 1.663e-04, 9.436e-07, 4.126e-02, 1.954e-04 }, // NOx
-        { 0.000e+00, 7.084e-03, 2.689e-01, 1.090e-05, 1.033e-06, 1.923e-03, 1.439e-06 }, // PM + PM (non-exhaust)
+        { 1.277e+03, 8.892e+01, 0.000e+00, 0.000e+00, 2.041e-01, 4.559e+02, 3.047e+00 }, // CO2(total)
+        { 5.373e-02, 1.924e-02, 3.012e-01, 0.000e+00, 0.000e+00, 3.933e-03, 0.000e+00 }, // CO
+        { 6.316e-02, 1.536e-02, 3.936e-01, 0.000e+00, 0.000e+00, 1.302e-02, 0.000e+00 }, // HC
+        { 4.102e+02, 2.858e+01, 0.000e+00, 0.000e+00, 6.559e-02, 1.465e+02, 9.793e-01 }, // FC
+        { 0.000e+00, 2.964e-02, 0.000e+00, 2.155e-03, 4.403e-05, 1.485e-01, 2.533e-03 }, // NOx
+        { 0.000e+00, 2.550e-02, 2.689e-01, 1.412e-04, 4.821e-05, 6.923e-03, 1.865e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
@@ -2499,699 +2499,699 @@
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO2(total)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // HC
-        { 7.114e+01, 1.643e+00, 7.037e+01, 0.000e+00, 4.085e-04, 7.915e+00, 3.738e-02 }, // FC
+        { 7.114e+01, 5.914e+00, 7.037e+01, 0.000e+00, 1.906e-02, 2.849e+01, 4.845e-01 }, // FC
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // NOx
-        { 0.000e+00, 7.159e-03, 0.000e+00, 9.859e-06, 0.000e+00, 0.000e+00, 3.744e-07 }, // PM + PM (non-exhaust)
+        { 0.000e+00, 2.577e-02, 0.000e+00, 1.278e-04, 0.000e+00, 0.000e+00, 4.852e-06 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // Coach_Std_le18t_50ties
-        { 3.820e+03, 1.501e+02, 0.000e+00, 7.595e-01, 0.000e+00, 5.895e+02, 4.710e-02 }, // CO2(total)
-        { 2.777e+01, 1.358e-01, 1.976e+01, 0.000e+00, 1.494e-06, 4.042e-01, 0.000e+00 }, // CO
-        { 9.746e+00, 0.000e+00, 4.569e+00, 0.000e+00, 1.904e-06, 1.271e-02, 1.560e-04 }, // HC
-        { 1.228e+03, 4.823e+01, 0.000e+00, 2.441e-01, 0.000e+00, 1.895e+02, 1.514e-02 }, // FC
-        { 4.784e+01, 2.486e+00, 0.000e+00, 1.022e-02, 0.000e+00, 8.762e+00, 2.733e-03 }, // NOx
-        { 6.597e+00, 3.386e-02, 1.141e+00, 3.251e-04, 1.291e-06, 1.467e-01, 1.031e-05 }, // PM + PM (non-exhaust)
+        { 3.820e+03, 5.403e+02, 0.000e+00, 9.843e+00, 0.000e+00, 2.122e+03, 6.104e-01 }, // CO2(total)
+        { 2.777e+01, 4.890e-01, 1.976e+01, 0.000e+00, 6.969e-05, 1.455e+00, 0.000e+00 }, // CO
+        { 9.746e+00, 0.000e+00, 4.569e+00, 0.000e+00, 8.883e-05, 4.576e-02, 2.021e-03 }, // HC
+        { 1.228e+03, 1.736e+02, 0.000e+00, 3.163e+00, 0.000e+00, 6.820e+02, 1.962e-01 }, // FC
+        { 4.784e+01, 8.948e+00, 0.000e+00, 1.324e-01, 0.000e+00, 3.154e+01, 3.542e-02 }, // NOx
+        { 6.597e+00, 1.219e-01, 1.141e+00, 4.213e-03, 6.024e-05, 5.283e-01, 1.336e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // Coach_Std_le18t_60ties
-        { 3.820e+03, 1.501e+02, 0.000e+00, 7.595e-01, 0.000e+00, 5.895e+02, 4.710e-02 }, // CO2(total)
-        { 2.777e+01, 1.358e-01, 1.976e+01, 0.000e+00, 1.494e-06, 4.042e-01, 0.000e+00 }, // CO
-        { 9.746e+00, 0.000e+00, 4.569e+00, 0.000e+00, 1.904e-06, 1.271e-02, 1.560e-04 }, // HC
-        { 1.228e+03, 4.823e+01, 0.000e+00, 2.441e-01, 0.000e+00, 1.895e+02, 1.514e-02 }, // FC
-        { 4.784e+01, 2.486e+00, 0.000e+00, 1.022e-02, 0.000e+00, 8.762e+00, 2.733e-03 }, // NOx
-        { 6.597e+00, 3.386e-02, 1.141e+00, 3.251e-04, 1.291e-06, 1.467e-01, 1.031e-05 }, // PM + PM (non-exhaust)
+        { 3.820e+03, 5.403e+02, 0.000e+00, 9.843e+00, 0.000e+00, 2.122e+03, 6.104e-01 }, // CO2(total)
+        { 2.777e+01, 4.890e-01, 1.976e+01, 0.000e+00, 6.969e-05, 1.455e+00, 0.000e+00 }, // CO
+        { 9.746e+00, 0.000e+00, 4.569e+00, 0.000e+00, 8.883e-05, 4.576e-02, 2.021e-03 }, // HC
+        { 1.228e+03, 1.736e+02, 0.000e+00, 3.163e+00, 0.000e+00, 6.820e+02, 1.962e-01 }, // FC
+        { 4.784e+01, 8.948e+00, 0.000e+00, 1.324e-01, 0.000e+00, 3.154e+01, 3.542e-02 }, // NOx
+        { 6.597e+00, 1.219e-01, 1.141e+00, 4.213e-03, 6.024e-05, 5.283e-01, 1.336e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // Coach_Std_le18t_70ties
-        { 3.820e+03, 1.501e+02, 0.000e+00, 7.595e-01, 0.000e+00, 5.895e+02, 4.710e-02 }, // CO2(total)
-        { 2.777e+01, 1.358e-01, 1.976e+01, 0.000e+00, 1.494e-06, 4.042e-01, 0.000e+00 }, // CO
-        { 9.746e+00, 0.000e+00, 4.569e+00, 0.000e+00, 1.904e-06, 1.271e-02, 1.560e-04 }, // HC
-        { 1.228e+03, 4.823e+01, 0.000e+00, 2.441e-01, 0.000e+00, 1.895e+02, 1.514e-02 }, // FC
-        { 4.784e+01, 2.486e+00, 0.000e+00, 1.022e-02, 0.000e+00, 8.762e+00, 2.733e-03 }, // NOx
-        { 6.597e+00, 3.386e-02, 1.141e+00, 3.251e-04, 1.291e-06, 1.467e-01, 1.031e-05 }, // PM + PM (non-exhaust)
+        { 3.820e+03, 5.403e+02, 0.000e+00, 9.843e+00, 0.000e+00, 2.122e+03, 6.104e-01 }, // CO2(total)
+        { 2.777e+01, 4.890e-01, 1.976e+01, 0.000e+00, 6.969e-05, 1.455e+00, 0.000e+00 }, // CO
+        { 9.746e+00, 0.000e+00, 4.569e+00, 0.000e+00, 8.883e-05, 4.576e-02, 2.021e-03 }, // HC
+        { 1.228e+03, 1.736e+02, 0.000e+00, 3.163e+00, 0.000e+00, 6.820e+02, 1.962e-01 }, // FC
+        { 4.784e+01, 8.948e+00, 0.000e+00, 1.324e-01, 0.000e+00, 3.154e+01, 3.542e-02 }, // NOx
+        { 6.597e+00, 1.219e-01, 1.141e+00, 4.213e-03, 6.024e-05, 5.283e-01, 1.336e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // Coach_Std_le18t_80ties
-        { 3.820e+03, 1.501e+02, 0.000e+00, 7.595e-01, 0.000e+00, 5.895e+02, 4.710e-02 }, // CO2(total)
-        { 2.777e+01, 1.358e-01, 1.976e+01, 0.000e+00, 1.494e-06, 4.042e-01, 0.000e+00 }, // CO
-        { 9.746e+00, 0.000e+00, 4.569e+00, 0.000e+00, 1.904e-06, 1.271e-02, 1.560e-04 }, // HC
-        { 1.228e+03, 4.823e+01, 0.000e+00, 2.441e-01, 0.000e+00, 1.895e+02, 1.514e-02 }, // FC
-        { 4.784e+01, 2.486e+00, 0.000e+00, 1.022e-02, 0.000e+00, 8.762e+00, 2.733e-03 }, // NOx
-        { 6.597e+00, 3.386e-02, 1.141e+00, 3.251e-04, 1.291e-06, 1.467e-01, 1.031e-05 }, // PM + PM (non-exhaust)
+        { 3.820e+03, 5.403e+02, 0.000e+00, 9.843e+00, 0.000e+00, 2.122e+03, 6.104e-01 }, // CO2(total)
+        { 2.777e+01, 4.890e-01, 1.976e+01, 0.000e+00, 6.969e-05, 1.455e+00, 0.000e+00 }, // CO
+        { 9.746e+00, 0.000e+00, 4.569e+00, 0.000e+00, 8.883e-05, 4.576e-02, 2.021e-03 }, // HC
+        { 1.228e+03, 1.736e+02, 0.000e+00, 3.163e+00, 0.000e+00, 6.820e+02, 1.962e-01 }, // FC
+        { 4.784e+01, 8.948e+00, 0.000e+00, 1.324e-01, 0.000e+00, 3.154e+01, 3.542e-02 }, // NOx
+        { 6.597e+00, 1.219e-01, 1.141e+00, 4.213e-03, 6.024e-05, 5.283e-01, 1.336e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // Coach_Std_le18t_Euro-I
-        { 3.225e+03, 1.666e+02, 0.000e+00, 5.384e-01, 0.000e+00, 5.728e+02, 0.000e+00 }, // CO2(total)
-        { 1.395e+01, 2.851e-01, 0.000e+00, 4.183e-04, 0.000e+00, 8.524e-01, 4.968e-04 }, // CO
-        { 8.721e+00, 0.000e+00, 3.548e+00, 0.000e+00, 2.591e-06, 9.159e-02, 1.409e-04 }, // HC
-        { 1.037e+03, 5.353e+01, 0.000e+00, 1.730e-01, 0.000e+00, 1.841e+02, 0.000e+00 }, // FC
-        { 3.317e+01, 2.000e+00, 0.000e+00, 3.449e-03, 0.000e+00, 6.024e+00, 0.000e+00 }, // NOx
-        { 6.240e+00, 0.000e+00, 0.000e+00, 4.720e-04, 1.406e-06, 1.074e-01, 3.713e-04 }, // PM + PM (non-exhaust)
+        { 3.225e+03, 5.996e+02, 0.000e+00, 6.978e+00, 0.000e+00, 2.062e+03, 0.000e+00 }, // CO2(total)
+        { 1.395e+01, 1.026e+00, 0.000e+00, 5.421e-03, 0.000e+00, 3.069e+00, 6.439e-03 }, // CO
+        { 8.721e+00, 0.000e+00, 3.548e+00, 0.000e+00, 1.209e-04, 3.297e-01, 1.826e-03 }, // HC
+        { 1.037e+03, 1.927e+02, 0.000e+00, 2.242e+00, 0.000e+00, 6.627e+02, 0.000e+00 }, // FC
+        { 3.317e+01, 7.200e+00, 0.000e+00, 4.470e-02, 0.000e+00, 2.168e+01, 0.000e+00 }, // NOx
+        { 6.240e+00, 0.000e+00, 0.000e+00, 6.116e-03, 6.562e-05, 3.867e-01, 4.812e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // Coach_Std_le18t_Euro-II
-        { 2.132e+03, 2.096e+02, 6.397e+02, 4.543e-02, 0.000e+00, 5.322e+02, 0.000e+00 }, // CO2(total)
-        { 1.302e+01, 1.810e-01, 1.034e+01, 0.000e+00, 0.000e+00, 4.531e-01, 0.000e+00 }, // CO
-        { 5.507e+00, 0.000e+00, 3.037e+00, 0.000e+00, 1.513e-06, 1.364e-02, 4.158e-04 }, // HC
-        { 6.851e+02, 6.737e+01, 2.056e+02, 1.460e-02, 0.000e+00, 1.710e+02, 0.000e+00 }, // FC
-        { 3.753e+01, 2.187e+00, 3.710e+01, 2.149e-04, 0.000e+00, 5.325e+00, 0.000e+00 }, // NOx
-        { 2.810e+00, 2.461e-02, 1.079e+00, 9.507e-05, 1.309e-06, 5.533e-02, 1.349e-05 }, // PM + PM (non-exhaust)
+        { 2.132e+03, 7.547e+02, 6.397e+02, 5.888e-01, 0.000e+00, 1.916e+03, 0.000e+00 }, // CO2(total)
+        { 1.302e+01, 6.516e-01, 1.034e+01, 0.000e+00, 0.000e+00, 1.631e+00, 0.000e+00 }, // CO
+        { 5.507e+00, 0.000e+00, 3.037e+00, 0.000e+00, 7.057e-05, 4.911e-02, 5.389e-03 }, // HC
+        { 6.851e+02, 2.425e+02, 2.056e+02, 1.892e-01, 0.000e+00, 6.157e+02, 0.000e+00 }, // FC
+        { 3.753e+01, 7.872e+00, 3.710e+01, 2.785e-03, 0.000e+00, 1.917e+01, 0.000e+00 }, // NOx
+        { 2.810e+00, 8.861e-02, 1.079e+00, 1.232e-03, 6.109e-05, 1.992e-01, 1.748e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // Coach_Std_le18t_Euro-III
-        { 2.968e+03, 1.907e+02, 1.799e+02, 0.000e+00, 1.915e-03, 5.473e+02, 0.000e+00 }, // CO2(total)
-        { 2.060e+01, 1.192e-01, 6.576e+00, 0.000e+00, 0.000e+00, 3.921e-01, 0.000e+00 }, // CO
-        { 5.166e+00, 0.000e+00, 2.793e+00, 0.000e+00, 1.038e-06, 0.000e+00, 4.514e-04 }, // HC
-        { 9.537e+02, 6.129e+01, 5.781e+01, 0.000e+00, 6.153e-04, 1.759e+02, 0.000e+00 }, // FC
-        { 2.574e+01, 1.764e+00, 2.131e+01, 0.000e+00, 0.000e+00, 4.222e+00, 0.000e+00 }, // NOx
-        { 4.052e+00, 0.000e+00, 2.192e-02, 1.047e-04, 2.113e-06, 3.682e-02, 6.594e-05 }, // PM + PM (non-exhaust)
+        { 2.968e+03, 6.866e+02, 1.799e+02, 0.000e+00, 8.933e-02, 1.970e+03, 0.000e+00 }, // CO2(total)
+        { 2.060e+01, 4.292e-01, 6.576e+00, 0.000e+00, 0.000e+00, 1.412e+00, 0.000e+00 }, // CO
+        { 5.166e+00, 0.000e+00, 2.793e+00, 0.000e+00, 4.845e-05, 0.000e+00, 5.850e-03 }, // HC
+        { 9.537e+02, 2.206e+02, 5.781e+01, 0.000e+00, 2.871e-02, 6.332e+02, 0.000e+00 }, // FC
+        { 2.574e+01, 6.351e+00, 2.131e+01, 0.000e+00, 0.000e+00, 1.520e+01, 0.000e+00 }, // NOx
+        { 4.052e+00, 0.000e+00, 2.192e-02, 1.357e-03, 9.859e-05, 1.326e-01, 8.545e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // Coach_Std_le18t_Euro-IV_EGR
-        { 1.575e+03, 2.199e+02, 2.019e+03, 0.000e+00, 0.000e+00, 5.279e+02, 0.000e+00 }, // CO2(total)
-        { 1.075e+01, 1.232e-01, 1.611e+01, 0.000e+00, 0.000e+00, 2.985e-01, 0.000e+00 }, // CO
-        { 2.636e-01, 1.294e-02, 3.043e-01, 0.000e+00, 0.000e+00, 2.923e-02, 0.000e+00 }, // HC
-        { 5.060e+02, 7.068e+01, 6.487e+02, 0.000e+00, 0.000e+00, 1.696e+02, 0.000e+00 }, // FC
-        { 3.844e+01, 1.289e+00, 6.508e+01, 0.000e+00, 0.000e+00, 3.178e+00, 0.000e+00 }, // NOx
-        { 1.931e+00, 5.313e-03, 7.545e-01, 9.518e-05, 1.305e-06, 1.135e-02, 1.294e-05 }, // PM + PM (non-exhaust)
+        { 1.575e+03, 7.917e+02, 2.019e+03, 0.000e+00, 0.000e+00, 1.900e+03, 0.000e+00 }, // CO2(total)
+        { 1.075e+01, 4.436e-01, 1.611e+01, 0.000e+00, 0.000e+00, 1.075e+00, 0.000e+00 }, // CO
+        { 2.636e-01, 4.660e-02, 3.043e-01, 0.000e+00, 0.000e+00, 1.052e-01, 0.000e+00 }, // HC
+        { 5.060e+02, 2.544e+02, 6.487e+02, 0.000e+00, 0.000e+00, 6.107e+02, 0.000e+00 }, // FC
+        { 3.844e+01, 4.639e+00, 6.508e+01, 0.000e+00, 0.000e+00, 1.144e+01, 0.000e+00 }, // NOx
+        { 1.931e+00, 1.913e-02, 7.545e-01, 1.234e-03, 6.090e-05, 4.086e-02, 1.677e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // Coach_Std_le18t_Euro-IV_SCR
-        { 1.442e+03, 2.195e+02, 1.662e+03, 0.000e+00, 0.000e+00, 5.276e+02, 0.000e+00 }, // CO2(total)
-        { 4.229e+01, 7.770e-02, 9.091e+01, 0.000e+00, 0.000e+00, 3.205e-02, 0.000e+00 }, // CO
-        { 1.507e-01, 3.840e-03, 1.374e-01, 0.000e+00, 6.980e-08, 1.036e-02, 0.000e+00 }, // HC
-        { 4.635e+02, 7.056e+01, 5.342e+02, 0.000e+00, 0.000e+00, 1.695e+02, 0.000e+00 }, // FC
-        { 3.642e+01, 3.679e-01, 0.000e+00, 0.000e+00, 1.740e-05, 1.686e+00, 3.712e-04 }, // NOx
-        { 2.094e+00, 3.325e-03, 1.314e+00, 9.861e-05, 1.265e-06, 5.014e-03, 1.110e-05 }, // PM + PM (non-exhaust)
+        { 1.442e+03, 7.904e+02, 1.662e+03, 0.000e+00, 0.000e+00, 1.899e+03, 0.000e+00 }, // CO2(total)
+        { 4.229e+01, 2.797e-01, 9.091e+01, 0.000e+00, 0.000e+00, 1.154e-01, 0.000e+00 }, // CO
+        { 1.507e-01, 1.382e-02, 1.374e-01, 0.000e+00, 3.256e-06, 3.729e-02, 0.000e+00 }, // HC
+        { 4.635e+02, 2.540e+02, 5.342e+02, 0.000e+00, 0.000e+00, 6.104e+02, 0.000e+00 }, // FC
+        { 3.642e+01, 1.324e+00, 0.000e+00, 0.000e+00, 8.120e-04, 6.068e+00, 4.811e-03 }, // NOx
+        { 2.094e+00, 1.197e-02, 1.314e+00, 1.278e-03, 5.903e-05, 1.805e-02, 1.438e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // Coach_Std_le18t_Euro-IV_SCRs
-        { 1.442e+03, 2.195e+02, 1.662e+03, 0.000e+00, 0.000e+00, 5.276e+02, 0.000e+00 }, // CO2(total)
-        { 4.229e+01, 7.770e-02, 9.091e+01, 0.000e+00, 0.000e+00, 3.205e-02, 0.000e+00 }, // CO
-        { 1.507e-01, 3.840e-03, 1.374e-01, 0.000e+00, 6.980e-08, 1.036e-02, 0.000e+00 }, // HC
-        { 4.635e+02, 7.056e+01, 5.342e+02, 0.000e+00, 0.000e+00, 1.695e+02, 0.000e+00 }, // FC
-        { 3.386e+01, 2.076e+00, 3.749e+01, 0.000e+00, 9.087e-06, 5.226e+00, 0.000e+00 }, // NOx
-        { 2.094e+00, 3.325e-03, 1.314e+00, 9.861e-05, 1.265e-06, 5.014e-03, 1.110e-05 }, // PM + PM (non-exhaust)
+        { 1.442e+03, 7.904e+02, 1.662e+03, 0.000e+00, 0.000e+00, 1.899e+03, 0.000e+00 }, // CO2(total)
+        { 4.229e+01, 2.797e-01, 9.091e+01, 0.000e+00, 0.000e+00, 1.154e-01, 0.000e+00 }, // CO
+        { 1.507e-01, 1.382e-02, 1.374e-01, 0.000e+00, 3.256e-06, 3.729e-02, 0.000e+00 }, // HC
+        { 4.635e+02, 2.540e+02, 5.342e+02, 0.000e+00, 0.000e+00, 6.104e+02, 0.000e+00 }, // FC
+        { 3.386e+01, 7.475e+00, 3.749e+01, 0.000e+00, 4.240e-04, 1.881e+01, 0.000e+00 }, // NOx
+        { 2.094e+00, 1.197e-02, 1.314e+00, 1.278e-03, 5.903e-05, 1.805e-02, 1.438e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // Coach_Std_le18t_Euro-V_EGR
-        { 1.191e+03, 2.189e+02, 9.422e+02, 0.000e+00, 0.000e+00, 5.331e+02, 0.000e+00 }, // CO2(total)
+        { 1.191e+03, 7.880e+02, 9.422e+02, 0.000e+00, 0.000e+00, 1.919e+03, 0.000e+00 }, // CO2(total)
         { 1.241e+01, 0.000e+00, 2.097e+01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 1.034e+00, 5.067e-03, 6.761e-01, 0.000e+00, 4.729e-07, 2.920e-02, 0.000e+00 }, // HC
-        { 3.826e+02, 7.035e+01, 3.028e+02, 0.000e+00, 0.000e+00, 1.713e+02, 0.000e+00 }, // FC
-        { 4.173e+01, 6.936e-01, 6.709e+01, 0.000e+00, 0.000e+00, 1.669e+00, 0.000e+00 }, // NOx
-        { 1.691e+00, 2.805e-03, 1.023e-01, 9.497e-05, 1.672e-06, 1.766e-02, 1.221e-05 }, // PM + PM (non-exhaust)
+        { 1.034e+00, 1.824e-02, 6.761e-01, 0.000e+00, 2.207e-05, 1.051e-01, 0.000e+00 }, // HC
+        { 3.826e+02, 2.533e+02, 3.028e+02, 0.000e+00, 0.000e+00, 6.167e+02, 0.000e+00 }, // FC
+        { 4.173e+01, 2.497e+00, 6.709e+01, 0.000e+00, 0.000e+00, 6.007e+00, 0.000e+00 }, // NOx
+        { 1.691e+00, 1.010e-02, 1.023e-01, 1.231e-03, 7.803e-05, 6.359e-02, 1.582e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // Coach_Std_le18t_Euro-V_SCR
-        { 1.093e+03, 2.159e+02, 6.901e+02, 0.000e+00, 0.000e+00, 5.268e+02, 0.000e+00 }, // CO2(total)
-        { 3.992e+01, 4.122e-02, 7.542e+01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 1.412e-01, 4.512e-03, 7.376e-02, 2.192e-06, 0.000e+00, 1.052e-02, 0.000e+00 }, // HC
-        { 3.512e+02, 6.938e+01, 2.218e+02, 0.000e+00, 0.000e+00, 1.693e+02, 0.000e+00 }, // FC
-        { 3.792e+01, 3.531e-02, 0.000e+00, 0.000e+00, 1.377e-05, 3.083e-01, 4.045e-03 }, // NOx
-        { 2.126e+00, 2.649e-03, 1.295e+00, 9.911e-05, 1.262e-06, 2.939e-03, 1.113e-05 }, // PM + PM (non-exhaust)
+        { 1.093e+03, 7.772e+02, 6.901e+02, 0.000e+00, 0.000e+00, 1.896e+03, 0.000e+00 }, // CO2(total)
+        { 3.992e+01, 1.484e-01, 7.542e+01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
+        { 1.412e-01, 1.624e-02, 7.376e-02, 2.841e-05, 0.000e+00, 3.788e-02, 0.000e+00 }, // HC
+        { 3.512e+02, 2.498e+02, 2.218e+02, 0.000e+00, 0.000e+00, 6.095e+02, 0.000e+00 }, // FC
+        { 3.792e+01, 1.271e-01, 0.000e+00, 0.000e+00, 6.423e-04, 1.110e+00, 5.242e-02 }, // NOx
+        { 2.126e+00, 9.537e-03, 1.295e+00, 1.284e-03, 5.887e-05, 1.058e-02, 1.442e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // Coach_Std_le18t_Euro-V_SCRs
-        { 1.093e+03, 2.159e+02, 6.901e+02, 0.000e+00, 0.000e+00, 5.268e+02, 0.000e+00 }, // CO2(total)
-        { 3.992e+01, 4.122e-02, 7.542e+01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 1.412e-01, 4.512e-03, 7.376e-02, 2.192e-06, 0.000e+00, 1.052e-02, 0.000e+00 }, // HC
-        { 3.512e+02, 6.938e+01, 2.218e+02, 0.000e+00, 0.000e+00, 1.693e+02, 0.000e+00 }, // FC
-        { 3.591e+01, 2.126e+00, 2.383e+01, 4.701e-04, 0.000e+00, 5.238e+00, 0.000e+00 }, // NOx
-        { 2.126e+00, 2.649e-03, 1.295e+00, 9.911e-05, 1.262e-06, 2.939e-03, 1.113e-05 }, // PM + PM (non-exhaust)
+        { 1.093e+03, 7.772e+02, 6.901e+02, 0.000e+00, 0.000e+00, 1.896e+03, 0.000e+00 }, // CO2(total)
+        { 3.992e+01, 1.484e-01, 7.542e+01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
+        { 1.412e-01, 1.624e-02, 7.376e-02, 2.841e-05, 0.000e+00, 3.788e-02, 0.000e+00 }, // HC
+        { 3.512e+02, 2.498e+02, 2.218e+02, 0.000e+00, 0.000e+00, 6.095e+02, 0.000e+00 }, // FC
+        { 3.591e+01, 7.653e+00, 2.383e+01, 6.092e-03, 0.000e+00, 1.886e+01, 0.000e+00 }, // NOx
+        { 2.126e+00, 9.537e-03, 1.295e+00, 1.284e-03, 5.887e-05, 1.058e-02, 1.442e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // Coach_Std_le18t_Euro-VI_A-C
-        { 1.148e+03, 2.125e+02, 1.240e+03, 0.000e+00, 0.000e+00, 5.172e+02, 0.000e+00 }, // CO2(total)
-        { 2.909e+00, 7.146e-03, 3.835e+00, 1.491e-05, 0.000e+00, 1.379e-02, 0.000e+00 }, // CO
-        { 1.622e-01, 3.119e-03, 0.000e+00, 0.000e+00, 0.000e+00, 8.194e-03, 0.000e+00 }, // HC
-        { 3.690e+02, 6.830e+01, 3.984e+02, 0.000e+00, 0.000e+00, 1.662e+02, 0.000e+00 }, // FC
-        { 5.466e+00, 0.000e+00, 8.501e-01, 0.000e+00, 6.092e-07, 0.000e+00, 1.337e-04 }, // NOx
-        { 1.580e+00, 0.000e+00, 2.352e-01, 1.002e-04, 1.250e-06, 0.000e+00, 1.083e-05 }, // PM + PM (non-exhaust)
+        { 1.148e+03, 7.651e+02, 1.240e+03, 0.000e+00, 0.000e+00, 1.862e+03, 0.000e+00 }, // CO2(total)
+        { 2.909e+00, 2.573e-02, 3.835e+00, 1.932e-04, 0.000e+00, 4.965e-02, 0.000e+00 }, // CO
+        { 1.622e-01, 1.123e-02, 0.000e+00, 0.000e+00, 0.000e+00, 2.950e-02, 0.000e+00 }, // HC
+        { 3.690e+02, 2.459e+02, 3.984e+02, 0.000e+00, 0.000e+00, 5.984e+02, 0.000e+00 }, // FC
+        { 5.466e+00, 0.000e+00, 8.501e-01, 0.000e+00, 2.842e-05, 0.000e+00, 1.733e-03 }, // NOx
+        { 1.580e+00, 0.000e+00, 2.352e-01, 1.299e-03, 5.832e-05, 0.000e+00, 1.404e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // Coach_Std_le18t_Euro-VIs_A-C
-        { 1.148e+03, 2.125e+02, 1.240e+03, 0.000e+00, 0.000e+00, 5.172e+02, 0.000e+00 }, // CO2(total)
-        { 2.909e+00, 7.146e-03, 3.835e+00, 1.491e-05, 0.000e+00, 1.379e-02, 0.000e+00 }, // CO
-        { 1.622e-01, 3.119e-03, 0.000e+00, 0.000e+00, 0.000e+00, 8.194e-03, 0.000e+00 }, // HC
-        { 3.690e+02, 6.830e+01, 3.984e+02, 0.000e+00, 0.000e+00, 1.662e+02, 0.000e+00 }, // FC
-        { 6.470e+00, 1.585e+00, 0.000e+00, 0.000e+00, 0.000e+00, 3.864e+00, 0.000e+00 }, // NOx
-        { 1.580e+00, 0.000e+00, 2.352e-01, 1.002e-04, 1.250e-06, 0.000e+00, 1.083e-05 }, // PM + PM (non-exhaust)
+        { 1.148e+03, 7.651e+02, 1.240e+03, 0.000e+00, 0.000e+00, 1.862e+03, 0.000e+00 }, // CO2(total)
+        { 2.909e+00, 2.573e-02, 3.835e+00, 1.932e-04, 0.000e+00, 4.965e-02, 0.000e+00 }, // CO
+        { 1.622e-01, 1.123e-02, 0.000e+00, 0.000e+00, 0.000e+00, 2.950e-02, 0.000e+00 }, // HC
+        { 3.690e+02, 2.459e+02, 3.984e+02, 0.000e+00, 0.000e+00, 5.984e+02, 0.000e+00 }, // FC
+        { 6.470e+00, 5.705e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.391e+01, 0.000e+00 }, // NOx
+        { 1.580e+00, 0.000e+00, 2.352e-01, 1.299e-03, 5.832e-05, 0.000e+00, 1.404e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // Coach_Std_le18t_Euro-VI_D-E
-        { 9.487e+02, 2.112e+02, 4.872e+02, 0.000e+00, 0.000e+00, 5.183e+02, 0.000e+00 }, // CO2(total)
+        { 9.487e+02, 7.605e+02, 4.872e+02, 0.000e+00, 0.000e+00, 1.866e+03, 0.000e+00 }, // CO2(total)
         { 1.467e+00, 0.000e+00, 2.016e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 4.334e-01, 1.770e-04, 1.132e-01, 1.380e-05, 0.000e+00, 3.699e-03, 6.643e-06 }, // HC
-        { 3.049e+02, 6.789e+01, 1.566e+02, 0.000e+00, 0.000e+00, 1.666e+02, 0.000e+00 }, // FC
-        { 3.331e+00, 1.912e-03, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 3.074e-04 }, // NOx
-        { 1.440e+00, 4.472e-04, 6.017e-03, 1.014e-04, 1.246e-06, 1.388e-03, 1.037e-05 }, // PM + PM (non-exhaust)
+        { 4.334e-01, 6.370e-04, 1.132e-01, 1.789e-04, 0.000e+00, 1.332e-02, 8.610e-05 }, // HC
+        { 3.049e+02, 2.444e+02, 1.566e+02, 0.000e+00, 0.000e+00, 5.996e+02, 0.000e+00 }, // FC
+        { 3.331e+00, 6.882e-03, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 3.985e-03 }, // NOx
+        { 1.440e+00, 1.610e-03, 6.017e-03, 1.314e-03, 5.814e-05, 4.996e-03, 1.344e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // Coach_Std_le18t_Euro-VIs_D-E
-        { 9.487e+02, 2.112e+02, 4.872e+02, 0.000e+00, 0.000e+00, 5.183e+02, 0.000e+00 }, // CO2(total)
+        { 9.487e+02, 7.605e+02, 4.872e+02, 0.000e+00, 0.000e+00, 1.866e+03, 0.000e+00 }, // CO2(total)
         { 1.467e+00, 0.000e+00, 2.016e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 4.334e-01, 1.770e-04, 1.132e-01, 1.380e-05, 0.000e+00, 3.699e-03, 6.643e-06 }, // HC
-        { 3.049e+02, 6.789e+01, 1.566e+02, 0.000e+00, 0.000e+00, 1.666e+02, 0.000e+00 }, // FC
-        { 2.041e+01, 1.782e+00, 3.870e+01, 0.000e+00, 0.000e+00, 4.022e+00, 0.000e+00 }, // NOx
-        { 1.440e+00, 4.472e-04, 6.017e-03, 1.014e-04, 1.246e-06, 1.388e-03, 1.037e-05 }, // PM + PM (non-exhaust)
+        { 4.334e-01, 6.370e-04, 1.132e-01, 1.789e-04, 0.000e+00, 1.332e-02, 8.610e-05 }, // HC
+        { 3.049e+02, 2.444e+02, 1.566e+02, 0.000e+00, 0.000e+00, 5.996e+02, 0.000e+00 }, // FC
+        { 2.041e+01, 6.416e+00, 3.870e+01, 0.000e+00, 0.000e+00, 1.448e+01, 0.000e+00 }, // NOx
+        { 1.440e+00, 1.610e-03, 6.017e-03, 1.314e-03, 5.814e-05, 4.996e-03, 1.344e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // Coach_3-Axes_gt18t_50ties
-        { 2.745e+03, 2.542e+02, 7.265e+02, 1.784e-01, 0.000e+00, 6.871e+02, 0.000e+00 }, // CO2(total)
-        { 3.344e+01, 0.000e+00, 1.696e+01, 1.455e-03, 2.377e-06, 5.365e-01, 0.000e+00 }, // CO
-        { 1.049e+01, 0.000e+00, 4.130e+00, 0.000e+00, 3.244e-06, 4.809e-02, 0.000e+00 }, // HC
-        { 8.820e+02, 8.170e+01, 2.335e+02, 5.733e-02, 0.000e+00, 2.208e+02, 0.000e+00 }, // FC
-        { 3.197e+01, 4.137e+00, 1.074e+01, 1.108e-03, 0.000e+00, 1.054e+01, 0.000e+00 }, // NOx
-        { 7.356e+00, 2.946e-02, 1.441e+00, 4.872e-04, 1.291e-06, 1.695e-01, 1.295e-05 }, // PM + PM (non-exhaust)
+        { 2.745e+03, 9.152e+02, 7.265e+02, 2.312e+00, 0.000e+00, 2.473e+03, 0.000e+00 }, // CO2(total)
+        { 3.344e+01, 0.000e+00, 1.696e+01, 1.885e-02, 1.109e-04, 1.931e+00, 0.000e+00 }, // CO
+        { 1.049e+01, 0.000e+00, 4.130e+00, 0.000e+00, 1.513e-04, 1.731e-01, 0.000e+00 }, // HC
+        { 8.820e+02, 2.941e+02, 2.335e+02, 7.430e-01, 0.000e+00, 7.949e+02, 0.000e+00 }, // FC
+        { 3.197e+01, 1.489e+01, 1.074e+01, 1.436e-02, 0.000e+00, 3.794e+01, 0.000e+00 }, // NOx
+        { 7.356e+00, 1.060e-01, 1.441e+00, 6.315e-03, 6.024e-05, 6.103e-01, 1.679e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // Coach_3-Axes_gt18t_60ties
-        { 2.745e+03, 2.542e+02, 7.265e+02, 1.784e-01, 0.000e+00, 6.871e+02, 0.000e+00 }, // CO2(total)
-        { 3.344e+01, 0.000e+00, 1.696e+01, 1.455e-03, 2.377e-06, 5.365e-01, 0.000e+00 }, // CO
-        { 1.049e+01, 0.000e+00, 4.130e+00, 0.000e+00, 3.244e-06, 4.809e-02, 0.000e+00 }, // HC
-        { 8.820e+02, 8.170e+01, 2.335e+02, 5.733e-02, 0.000e+00, 2.208e+02, 0.000e+00 }, // FC
-        { 3.197e+01, 4.137e+00, 1.074e+01, 1.108e-03, 0.000e+00, 1.054e+01, 0.000e+00 }, // NOx
-        { 7.356e+00, 2.946e-02, 1.441e+00, 4.872e-04, 1.291e-06, 1.695e-01, 1.295e-05 }, // PM + PM (non-exhaust)
+        { 2.745e+03, 9.152e+02, 7.265e+02, 2.312e+00, 0.000e+00, 2.473e+03, 0.000e+00 }, // CO2(total)
+        { 3.344e+01, 0.000e+00, 1.696e+01, 1.885e-02, 1.109e-04, 1.931e+00, 0.000e+00 }, // CO
+        { 1.049e+01, 0.000e+00, 4.130e+00, 0.000e+00, 1.513e-04, 1.731e-01, 0.000e+00 }, // HC
+        { 8.820e+02, 2.941e+02, 2.335e+02, 7.430e-01, 0.000e+00, 7.949e+02, 0.000e+00 }, // FC
+        { 3.197e+01, 1.489e+01, 1.074e+01, 1.436e-02, 0.000e+00, 3.794e+01, 0.000e+00 }, // NOx
+        { 7.356e+00, 1.060e-01, 1.441e+00, 6.315e-03, 6.024e-05, 6.103e-01, 1.679e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // Coach_3-Axes_gt18t_70ties
-        { 2.745e+03, 2.542e+02, 7.265e+02, 1.784e-01, 0.000e+00, 6.871e+02, 0.000e+00 }, // CO2(total)
-        { 3.344e+01, 0.000e+00, 1.696e+01, 1.455e-03, 2.377e-06, 5.365e-01, 0.000e+00 }, // CO
-        { 1.049e+01, 0.000e+00, 4.130e+00, 0.000e+00, 3.244e-06, 4.809e-02, 0.000e+00 }, // HC
-        { 8.820e+02, 8.170e+01, 2.335e+02, 5.733e-02, 0.000e+00, 2.208e+02, 0.000e+00 }, // FC
-        { 3.197e+01, 4.137e+00, 1.074e+01, 1.108e-03, 0.000e+00, 1.054e+01, 0.000e+00 }, // NOx
-        { 7.356e+00, 2.946e-02, 1.441e+00, 4.872e-04, 1.291e-06, 1.695e-01, 1.295e-05 }, // PM + PM (non-exhaust)
+        { 2.745e+03, 9.152e+02, 7.265e+02, 2.312e+00, 0.000e+00, 2.473e+03, 0.000e+00 }, // CO2(total)
+        { 3.344e+01, 0.000e+00, 1.696e+01, 1.885e-02, 1.109e-04, 1.931e+00, 0.000e+00 }, // CO
+        { 1.049e+01, 0.000e+00, 4.130e+00, 0.000e+00, 1.513e-04, 1.731e-01, 0.000e+00 }, // HC
+        { 8.820e+02, 2.941e+02, 2.335e+02, 7.430e-01, 0.000e+00, 7.949e+02, 0.000e+00 }, // FC
+        { 3.197e+01, 1.489e+01, 1.074e+01, 1.436e-02, 0.000e+00, 3.794e+01, 0.000e+00 }, // NOx
+        { 7.356e+00, 1.060e-01, 1.441e+00, 6.315e-03, 6.024e-05, 6.103e-01, 1.679e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // Coach_3-Axes_gt18t_80ties
-        { 2.745e+03, 2.542e+02, 7.265e+02, 1.784e-01, 0.000e+00, 6.871e+02, 0.000e+00 }, // CO2(total)
-        { 3.344e+01, 0.000e+00, 1.696e+01, 1.455e-03, 2.377e-06, 5.365e-01, 0.000e+00 }, // CO
-        { 1.049e+01, 0.000e+00, 4.130e+00, 0.000e+00, 3.244e-06, 4.809e-02, 0.000e+00 }, // HC
-        { 8.820e+02, 8.170e+01, 2.335e+02, 5.733e-02, 0.000e+00, 2.208e+02, 0.000e+00 }, // FC
-        { 3.197e+01, 4.137e+00, 1.074e+01, 1.108e-03, 0.000e+00, 1.054e+01, 0.000e+00 }, // NOx
-        { 7.356e+00, 2.946e-02, 1.441e+00, 4.872e-04, 1.291e-06, 1.695e-01, 1.295e-05 }, // PM + PM (non-exhaust)
+        { 2.745e+03, 9.152e+02, 7.265e+02, 2.312e+00, 0.000e+00, 2.473e+03, 0.000e+00 }, // CO2(total)
+        { 3.344e+01, 0.000e+00, 1.696e+01, 1.885e-02, 1.109e-04, 1.931e+00, 0.000e+00 }, // CO
+        { 1.049e+01, 0.000e+00, 4.130e+00, 0.000e+00, 1.513e-04, 1.731e-01, 0.000e+00 }, // HC
+        { 8.820e+02, 2.941e+02, 2.335e+02, 7.430e-01, 0.000e+00, 7.949e+02, 0.000e+00 }, // FC
+        { 3.197e+01, 1.489e+01, 1.074e+01, 1.436e-02, 0.000e+00, 3.794e+01, 0.000e+00 }, // NOx
+        { 7.356e+00, 1.060e-01, 1.441e+00, 6.315e-03, 6.024e-05, 6.103e-01, 1.679e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // Coach_3-Axes_gt18t_Euro-I
-        { 2.364e+03, 2.623e+02, 1.565e+03, 0.000e+00, 0.000e+00, 6.506e+02, 0.000e+00 }, // CO2(total)
-        { 1.349e+01, 3.973e-01, 0.000e+00, 0.000e+00, 0.000e+00, 1.019e+00, 0.000e+00 }, // CO
-        { 9.425e+00, 0.000e+00, 3.139e+00, 0.000e+00, 4.043e-06, 1.392e-01, 0.000e+00 }, // HC
-        { 7.596e+02, 8.431e+01, 5.028e+02, 0.000e+00, 0.000e+00, 2.091e+02, 0.000e+00 }, // FC
-        { 3.587e+01, 2.684e+00, 3.561e+01, 0.000e+00, 0.000e+00, 6.629e+00, 0.000e+00 }, // NOx
-        { 6.366e+00, 1.307e-02, 0.000e+00, 5.040e-04, 1.315e-06, 1.662e-01, 1.433e-05 }, // PM + PM (non-exhaust)
+        { 2.364e+03, 9.444e+02, 1.565e+03, 0.000e+00, 0.000e+00, 2.342e+03, 0.000e+00 }, // CO2(total)
+        { 1.349e+01, 1.430e+00, 0.000e+00, 0.000e+00, 0.000e+00, 3.667e+00, 0.000e+00 }, // CO
+        { 9.425e+00, 0.000e+00, 3.139e+00, 0.000e+00, 1.886e-04, 5.010e-01, 0.000e+00 }, // HC
+        { 7.596e+02, 3.035e+02, 5.028e+02, 0.000e+00, 0.000e+00, 7.527e+02, 0.000e+00 }, // FC
+        { 3.587e+01, 9.661e+00, 3.561e+01, 0.000e+00, 0.000e+00, 2.387e+01, 0.000e+00 }, // NOx
+        { 6.366e+00, 4.705e-02, 0.000e+00, 6.532e-03, 6.136e-05, 5.984e-01, 1.857e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // Coach_3-Axes_gt18t_Euro-II
-        { 3.270e+03, 2.350e+02, 4.633e+03, 0.000e+00, 0.000e+00, 5.710e+02, 0.000e+00 }, // CO2(total)
-        { 1.493e+01, 2.036e-01, 1.256e+01, 0.000e+00, 0.000e+00, 5.148e-01, 0.000e+00 }, // CO
-        { 5.907e+00, 0.000e+00, 2.551e+00, 0.000e+00, 2.358e-06, 3.748e-02, 4.377e-04 }, // HC
-        { 1.051e+03, 7.551e+01, 1.489e+03, 0.000e+00, 0.000e+00, 1.835e+02, 0.000e+00 }, // FC
-        { 5.589e+01, 2.357e+00, 8.073e+01, 0.000e+00, 0.000e+00, 5.727e+00, 0.000e+00 }, // NOx
-        { 2.928e+00, 3.005e-02, 9.837e-01, 9.911e-05, 1.276e-06, 6.959e-02, 1.474e-05 }, // PM + PM (non-exhaust)
+        { 3.270e+03, 8.458e+02, 4.633e+03, 0.000e+00, 0.000e+00, 2.056e+03, 0.000e+00 }, // CO2(total)
+        { 1.493e+01, 7.331e-01, 1.256e+01, 0.000e+00, 0.000e+00, 1.853e+00, 0.000e+00 }, // CO
+        { 5.907e+00, 0.000e+00, 2.551e+00, 0.000e+00, 1.100e-04, 1.349e-01, 5.672e-03 }, // HC
+        { 1.051e+03, 2.718e+02, 1.489e+03, 0.000e+00, 0.000e+00, 6.606e+02, 0.000e+00 }, // FC
+        { 5.589e+01, 8.486e+00, 8.073e+01, 0.000e+00, 0.000e+00, 2.062e+01, 0.000e+00 }, // NOx
+        { 2.928e+00, 1.082e-01, 9.837e-01, 1.285e-03, 5.952e-05, 2.505e-01, 1.910e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // Coach_3-Axes_gt18t_Euro-III
-        { 3.740e+03, 2.280e+02, 5.633e+03, 0.000e+00, 0.000e+00, 5.582e+02, 0.000e+00 }, // CO2(total)
-        { 2.064e+01, 1.824e-01, 6.502e+00, 0.000e+00, 0.000e+00, 5.355e-01, 0.000e+00 }, // CO
-        { 5.476e+00, 0.000e+00, 2.823e+00, 0.000e+00, 1.634e-06, 0.000e+00, 6.355e-04 }, // HC
-        { 1.202e+03, 7.327e+01, 1.810e+03, 0.000e+00, 0.000e+00, 1.794e+02, 0.000e+00 }, // FC
-        { 4.924e+01, 1.749e+00, 7.296e+01, 0.000e+00, 0.000e+00, 4.335e+00, 0.000e+00 }, // NOx
-        { 3.661e+00, 1.737e-02, 0.000e+00, 9.712e-05, 1.286e-06, 4.996e-02, 1.290e-05 }, // PM + PM (non-exhaust)
+        { 3.740e+03, 8.207e+02, 5.633e+03, 0.000e+00, 0.000e+00, 2.010e+03, 0.000e+00 }, // CO2(total)
+        { 2.064e+01, 6.567e-01, 6.502e+00, 0.000e+00, 0.000e+00, 1.928e+00, 0.000e+00 }, // CO
+        { 5.476e+00, 0.000e+00, 2.823e+00, 0.000e+00, 7.622e-05, 0.000e+00, 8.235e-03 }, // HC
+        { 1.202e+03, 2.638e+02, 1.810e+03, 0.000e+00, 0.000e+00, 6.458e+02, 0.000e+00 }, // FC
+        { 4.924e+01, 6.296e+00, 7.296e+01, 0.000e+00, 0.000e+00, 1.561e+01, 0.000e+00 }, // NOx
+        { 3.661e+00, 6.254e-02, 0.000e+00, 1.259e-03, 5.999e-05, 1.799e-01, 1.671e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // Coach_3-Axes_gt18t_Euro-IV_EGR
-        { 3.103e+03, 2.366e+02, 5.988e+03, 0.000e+00, 0.000e+00, 5.683e+02, 0.000e+00 }, // CO2(total)
-        { 1.110e+01, 1.472e-01, 1.615e+01, 0.000e+00, 0.000e+00, 3.721e-01, 0.000e+00 }, // CO
-        { 4.001e-01, 1.325e-02, 6.505e-01, 0.000e+00, 0.000e+00, 2.868e-02, 0.000e+00 }, // HC
-        { 9.971e+02, 7.602e+01, 1.924e+03, 0.000e+00, 0.000e+00, 1.826e+02, 0.000e+00 }, // FC
-        { 4.812e+01, 1.392e+00, 8.578e+01, 0.000e+00, 0.000e+00, 3.529e+00, 0.000e+00 }, // NOx
-        { 1.994e+00, 5.629e-03, 7.803e-01, 9.382e-05, 1.317e-06, 1.354e-02, 1.269e-05 }, // PM + PM (non-exhaust)
+        { 3.103e+03, 8.516e+02, 5.988e+03, 0.000e+00, 0.000e+00, 2.046e+03, 0.000e+00 }, // CO2(total)
+        { 1.110e+01, 5.301e-01, 1.615e+01, 0.000e+00, 0.000e+00, 1.340e+00, 0.000e+00 }, // CO
+        { 4.001e-01, 4.771e-02, 6.505e-01, 0.000e+00, 0.000e+00, 1.033e-01, 0.000e+00 }, // HC
+        { 9.971e+02, 2.737e+02, 1.924e+03, 0.000e+00, 0.000e+00, 6.575e+02, 0.000e+00 }, // FC
+        { 4.812e+01, 5.013e+00, 8.578e+01, 0.000e+00, 0.000e+00, 1.270e+01, 0.000e+00 }, // NOx
+        { 1.994e+00, 2.026e-02, 7.803e-01, 1.216e-03, 6.145e-05, 4.875e-02, 1.645e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // Coach_3-Axes_gt18t_Euro-IV_SCR
-        { 2.801e+03, 2.388e+02, 5.087e+03, 0.000e+00, 0.000e+00, 5.769e+02, 0.000e+00 }, // CO2(total)
-        { 3.977e+01, 1.473e-01, 8.061e+01, 0.000e+00, 0.000e+00, 2.765e-01, 0.000e+00 }, // CO
-        { 1.870e-01, 4.331e-03, 1.719e-01, 0.000e+00, 1.043e-07, 1.242e-02, 0.000e+00 }, // HC
-        { 9.003e+02, 7.673e+01, 1.635e+03, 0.000e+00, 0.000e+00, 1.854e+02, 0.000e+00 }, // FC
-        { 4.320e+01, 4.283e-01, 0.000e+00, 0.000e+00, 1.724e-05, 2.045e+00, 0.000e+00 }, // NOx
-        { 2.122e+00, 4.131e-03, 1.261e+00, 9.348e-05, 1.315e-06, 8.331e-03, 1.122e-05 }, // PM + PM (non-exhaust)
+        { 2.801e+03, 8.595e+02, 5.087e+03, 0.000e+00, 0.000e+00, 2.077e+03, 0.000e+00 }, // CO2(total)
+        { 3.977e+01, 5.302e-01, 8.061e+01, 0.000e+00, 0.000e+00, 9.955e-01, 0.000e+00 }, // CO
+        { 1.870e-01, 1.559e-02, 1.719e-01, 0.000e+00, 4.867e-06, 4.472e-02, 0.000e+00 }, // HC
+        { 9.003e+02, 2.762e+02, 1.635e+03, 0.000e+00, 0.000e+00, 6.675e+02, 0.000e+00 }, // FC
+        { 4.320e+01, 1.542e+00, 0.000e+00, 0.000e+00, 8.044e-04, 7.363e+00, 0.000e+00 }, // NOx
+        { 2.122e+00, 1.487e-02, 1.261e+00, 1.211e-03, 6.137e-05, 2.999e-02, 1.454e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // Coach_3-Axes_gt18t_Euro-IV_SCRs
-        { 2.801e+03, 2.388e+02, 5.087e+03, 0.000e+00, 0.000e+00, 5.769e+02, 0.000e+00 }, // CO2(total)
-        { 3.977e+01, 1.473e-01, 8.061e+01, 0.000e+00, 0.000e+00, 2.765e-01, 0.000e+00 }, // CO
-        { 1.870e-01, 4.331e-03, 1.719e-01, 0.000e+00, 1.043e-07, 1.242e-02, 0.000e+00 }, // HC
-        { 9.003e+02, 7.673e+01, 1.635e+03, 0.000e+00, 0.000e+00, 1.854e+02, 0.000e+00 }, // FC
-        { 4.548e+01, 2.390e+00, 7.622e+01, 0.000e+00, 0.000e+00, 5.702e+00, 0.000e+00 }, // NOx
-        { 2.122e+00, 4.131e-03, 1.261e+00, 9.348e-05, 1.315e-06, 8.331e-03, 1.122e-05 }, // PM + PM (non-exhaust)
+        { 2.801e+03, 8.595e+02, 5.087e+03, 0.000e+00, 0.000e+00, 2.077e+03, 0.000e+00 }, // CO2(total)
+        { 3.977e+01, 5.302e-01, 8.061e+01, 0.000e+00, 0.000e+00, 9.955e-01, 0.000e+00 }, // CO
+        { 1.870e-01, 1.559e-02, 1.719e-01, 0.000e+00, 4.867e-06, 4.472e-02, 0.000e+00 }, // HC
+        { 9.003e+02, 2.762e+02, 1.635e+03, 0.000e+00, 0.000e+00, 6.675e+02, 0.000e+00 }, // FC
+        { 4.548e+01, 8.602e+00, 7.622e+01, 0.000e+00, 0.000e+00, 2.053e+01, 0.000e+00 }, // NOx
+        { 2.122e+00, 1.487e-02, 1.261e+00, 1.211e-03, 6.137e-05, 2.999e-02, 1.454e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // Coach_3-Axes_gt18t_Euro-V_EGR
-        { 2.546e+03, 2.388e+02, 4.360e+03, 0.000e+00, 0.000e+00, 5.856e+02, 0.000e+00 }, // CO2(total)
-        { 1.267e+01, 1.629e-03, 2.027e+01, 0.000e+00, 0.000e+00, 1.758e-02, 0.000e+00 }, // CO
-        { 1.222e+00, 5.330e-03, 8.766e-01, 0.000e+00, 4.780e-07, 3.232e-02, 0.000e+00 }, // HC
-        { 8.182e+02, 7.676e+01, 1.401e+03, 0.000e+00, 0.000e+00, 1.882e+02, 0.000e+00 }, // FC
-        { 4.625e+01, 7.802e-01, 7.316e+01, 0.000e+00, 0.000e+00, 1.937e+00, 0.000e+00 }, // NOx
-        { 1.877e+00, 1.136e-04, 2.484e-01, 9.562e-05, 1.925e-06, 1.815e-02, 2.566e-05 }, // PM + PM (non-exhaust)
+        { 2.546e+03, 8.598e+02, 4.360e+03, 0.000e+00, 0.000e+00, 2.108e+03, 0.000e+00 }, // CO2(total)
+        { 1.267e+01, 5.863e-03, 2.027e+01, 0.000e+00, 0.000e+00, 6.330e-02, 0.000e+00 }, // CO
+        { 1.222e+00, 1.919e-02, 8.766e-01, 0.000e+00, 2.230e-05, 1.164e-01, 0.000e+00 }, // HC
+        { 8.182e+02, 2.763e+02, 1.401e+03, 0.000e+00, 0.000e+00, 6.775e+02, 0.000e+00 }, // FC
+        { 4.625e+01, 2.809e+00, 7.316e+01, 0.000e+00, 0.000e+00, 6.973e+00, 0.000e+00 }, // NOx
+        { 1.877e+00, 4.091e-04, 2.484e-01, 1.239e-03, 8.984e-05, 6.533e-02, 3.325e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // Coach_3-Axes_gt18t_Euro-V_SCR
-        { 2.310e+03, 2.378e+02, 3.688e+03, 0.000e+00, 0.000e+00, 5.864e+02, 0.000e+00 }, // CO2(total)
-        { 3.737e+01, 1.106e-01, 6.749e+01, 0.000e+00, 0.000e+00, 1.558e-01, 0.000e+00 }, // CO
-        { 1.672e-01, 5.555e-03, 6.936e-02, 0.000e+00, 1.461e-08, 1.334e-02, 0.000e+00 }, // HC
-        { 7.424e+02, 7.644e+01, 1.185e+03, 0.000e+00, 0.000e+00, 1.885e+02, 0.000e+00 }, // FC
-        { 4.254e+01, 9.822e-02, 0.000e+00, 0.000e+00, 8.508e-06, 5.631e-01, 2.665e-03 }, // NOx
-        { 2.152e+00, 3.380e-03, 1.201e+00, 1.008e-04, 1.240e-06, 6.223e-03, 9.431e-06 }, // PM + PM (non-exhaust)
+        { 2.310e+03, 8.562e+02, 3.688e+03, 0.000e+00, 0.000e+00, 2.111e+03, 0.000e+00 }, // CO2(total)
+        { 3.737e+01, 3.982e-01, 6.749e+01, 0.000e+00, 0.000e+00, 5.610e-01, 0.000e+00 }, // CO
+        { 1.672e-01, 2.000e-02, 6.936e-02, 0.000e+00, 6.815e-07, 4.801e-02, 0.000e+00 }, // HC
+        { 7.424e+02, 2.752e+02, 1.185e+03, 0.000e+00, 0.000e+00, 6.784e+02, 0.000e+00 }, // FC
+        { 4.254e+01, 3.536e-01, 0.000e+00, 0.000e+00, 3.969e-04, 2.027e+00, 3.453e-02 }, // NOx
+        { 2.152e+00, 1.217e-02, 1.201e+00, 1.306e-03, 5.787e-05, 2.240e-02, 1.222e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // Coach_3-Axes_gt18t_Euro-V_SCRs
-        { 2.310e+03, 2.378e+02, 3.688e+03, 0.000e+00, 0.000e+00, 5.864e+02, 0.000e+00 }, // CO2(total)
-        { 3.737e+01, 1.106e-01, 6.749e+01, 0.000e+00, 0.000e+00, 1.558e-01, 0.000e+00 }, // CO
-        { 1.672e-01, 5.555e-03, 6.936e-02, 0.000e+00, 1.461e-08, 1.334e-02, 0.000e+00 }, // HC
-        { 7.424e+02, 7.644e+01, 1.185e+03, 0.000e+00, 0.000e+00, 1.885e+02, 0.000e+00 }, // FC
-        { 5.091e+01, 2.388e+00, 5.840e+01, 0.000e+00, 0.000e+00, 5.802e+00, 0.000e+00 }, // NOx
-        { 2.152e+00, 3.380e-03, 1.201e+00, 1.008e-04, 1.240e-06, 6.223e-03, 9.431e-06 }, // PM + PM (non-exhaust)
+        { 2.310e+03, 8.562e+02, 3.688e+03, 0.000e+00, 0.000e+00, 2.111e+03, 0.000e+00 }, // CO2(total)
+        { 3.737e+01, 3.982e-01, 6.749e+01, 0.000e+00, 0.000e+00, 5.610e-01, 0.000e+00 }, // CO
+        { 1.672e-01, 2.000e-02, 6.936e-02, 0.000e+00, 6.815e-07, 4.801e-02, 0.000e+00 }, // HC
+        { 7.424e+02, 2.752e+02, 1.185e+03, 0.000e+00, 0.000e+00, 6.784e+02, 0.000e+00 }, // FC
+        { 5.091e+01, 8.595e+00, 5.840e+01, 0.000e+00, 0.000e+00, 2.089e+01, 0.000e+00 }, // NOx
+        { 2.152e+00, 1.217e-02, 1.201e+00, 1.306e-03, 5.787e-05, 2.240e-02, 1.222e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // Coach_3-Axes_gt18t_Euro-VI_A-C
-        { 2.381e+03, 2.331e+02, 4.333e+03, 0.000e+00, 0.000e+00, 5.712e+02, 0.000e+00 }, // CO2(total)
-        { 2.522e+00, 2.037e-02, 2.882e+00, 0.000e+00, 0.000e+00, 3.820e-02, 0.000e+00 }, // CO
-        { 1.629e-01, 4.116e-03, 0.000e+00, 0.000e+00, 0.000e+00, 1.035e-02, 0.000e+00 }, // HC
-        { 7.651e+02, 7.491e+01, 1.393e+03, 0.000e+00, 0.000e+00, 1.836e+02, 0.000e+00 }, // FC
-        { 6.218e+00, 0.000e+00, 2.816e-01, 0.000e+00, 9.262e-07, 0.000e+00, 3.533e-04 }, // NOx
-        { 1.600e+00, 0.000e+00, 2.103e-01, 9.743e-05, 1.279e-06, 8.176e-04, 1.001e-05 }, // PM + PM (non-exhaust)
+        { 2.381e+03, 8.391e+02, 4.333e+03, 0.000e+00, 0.000e+00, 2.056e+03, 0.000e+00 }, // CO2(total)
+        { 2.522e+00, 7.333e-02, 2.882e+00, 0.000e+00, 0.000e+00, 1.375e-01, 0.000e+00 }, // CO
+        { 1.629e-01, 1.482e-02, 0.000e+00, 0.000e+00, 0.000e+00, 3.725e-02, 0.000e+00 }, // HC
+        { 7.651e+02, 2.697e+02, 1.393e+03, 0.000e+00, 0.000e+00, 6.608e+02, 0.000e+00 }, // FC
+        { 6.218e+00, 0.000e+00, 2.816e-01, 0.000e+00, 4.322e-05, 0.000e+00, 4.579e-03 }, // NOx
+        { 1.600e+00, 0.000e+00, 2.103e-01, 1.263e-03, 5.969e-05, 2.943e-03, 1.298e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // Coach_3-Axes_gt18t_Euro-VIs_A-C
-        { 2.381e+03, 2.331e+02, 4.333e+03, 0.000e+00, 0.000e+00, 5.712e+02, 0.000e+00 }, // CO2(total)
-        { 2.522e+00, 2.037e-02, 2.882e+00, 0.000e+00, 0.000e+00, 3.820e-02, 0.000e+00 }, // CO
-        { 1.629e-01, 4.116e-03, 0.000e+00, 0.000e+00, 0.000e+00, 1.035e-02, 0.000e+00 }, // HC
-        { 7.651e+02, 7.491e+01, 1.393e+03, 0.000e+00, 0.000e+00, 1.836e+02, 0.000e+00 }, // FC
-        { 1.823e+01, 1.705e+00, 2.843e+01, 0.000e+00, 0.000e+00, 4.169e+00, 0.000e+00 }, // NOx
-        { 1.600e+00, 0.000e+00, 2.103e-01, 9.743e-05, 1.279e-06, 8.176e-04, 1.001e-05 }, // PM + PM (non-exhaust)
+        { 2.381e+03, 8.391e+02, 4.333e+03, 0.000e+00, 0.000e+00, 2.056e+03, 0.000e+00 }, // CO2(total)
+        { 2.522e+00, 7.333e-02, 2.882e+00, 0.000e+00, 0.000e+00, 1.375e-01, 0.000e+00 }, // CO
+        { 1.629e-01, 1.482e-02, 0.000e+00, 0.000e+00, 0.000e+00, 3.725e-02, 0.000e+00 }, // HC
+        { 7.651e+02, 2.697e+02, 1.393e+03, 0.000e+00, 0.000e+00, 6.608e+02, 0.000e+00 }, // FC
+        { 1.823e+01, 6.136e+00, 2.843e+01, 0.000e+00, 0.000e+00, 1.501e+01, 0.000e+00 }, // NOx
+        { 1.600e+00, 0.000e+00, 2.103e-01, 1.263e-03, 5.969e-05, 2.943e-03, 1.298e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // Coach_3-Axes_gt18t_Euro-VI_D-E
-        { 2.116e+03, 2.331e+02, 3.315e+03, 0.000e+00, 0.000e+00, 5.770e+02, 0.000e+00 }, // CO2(total)
+        { 2.116e+03, 8.393e+02, 3.315e+03, 0.000e+00, 0.000e+00, 2.077e+03, 0.000e+00 }, // CO2(total)
         { 1.187e+00, 0.000e+00, 1.541e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 4.823e-01, 5.712e-04, 8.773e-02, 1.123e-05, 0.000e+00, 5.488e-03, 0.000e+00 }, // HC
-        { 6.800e+02, 7.493e+01, 1.066e+03, 0.000e+00, 0.000e+00, 1.854e+02, 0.000e+00 }, // FC
-        { 3.660e+00, 2.342e-03, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 3.184e-04 }, // NOx
-        { 1.446e+00, 6.413e-04, 8.832e-03, 9.753e-05, 1.275e-06, 1.686e-03, 1.002e-05 }, // PM + PM (non-exhaust)
+        { 4.823e-01, 2.056e-03, 8.773e-02, 1.456e-04, 0.000e+00, 1.976e-02, 0.000e+00 }, // HC
+        { 6.800e+02, 2.697e+02, 1.066e+03, 0.000e+00, 0.000e+00, 6.675e+02, 0.000e+00 }, // FC
+        { 3.660e+00, 8.431e-03, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 4.126e-03 }, // NOx
+        { 1.446e+00, 2.309e-03, 8.832e-03, 1.264e-03, 5.946e-05, 6.071e-03, 1.299e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // Coach_3-Axes_gt18t_Euro-VIs_D-E
-        { 2.116e+03, 2.331e+02, 3.315e+03, 0.000e+00, 0.000e+00, 5.770e+02, 0.000e+00 }, // CO2(total)
+        { 2.116e+03, 8.393e+02, 3.315e+03, 0.000e+00, 0.000e+00, 2.077e+03, 0.000e+00 }, // CO2(total)
         { 1.187e+00, 0.000e+00, 1.541e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 4.823e-01, 5.712e-04, 8.773e-02, 1.123e-05, 0.000e+00, 5.488e-03, 0.000e+00 }, // HC
-        { 6.800e+02, 7.493e+01, 1.066e+03, 0.000e+00, 0.000e+00, 1.854e+02, 0.000e+00 }, // FC
-        { 4.154e+01, 1.756e+00, 8.539e+01, 0.000e+00, 0.000e+00, 3.952e+00, 0.000e+00 }, // NOx
-        { 1.446e+00, 6.413e-04, 8.832e-03, 9.753e-05, 1.275e-06, 1.686e-03, 1.002e-05 }, // PM + PM (non-exhaust)
+        { 4.823e-01, 2.056e-03, 8.773e-02, 1.456e-04, 0.000e+00, 1.976e-02, 0.000e+00 }, // HC
+        { 6.800e+02, 2.697e+02, 1.066e+03, 0.000e+00, 0.000e+00, 6.675e+02, 0.000e+00 }, // FC
+        { 4.154e+01, 6.321e+00, 8.539e+01, 0.000e+00, 0.000e+00, 1.423e+01, 0.000e+00 }, // NOx
+        { 1.446e+00, 2.309e-03, 8.832e-03, 1.264e-03, 5.946e-05, 6.071e-03, 1.299e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // Coach_Midi_le15t_50ties
-        { 2.647e+03, 8.997e+01, 0.000e+00, 0.000e+00, 5.403e-03, 3.238e+02, 0.000e+00 }, // CO2(total)
-        { 3.183e+01, 0.000e+00, 0.000e+00, 1.482e-03, 3.898e-05, 9.860e-01, 5.073e-03 }, // CO
-        { 1.508e+01, 0.000e+00, 6.738e+00, 0.000e+00, 4.813e-06, 0.000e+00, 2.121e-04 }, // HC
-        { 8.507e+02, 2.891e+01, 0.000e+00, 0.000e+00, 1.736e-03, 1.041e+02, 0.000e+00 }, // FC
-        { 3.911e+01, 9.804e-01, 0.000e+00, 0.000e+00, 7.530e-05, 3.938e+00, 7.798e-05 }, // NOx
-        { 6.367e+00, 0.000e+00, 0.000e+00, 5.243e-04, 4.327e-06, 1.805e-01, 2.021e-04 }, // PM + PM (non-exhaust)
+        { 2.647e+03, 3.239e+02, 0.000e+00, 0.000e+00, 2.521e-01, 1.166e+03, 0.000e+00 }, // CO2(total)
+        { 3.183e+01, 0.000e+00, 0.000e+00, 1.920e-02, 1.819e-03, 3.550e+00, 6.574e-02 }, // CO
+        { 1.508e+01, 0.000e+00, 6.738e+00, 0.000e+00, 2.245e-04, 0.000e+00, 2.749e-03 }, // HC
+        { 8.507e+02, 1.041e+02, 0.000e+00, 0.000e+00, 8.102e-02, 3.747e+02, 0.000e+00 }, // FC
+        { 3.911e+01, 3.530e+00, 0.000e+00, 0.000e+00, 3.513e-03, 1.418e+01, 1.011e-03 }, // NOx
+        { 6.367e+00, 0.000e+00, 0.000e+00, 6.795e-03, 2.019e-04, 6.499e-01, 2.619e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // Coach_Midi_le15t_60ties
-        { 2.647e+03, 8.997e+01, 0.000e+00, 0.000e+00, 5.403e-03, 3.238e+02, 0.000e+00 }, // CO2(total)
-        { 3.183e+01, 0.000e+00, 0.000e+00, 1.482e-03, 3.898e-05, 9.860e-01, 5.073e-03 }, // CO
-        { 1.508e+01, 0.000e+00, 6.738e+00, 0.000e+00, 4.813e-06, 0.000e+00, 2.121e-04 }, // HC
-        { 8.507e+02, 2.891e+01, 0.000e+00, 0.000e+00, 1.736e-03, 1.041e+02, 0.000e+00 }, // FC
-        { 3.911e+01, 9.804e-01, 0.000e+00, 0.000e+00, 7.530e-05, 3.938e+00, 7.798e-05 }, // NOx
-        { 6.367e+00, 0.000e+00, 0.000e+00, 5.243e-04, 4.327e-06, 1.805e-01, 2.021e-04 }, // PM + PM (non-exhaust)
+        { 2.647e+03, 3.239e+02, 0.000e+00, 0.000e+00, 2.521e-01, 1.166e+03, 0.000e+00 }, // CO2(total)
+        { 3.183e+01, 0.000e+00, 0.000e+00, 1.920e-02, 1.819e-03, 3.550e+00, 6.574e-02 }, // CO
+        { 1.508e+01, 0.000e+00, 6.738e+00, 0.000e+00, 2.245e-04, 0.000e+00, 2.749e-03 }, // HC
+        { 8.507e+02, 1.041e+02, 0.000e+00, 0.000e+00, 8.102e-02, 3.747e+02, 0.000e+00 }, // FC
+        { 3.911e+01, 3.530e+00, 0.000e+00, 0.000e+00, 3.513e-03, 1.418e+01, 1.011e-03 }, // NOx
+        { 6.367e+00, 0.000e+00, 0.000e+00, 6.795e-03, 2.019e-04, 6.499e-01, 2.619e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // Coach_Midi_le15t_70ties
-        { 2.647e+03, 8.997e+01, 0.000e+00, 0.000e+00, 5.403e-03, 3.238e+02, 0.000e+00 }, // CO2(total)
-        { 3.183e+01, 0.000e+00, 0.000e+00, 1.482e-03, 3.898e-05, 9.860e-01, 5.073e-03 }, // CO
-        { 1.508e+01, 0.000e+00, 6.738e+00, 0.000e+00, 4.813e-06, 0.000e+00, 2.121e-04 }, // HC
-        { 8.507e+02, 2.891e+01, 0.000e+00, 0.000e+00, 1.736e-03, 1.041e+02, 0.000e+00 }, // FC
-        { 3.911e+01, 9.804e-01, 0.000e+00, 0.000e+00, 7.530e-05, 3.938e+00, 7.798e-05 }, // NOx
-        { 6.367e+00, 0.000e+00, 0.000e+00, 5.243e-04, 4.327e-06, 1.805e-01, 2.021e-04 }, // PM + PM (non-exhaust)
+        { 2.647e+03, 3.239e+02, 0.000e+00, 0.000e+00, 2.521e-01, 1.166e+03, 0.000e+00 }, // CO2(total)
+        { 3.183e+01, 0.000e+00, 0.000e+00, 1.920e-02, 1.819e-03, 3.550e+00, 6.574e-02 }, // CO
+        { 1.508e+01, 0.000e+00, 6.738e+00, 0.000e+00, 2.245e-04, 0.000e+00, 2.749e-03 }, // HC
+        { 8.507e+02, 1.041e+02, 0.000e+00, 0.000e+00, 8.102e-02, 3.747e+02, 0.000e+00 }, // FC
+        { 3.911e+01, 3.530e+00, 0.000e+00, 0.000e+00, 3.513e-03, 1.418e+01, 1.011e-03 }, // NOx
+        { 6.367e+00, 0.000e+00, 0.000e+00, 6.795e-03, 2.019e-04, 6.499e-01, 2.619e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // Coach_Midi_le15t_80ties
-        { 2.647e+03, 8.997e+01, 0.000e+00, 0.000e+00, 5.403e-03, 3.238e+02, 0.000e+00 }, // CO2(total)
-        { 3.183e+01, 0.000e+00, 0.000e+00, 1.482e-03, 3.898e-05, 9.860e-01, 5.073e-03 }, // CO
-        { 1.508e+01, 0.000e+00, 6.738e+00, 0.000e+00, 4.813e-06, 0.000e+00, 2.121e-04 }, // HC
-        { 8.507e+02, 2.891e+01, 0.000e+00, 0.000e+00, 1.736e-03, 1.041e+02, 0.000e+00 }, // FC
-        { 3.911e+01, 9.804e-01, 0.000e+00, 0.000e+00, 7.530e-05, 3.938e+00, 7.798e-05 }, // NOx
-        { 6.367e+00, 0.000e+00, 0.000e+00, 5.243e-04, 4.327e-06, 1.805e-01, 2.021e-04 }, // PM + PM (non-exhaust)
+        { 2.647e+03, 3.239e+02, 0.000e+00, 0.000e+00, 2.521e-01, 1.166e+03, 0.000e+00 }, // CO2(total)
+        { 3.183e+01, 0.000e+00, 0.000e+00, 1.920e-02, 1.819e-03, 3.550e+00, 6.574e-02 }, // CO
+        { 1.508e+01, 0.000e+00, 6.738e+00, 0.000e+00, 2.245e-04, 0.000e+00, 2.749e-03 }, // HC
+        { 8.507e+02, 1.041e+02, 0.000e+00, 0.000e+00, 8.102e-02, 3.747e+02, 0.000e+00 }, // FC
+        { 3.911e+01, 3.530e+00, 0.000e+00, 0.000e+00, 3.513e-03, 1.418e+01, 1.011e-03 }, // NOx
+        { 6.367e+00, 0.000e+00, 0.000e+00, 6.795e-03, 2.019e-04, 6.499e-01, 2.619e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // Coach_Midi_le15t_Euro-I
-        { 2.586e+03, 8.738e+01, 0.000e+00, 0.000e+00, 4.901e-03, 3.113e+02, 0.000e+00 }, // CO2(total)
-        { 1.492e+01, 0.000e+00, 7.425e+00, 3.489e-04, 6.777e-06, 3.255e-01, 0.000e+00 }, // CO
-        { 3.137e+00, 0.000e+00, 0.000e+00, 0.000e+00, 2.904e-06, 6.416e-02, 9.264e-05 }, // HC
-        { 8.310e+02, 2.808e+01, 0.000e+00, 0.000e+00, 1.575e-03, 1.001e+02, 0.000e+00 }, // FC
-        { 2.251e+01, 9.590e-01, 5.626e+00, 0.000e+00, 3.717e-05, 2.930e+00, 0.000e+00 }, // NOx
-        { 3.911e+00, 0.000e+00, 0.000e+00, 8.964e-05, 3.840e-06, 6.470e-02, 9.436e-05 }, // PM + PM (non-exhaust)
+        { 2.586e+03, 3.146e+02, 0.000e+00, 0.000e+00, 2.287e-01, 1.121e+03, 0.000e+00 }, // CO2(total)
+        { 1.492e+01, 0.000e+00, 7.425e+00, 4.522e-03, 3.162e-04, 1.172e+00, 0.000e+00 }, // CO
+        { 3.137e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.355e-04, 2.310e-01, 1.201e-03 }, // HC
+        { 8.310e+02, 1.011e+02, 0.000e+00, 0.000e+00, 7.349e-02, 3.602e+02, 0.000e+00 }, // FC
+        { 2.251e+01, 3.452e+00, 5.626e+00, 0.000e+00, 1.734e-03, 1.055e+01, 0.000e+00 }, // NOx
+        { 3.911e+00, 0.000e+00, 0.000e+00, 1.162e-03, 1.791e-04, 2.329e-01, 1.223e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // Coach_Midi_le15t_Euro-II
-        { 2.359e+03, 8.972e+01, 6.397e+02, 0.000e+00, 3.741e-03, 2.875e+02, 0.000e+00 }, // CO2(total)
-        { 1.377e+01, 0.000e+00, 1.862e+01, 0.000e+00, 6.408e-07, 2.396e-02, 0.000e+00 }, // CO
-        { 2.035e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.673e-06, 4.316e-02, 3.475e-05 }, // HC
-        { 7.581e+02, 2.883e+01, 2.056e+02, 0.000e+00, 1.202e-03, 9.239e+01, 0.000e+00 }, // FC
-        { 2.543e+01, 8.932e-01, 6.583e+00, 0.000e+00, 3.681e-05, 2.823e+00, 0.000e+00 }, // NOx
-        { 2.916e+00, 0.000e+00, 1.251e+00, 7.978e-05, 2.059e-06, 1.846e-02, 1.712e-05 }, // PM + PM (non-exhaust)
+        { 2.359e+03, 3.230e+02, 6.397e+02, 0.000e+00, 1.745e-01, 1.035e+03, 0.000e+00 }, // CO2(total)
+        { 1.377e+01, 0.000e+00, 1.862e+01, 0.000e+00, 2.990e-05, 8.627e-02, 0.000e+00 }, // CO
+        { 2.035e+00, 0.000e+00, 0.000e+00, 0.000e+00, 7.808e-05, 1.554e-01, 4.504e-04 }, // HC
+        { 7.581e+02, 1.038e+02, 2.056e+02, 0.000e+00, 5.610e-02, 3.326e+02, 0.000e+00 }, // FC
+        { 2.543e+01, 3.216e+00, 6.583e+00, 0.000e+00, 1.717e-03, 1.016e+01, 0.000e+00 }, // NOx
+        { 2.916e+00, 0.000e+00, 1.251e+00, 1.034e-03, 9.606e-05, 6.645e-02, 2.218e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // Coach_Midi_le15t_Euro-III
-        { 1.794e+03, 1.129e+02, 9.018e+02, 0.000e+00, 2.310e-03, 3.003e+02, 0.000e+00 }, // CO2(total)
-        { 1.253e+01, 0.000e+00, 7.256e+00, 0.000e+00, 1.896e-06, 0.000e+00, 7.842e-04 }, // CO
-        { 1.839e+00, 1.904e-03, 2.832e-01, 0.000e+00, 9.548e-07, 3.290e-02, 0.000e+00 }, // HC
-        { 5.767e+02, 3.627e+01, 2.898e+02, 0.000e+00, 7.425e-04, 9.650e+01, 0.000e+00 }, // FC
-        { 1.742e+01, 7.515e-01, 6.072e+00, 2.288e-03, 0.000e+00, 2.194e+00, 0.000e+00 }, // NOx
-        { 2.506e+00, 4.223e-03, 3.959e-01, 8.504e-05, 1.673e-06, 1.787e-02, 2.369e-05 }, // PM + PM (non-exhaust)
+        { 1.794e+03, 4.063e+02, 9.018e+02, 0.000e+00, 1.078e-01, 1.081e+03, 0.000e+00 }, // CO2(total)
+        { 1.253e+01, 0.000e+00, 7.256e+00, 0.000e+00, 8.845e-05, 0.000e+00, 1.016e-02 }, // CO
+        { 1.839e+00, 6.853e-03, 2.832e-01, 0.000e+00, 4.455e-05, 1.184e-01, 0.000e+00 }, // HC
+        { 5.767e+02, 1.306e+02, 2.898e+02, 0.000e+00, 3.464e-02, 3.474e+02, 0.000e+00 }, // FC
+        { 1.742e+01, 2.706e+00, 6.072e+00, 2.965e-02, 0.000e+00, 7.899e+00, 0.000e+00 }, // NOx
+        { 2.506e+00, 1.520e-02, 3.959e-01, 1.102e-03, 7.806e-05, 6.433e-02, 3.070e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // Coach_Midi_le15t_Euro-IV_EGR
-        { 6.999e+02, 1.318e+02, 1.293e+03, 0.000e+00, 1.407e-03, 2.988e+02, 0.000e+00 }, // CO2(total)
-        { 5.707e+00, 0.000e+00, 6.260e+00, 1.756e-04, 4.760e-06, 0.000e+00, 1.525e-03 }, // CO
-        { 2.892e-01, 0.000e+00, 3.544e-01, 1.544e-05, 3.495e-07, 0.000e+00, 9.426e-05 }, // HC
-        { 2.249e+02, 4.236e+01, 4.156e+02, 0.000e+00, 4.523e-04, 9.603e+01, 0.000e+00 }, // FC
-        { 1.757e+01, 5.976e-01, 3.049e+01, 4.952e-04, 0.000e+00, 1.171e+00, 1.237e-03 }, // NOx
-        { 1.701e+00, 0.000e+00, 2.932e-01, 8.545e-05, 1.629e-06, 0.000e+00, 6.005e-05 }, // PM + PM (non-exhaust)
+        { 6.999e+02, 4.745e+02, 1.293e+03, 0.000e+00, 6.566e-02, 1.076e+03, 0.000e+00 }, // CO2(total)
+        { 5.707e+00, 0.000e+00, 6.260e+00, 2.276e-03, 2.221e-04, 0.000e+00, 1.976e-02 }, // CO
+        { 2.892e-01, 0.000e+00, 3.544e-01, 2.001e-04, 1.631e-05, 0.000e+00, 1.222e-03 }, // HC
+        { 2.249e+02, 1.525e+02, 4.156e+02, 0.000e+00, 2.110e-02, 3.457e+02, 0.000e+00 }, // FC
+        { 1.757e+01, 2.151e+00, 3.049e+01, 6.418e-03, 0.000e+00, 4.217e+00, 1.603e-02 }, // NOx
+        { 1.701e+00, 0.000e+00, 2.932e-01, 1.107e-03, 7.598e-05, 0.000e+00, 7.783e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // Coach_Midi_le15t_Euro-IV_SCR
-        { 7.832e+02, 1.288e+02, 1.781e+03, 0.000e+00, 1.210e-03, 2.846e+02, 0.000e+00 }, // CO2(total)
-        { 1.652e+01, 0.000e+00, 2.138e+01, 0.000e+00, 1.055e-06, 0.000e+00, 3.676e-04 }, // CO
-        { 7.128e-02, 2.001e-03, 1.182e-01, 0.000e+00, 6.602e-08, 4.648e-03, 0.000e+00 }, // HC
-        { 2.517e+02, 4.138e+01, 5.723e+02, 0.000e+00, 3.890e-04, 9.145e+01, 0.000e+00 }, // FC
-        { 1.512e+01, 2.393e-01, 0.000e+00, 0.000e+00, 1.570e-05, 8.097e-01, 8.616e-04 }, // NOx
-        { 1.722e+00, 0.000e+00, 3.865e-01, 9.280e-05, 1.522e-06, 0.000e+00, 4.857e-05 }, // PM + PM (non-exhaust)
+        { 7.832e+02, 4.636e+02, 1.781e+03, 0.000e+00, 5.647e-02, 1.024e+03, 0.000e+00 }, // CO2(total)
+        { 1.652e+01, 0.000e+00, 2.138e+01, 0.000e+00, 4.924e-05, 0.000e+00, 4.764e-03 }, // CO
+        { 7.128e-02, 7.203e-03, 1.182e-01, 0.000e+00, 3.080e-06, 1.673e-02, 0.000e+00 }, // HC
+        { 2.517e+02, 1.490e+02, 5.723e+02, 0.000e+00, 1.815e-02, 3.292e+02, 0.000e+00 }, // FC
+        { 1.512e+01, 8.614e-01, 0.000e+00, 0.000e+00, 7.326e-04, 2.915e+00, 1.117e-02 }, // NOx
+        { 1.722e+00, 0.000e+00, 3.865e-01, 1.203e-03, 7.102e-05, 0.000e+00, 6.295e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // Coach_Midi_le15t_Euro-IV_SCRs
-        { 7.832e+02, 1.288e+02, 1.781e+03, 0.000e+00, 1.210e-03, 2.846e+02, 0.000e+00 }, // CO2(total)
-        { 1.652e+01, 0.000e+00, 2.138e+01, 0.000e+00, 1.055e-06, 0.000e+00, 3.676e-04 }, // CO
-        { 7.128e-02, 2.001e-03, 1.182e-01, 0.000e+00, 6.602e-08, 4.648e-03, 0.000e+00 }, // HC
-        { 2.517e+02, 4.138e+01, 5.723e+02, 0.000e+00, 3.890e-04, 9.145e+01, 0.000e+00 }, // FC
-        { 1.751e+01, 1.044e+00, 1.381e+01, 0.000e+00, 2.515e-05, 2.745e+00, 0.000e+00 }, // NOx
-        { 1.722e+00, 0.000e+00, 3.865e-01, 9.280e-05, 1.522e-06, 0.000e+00, 4.857e-05 }, // PM + PM (non-exhaust)
+        { 7.832e+02, 4.636e+02, 1.781e+03, 0.000e+00, 5.647e-02, 1.024e+03, 0.000e+00 }, // CO2(total)
+        { 1.652e+01, 0.000e+00, 2.138e+01, 0.000e+00, 4.924e-05, 0.000e+00, 4.764e-03 }, // CO
+        { 7.128e-02, 7.203e-03, 1.182e-01, 0.000e+00, 3.080e-06, 1.673e-02, 0.000e+00 }, // HC
+        { 2.517e+02, 1.490e+02, 5.723e+02, 0.000e+00, 1.815e-02, 3.292e+02, 0.000e+00 }, // FC
+        { 1.751e+01, 3.759e+00, 1.381e+01, 0.000e+00, 1.173e-03, 9.881e+00, 0.000e+00 }, // NOx
+        { 1.722e+00, 0.000e+00, 3.865e-01, 1.203e-03, 7.102e-05, 0.000e+00, 6.295e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // Coach_Midi_le15t_Euro-V_EGR
-        { 6.105e+02, 1.312e+02, 1.877e+03, 0.000e+00, 7.308e-04, 2.789e+02, 0.000e+00 }, // CO2(total)
-        { 4.155e+00, 0.000e+00, 4.366e+00, 0.000e+00, 0.000e+00, 0.000e+00, 3.524e-05 }, // CO
-        { 4.500e-01, 1.709e-03, 4.894e-01, 0.000e+00, 4.539e-07, 3.140e-03, 9.651e-05 }, // HC
-        { 1.962e+02, 4.217e+01, 6.033e+02, 0.000e+00, 2.349e-04, 8.964e+01, 0.000e+00 }, // FC
-        { 2.134e+01, 1.276e-01, 3.665e+01, 2.630e-03, 0.000e+00, 0.000e+00, 7.866e-03 }, // NOx
-        { 1.564e+00, 8.252e-04, 0.000e+00, 9.018e-05, 1.764e-06, 1.011e-02, 2.328e-05 }, // PM + PM (non-exhaust)
+        { 6.105e+02, 4.723e+02, 1.877e+03, 0.000e+00, 3.410e-02, 1.004e+03, 0.000e+00 }, // CO2(total)
+        { 4.155e+00, 0.000e+00, 4.366e+00, 0.000e+00, 0.000e+00, 0.000e+00, 4.567e-04 }, // CO
+        { 4.500e-01, 6.152e-03, 4.894e-01, 0.000e+00, 2.118e-05, 1.131e-02, 1.251e-03 }, // HC
+        { 1.962e+02, 1.518e+02, 6.033e+02, 0.000e+00, 1.096e-02, 3.227e+02, 0.000e+00 }, // FC
+        { 2.134e+01, 4.592e-01, 3.665e+01, 3.408e-02, 0.000e+00, 0.000e+00, 1.019e-01 }, // NOx
+        { 1.564e+00, 2.971e-03, 0.000e+00, 1.169e-03, 8.228e-05, 3.641e-02, 3.017e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // Coach_Midi_le15t_Euro-V_SCR
-        { 7.002e+02, 1.261e+02, 2.112e+03, 0.000e+00, 7.259e-04, 2.670e+02, 0.000e+00 }, // CO2(total)
-        { 1.495e+01, 0.000e+00, 1.470e+01, 3.183e-04, 2.199e-06, 0.000e+00, 1.689e-03 }, // CO
-        { 6.714e-02, 2.315e-03, 1.017e-01, 0.000e+00, 2.006e-08, 4.316e-03, 0.000e+00 }, // HC
-        { 2.250e+02, 4.051e+01, 6.787e+02, 0.000e+00, 2.333e-04, 8.582e+01, 0.000e+00 }, // FC
-        { 1.269e+01, 1.394e-01, 0.000e+00, 0.000e+00, 3.213e-06, 2.077e-01, 1.762e-03 }, // NOx
-        { 1.706e+00, 0.000e+00, 3.116e-01, 1.120e-04, 1.379e-06, 0.000e+00, 6.332e-05 }, // PM + PM (non-exhaust)
+        { 7.002e+02, 4.538e+02, 2.112e+03, 0.000e+00, 3.387e-02, 9.614e+02, 0.000e+00 }, // CO2(total)
+        { 1.495e+01, 0.000e+00, 1.470e+01, 4.125e-03, 1.026e-04, 0.000e+00, 2.188e-02 }, // CO
+        { 6.714e-02, 8.335e-03, 1.017e-01, 0.000e+00, 9.358e-07, 1.554e-02, 0.000e+00 }, // HC
+        { 2.250e+02, 1.458e+02, 6.787e+02, 0.000e+00, 1.088e-02, 3.090e+02, 0.000e+00 }, // FC
+        { 1.269e+01, 5.018e-01, 0.000e+00, 0.000e+00, 1.499e-04, 7.477e-01, 2.283e-02 }, // NOx
+        { 1.706e+00, 0.000e+00, 3.116e-01, 1.451e-03, 6.435e-05, 0.000e+00, 8.206e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // Coach_Midi_le15t_Euro-V_SCRs
-        { 7.002e+02, 1.261e+02, 2.112e+03, 0.000e+00, 7.259e-04, 2.670e+02, 0.000e+00 }, // CO2(total)
-        { 1.495e+01, 0.000e+00, 1.470e+01, 3.183e-04, 2.199e-06, 0.000e+00, 1.689e-03 }, // CO
-        { 6.714e-02, 2.315e-03, 1.017e-01, 0.000e+00, 2.006e-08, 4.316e-03, 0.000e+00 }, // HC
-        { 2.250e+02, 4.051e+01, 6.787e+02, 0.000e+00, 2.333e-04, 8.582e+01, 0.000e+00 }, // FC
-        { 1.863e+01, 1.075e+00, 1.550e+01, 0.000e+00, 1.781e-05, 2.636e+00, 0.000e+00 }, // NOx
-        { 1.706e+00, 0.000e+00, 3.116e-01, 1.120e-04, 1.379e-06, 0.000e+00, 6.332e-05 }, // PM + PM (non-exhaust)
+        { 7.002e+02, 4.538e+02, 2.112e+03, 0.000e+00, 3.387e-02, 9.614e+02, 0.000e+00 }, // CO2(total)
+        { 1.495e+01, 0.000e+00, 1.470e+01, 4.125e-03, 1.026e-04, 0.000e+00, 2.188e-02 }, // CO
+        { 6.714e-02, 8.335e-03, 1.017e-01, 0.000e+00, 9.358e-07, 1.554e-02, 0.000e+00 }, // HC
+        { 2.250e+02, 1.458e+02, 6.787e+02, 0.000e+00, 1.088e-02, 3.090e+02, 0.000e+00 }, // FC
+        { 1.863e+01, 3.868e+00, 1.550e+01, 0.000e+00, 8.310e-04, 9.488e+00, 0.000e+00 }, // NOx
+        { 1.706e+00, 0.000e+00, 3.116e-01, 1.451e-03, 6.435e-05, 0.000e+00, 8.206e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // Coach_Midi_le15t_Euro-VI_A-C
-        { 4.728e+02, 1.293e+02, 2.096e+03, 0.000e+00, 4.862e-04, 2.668e+02, 0.000e+00 }, // CO2(total)
-        { 1.223e+00, 1.996e-04, 1.495e+00, 0.000e+00, 4.567e-07, 4.775e-03, 0.000e+00 }, // CO
-        { 7.564e-02, 1.696e-03, 1.142e-01, 0.000e+00, 0.000e+00, 3.034e-03, 0.000e+00 }, // HC
-        { 1.520e+02, 4.156e+01, 6.735e+02, 0.000e+00, 1.563e-04, 8.574e+01, 0.000e+00 }, // FC
-        { 2.587e+00, 0.000e+00, 2.699e-01, 0.000e+00, 7.509e-07, 0.000e+00, 3.960e-05 }, // NOx
-        { 1.480e+00, 0.000e+00, 5.979e-02, 8.557e-05, 1.480e-06, 2.664e-04, 2.329e-05 }, // PM + PM (non-exhaust)
+        { 4.728e+02, 4.655e+02, 2.096e+03, 0.000e+00, 2.268e-02, 9.605e+02, 0.000e+00 }, // CO2(total)
+        { 1.223e+00, 7.185e-04, 1.495e+00, 0.000e+00, 2.131e-05, 1.719e-02, 0.000e+00 }, // CO
+        { 7.564e-02, 6.104e-03, 1.142e-01, 0.000e+00, 0.000e+00, 1.092e-02, 0.000e+00 }, // HC
+        { 1.520e+02, 1.496e+02, 6.735e+02, 0.000e+00, 7.290e-03, 3.087e+02, 0.000e+00 }, // FC
+        { 2.587e+00, 0.000e+00, 2.699e-01, 0.000e+00, 3.503e-05, 0.000e+00, 5.132e-04 }, // NOx
+        { 1.480e+00, 0.000e+00, 5.979e-02, 1.109e-03, 6.904e-05, 9.590e-04, 3.019e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // Coach_Midi_le15t_Euro-VIs_A-C
-        { 4.728e+02, 1.293e+02, 2.096e+03, 0.000e+00, 4.862e-04, 2.668e+02, 0.000e+00 }, // CO2(total)
-        { 1.223e+00, 1.996e-04, 1.495e+00, 0.000e+00, 4.567e-07, 4.775e-03, 0.000e+00 }, // CO
-        { 7.564e-02, 1.696e-03, 1.142e-01, 0.000e+00, 0.000e+00, 3.034e-03, 0.000e+00 }, // HC
-        { 1.520e+02, 4.156e+01, 6.735e+02, 0.000e+00, 1.563e-04, 8.574e+01, 0.000e+00 }, // FC
-        { 3.749e+00, 7.788e-01, 0.000e+00, 1.671e-03, 0.000e+00, 2.014e+00, 0.000e+00 }, // NOx
-        { 1.480e+00, 0.000e+00, 5.979e-02, 8.557e-05, 1.480e-06, 2.664e-04, 2.329e-05 }, // PM + PM (non-exhaust)
+        { 4.728e+02, 4.655e+02, 2.096e+03, 0.000e+00, 2.268e-02, 9.605e+02, 0.000e+00 }, // CO2(total)
+        { 1.223e+00, 7.185e-04, 1.495e+00, 0.000e+00, 2.131e-05, 1.719e-02, 0.000e+00 }, // CO
+        { 7.564e-02, 6.104e-03, 1.142e-01, 0.000e+00, 0.000e+00, 1.092e-02, 0.000e+00 }, // HC
+        { 1.520e+02, 1.496e+02, 6.735e+02, 0.000e+00, 7.290e-03, 3.087e+02, 0.000e+00 }, // FC
+        { 3.749e+00, 2.804e+00, 0.000e+00, 2.165e-02, 0.000e+00, 7.252e+00, 0.000e+00 }, // NOx
+        { 1.480e+00, 0.000e+00, 5.979e-02, 1.109e-03, 6.904e-05, 9.590e-04, 3.019e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // Coach_Midi_le15t_Euro-VI_D-E
-        { 2.860e+02, 1.328e+02, 1.445e+03, 0.000e+00, 3.904e-04, 2.768e+02, 0.000e+00 }, // CO2(total)
+        { 2.860e+02, 4.783e+02, 1.445e+03, 0.000e+00, 1.821e-02, 9.964e+02, 0.000e+00 }, // CO2(total)
         { 3.217e-01, 0.000e+00, 2.175e-01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 1.631e-01, 0.000e+00, 3.570e-02, 1.204e-05, 1.118e-08, 1.162e-03, 1.873e-05 }, // HC
-        { 9.191e+01, 4.270e+01, 4.645e+02, 0.000e+00, 1.255e-04, 8.895e+01, 0.000e+00 }, // FC
-        { 8.011e-01, 0.000e+00, 4.832e-01, 0.000e+00, 5.081e-07, 0.000e+00, 1.148e-04 }, // NOx
-        { 1.433e+00, 3.415e-04, 3.485e-03, 8.483e-05, 1.472e-06, 7.861e-04, 2.350e-05 }, // PM + PM (non-exhaust)
+        { 1.631e-01, 0.000e+00, 3.570e-02, 1.561e-04, 5.217e-07, 4.183e-03, 2.428e-04 }, // HC
+        { 9.191e+01, 1.537e+02, 4.645e+02, 0.000e+00, 5.854e-03, 3.202e+02, 0.000e+00 }, // FC
+        { 8.011e-01, 0.000e+00, 4.832e-01, 0.000e+00, 2.371e-05, 0.000e+00, 1.488e-03 }, // NOx
+        { 1.433e+00, 1.229e-03, 3.485e-03, 1.099e-03, 6.869e-05, 2.830e-03, 3.045e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // Coach_Midi_le15t_Euro-VIs_D-E
-        { 2.860e+02, 1.328e+02, 1.445e+03, 0.000e+00, 3.904e-04, 2.768e+02, 0.000e+00 }, // CO2(total)
+        { 2.860e+02, 4.783e+02, 1.445e+03, 0.000e+00, 1.821e-02, 9.964e+02, 0.000e+00 }, // CO2(total)
         { 3.217e-01, 0.000e+00, 2.175e-01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 1.631e-01, 0.000e+00, 3.570e-02, 1.204e-05, 1.118e-08, 1.162e-03, 1.873e-05 }, // HC
-        { 9.191e+01, 4.270e+01, 4.645e+02, 0.000e+00, 1.255e-04, 8.895e+01, 0.000e+00 }, // FC
-        { 3.116e+01, 0.000e+00, 5.667e+01, 8.304e-03, 0.000e+00, 0.000e+00, 1.652e-02 }, // NOx
-        { 1.433e+00, 3.415e-04, 3.485e-03, 8.483e-05, 1.472e-06, 7.861e-04, 2.350e-05 }, // PM + PM (non-exhaust)
+        { 1.631e-01, 0.000e+00, 3.570e-02, 1.561e-04, 5.217e-07, 4.183e-03, 2.428e-04 }, // HC
+        { 9.191e+01, 1.537e+02, 4.645e+02, 0.000e+00, 5.854e-03, 3.202e+02, 0.000e+00 }, // FC
+        { 3.116e+01, 0.000e+00, 5.667e+01, 1.076e-01, 0.000e+00, 0.000e+00, 2.142e-01 }, // NOx
+        { 1.433e+00, 1.229e-03, 3.485e-03, 1.099e-03, 6.869e-05, 2.830e-03, 3.045e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // Coach_Std_le18t_CNG_Euro-I
-        { 3.680e+03, 1.901e+02, 0.000e+00, 6.143e-01, 0.000e+00, 6.536e+02, 0.000e+00 }, // CO2(total)
-        { 1.454e+01, 2.971e-01, 0.000e+00, 4.359e-04, 0.000e+00, 8.883e-01, 5.178e-04 }, // CO
-        { 9.782e+00, 0.000e+00, 3.979e+00, 0.000e+00, 2.907e-06, 1.027e-01, 1.581e-04 }, // HC
-        { 1.184e+03, 6.116e+01, 0.000e+00, 1.977e-01, 0.000e+00, 2.103e+02, 0.000e+00 }, // FC
-        { 3.451e+01, 2.081e+00, 0.000e+00, 3.589e-03, 0.000e+00, 6.268e+00, 0.000e+00 }, // NOx
-        { 6.929e+00, 0.000e+00, 0.000e+00, 5.260e-04, 1.420e-06, 1.228e-01, 4.228e-04 }, // PM + PM (non-exhaust)
+        { 3.680e+03, 6.842e+02, 0.000e+00, 7.962e+00, 0.000e+00, 2.353e+03, 0.000e+00 }, // CO2(total)
+        { 1.454e+01, 1.070e+00, 0.000e+00, 5.649e-03, 0.000e+00, 3.198e+00, 6.710e-03 }, // CO
+        { 9.782e+00, 0.000e+00, 3.979e+00, 0.000e+00, 1.356e-04, 3.698e-01, 2.048e-03 }, // HC
+        { 1.184e+03, 2.202e+02, 0.000e+00, 2.562e+00, 0.000e+00, 7.571e+02, 0.000e+00 }, // FC
+        { 3.451e+01, 7.493e+00, 0.000e+00, 4.652e-02, 0.000e+00, 2.257e+01, 0.000e+00 }, // NOx
+        { 6.929e+00, 0.000e+00, 0.000e+00, 6.817e-03, 6.626e-05, 4.421e-01, 5.480e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // Coach_Std_le18t_CNG_Euro-II
-        { 2.433e+03, 2.392e+02, 7.300e+02, 5.184e-02, 0.000e+00, 6.073e+02, 0.000e+00 }, // CO2(total)
-        { 1.335e+01, 1.857e-01, 1.061e+01, 0.000e+00, 0.000e+00, 4.647e-01, 0.000e+00 }, // CO
-        { 5.885e+00, 0.000e+00, 3.246e+00, 0.000e+00, 1.617e-06, 1.458e-02, 4.444e-04 }, // HC
-        { 7.828e+02, 7.697e+01, 2.349e+02, 1.668e-02, 0.000e+00, 1.954e+02, 0.000e+00 }, // FC
-        { 3.822e+01, 2.227e+00, 3.779e+01, 2.188e-04, 0.000e+00, 5.422e+00, 0.000e+00 }, // NOx
-        { 2.870e+00, 2.568e-02, 1.125e+00, 9.507e-05, 1.309e-06, 5.772e-02, 1.349e-05 }, // PM + PM (non-exhaust)
+        { 2.433e+03, 8.611e+02, 7.300e+02, 6.718e-01, 0.000e+00, 2.186e+03, 0.000e+00 }, // CO2(total)
+        { 1.335e+01, 6.684e-01, 1.061e+01, 0.000e+00, 0.000e+00, 1.673e+00, 0.000e+00 }, // CO
+        { 5.885e+00, 0.000e+00, 3.246e+00, 0.000e+00, 7.543e-05, 5.248e-02, 5.760e-03 }, // HC
+        { 7.828e+02, 2.771e+02, 2.349e+02, 2.162e-01, 0.000e+00, 7.035e+02, 0.000e+00 }, // FC
+        { 3.822e+01, 8.016e+00, 3.779e+01, 2.836e-03, 0.000e+00, 1.952e+01, 0.000e+00 }, // NOx
+        { 2.870e+00, 9.244e-02, 1.125e+00, 1.232e-03, 6.109e-05, 2.078e-01, 1.748e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // Coach_Std_le18t_CNG_Euro-III
-        { 3.386e+03, 2.176e+02, 2.052e+02, 0.000e+00, 2.185e-03, 6.245e+02, 0.000e+00 }, // CO2(total)
-        { 2.098e+01, 1.214e-01, 6.697e+00, 0.000e+00, 0.000e+00, 3.993e-01, 0.000e+00 }, // CO
-        { 5.354e+00, 0.000e+00, 2.894e+00, 0.000e+00, 1.076e-06, 0.000e+00, 4.678e-04 }, // HC
-        { 1.090e+03, 7.002e+01, 6.604e+01, 0.000e+00, 7.030e-04, 2.009e+02, 0.000e+00 }, // FC
-        { 2.612e+01, 1.790e+00, 2.163e+01, 0.000e+00, 0.000e+00, 4.285e+00, 0.000e+00 }, // NOx
-        { 4.089e+00, 0.000e+00, 2.223e-02, 1.047e-04, 2.126e-06, 3.734e-02, 6.681e-05 }, // PM + PM (non-exhaust)
+        { 3.386e+03, 7.834e+02, 2.052e+02, 0.000e+00, 1.019e-01, 2.248e+03, 0.000e+00 }, // CO2(total)
+        { 2.098e+01, 4.371e-01, 6.697e+00, 0.000e+00, 0.000e+00, 1.438e+00, 0.000e+00 }, // CO
+        { 5.354e+00, 0.000e+00, 2.894e+00, 0.000e+00, 5.021e-05, 0.000e+00, 6.063e-03 }, // HC
+        { 1.090e+03, 2.521e+02, 6.604e+01, 0.000e+00, 3.280e-02, 7.234e+02, 0.000e+00 }, // FC
+        { 2.612e+01, 6.445e+00, 2.163e+01, 0.000e+00, 0.000e+00, 1.542e+01, 0.000e+00 }, // NOx
+        { 4.089e+00, 0.000e+00, 2.223e-02, 1.357e-03, 9.920e-05, 1.344e-01, 8.658e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // Coach_Std_le18t_CNG_Euro-IV
-        { 1.797e+03, 2.509e+02, 2.303e+03, 0.000e+00, 0.000e+00, 6.023e+02, 0.000e+00 }, // CO2(total)
+        { 1.797e+03, 9.034e+02, 2.303e+03, 0.000e+00, 0.000e+00, 2.168e+03, 0.000e+00 }, // CO2(total)
         { 6.205e+00, 0.000e+00, 1.049e+01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 2.069e+00, 1.013e-02, 1.352e+00, 0.000e+00, 9.459e-07, 5.839e-02, 0.000e+00 }, // HC
-        { 5.781e+02, 8.075e+01, 7.411e+02, 0.000e+00, 0.000e+00, 1.938e+02, 0.000e+00 }, // FC
-        { 2.504e+01, 4.161e-01, 4.025e+01, 0.000e+00, 0.000e+00, 1.001e+00, 0.000e+00 }, // NOx
-        { 1.931e+00, 5.315e-03, 7.549e-01, 9.518e-05, 1.305e-06, 1.135e-02, 1.294e-05 }, // PM + PM (non-exhaust)
+        { 2.069e+00, 3.648e-02, 1.352e+00, 0.000e+00, 4.413e-05, 2.102e-01, 0.000e+00 }, // HC
+        { 5.781e+02, 2.907e+02, 7.411e+02, 0.000e+00, 0.000e+00, 6.977e+02, 0.000e+00 }, // FC
+        { 2.504e+01, 1.498e+00, 4.025e+01, 0.000e+00, 0.000e+00, 3.604e+00, 0.000e+00 }, // NOx
+        { 1.931e+00, 1.914e-02, 7.549e-01, 1.234e-03, 6.090e-05, 4.088e-02, 1.677e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // Coach_Std_le18t_CNG_Euro-V
-        { 1.191e+03, 2.352e+02, 7.518e+02, 0.000e+00, 0.000e+00, 5.739e+02, 0.000e+00 }, // CO2(total)
-        { 8.845e-01, 1.747e-01, 5.585e-01, 0.000e+00, 0.000e+00, 4.264e-01, 0.000e+00 }, // CO
-        { 4.173e-01, 8.244e-02, 2.635e-01, 0.000e+00, 0.000e+00, 2.012e-01, 0.000e+00 }, // HC
-        { 3.831e+02, 7.568e+01, 2.419e+02, 0.000e+00, 0.000e+00, 1.847e+02, 0.000e+00 }, // FC
-        { 1.608e+00, 3.177e-01, 1.016e+00, 0.000e+00, 0.000e+00, 7.754e-01, 0.000e+00 }, // NOx
-        { 1.428e+00, 1.363e-03, 4.358e-03, 9.911e-05, 1.262e-06, 3.327e-03, 1.113e-05 }, // PM + PM (non-exhaust)
+        { 1.191e+03, 8.467e+02, 7.518e+02, 0.000e+00, 0.000e+00, 2.066e+03, 0.000e+00 }, // CO2(total)
+        { 8.845e-01, 6.290e-01, 5.585e-01, 0.000e+00, 0.000e+00, 1.535e+00, 0.000e+00 }, // CO
+        { 4.173e-01, 2.968e-01, 2.635e-01, 0.000e+00, 0.000e+00, 7.242e-01, 0.000e+00 }, // HC
+        { 3.831e+02, 2.724e+02, 2.419e+02, 0.000e+00, 0.000e+00, 6.648e+02, 0.000e+00 }, // FC
+        { 1.608e+00, 1.144e+00, 1.016e+00, 0.000e+00, 0.000e+00, 2.791e+00, 0.000e+00 }, // NOx
+        { 1.428e+00, 4.908e-03, 4.358e-03, 1.284e-03, 5.887e-05, 1.198e-02, 1.442e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // Coach_Std_le18t_CNG_Euro-VI
-        { 1.251e+03, 2.315e+02, 1.351e+03, 0.000e+00, 0.000e+00, 5.635e+02, 0.000e+00 }, // CO2(total)
-        { 8.101e-01, 1.500e-01, 8.747e-01, 0.000e+00, 0.000e+00, 3.649e-01, 0.000e+00 }, // CO
-        { 2.147e-01, 3.974e-02, 2.318e-01, 0.000e+00, 0.000e+00, 9.670e-02, 0.000e+00 }, // HC
-        { 4.025e+02, 7.450e+01, 4.346e+02, 0.000e+00, 0.000e+00, 1.813e+02, 0.000e+00 }, // FC
-        { 5.378e-01, 9.955e-02, 5.807e-01, 0.000e+00, 0.000e+00, 2.423e-01, 0.000e+00 }, // NOx
-        { 1.427e+00, 1.342e-03, 7.829e-03, 1.002e-04, 1.250e-06, 3.266e-03, 1.083e-05 }, // PM + PM (non-exhaust)
+        { 1.251e+03, 8.336e+02, 1.351e+03, 0.000e+00, 0.000e+00, 2.028e+03, 0.000e+00 }, // CO2(total)
+        { 8.101e-01, 5.399e-01, 8.747e-01, 0.000e+00, 0.000e+00, 1.314e+00, 0.000e+00 }, // CO
+        { 2.147e-01, 1.430e-01, 2.318e-01, 0.000e+00, 0.000e+00, 3.481e-01, 0.000e+00 }, // HC
+        { 4.025e+02, 2.682e+02, 4.346e+02, 0.000e+00, 0.000e+00, 6.527e+02, 0.000e+00 }, // FC
+        { 5.378e-01, 3.584e-01, 5.807e-01, 0.000e+00, 0.000e+00, 8.721e-01, 0.000e+00 }, // NOx
+        { 1.427e+00, 4.832e-03, 7.829e-03, 1.299e-03, 5.832e-05, 1.176e-02, 1.404e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // Coach_3-Axes_gt18t_CNG_Euro-I
-        { 2.697e+03, 2.993e+02, 1.785e+03, 0.000e+00, 0.000e+00, 7.424e+02, 0.000e+00 }, // CO2(total)
-        { 1.405e+01, 4.140e-01, 0.000e+00, 0.000e+00, 0.000e+00, 1.062e+00, 0.000e+00 }, // CO
-        { 1.057e+01, 0.000e+00, 3.521e+00, 0.000e+00, 4.535e-06, 1.561e-01, 0.000e+00 }, // HC
-        { 8.678e+02, 9.632e+01, 5.745e+02, 0.000e+00, 0.000e+00, 2.389e+02, 0.000e+00 }, // FC
-        { 3.732e+01, 2.793e+00, 3.706e+01, 0.000e+00, 0.000e+00, 6.898e+00, 0.000e+00 }, // NOx
-        { 7.074e+00, 1.494e-02, 0.000e+00, 5.626e-04, 1.315e-06, 1.900e-01, 1.433e-05 }, // PM + PM (non-exhaust)
+        { 2.697e+03, 1.078e+03, 1.785e+03, 0.000e+00, 0.000e+00, 2.673e+03, 0.000e+00 }, // CO2(total)
+        { 1.405e+01, 1.490e+00, 0.000e+00, 0.000e+00, 0.000e+00, 3.822e+00, 0.000e+00 }, // CO
+        { 1.057e+01, 0.000e+00, 3.521e+00, 0.000e+00, 2.116e-04, 5.620e-01, 0.000e+00 }, // HC
+        { 8.678e+02, 3.467e+02, 5.745e+02, 0.000e+00, 0.000e+00, 8.600e+02, 0.000e+00 }, // FC
+        { 3.732e+01, 1.005e+01, 3.706e+01, 0.000e+00, 0.000e+00, 2.483e+01, 0.000e+00 }, // NOx
+        { 7.074e+00, 5.379e-02, 0.000e+00, 7.291e-03, 6.136e-05, 6.840e-01, 1.857e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // Coach_3-Axes_gt18t_CNG_Euro-II
-        { 3.731e+03, 2.681e+02, 5.287e+03, 0.000e+00, 0.000e+00, 6.516e+02, 0.000e+00 }, // CO2(total)
-        { 1.532e+01, 2.089e-01, 1.288e+01, 0.000e+00, 0.000e+00, 5.281e-01, 0.000e+00 }, // CO
-        { 6.313e+00, 0.000e+00, 2.726e+00, 0.000e+00, 2.520e-06, 4.005e-02, 4.678e-04 }, // HC
-        { 1.201e+03, 8.627e+01, 1.701e+03, 0.000e+00, 0.000e+00, 2.097e+02, 0.000e+00 }, // FC
-        { 5.692e+01, 2.401e+00, 8.222e+01, 0.000e+00, 0.000e+00, 5.833e+00, 0.000e+00 }, // NOx
-        { 2.993e+00, 3.135e-02, 1.026e+00, 9.911e-05, 1.276e-06, 7.259e-02, 1.474e-05 }, // PM + PM (non-exhaust)
+        { 3.731e+03, 9.652e+02, 5.287e+03, 0.000e+00, 0.000e+00, 2.346e+03, 0.000e+00 }, // CO2(total)
+        { 1.532e+01, 7.520e-01, 1.288e+01, 0.000e+00, 0.000e+00, 1.901e+00, 0.000e+00 }, // CO
+        { 6.313e+00, 0.000e+00, 2.726e+00, 0.000e+00, 1.176e-04, 1.442e-01, 6.062e-03 }, // HC
+        { 1.201e+03, 3.106e+02, 1.701e+03, 0.000e+00, 0.000e+00, 7.548e+02, 0.000e+00 }, // FC
+        { 5.692e+01, 8.643e+00, 8.222e+01, 0.000e+00, 0.000e+00, 2.100e+01, 0.000e+00 }, // NOx
+        { 2.993e+00, 1.129e-01, 1.026e+00, 1.285e-03, 5.952e-05, 2.613e-01, 1.910e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // Coach_3-Axes_gt18t_CNG_Euro-III
-        { 4.267e+03, 2.601e+02, 6.428e+03, 0.000e+00, 0.000e+00, 6.370e+02, 0.000e+00 }, // CO2(total)
-        { 2.102e+01, 1.858e-01, 6.622e+00, 0.000e+00, 0.000e+00, 5.454e-01, 0.000e+00 }, // CO
-        { 5.675e+00, 0.000e+00, 2.926e+00, 0.000e+00, 1.693e-06, 0.000e+00, 6.585e-04 }, // HC
-        { 1.373e+03, 8.370e+01, 2.068e+03, 0.000e+00, 0.000e+00, 2.050e+02, 0.000e+00 }, // FC
-        { 4.996e+01, 1.775e+00, 7.403e+01, 0.000e+00, 0.000e+00, 4.399e+00, 0.000e+00 }, // NOx
-        { 3.692e+00, 1.762e-02, 0.000e+00, 9.712e-05, 1.286e-06, 5.067e-02, 1.290e-05 }, // PM + PM (non-exhaust)
+        { 4.267e+03, 9.365e+02, 6.428e+03, 0.000e+00, 0.000e+00, 2.293e+03, 0.000e+00 }, // CO2(total)
+        { 2.102e+01, 6.688e-01, 6.622e+00, 0.000e+00, 0.000e+00, 1.963e+00, 0.000e+00 }, // CO
+        { 5.675e+00, 0.000e+00, 2.926e+00, 0.000e+00, 7.899e-05, 0.000e+00, 8.534e-03 }, // HC
+        { 1.373e+03, 3.013e+02, 2.068e+03, 0.000e+00, 0.000e+00, 7.379e+02, 0.000e+00 }, // FC
+        { 4.996e+01, 6.388e+00, 7.403e+01, 0.000e+00, 0.000e+00, 1.584e+01, 0.000e+00 }, // NOx
+        { 3.692e+00, 6.343e-02, 0.000e+00, 1.259e-03, 5.999e-05, 1.824e-01, 1.671e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // Coach_3-Axes_gt18t_CNG_Euro-IV
-        { 3.540e+03, 2.699e+02, 6.833e+03, 0.000e+00, 0.000e+00, 6.485e+02, 0.000e+00 }, // CO2(total)
-        { 6.334e+00, 8.143e-04, 1.014e+01, 0.000e+00, 0.000e+00, 8.792e-03, 0.000e+00 }, // CO
-        { 2.443e+00, 1.066e-02, 1.753e+00, 0.000e+00, 9.559e-07, 6.465e-02, 0.000e+00 }, // HC
-        { 1.139e+03, 8.686e+01, 2.199e+03, 0.000e+00, 0.000e+00, 2.087e+02, 0.000e+00 }, // FC
-        { 2.775e+01, 4.681e-01, 4.390e+01, 0.000e+00, 0.000e+00, 1.162e+00, 0.000e+00 }, // NOx
-        { 1.994e+00, 5.632e-03, 7.807e-01, 9.382e-05, 1.317e-06, 1.355e-02, 1.269e-05 }, // PM + PM (non-exhaust)
+        { 3.540e+03, 9.717e+02, 6.833e+03, 0.000e+00, 0.000e+00, 2.335e+03, 0.000e+00 }, // CO2(total)
+        { 6.334e+00, 2.932e-03, 1.014e+01, 0.000e+00, 0.000e+00, 3.165e-02, 0.000e+00 }, // CO
+        { 2.443e+00, 3.838e-02, 1.753e+00, 0.000e+00, 4.460e-05, 2.327e-01, 0.000e+00 }, // HC
+        { 1.139e+03, 3.127e+02, 2.199e+03, 0.000e+00, 0.000e+00, 7.512e+02, 0.000e+00 }, // FC
+        { 2.775e+01, 1.685e+00, 4.390e+01, 0.000e+00, 0.000e+00, 4.184e+00, 0.000e+00 }, // NOx
+        { 1.994e+00, 2.027e-02, 7.807e-01, 1.216e-03, 6.145e-05, 4.878e-02, 1.645e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // Coach_3-Axes_gt18t_CNG_Euro-V
-        { 2.517e+03, 2.591e+02, 4.018e+03, 0.000e+00, 0.000e+00, 6.388e+02, 0.000e+00 }, // CO2(total)
-        { 1.870e+00, 1.925e-01, 2.985e+00, 0.000e+00, 0.000e+00, 4.746e-01, 0.000e+00 }, // CO
-        { 8.821e-01, 9.082e-02, 1.408e+00, 0.000e+00, 0.000e+00, 2.239e-01, 0.000e+00 }, // HC
-        { 8.098e+02, 8.338e+01, 1.293e+03, 0.000e+00, 0.000e+00, 2.056e+02, 0.000e+00 }, // FC
-        { 3.400e+00, 3.501e-01, 5.428e+00, 0.000e+00, 0.000e+00, 8.631e-01, 0.000e+00 }, // NOx
-        { 1.436e+00, 1.502e-03, 2.329e-02, 1.008e-04, 1.240e-06, 3.756e-03, 9.431e-06 }, // PM + PM (non-exhaust)
+        { 2.517e+03, 9.328e+02, 4.018e+03, 0.000e+00, 0.000e+00, 2.300e+03, 0.000e+00 }, // CO2(total)
+        { 1.870e+00, 6.930e-01, 2.985e+00, 0.000e+00, 0.000e+00, 1.709e+00, 0.000e+00 }, // CO
+        { 8.821e-01, 3.270e-01, 1.408e+00, 0.000e+00, 0.000e+00, 8.061e-01, 0.000e+00 }, // HC
+        { 8.098e+02, 3.002e+02, 1.293e+03, 0.000e+00, 0.000e+00, 7.400e+02, 0.000e+00 }, // FC
+        { 3.400e+00, 1.260e+00, 5.428e+00, 0.000e+00, 0.000e+00, 3.107e+00, 0.000e+00 }, // NOx
+        { 1.436e+00, 5.407e-03, 2.329e-02, 1.306e-03, 5.787e-05, 1.352e-02, 1.222e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // Coach_3-Axes_gt18t_CNG_Euro-VI
-        { 2.594e+03, 2.539e+02, 4.721e+03, 0.000e+00, 0.000e+00, 6.223e+02, 0.000e+00 }, // CO2(total)
-        { 1.680e+00, 1.645e-01, 3.058e+00, 0.000e+00, 0.000e+00, 4.030e-01, 0.000e+00 }, // CO
-        { 4.451e-01, 4.358e-02, 8.102e-01, 0.000e+00, 0.000e+00, 1.068e-01, 0.000e+00 }, // HC
-        { 8.346e+02, 8.171e+01, 1.519e+03, 0.000e+00, 0.000e+00, 2.002e+02, 0.000e+00 }, // FC
-        { 1.115e+00, 1.092e-01, 2.030e+00, 0.000e+00, 0.000e+00, 2.675e-01, 0.000e+00 }, // NOx
-        { 1.440e+00, 1.472e-03, 2.744e-02, 9.743e-05, 1.271e-06, 3.607e-03, 1.001e-05 }, // PM + PM (non-exhaust)
+        { 2.594e+03, 9.141e+02, 4.721e+03, 0.000e+00, 0.000e+00, 2.240e+03, 0.000e+00 }, // CO2(total)
+        { 1.680e+00, 5.920e-01, 3.058e+00, 0.000e+00, 0.000e+00, 1.451e+00, 0.000e+00 }, // CO
+        { 4.451e-01, 1.569e-01, 8.102e-01, 0.000e+00, 0.000e+00, 3.844e-01, 0.000e+00 }, // HC
+        { 8.346e+02, 2.941e+02, 1.519e+03, 0.000e+00, 0.000e+00, 7.208e+02, 0.000e+00 }, // FC
+        { 1.115e+00, 3.930e-01, 2.030e+00, 0.000e+00, 0.000e+00, 9.631e-01, 0.000e+00 }, // NOx
+        { 1.440e+00, 5.299e-03, 2.744e-02, 1.263e-03, 5.931e-05, 1.299e-02, 1.298e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // Coach_Midi_le15t_CNG_Euro-I
-        { 2.950e+03, 9.971e+01, 0.000e+00, 0.000e+00, 5.593e-03, 3.553e+02, 0.000e+00 }, // CO2(total)
-        { 1.555e+01, 0.000e+00, 7.738e+00, 3.636e-04, 7.063e-06, 3.392e-01, 0.000e+00 }, // CO
-        { 3.519e+00, 0.000e+00, 0.000e+00, 0.000e+00, 3.257e-06, 7.197e-02, 1.039e-04 }, // HC
-        { 9.494e+02, 3.208e+01, 0.000e+00, 0.000e+00, 1.800e-03, 1.143e+02, 0.000e+00 }, // FC
-        { 2.343e+01, 9.980e-01, 5.854e+00, 0.000e+00, 3.867e-05, 3.049e+00, 0.000e+00 }, // NOx
-        { 4.272e+00, 0.000e+00, 0.000e+00, 8.964e-05, 4.182e-06, 7.396e-02, 1.056e-04 }, // PM + PM (non-exhaust)
+        { 2.950e+03, 3.590e+02, 0.000e+00, 0.000e+00, 2.609e-01, 1.279e+03, 0.000e+00 }, // CO2(total)
+        { 1.555e+01, 0.000e+00, 7.738e+00, 4.712e-03, 3.295e-04, 1.221e+00, 0.000e+00 }, // CO
+        { 3.519e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.520e-04, 2.591e-01, 1.347e-03 }, // HC
+        { 9.494e+02, 1.155e+02, 0.000e+00, 0.000e+00, 8.396e-02, 4.115e+02, 0.000e+00 }, // FC
+        { 2.343e+01, 3.593e+00, 5.854e+00, 0.000e+00, 1.804e-03, 1.098e+01, 0.000e+00 }, // NOx
+        { 4.272e+00, 0.000e+00, 0.000e+00, 1.162e-03, 1.951e-04, 2.663e-01, 1.369e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // Coach_Midi_le15t_CNG_Euro-II
-        { 2.692e+03, 1.024e+02, 7.299e+02, 0.000e+00, 4.269e-03, 3.280e+02, 0.000e+00 }, // CO2(total)
-        { 1.413e+01, 0.000e+00, 1.910e+01, 0.000e+00, 6.573e-07, 2.458e-02, 0.000e+00 }, // CO
-        { 2.175e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.789e-06, 4.612e-02, 3.714e-05 }, // HC
-        { 8.661e+02, 3.294e+01, 2.349e+02, 0.000e+00, 1.374e-03, 1.056e+02, 0.000e+00 }, // FC
-        { 2.590e+01, 9.096e-01, 6.704e+00, 0.000e+00, 3.749e-05, 2.875e+00, 0.000e+00 }, // NOx
-        { 2.981e+00, 0.000e+00, 1.305e+00, 7.978e-05, 2.082e-06, 1.926e-02, 1.712e-05 }, // PM + PM (non-exhaust)
+        { 2.692e+03, 3.686e+02, 7.299e+02, 0.000e+00, 1.992e-01, 1.181e+03, 0.000e+00 }, // CO2(total)
+        { 1.413e+01, 0.000e+00, 1.910e+01, 0.000e+00, 3.067e-05, 8.850e-02, 0.000e+00 }, // CO
+        { 2.175e+00, 0.000e+00, 0.000e+00, 0.000e+00, 8.345e-05, 1.660e-01, 4.814e-04 }, // HC
+        { 8.661e+02, 1.186e+02, 2.349e+02, 0.000e+00, 6.409e-02, 3.800e+02, 0.000e+00 }, // FC
+        { 2.590e+01, 3.275e+00, 6.704e+00, 0.000e+00, 1.749e-03, 1.035e+01, 0.000e+00 }, // NOx
+        { 2.981e+00, 0.000e+00, 1.305e+00, 1.034e-03, 9.713e-05, 6.932e-02, 2.218e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // Coach_Midi_le15t_CNG_Euro-III
-        { 2.048e+03, 1.288e+02, 1.029e+03, 0.000e+00, 2.636e-03, 3.426e+02, 0.000e+00 }, // CO2(total)
-        { 1.276e+01, 0.000e+00, 7.390e+00, 0.000e+00, 1.931e-06, 0.000e+00, 7.987e-04 }, // CO
-        { 1.906e+00, 1.973e-03, 2.935e-01, 0.000e+00, 9.895e-07, 3.410e-02, 0.000e+00 }, // HC
-        { 6.589e+02, 4.144e+01, 3.311e+02, 0.000e+00, 8.483e-04, 1.103e+02, 0.000e+00 }, // FC
-        { 1.767e+01, 7.626e-01, 6.161e+00, 2.322e-03, 0.000e+00, 2.226e+00, 0.000e+00 }, // NOx
-        { 2.521e+00, 4.283e-03, 4.015e-01, 8.504e-05, 1.676e-06, 1.812e-02, 2.369e-05 }, // PM + PM (non-exhaust)
+        { 2.048e+03, 4.636e+02, 1.029e+03, 0.000e+00, 1.230e-01, 1.233e+03, 0.000e+00 }, // CO2(total)
+        { 1.276e+01, 0.000e+00, 7.390e+00, 0.000e+00, 9.008e-05, 0.000e+00, 1.035e-02 }, // CO
+        { 1.906e+00, 7.102e-03, 2.935e-01, 0.000e+00, 4.616e-05, 1.227e-01, 0.000e+00 }, // HC
+        { 6.589e+02, 1.492e+02, 3.311e+02, 0.000e+00, 3.958e-02, 3.969e+02, 0.000e+00 }, // FC
+        { 1.767e+01, 2.745e+00, 6.161e+00, 3.009e-02, 0.000e+00, 8.015e+00, 0.000e+00 }, // NOx
+        { 2.521e+00, 1.542e-02, 4.015e-01, 1.102e-03, 7.820e-05, 6.524e-02, 3.070e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // Coach_Midi_le15t_CNG_Euro-IV
-        { 7.986e+02, 1.504e+02, 1.476e+03, 0.000e+00, 1.606e-03, 3.409e+02, 0.000e+00 }, // CO2(total)
-        { 2.078e+00, 0.000e+00, 2.183e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.762e-05 }, // CO
-        { 9.001e-01, 3.418e-03, 9.788e-01, 0.000e+00, 9.079e-07, 6.281e-03, 1.930e-04 }, // HC
-        { 2.570e+02, 4.839e+01, 4.748e+02, 0.000e+00, 5.167e-04, 1.097e+02, 0.000e+00 }, // FC
-        { 1.280e+01, 7.653e-02, 2.199e+01, 1.578e-03, 0.000e+00, 0.000e+00, 4.720e-03 }, // NOx
-        { 1.701e+00, 0.000e+00, 2.933e-01, 8.545e-05, 1.629e-06, 0.000e+00, 6.007e-05 }, // PM + PM (non-exhaust)
+        { 7.986e+02, 5.414e+02, 1.476e+03, 0.000e+00, 7.492e-02, 1.227e+03, 0.000e+00 }, // CO2(total)
+        { 2.078e+00, 0.000e+00, 2.183e+00, 0.000e+00, 0.000e+00, 0.000e+00, 2.283e-04 }, // CO
+        { 9.001e-01, 1.230e-02, 9.788e-01, 0.000e+00, 4.236e-05, 2.261e-02, 2.501e-03 }, // HC
+        { 2.570e+02, 1.742e+02, 4.748e+02, 0.000e+00, 2.411e-02, 3.949e+02, 0.000e+00 }, // FC
+        { 1.280e+01, 2.755e-01, 2.199e+01, 2.045e-02, 0.000e+00, 0.000e+00, 6.117e-02 }, // NOx
+        { 1.701e+00, 0.000e+00, 2.933e-01, 1.107e-03, 7.599e-05, 0.000e+00, 7.785e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // Coach_Midi_le15t_CNG_Euro-V
-        { 7.628e+02, 1.373e+02, 2.301e+03, 0.000e+00, 7.908e-04, 2.909e+02, 0.000e+00 }, // CO2(total)
-        { 5.667e-01, 1.020e-01, 1.709e+00, 0.000e+00, 5.875e-07, 2.161e-01, 0.000e+00 }, // CO
-        { 2.674e-01, 4.814e-02, 8.064e-01, 0.000e+00, 2.772e-07, 1.020e-01, 0.000e+00 }, // HC
-        { 2.454e+02, 4.419e+01, 7.403e+02, 0.000e+00, 2.545e-04, 9.362e+01, 0.000e+00 }, // FC
-        { 1.031e+00, 1.855e-01, 3.108e+00, 0.000e+00, 1.068e-06, 3.931e-01, 0.000e+00 }, // NOx
-        { 1.421e+00, 7.961e-04, 1.334e-02, 9.578e-05, 1.368e-06, 1.686e-03, 2.231e-05 }, // PM + PM (non-exhaust)
+        { 7.628e+02, 4.944e+02, 2.301e+03, 0.000e+00, 3.690e-02, 1.047e+03, 0.000e+00 }, // CO2(total)
+        { 5.667e-01, 3.673e-01, 1.709e+00, 0.000e+00, 2.741e-05, 7.781e-01, 0.000e+00 }, // CO
+        { 2.674e-01, 1.733e-01, 8.064e-01, 0.000e+00, 1.293e-05, 3.671e-01, 0.000e+00 }, // HC
+        { 2.454e+02, 1.591e+02, 7.403e+02, 0.000e+00, 1.187e-02, 3.370e+02, 0.000e+00 }, // FC
+        { 1.031e+00, 6.679e-01, 3.108e+00, 0.000e+00, 4.985e-05, 1.415e+00, 0.000e+00 }, // NOx
+        { 1.421e+00, 2.866e-03, 1.334e-02, 1.241e-03, 6.381e-05, 6.071e-03, 2.892e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // Coach_Midi_le15t_CNG_Euro-VI
-        { 1.100e+03, 1.362e+02, 2.494e+03, 0.000e+00, 1.750e-03, 2.988e+02, 0.000e+00 }, // CO2(total)
-        { 7.122e-01, 8.822e-02, 1.615e+00, 0.000e+00, 1.133e-06, 1.935e-01, 0.000e+00 }, // CO
-        { 1.887e-01, 2.338e-02, 4.280e-01, 0.000e+00, 3.003e-07, 5.128e-02, 0.000e+00 }, // HC
-        { 3.538e+02, 4.383e+01, 8.025e+02, 0.000e+00, 5.631e-04, 9.615e+01, 0.000e+00 }, // FC
-        { 4.728e-01, 5.857e-02, 1.072e+00, 0.000e+00, 7.523e-07, 1.285e-01, 0.000e+00 }, // NOx
-        { 1.431e+00, 7.896e-04, 1.446e-02, 9.208e-05, 1.392e-06, 1.732e-03, 1.892e-05 }, // PM + PM (non-exhaust)
+        { 1.100e+03, 4.904e+02, 2.494e+03, 0.000e+00, 8.164e-02, 1.076e+03, 0.000e+00 }, // CO2(total)
+        { 7.122e-01, 3.176e-01, 1.615e+00, 0.000e+00, 5.288e-05, 6.967e-01, 0.000e+00 }, // CO
+        { 1.887e-01, 8.416e-02, 4.280e-01, 0.000e+00, 1.401e-05, 1.846e-01, 0.000e+00 }, // HC
+        { 3.538e+02, 1.578e+02, 8.025e+02, 0.000e+00, 2.627e-02, 3.462e+02, 0.000e+00 }, // FC
+        { 4.728e-01, 2.108e-01, 1.072e+00, 0.000e+00, 3.510e-05, 4.625e-01, 0.000e+00 }, // NOx
+        { 1.431e+00, 2.843e-03, 1.446e-02, 1.193e-03, 6.493e-05, 6.236e-03, 2.453e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
@@ -3201,8 +3201,8 @@
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // HC
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // NOx
-        { 1.215e+00, 0.000e+00, 0.000e+00, 1.758e-04, 6.891e-07, 0.000e+00, 0.000e+00 }, // PM + PM (non-exhaust)
-        { 6.191e+00, 1.162e-01, 2.528e+00, 0.000e+00, 1.428e-05, 1.225e+00, 4.167e-04 }, // FC_MJ
+        { 1.215e+00, 0.000e+00, 0.000e+00, 2.278e-03, 3.215e-05, 0.000e+00, 0.000e+00 }, // PM + PM (non-exhaust)
+        { 6.191e+00, 4.184e-01, 2.528e+00, 0.000e+00, 6.665e-04, 4.410e+00, 5.400e-03 }, // FC_MJ
     },
     {
         // Coach_BEV_3-Axes_gt18t
@@ -3211,8 +3211,8 @@
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // HC
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // NOx
-        { 1.212e+00, 0.000e+00, 0.000e+00, 1.882e-04, 5.485e-07, 0.000e+00, 0.000e+00 }, // PM + PM (non-exhaust)
-        { 9.862e+00, 1.248e-01, 1.597e+00, 0.000e+00, 1.454e-05, 1.568e+00, 6.001e-05 }, // FC_MJ
+        { 1.212e+00, 0.000e+00, 0.000e+00, 2.440e-03, 2.559e-05, 0.000e+00, 0.000e+00 }, // PM + PM (non-exhaust)
+        { 9.862e+00, 4.494e-01, 1.597e+00, 0.000e+00, 6.783e-04, 5.644e+00, 7.777e-04 }, // FC_MJ
     },
     {
         // Coach_BEV_Midi
@@ -3221,17 +3221,17 @@
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // HC
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // NOx
-        { 9.996e-01, 2.793e-03, 0.000e+00, 2.405e-04, 0.000e+00, 0.000e+00, 8.519e-06 }, // PM + PM (non-exhaust)
-        { 3.137e+00, 1.176e-01, 1.677e-02, 0.000e+00, 1.322e-05, 7.192e-01, 0.000e+00 }, // FC_MJ
+        { 9.996e-01, 1.006e-02, 0.000e+00, 3.117e-03, 0.000e+00, 0.000e+00, 1.104e-04 }, // PM + PM (non-exhaust)
+        { 3.137e+00, 4.235e-01, 1.677e-02, 0.000e+00, 6.167e-04, 2.589e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // Coach_FuelCell_Std_le18t
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO2(total)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // HC
-        { 3.429e+02, 6.438e+00, 1.400e+02, 0.000e+00, 7.911e-04, 6.784e+01, 2.308e-02 }, // FC
+        { 3.429e+02, 2.318e+01, 1.400e+02, 0.000e+00, 3.691e-02, 2.442e+02, 2.991e-01 }, // FC
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // NOx
-        { 1.215e+00, 0.000e+00, 0.000e+00, 1.758e-04, 6.891e-07, 0.000e+00, 0.000e+00 }, // PM + PM (non-exhaust)
+        { 1.215e+00, 0.000e+00, 0.000e+00, 2.278e-03, 3.215e-05, 0.000e+00, 0.000e+00 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
@@ -3239,9 +3239,9 @@
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO2(total)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // HC
-        { 5.462e+02, 6.914e+00, 8.847e+01, 0.000e+00, 8.052e-04, 8.684e+01, 3.323e-03 }, // FC
+        { 5.462e+02, 2.489e+01, 8.847e+01, 0.000e+00, 3.757e-02, 3.126e+02, 4.307e-02 }, // FC
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // NOx
-        { 1.212e+00, 0.000e+00, 0.000e+00, 1.882e-04, 5.485e-07, 0.000e+00, 0.000e+00 }, // PM + PM (non-exhaust)
+        { 1.212e+00, 0.000e+00, 0.000e+00, 2.440e-03, 2.559e-05, 0.000e+00, 0.000e+00 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
@@ -3249,1269 +3249,1269 @@
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO2(total)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // HC
-        { 1.737e+02, 6.515e+00, 9.289e-01, 0.000e+00, 7.321e-04, 3.983e+01, 0.000e+00 }, // FC
+        { 1.737e+02, 2.345e+01, 9.289e-01, 0.000e+00, 3.416e-02, 1.434e+02, 0.000e+00 }, // FC
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // NOx
-        { 9.996e-01, 2.793e-03, 0.000e+00, 2.405e-04, 0.000e+00, 0.000e+00, 8.519e-06 }, // PM + PM (non-exhaust)
+        { 9.996e-01, 1.006e-02, 0.000e+00, 3.117e-03, 0.000e+00, 0.000e+00, 1.104e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // Coach_Std_le18t_EE
-        { 3.820e+03, 1.501e+02, 0.000e+00, 7.595e-01, 0.000e+00, 5.895e+02, 4.710e-02 }, // CO2(total)
-        { 8.331e+01, 4.075e-01, 5.928e+01, 0.000e+00, 4.481e-06, 1.213e+00, 0.000e+00 }, // CO
-        { 2.924e+01, 0.000e+00, 1.371e+01, 0.000e+00, 5.712e-06, 3.813e-02, 4.679e-04 }, // HC
-        { 1.228e+03, 4.823e+01, 0.000e+00, 2.441e-01, 0.000e+00, 1.895e+02, 1.514e-02 }, // FC
-        { 4.784e+01, 2.486e+00, 0.000e+00, 1.022e-02, 0.000e+00, 8.762e+00, 2.733e-03 }, // NOx
-        { 9.186e+00, 5.078e-02, 1.711e+00, 4.396e-04, 1.291e-06, 2.201e-01, 1.031e-05 }, // PM + PM (non-exhaust)
+        { 3.820e+03, 5.403e+02, 0.000e+00, 9.843e+00, 0.000e+00, 2.122e+03, 6.104e-01 }, // CO2(total)
+        { 8.331e+01, 1.467e+00, 5.928e+01, 0.000e+00, 2.091e-04, 4.365e+00, 0.000e+00 }, // CO
+        { 2.924e+01, 0.000e+00, 1.371e+01, 0.000e+00, 2.665e-04, 1.373e-01, 6.064e-03 }, // HC
+        { 1.228e+03, 1.736e+02, 0.000e+00, 3.163e+00, 0.000e+00, 6.820e+02, 1.962e-01 }, // FC
+        { 4.784e+01, 8.948e+00, 0.000e+00, 1.324e-01, 0.000e+00, 3.154e+01, 3.542e-02 }, // NOx
+        { 9.186e+00, 1.828e-01, 1.711e+00, 5.698e-03, 6.024e-05, 7.924e-01, 1.336e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // UBus_Midi_P_le15t_Euro-IV
-        { 1.814e+03, 1.193e+02, 1.683e+03, 0.000e+00, 0.000e+00, 2.799e+02, 0.000e+00 }, // CO2(total)
-        { 9.102e+00, 6.005e-02, 1.108e+01, 0.000e+00, 0.000e+00, 1.893e-01, 0.000e+00 }, // CO
-        { 9.790e-02, 1.866e-03, 1.536e-01, 0.000e+00, 0.000e+00, 3.345e-03, 0.000e+00 }, // HC
-        { 5.880e+02, 3.867e+01, 5.457e+02, 0.000e+00, 0.000e+00, 9.073e+01, 0.000e+00 }, // FC
-        { 2.209e+00, 2.482e-02, 3.409e+00, 0.000e+00, 0.000e+00, 7.075e-02, 0.000e+00 }, // NOx
-        { 1.402e+00, 1.075e-03, 7.378e-03, 0.000e+00, 2.619e-06, 7.733e-05, 0.000e+00 }, // PM + PM (non-exhaust)
+        { 1.814e+03, 4.294e+02, 1.683e+03, 0.000e+00, 0.000e+00, 1.008e+03, 0.000e+00 }, // CO2(total)
+        { 9.102e+00, 2.162e-01, 1.108e+01, 0.000e+00, 0.000e+00, 6.813e-01, 0.000e+00 }, // CO
+        { 9.790e-02, 6.719e-03, 1.536e-01, 0.000e+00, 0.000e+00, 1.204e-02, 0.000e+00 }, // HC
+        { 5.880e+02, 1.392e+02, 5.457e+02, 0.000e+00, 0.000e+00, 3.266e+02, 0.000e+00 }, // FC
+        { 2.209e+00, 8.936e-02, 3.409e+00, 0.000e+00, 0.000e+00, 2.547e-01, 0.000e+00 }, // NOx
+        { 1.402e+00, 3.870e-03, 7.378e-03, 0.000e+00, 1.222e-04, 2.784e-04, 0.000e+00 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // UBus_Midi_P_le15t_Euro-V
-        { 2.195e+03, 1.571e+02, 1.857e+03, 0.000e+00, 0.000e+00, 3.745e+02, 0.000e+00 }, // CO2(total)
+        { 2.195e+03, 5.656e+02, 1.857e+03, 0.000e+00, 0.000e+00, 1.348e+03, 0.000e+00 }, // CO2(total)
         { 1.014e+01, 0.000e+00, 1.862e+01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 2.285e-01, 3.617e-03, 1.264e-01, 0.000e+00, 8.915e-08, 1.009e-02, 0.000e+00 }, // HC
-        { 7.117e+02, 5.093e+01, 6.019e+02, 0.000e+00, 0.000e+00, 1.214e+02, 0.000e+00 }, // FC
-        { 5.754e-01, 3.990e-03, 8.435e-01, 0.000e+00, 0.000e+00, 1.154e-02, 0.000e+00 }, // NOx
-        { 1.389e+00, 1.376e-03, 2.424e-04, 1.066e-06, 2.618e-06, 1.418e-04, 6.180e-06 }, // PM + PM (non-exhaust)
+        { 2.285e-01, 1.302e-02, 1.264e-01, 0.000e+00, 4.160e-06, 3.631e-02, 0.000e+00 }, // HC
+        { 7.117e+02, 1.834e+02, 6.019e+02, 0.000e+00, 0.000e+00, 4.370e+02, 0.000e+00 }, // FC
+        { 5.754e-01, 1.436e-02, 8.435e-01, 0.000e+00, 0.000e+00, 4.155e-02, 0.000e+00 }, // NOx
+        { 1.389e+00, 4.952e-03, 2.424e-04, 1.382e-05, 1.221e-04, 5.104e-04, 8.009e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // UBus_Midi_P_le15t_Euro-VI
-        { 2.370e+03, 1.466e+02, 2.603e+03, 0.000e+00, 0.000e+00, 3.492e+02, 0.000e+00 }, // CO2(total)
-        { 2.707e+00, 2.529e-03, 3.862e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 5.806e-02, 9.903e-04, 3.113e-02, 0.000e+00, 0.000e+00, 2.294e-03, 0.000e+00 }, // HC
-        { 7.683e+02, 4.752e+01, 8.438e+02, 0.000e+00, 0.000e+00, 1.132e+02, 0.000e+00 }, // FC
-        { 5.986e-02, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 2.014e-06 }, // NOx
-        { 1.389e+00, 1.413e-03, 2.650e-03, 0.000e+00, 2.608e-06, 0.000e+00, 4.541e-06 }, // PM + PM (non-exhaust)
+        { 2.370e+03, 5.277e+02, 2.603e+03, 0.000e+00, 0.000e+00, 1.257e+03, 0.000e+00 }, // CO2(total)
+        { 2.707e+00, 9.106e-03, 3.862e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
+        { 5.806e-02, 3.565e-03, 3.113e-02, 0.000e+00, 0.000e+00, 8.258e-03, 0.000e+00 }, // HC
+        { 7.683e+02, 1.711e+02, 8.438e+02, 0.000e+00, 0.000e+00, 4.076e+02, 0.000e+00 }, // FC
+        { 5.986e-02, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 2.610e-05 }, // NOx
+        { 1.389e+00, 5.087e-03, 2.650e-03, 0.000e+00, 1.217e-04, 0.000e+00, 5.885e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // UBus_Midi_le15t_50ties
-        { 2.436e+03, 1.410e+02, 1.186e+03, 0.000e+00, 0.000e+00, 3.357e+02, 0.000e+00 }, // CO2(total)
-        { 3.516e+01, 0.000e+00, 1.459e+01, 3.804e-03, 1.838e-05, 4.665e-01, 1.033e-02 }, // CO
-        { 1.454e+01, 0.000e+00, 2.188e+00, 0.000e+00, 1.270e-05, 0.000e+00, 1.538e-03 }, // HC
-        { 7.829e+02, 4.530e+01, 3.811e+02, 0.000e+00, 0.000e+00, 1.079e+02, 0.000e+00 }, // FC
-        { 3.026e+01, 1.751e+00, 1.123e+01, 0.000e+00, 0.000e+00, 4.128e+00, 0.000e+00 }, // NOx
-        { 6.688e+00, 2.280e-02, 4.382e-01, 4.813e-04, 2.505e-06, 1.937e-01, 0.000e+00 }, // PM + PM (non-exhaust)
+        { 2.436e+03, 5.075e+02, 1.186e+03, 0.000e+00, 0.000e+00, 1.208e+03, 0.000e+00 }, // CO2(total)
+        { 3.516e+01, 0.000e+00, 1.459e+01, 4.931e-02, 8.577e-04, 1.680e+00, 1.339e-01 }, // CO
+        { 1.454e+01, 0.000e+00, 2.188e+00, 0.000e+00, 5.923e-04, 0.000e+00, 1.993e-02 }, // HC
+        { 7.829e+02, 1.631e+02, 3.811e+02, 0.000e+00, 0.000e+00, 3.884e+02, 0.000e+00 }, // FC
+        { 3.026e+01, 6.303e+00, 1.123e+01, 0.000e+00, 0.000e+00, 1.486e+01, 0.000e+00 }, // NOx
+        { 6.688e+00, 8.209e-02, 4.382e-01, 6.237e-03, 1.169e-04, 6.974e-01, 0.000e+00 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // UBus_Midi_le15t_60ties
-        { 2.436e+03, 1.410e+02, 1.186e+03, 0.000e+00, 0.000e+00, 3.357e+02, 0.000e+00 }, // CO2(total)
-        { 3.516e+01, 0.000e+00, 1.459e+01, 3.804e-03, 1.838e-05, 4.665e-01, 1.033e-02 }, // CO
-        { 1.454e+01, 0.000e+00, 2.188e+00, 0.000e+00, 1.270e-05, 0.000e+00, 1.538e-03 }, // HC
-        { 7.829e+02, 4.530e+01, 3.811e+02, 0.000e+00, 0.000e+00, 1.079e+02, 0.000e+00 }, // FC
-        { 3.026e+01, 1.751e+00, 1.123e+01, 0.000e+00, 0.000e+00, 4.128e+00, 0.000e+00 }, // NOx
-        { 6.688e+00, 2.280e-02, 4.382e-01, 4.813e-04, 2.505e-06, 1.937e-01, 0.000e+00 }, // PM + PM (non-exhaust)
+        { 2.436e+03, 5.075e+02, 1.186e+03, 0.000e+00, 0.000e+00, 1.208e+03, 0.000e+00 }, // CO2(total)
+        { 3.516e+01, 0.000e+00, 1.459e+01, 4.931e-02, 8.577e-04, 1.680e+00, 1.339e-01 }, // CO
+        { 1.454e+01, 0.000e+00, 2.188e+00, 0.000e+00, 5.923e-04, 0.000e+00, 1.993e-02 }, // HC
+        { 7.829e+02, 1.631e+02, 3.811e+02, 0.000e+00, 0.000e+00, 3.884e+02, 0.000e+00 }, // FC
+        { 3.026e+01, 6.303e+00, 1.123e+01, 0.000e+00, 0.000e+00, 1.486e+01, 0.000e+00 }, // NOx
+        { 6.688e+00, 8.209e-02, 4.382e-01, 6.237e-03, 1.169e-04, 6.974e-01, 0.000e+00 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // UBus_Midi_le15t_70ties
-        { 2.436e+03, 1.410e+02, 1.186e+03, 0.000e+00, 0.000e+00, 3.357e+02, 0.000e+00 }, // CO2(total)
-        { 3.516e+01, 0.000e+00, 1.459e+01, 3.804e-03, 1.838e-05, 4.665e-01, 1.033e-02 }, // CO
-        { 1.454e+01, 0.000e+00, 2.188e+00, 0.000e+00, 1.270e-05, 0.000e+00, 1.538e-03 }, // HC
-        { 7.829e+02, 4.530e+01, 3.811e+02, 0.000e+00, 0.000e+00, 1.079e+02, 0.000e+00 }, // FC
-        { 3.026e+01, 1.751e+00, 1.123e+01, 0.000e+00, 0.000e+00, 4.128e+00, 0.000e+00 }, // NOx
-        { 6.688e+00, 2.280e-02, 4.382e-01, 4.813e-04, 2.505e-06, 1.937e-01, 0.000e+00 }, // PM + PM (non-exhaust)
+        { 2.436e+03, 5.075e+02, 1.186e+03, 0.000e+00, 0.000e+00, 1.208e+03, 0.000e+00 }, // CO2(total)
+        { 3.516e+01, 0.000e+00, 1.459e+01, 4.931e-02, 8.577e-04, 1.680e+00, 1.339e-01 }, // CO
+        { 1.454e+01, 0.000e+00, 2.188e+00, 0.000e+00, 5.923e-04, 0.000e+00, 1.993e-02 }, // HC
+        { 7.829e+02, 1.631e+02, 3.811e+02, 0.000e+00, 0.000e+00, 3.884e+02, 0.000e+00 }, // FC
+        { 3.026e+01, 6.303e+00, 1.123e+01, 0.000e+00, 0.000e+00, 1.486e+01, 0.000e+00 }, // NOx
+        { 6.688e+00, 8.209e-02, 4.382e-01, 6.237e-03, 1.169e-04, 6.974e-01, 0.000e+00 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // UBus_Midi_le15t_80ties
-        { 2.436e+03, 1.410e+02, 1.186e+03, 0.000e+00, 0.000e+00, 3.357e+02, 0.000e+00 }, // CO2(total)
-        { 3.516e+01, 0.000e+00, 1.459e+01, 3.804e-03, 1.838e-05, 4.665e-01, 1.033e-02 }, // CO
-        { 1.454e+01, 0.000e+00, 2.188e+00, 0.000e+00, 1.270e-05, 0.000e+00, 1.538e-03 }, // HC
-        { 7.829e+02, 4.530e+01, 3.811e+02, 0.000e+00, 0.000e+00, 1.079e+02, 0.000e+00 }, // FC
-        { 3.026e+01, 1.751e+00, 1.123e+01, 0.000e+00, 0.000e+00, 4.128e+00, 0.000e+00 }, // NOx
-        { 6.688e+00, 2.280e-02, 4.382e-01, 4.813e-04, 2.505e-06, 1.937e-01, 0.000e+00 }, // PM + PM (non-exhaust)
+        { 2.436e+03, 5.075e+02, 1.186e+03, 0.000e+00, 0.000e+00, 1.208e+03, 0.000e+00 }, // CO2(total)
+        { 3.516e+01, 0.000e+00, 1.459e+01, 4.931e-02, 8.577e-04, 1.680e+00, 1.339e-01 }, // CO
+        { 1.454e+01, 0.000e+00, 2.188e+00, 0.000e+00, 5.923e-04, 0.000e+00, 1.993e-02 }, // HC
+        { 7.829e+02, 1.631e+02, 3.811e+02, 0.000e+00, 0.000e+00, 3.884e+02, 0.000e+00 }, // FC
+        { 3.026e+01, 6.303e+00, 1.123e+01, 0.000e+00, 0.000e+00, 1.486e+01, 0.000e+00 }, // NOx
+        { 6.688e+00, 8.209e-02, 4.382e-01, 6.237e-03, 1.169e-04, 6.974e-01, 0.000e+00 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // UBus_Midi_le15t_Euro-I
-        { 2.484e+03, 1.314e+02, 1.344e+03, 0.000e+00, 0.000e+00, 3.146e+02, 0.000e+00 }, // CO2(total)
-        { 1.694e+01, 7.756e-02, 1.231e+01, 0.000e+00, 0.000e+00, 3.322e-01, 0.000e+00 }, // CO
-        { 3.085e+00, 0.000e+00, 1.109e+00, 0.000e+00, 4.572e-06, 0.000e+00, 8.774e-04 }, // HC
-        { 7.985e+02, 4.223e+01, 4.318e+02, 0.000e+00, 0.000e+00, 1.011e+02, 0.000e+00 }, // FC
-        { 2.655e+01, 1.223e+00, 1.793e+01, 0.000e+00, 0.000e+00, 2.954e+00, 0.000e+00 }, // NOx
-        { 4.029e+00, 0.000e+00, 5.782e-01, 2.567e-04, 2.670e-06, 3.627e-02, 3.673e-04 }, // PM + PM (non-exhaust)
+        { 2.484e+03, 4.730e+02, 1.344e+03, 0.000e+00, 0.000e+00, 1.132e+03, 0.000e+00 }, // CO2(total)
+        { 1.694e+01, 2.792e-01, 1.231e+01, 0.000e+00, 0.000e+00, 1.196e+00, 0.000e+00 }, // CO
+        { 3.085e+00, 0.000e+00, 1.109e+00, 0.000e+00, 2.133e-04, 0.000e+00, 1.137e-02 }, // HC
+        { 7.985e+02, 1.520e+02, 4.318e+02, 0.000e+00, 0.000e+00, 3.639e+02, 0.000e+00 }, // FC
+        { 2.655e+01, 4.403e+00, 1.793e+01, 0.000e+00, 0.000e+00, 1.064e+01, 0.000e+00 }, // NOx
+        { 4.029e+00, 0.000e+00, 5.782e-01, 3.327e-03, 1.246e-04, 1.306e-01, 4.760e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // UBus_Midi_le15t_Euro-I_(DPF)
-        { 2.509e+03, 1.327e+02, 1.357e+03, 0.000e+00, 0.000e+00, 3.177e+02, 0.000e+00 }, // CO2(total)
-        { 5.589e+00, 2.559e-02, 4.063e+00, 0.000e+00, 0.000e+00, 1.096e-01, 0.000e+00 }, // CO
-        { 1.018e+00, 0.000e+00, 3.658e-01, 0.000e+00, 1.509e-06, 0.000e+00, 2.896e-04 }, // HC
-        { 8.064e+02, 4.265e+01, 4.361e+02, 0.000e+00, 0.000e+00, 1.021e+02, 0.000e+00 }, // FC
-        { 2.655e+01, 1.223e+00, 1.793e+01, 0.000e+00, 0.000e+00, 2.954e+00, 0.000e+00 }, // NOx
-        { 2.118e+00, 0.000e+00, 1.503e-01, 6.674e-05, 2.670e-06, 9.429e-03, 9.549e-05 }, // PM + PM (non-exhaust)
+        { 2.509e+03, 4.777e+02, 1.357e+03, 0.000e+00, 0.000e+00, 1.144e+03, 0.000e+00 }, // CO2(total)
+        { 5.589e+00, 9.214e-02, 4.063e+00, 0.000e+00, 0.000e+00, 3.947e-01, 0.000e+00 }, // CO
+        { 1.018e+00, 0.000e+00, 3.658e-01, 0.000e+00, 7.039e-05, 0.000e+00, 3.753e-03 }, // HC
+        { 8.064e+02, 1.535e+02, 4.361e+02, 0.000e+00, 0.000e+00, 3.676e+02, 0.000e+00 }, // FC
+        { 2.655e+01, 4.403e+00, 1.793e+01, 0.000e+00, 0.000e+00, 1.064e+01, 0.000e+00 }, // NOx
+        { 2.118e+00, 0.000e+00, 1.503e-01, 8.650e-04, 1.246e-04, 3.395e-02, 1.238e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // UBus_Midi_le15t_Euro-II
-        { 2.230e+03, 1.305e+02, 6.299e+02, 0.000e+00, 0.000e+00, 3.220e+02, 0.000e+00 }, // CO2(total)
-        { 1.496e+01, 0.000e+00, 1.557e+01, 0.000e+00, 0.000e+00, 7.899e-02, 0.000e+00 }, // CO
-        { 1.733e+00, 2.839e-03, 0.000e+00, 2.287e-04, 0.000e+00, 2.794e-02, 3.840e-04 }, // HC
-        { 7.167e+02, 4.193e+01, 2.024e+02, 0.000e+00, 0.000e+00, 1.035e+02, 0.000e+00 }, // FC
-        { 2.571e+01, 1.239e+00, 1.088e+01, 0.000e+00, 0.000e+00, 3.060e+00, 0.000e+00 }, // NOx
-        { 2.850e+00, 7.782e-03, 4.888e-01, 0.000e+00, 2.628e-06, 3.246e-02, 3.906e-06 }, // PM + PM (non-exhaust)
+        { 2.230e+03, 4.697e+02, 6.299e+02, 0.000e+00, 0.000e+00, 1.159e+03, 0.000e+00 }, // CO2(total)
+        { 1.496e+01, 0.000e+00, 1.557e+01, 0.000e+00, 0.000e+00, 2.844e-01, 0.000e+00 }, // CO
+        { 1.733e+00, 1.022e-02, 0.000e+00, 2.963e-03, 0.000e+00, 1.006e-01, 4.976e-03 }, // HC
+        { 7.167e+02, 1.510e+02, 2.024e+02, 0.000e+00, 0.000e+00, 3.725e+02, 0.000e+00 }, // FC
+        { 2.571e+01, 4.462e+00, 1.088e+01, 0.000e+00, 0.000e+00, 1.102e+01, 0.000e+00 }, // NOx
+        { 2.850e+00, 2.802e-02, 4.888e-01, 0.000e+00, 1.226e-04, 1.169e-01, 5.063e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // UBus_Midi_le15t_Euro-II_(DPF)
-        { 2.252e+03, 1.318e+02, 6.362e+02, 0.000e+00, 0.000e+00, 3.252e+02, 0.000e+00 }, // CO2(total)
-        { 4.937e+00, 0.000e+00, 5.137e+00, 0.000e+00, 0.000e+00, 2.607e-02, 0.000e+00 }, // CO
-        { 5.720e-01, 9.369e-04, 0.000e+00, 7.546e-05, 0.000e+00, 9.221e-03, 1.267e-04 }, // HC
-        { 7.239e+02, 4.235e+01, 2.045e+02, 0.000e+00, 0.000e+00, 1.045e+02, 0.000e+00 }, // FC
-        { 2.571e+01, 1.239e+00, 1.088e+01, 0.000e+00, 0.000e+00, 3.060e+00, 0.000e+00 }, // NOx
-        { 1.773e+00, 2.876e-03, 1.271e-01, 0.000e+00, 2.628e-06, 8.439e-03, 3.906e-06 }, // PM + PM (non-exhaust)
+        { 2.252e+03, 4.744e+02, 6.362e+02, 0.000e+00, 0.000e+00, 1.171e+03, 0.000e+00 }, // CO2(total)
+        { 4.937e+00, 0.000e+00, 5.137e+00, 0.000e+00, 0.000e+00, 9.385e-02, 0.000e+00 }, // CO
+        { 5.720e-01, 3.373e-03, 0.000e+00, 9.779e-04, 0.000e+00, 3.319e-02, 1.642e-03 }, // HC
+        { 7.239e+02, 1.525e+02, 2.045e+02, 0.000e+00, 0.000e+00, 3.763e+02, 0.000e+00 }, // FC
+        { 2.571e+01, 4.462e+00, 1.088e+01, 0.000e+00, 0.000e+00, 1.102e+01, 0.000e+00 }, // NOx
+        { 1.773e+00, 1.036e-02, 1.271e-01, 0.000e+00, 1.226e-04, 3.038e-02, 5.063e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // UBus_Midi_le15t_Euro-III
-        { 2.429e+03, 1.309e+02, 8.719e+02, 0.000e+00, 0.000e+00, 3.272e+02, 0.000e+00 }, // CO2(total)
-        { 1.505e+01, 0.000e+00, 1.143e+01, 0.000e+00, 0.000e+00, 6.833e-02, 0.000e+00 }, // CO
-        { 1.505e+00, 9.402e-03, 0.000e+00, 0.000e+00, 1.023e-06, 2.955e-02, 1.765e-04 }, // HC
-        { 7.806e+02, 4.207e+01, 2.802e+02, 0.000e+00, 0.000e+00, 1.052e+02, 0.000e+00 }, // FC
-        { 3.103e+01, 8.061e-01, 2.078e+01, 0.000e+00, 0.000e+00, 2.219e+00, 0.000e+00 }, // NOx
-        { 2.338e+00, 1.051e-02, 0.000e+00, 0.000e+00, 2.590e-06, 2.602e-02, 3.722e-06 }, // PM + PM (non-exhaust)
+        { 2.429e+03, 4.712e+02, 8.719e+02, 0.000e+00, 0.000e+00, 1.178e+03, 0.000e+00 }, // CO2(total)
+        { 1.505e+01, 0.000e+00, 1.143e+01, 0.000e+00, 0.000e+00, 2.460e-01, 0.000e+00 }, // CO
+        { 1.505e+00, 3.385e-02, 0.000e+00, 0.000e+00, 4.775e-05, 1.064e-01, 2.287e-03 }, // HC
+        { 7.806e+02, 1.514e+02, 2.802e+02, 0.000e+00, 0.000e+00, 3.786e+02, 0.000e+00 }, // FC
+        { 3.103e+01, 2.902e+00, 2.078e+01, 0.000e+00, 0.000e+00, 7.987e+00, 0.000e+00 }, // NOx
+        { 2.338e+00, 3.785e-02, 0.000e+00, 0.000e+00, 1.208e-04, 9.368e-02, 4.824e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // UBus_Midi_le15t_Euro-III_(DPF)
-        { 2.453e+03, 1.322e+02, 8.806e+02, 0.000e+00, 0.000e+00, 3.305e+02, 0.000e+00 }, // CO2(total)
-        { 4.966e+00, 0.000e+00, 3.773e+00, 0.000e+00, 0.000e+00, 2.255e-02, 0.000e+00 }, // CO
-        { 4.968e-01, 3.103e-03, 0.000e+00, 0.000e+00, 3.377e-07, 9.752e-03, 5.824e-05 }, // HC
-        { 7.884e+02, 4.249e+01, 2.830e+02, 0.000e+00, 0.000e+00, 1.062e+02, 0.000e+00 }, // FC
-        { 3.103e+01, 8.061e-01, 2.078e+01, 0.000e+00, 0.000e+00, 2.219e+00, 0.000e+00 }, // NOx
-        { 1.622e+00, 4.005e-03, 0.000e+00, 0.000e+00, 2.590e-06, 6.766e-03, 3.722e-06 }, // PM + PM (non-exhaust)
+        { 2.453e+03, 4.759e+02, 8.806e+02, 0.000e+00, 0.000e+00, 1.190e+03, 0.000e+00 }, // CO2(total)
+        { 4.966e+00, 0.000e+00, 3.773e+00, 0.000e+00, 0.000e+00, 8.118e-02, 0.000e+00 }, // CO
+        { 4.968e-01, 1.117e-02, 0.000e+00, 0.000e+00, 1.576e-05, 3.511e-02, 7.547e-04 }, // HC
+        { 7.884e+02, 1.530e+02, 2.830e+02, 0.000e+00, 0.000e+00, 3.824e+02, 0.000e+00 }, // FC
+        { 3.103e+01, 2.902e+00, 2.078e+01, 0.000e+00, 0.000e+00, 7.987e+00, 0.000e+00 }, // NOx
+        { 1.622e+00, 1.442e-02, 0.000e+00, 0.000e+00, 1.208e-04, 2.436e-02, 4.824e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // UBus_Midi_le15t_Euro-IV_EGR
-        { 2.006e+03, 1.319e+02, 1.862e+03, 0.000e+00, 0.000e+00, 3.096e+02, 0.000e+00 }, // CO2(total)
-        { 6.644e+00, 4.383e-02, 8.091e+00, 0.000e+00, 0.000e+00, 1.381e-01, 0.000e+00 }, // CO
-        { 2.447e-01, 4.666e-03, 3.840e-01, 0.000e+00, 0.000e+00, 8.363e-03, 0.000e+00 }, // HC
-        { 6.448e+02, 4.241e+01, 5.984e+02, 0.000e+00, 0.000e+00, 9.949e+01, 0.000e+00 }, // FC
-        { 3.682e+01, 4.137e-01, 5.682e+01, 0.000e+00, 0.000e+00, 1.179e+00, 0.000e+00 }, // NOx
-        { 1.701e+00, 2.051e-03, 3.687e-01, 0.000e+00, 2.619e-06, 3.865e-03, 0.000e+00 }, // PM + PM (non-exhaust)
+        { 2.006e+03, 4.750e+02, 1.862e+03, 0.000e+00, 0.000e+00, 1.114e+03, 0.000e+00 }, // CO2(total)
+        { 6.644e+00, 1.578e-01, 8.091e+00, 0.000e+00, 0.000e+00, 4.973e-01, 0.000e+00 }, // CO
+        { 2.447e-01, 1.680e-02, 3.840e-01, 0.000e+00, 0.000e+00, 3.011e-02, 0.000e+00 }, // HC
+        { 6.448e+02, 1.527e+02, 5.984e+02, 0.000e+00, 0.000e+00, 3.582e+02, 0.000e+00 }, // FC
+        { 3.682e+01, 1.489e+00, 5.682e+01, 0.000e+00, 0.000e+00, 4.245e+00, 0.000e+00 }, // NOx
+        { 1.701e+00, 7.383e-03, 3.687e-01, 0.000e+00, 1.222e-04, 1.391e-02, 0.000e+00 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // UBus_Midi_le15t_Euro-IV_SCR
-        { 1.858e+03, 1.348e+02, 1.401e+03, 0.000e+00, 0.000e+00, 3.201e+02, 0.000e+00 }, // CO2(total)
+        { 1.858e+03, 4.852e+02, 1.401e+03, 0.000e+00, 0.000e+00, 1.152e+03, 0.000e+00 }, // CO2(total)
         { 1.966e+01, 0.000e+00, 3.500e+01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 6.728e-02, 2.920e-03, 8.956e-02, 0.000e+00, 0.000e+00, 5.346e-03, 0.000e+00 }, // HC
-        { 5.970e+02, 4.331e+01, 4.503e+02, 0.000e+00, 0.000e+00, 1.029e+02, 0.000e+00 }, // FC
-        { 1.935e+01, 2.271e-01, 0.000e+00, 1.457e-03, 0.000e+00, 5.886e-01, 5.098e-03 }, // NOx
-        { 1.735e+00, 1.531e-03, 5.383e-01, 0.000e+00, 2.608e-06, 4.402e-04, 4.684e-06 }, // PM + PM (non-exhaust)
+        { 6.728e-02, 1.051e-02, 8.956e-02, 0.000e+00, 0.000e+00, 1.924e-02, 0.000e+00 }, // HC
+        { 5.970e+02, 1.559e+02, 4.503e+02, 0.000e+00, 0.000e+00, 3.703e+02, 0.000e+00 }, // FC
+        { 1.935e+01, 8.174e-01, 0.000e+00, 1.888e-02, 0.000e+00, 2.119e+00, 6.607e-02 }, // NOx
+        { 1.735e+00, 5.511e-03, 5.383e-01, 0.000e+00, 1.217e-04, 1.585e-03, 6.070e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // UBus_Midi_le15t_Euro-IV_SCRs
-        { 1.858e+03, 1.348e+02, 1.401e+03, 0.000e+00, 0.000e+00, 3.201e+02, 0.000e+00 }, // CO2(total)
+        { 1.858e+03, 4.852e+02, 1.401e+03, 0.000e+00, 0.000e+00, 1.152e+03, 0.000e+00 }, // CO2(total)
         { 1.966e+01, 0.000e+00, 3.500e+01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 6.728e-02, 2.920e-03, 8.956e-02, 0.000e+00, 0.000e+00, 5.346e-03, 0.000e+00 }, // HC
-        { 5.970e+02, 4.331e+01, 4.503e+02, 0.000e+00, 0.000e+00, 1.029e+02, 0.000e+00 }, // FC
-        { 2.194e+01, 1.272e+00, 1.051e+01, 0.000e+00, 0.000e+00, 3.082e+00, 0.000e+00 }, // NOx
-        { 1.735e+00, 1.531e-03, 5.383e-01, 0.000e+00, 2.608e-06, 4.402e-04, 4.684e-06 }, // PM + PM (non-exhaust)
+        { 6.728e-02, 1.051e-02, 8.956e-02, 0.000e+00, 0.000e+00, 1.924e-02, 0.000e+00 }, // HC
+        { 5.970e+02, 1.559e+02, 4.503e+02, 0.000e+00, 0.000e+00, 3.703e+02, 0.000e+00 }, // FC
+        { 2.194e+01, 4.579e+00, 1.051e+01, 0.000e+00, 0.000e+00, 1.110e+01, 0.000e+00 }, // NOx
+        { 1.735e+00, 5.511e-03, 5.383e-01, 0.000e+00, 1.217e-04, 1.585e-03, 6.070e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // UBus_Midi_le15t_Euro-IV_EGR_(DPF)
-        { 2.050e+03, 1.349e+02, 1.903e+03, 0.000e+00, 0.000e+00, 3.164e+02, 0.000e+00 }, // CO2(total)
-        { 1.129e+00, 7.452e-03, 1.375e+00, 0.000e+00, 0.000e+00, 2.348e-02, 0.000e+00 }, // CO
-        { 1.224e-02, 2.333e-04, 1.920e-02, 0.000e+00, 0.000e+00, 4.181e-04, 0.000e+00 }, // HC
-        { 6.590e+02, 4.334e+01, 6.116e+02, 0.000e+00, 0.000e+00, 1.017e+02, 0.000e+00 }, // FC
-        { 3.682e+01, 4.137e-01, 5.682e+01, 0.000e+00, 0.000e+00, 1.179e+00, 0.000e+00 }, // NOx
-        { 1.417e+00, 1.125e-03, 2.581e-02, 0.000e+00, 2.619e-06, 2.705e-04, 0.000e+00 }, // PM + PM (non-exhaust)
+        { 2.050e+03, 4.855e+02, 1.903e+03, 0.000e+00, 0.000e+00, 1.139e+03, 0.000e+00 }, // CO2(total)
+        { 1.129e+00, 2.683e-02, 1.375e+00, 0.000e+00, 0.000e+00, 8.454e-02, 0.000e+00 }, // CO
+        { 1.224e-02, 8.399e-04, 1.920e-02, 0.000e+00, 0.000e+00, 1.505e-03, 0.000e+00 }, // HC
+        { 6.590e+02, 1.560e+02, 6.116e+02, 0.000e+00, 0.000e+00, 3.660e+02, 0.000e+00 }, // FC
+        { 3.682e+01, 1.489e+00, 5.682e+01, 0.000e+00, 0.000e+00, 4.245e+00, 0.000e+00 }, // NOx
+        { 1.417e+00, 4.049e-03, 2.581e-02, 0.000e+00, 1.222e-04, 9.739e-04, 0.000e+00 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // UBus_Midi_le15t_Euro-IV_SCR_(DPF)
-        { 1.899e+03, 1.377e+02, 1.432e+03, 0.000e+00, 0.000e+00, 3.271e+02, 0.000e+00 }, // CO2(total)
+        { 1.899e+03, 4.959e+02, 1.432e+03, 0.000e+00, 0.000e+00, 1.178e+03, 0.000e+00 }, // CO2(total)
         { 3.342e+00, 0.000e+00, 5.950e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 3.364e-03, 1.460e-04, 4.478e-03, 0.000e+00, 0.000e+00, 2.673e-04, 0.000e+00 }, // HC
-        { 6.102e+02, 4.427e+01, 4.602e+02, 0.000e+00, 0.000e+00, 1.051e+02, 0.000e+00 }, // FC
-        { 1.935e+01, 2.271e-01, 0.000e+00, 1.457e-03, 0.000e+00, 5.886e-01, 5.098e-03 }, // NOx
-        { 1.393e+00, 1.531e-03, 2.153e-02, 0.000e+00, 2.608e-06, 1.761e-05, 4.684e-06 }, // PM + PM (non-exhaust)
+        { 3.364e-03, 5.257e-04, 4.478e-03, 0.000e+00, 0.000e+00, 9.622e-04, 0.000e+00 }, // HC
+        { 6.102e+02, 1.594e+02, 4.602e+02, 0.000e+00, 0.000e+00, 3.785e+02, 0.000e+00 }, // FC
+        { 1.935e+01, 8.174e-01, 0.000e+00, 1.888e-02, 0.000e+00, 2.119e+00, 6.607e-02 }, // NOx
+        { 1.393e+00, 5.511e-03, 2.153e-02, 0.000e+00, 1.217e-04, 6.339e-05, 6.070e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // UBus_Midi_le15t_Euro-IV_SCRs_(DPF)
-        { 1.899e+03, 1.377e+02, 1.432e+03, 0.000e+00, 0.000e+00, 3.271e+02, 0.000e+00 }, // CO2(total)
+        { 1.899e+03, 4.959e+02, 1.432e+03, 0.000e+00, 0.000e+00, 1.178e+03, 0.000e+00 }, // CO2(total)
         { 3.342e+00, 0.000e+00, 5.950e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 3.364e-03, 1.460e-04, 4.478e-03, 0.000e+00, 0.000e+00, 2.673e-04, 0.000e+00 }, // HC
-        { 6.102e+02, 4.427e+01, 4.602e+02, 0.000e+00, 0.000e+00, 1.051e+02, 0.000e+00 }, // FC
-        { 2.194e+01, 1.272e+00, 1.051e+01, 0.000e+00, 0.000e+00, 3.082e+00, 0.000e+00 }, // NOx
-        { 1.393e+00, 1.531e-03, 2.153e-02, 0.000e+00, 2.608e-06, 1.761e-05, 4.684e-06 }, // PM + PM (non-exhaust)
+        { 3.364e-03, 5.257e-04, 4.478e-03, 0.000e+00, 0.000e+00, 9.622e-04, 0.000e+00 }, // HC
+        { 6.102e+02, 1.594e+02, 4.602e+02, 0.000e+00, 0.000e+00, 3.785e+02, 0.000e+00 }, // FC
+        { 2.194e+01, 4.579e+00, 1.051e+01, 0.000e+00, 0.000e+00, 1.110e+01, 0.000e+00 }, // NOx
+        { 1.393e+00, 5.511e-03, 2.153e-02, 0.000e+00, 1.217e-04, 6.339e-05, 6.070e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // UBus_Midi_le15t_Euro-V_EGR
-        { 1.836e+03, 1.314e+02, 1.553e+03, 0.000e+00, 0.000e+00, 3.132e+02, 0.000e+00 }, // CO2(total)
+        { 1.836e+03, 4.730e+02, 1.553e+03, 0.000e+00, 0.000e+00, 1.128e+03, 0.000e+00 }, // CO2(total)
         { 5.666e+00, 0.000e+00, 1.040e+01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 3.462e-01, 5.480e-03, 1.915e-01, 0.000e+00, 1.351e-07, 1.528e-02, 0.000e+00 }, // HC
-        { 5.901e+02, 4.223e+01, 4.990e+02, 0.000e+00, 0.000e+00, 1.007e+02, 0.000e+00 }, // FC
-        { 2.877e+01, 1.995e-01, 4.217e+01, 0.000e+00, 0.000e+00, 5.770e-01, 0.000e+00 }, // NOx
-        { 1.465e+00, 2.765e-03, 1.212e-02, 5.330e-05, 2.618e-06, 7.089e-03, 7.483e-05 }, // PM + PM (non-exhaust)
+        { 3.462e-01, 1.973e-02, 1.915e-01, 0.000e+00, 6.302e-06, 5.502e-02, 0.000e+00 }, // HC
+        { 5.901e+02, 1.520e+02, 4.990e+02, 0.000e+00, 0.000e+00, 3.624e+02, 0.000e+00 }, // FC
+        { 2.877e+01, 7.182e-01, 4.217e+01, 0.000e+00, 0.000e+00, 2.077e+00, 0.000e+00 }, // NOx
+        { 1.465e+00, 9.953e-03, 1.212e-02, 6.908e-04, 1.221e-04, 2.552e-02, 9.698e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // UBus_Midi_le15t_Euro-V_SCR
-        { 1.827e+03, 1.280e+02, 1.610e+03, 0.000e+00, 0.000e+00, 3.049e+02, 0.000e+00 }, // CO2(total)
+        { 1.827e+03, 4.609e+02, 1.610e+03, 0.000e+00, 0.000e+00, 1.098e+03, 0.000e+00 }, // CO2(total)
         { 1.765e+01, 0.000e+00, 3.034e+01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 8.072e-02, 2.520e-03, 9.783e-02, 0.000e+00, 0.000e+00, 4.726e-03, 0.000e+00 }, // HC
-        { 5.871e+02, 4.114e+01, 5.174e+02, 0.000e+00, 0.000e+00, 9.798e+01, 0.000e+00 }, // FC
-        { 1.631e+01, 6.292e-02, 0.000e+00, 1.105e-03, 0.000e+00, 0.000e+00, 5.646e-03 }, // NOx
-        { 1.735e+00, 1.391e-03, 5.155e-01, 0.000e+00, 2.607e-06, 2.146e-04, 5.290e-06 }, // PM + PM (non-exhaust)
+        { 8.072e-02, 9.071e-03, 9.783e-02, 0.000e+00, 0.000e+00, 1.701e-02, 0.000e+00 }, // HC
+        { 5.871e+02, 1.481e+02, 5.174e+02, 0.000e+00, 0.000e+00, 3.527e+02, 0.000e+00 }, // FC
+        { 1.631e+01, 2.265e-01, 0.000e+00, 1.432e-02, 0.000e+00, 0.000e+00, 7.317e-02 }, // NOx
+        { 1.735e+00, 5.008e-03, 5.155e-01, 0.000e+00, 1.216e-04, 7.727e-04, 6.856e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // UBus_Midi_le15t_Euro-V_SCRs
-        { 1.827e+03, 1.280e+02, 1.610e+03, 0.000e+00, 0.000e+00, 3.049e+02, 0.000e+00 }, // CO2(total)
+        { 1.827e+03, 4.609e+02, 1.610e+03, 0.000e+00, 0.000e+00, 1.098e+03, 0.000e+00 }, // CO2(total)
         { 1.765e+01, 0.000e+00, 3.034e+01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 8.072e-02, 2.520e-03, 9.783e-02, 0.000e+00, 0.000e+00, 4.726e-03, 0.000e+00 }, // HC
-        { 5.871e+02, 4.114e+01, 5.174e+02, 0.000e+00, 0.000e+00, 9.798e+01, 0.000e+00 }, // FC
-        { 2.156e+01, 1.288e+00, 8.386e+00, 0.000e+00, 0.000e+00, 3.089e+00, 0.000e+00 }, // NOx
-        { 1.735e+00, 1.391e-03, 5.155e-01, 0.000e+00, 2.607e-06, 2.146e-04, 5.290e-06 }, // PM + PM (non-exhaust)
+        { 8.072e-02, 9.071e-03, 9.783e-02, 0.000e+00, 0.000e+00, 1.701e-02, 0.000e+00 }, // HC
+        { 5.871e+02, 1.481e+02, 5.174e+02, 0.000e+00, 0.000e+00, 3.527e+02, 0.000e+00 }, // FC
+        { 2.156e+01, 4.638e+00, 8.386e+00, 0.000e+00, 0.000e+00, 1.112e+01, 0.000e+00 }, // NOx
+        { 1.735e+00, 5.008e-03, 5.155e-01, 0.000e+00, 1.216e-04, 7.727e-04, 6.856e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // UBus_Midi_le15t_Euro-V_EGR_(DPF)
-        { 1.876e+03, 1.343e+02, 1.587e+03, 0.000e+00, 0.000e+00, 3.201e+02, 0.000e+00 }, // CO2(total)
+        { 1.876e+03, 4.834e+02, 1.587e+03, 0.000e+00, 0.000e+00, 1.152e+03, 0.000e+00 }, // CO2(total)
         { 9.632e-01, 0.000e+00, 1.768e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 1.731e-02, 2.740e-04, 9.576e-03, 0.000e+00, 6.754e-09, 7.641e-04, 0.000e+00 }, // HC
-        { 6.030e+02, 4.316e+01, 5.100e+02, 0.000e+00, 0.000e+00, 1.029e+02, 0.000e+00 }, // FC
-        { 2.877e+01, 1.995e-01, 4.217e+01, 0.000e+00, 0.000e+00, 5.770e-01, 0.000e+00 }, // NOx
-        { 1.393e+00, 1.446e-03, 8.484e-04, 3.731e-06, 2.618e-06, 4.962e-04, 9.683e-06 }, // PM + PM (non-exhaust)
+        { 1.731e-02, 9.864e-04, 9.576e-03, 0.000e+00, 3.151e-07, 2.751e-03, 0.000e+00 }, // HC
+        { 6.030e+02, 1.554e+02, 5.100e+02, 0.000e+00, 0.000e+00, 3.703e+02, 0.000e+00 }, // FC
+        { 2.877e+01, 7.182e-01, 4.217e+01, 0.000e+00, 0.000e+00, 2.077e+00, 0.000e+00 }, // NOx
+        { 1.393e+00, 5.207e-03, 8.484e-04, 4.835e-05, 1.221e-04, 1.786e-03, 1.255e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // UBus_Midi_le15t_Euro-V_SCR_(DPF)
-        { 1.867e+03, 1.308e+02, 1.645e+03, 0.000e+00, 0.000e+00, 3.116e+02, 0.000e+00 }, // CO2(total)
+        { 1.867e+03, 4.710e+02, 1.645e+03, 0.000e+00, 0.000e+00, 1.122e+03, 0.000e+00 }, // CO2(total)
         { 3.001e+00, 0.000e+00, 5.157e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 4.036e-03, 1.260e-04, 4.891e-03, 0.000e+00, 0.000e+00, 2.363e-04, 0.000e+00 }, // HC
-        { 6.001e+02, 4.205e+01, 5.288e+02, 0.000e+00, 0.000e+00, 1.001e+02, 0.000e+00 }, // FC
-        { 1.631e+01, 6.292e-02, 0.000e+00, 1.105e-03, 0.000e+00, 0.000e+00, 5.646e-03 }, // NOx
-        { 1.405e+00, 1.391e-03, 2.062e-02, 0.000e+00, 2.607e-06, 8.586e-06, 5.290e-06 }, // PM + PM (non-exhaust)
+        { 4.036e-03, 4.536e-04, 4.891e-03, 0.000e+00, 0.000e+00, 8.507e-04, 0.000e+00 }, // HC
+        { 6.001e+02, 1.514e+02, 5.288e+02, 0.000e+00, 0.000e+00, 3.605e+02, 0.000e+00 }, // FC
+        { 1.631e+01, 2.265e-01, 0.000e+00, 1.432e-02, 0.000e+00, 0.000e+00, 7.317e-02 }, // NOx
+        { 1.405e+00, 5.008e-03, 2.062e-02, 0.000e+00, 1.216e-04, 3.091e-05, 6.856e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // UBus_Midi_le15t_Euro-V_SCRs_(DPF)
-        { 1.867e+03, 1.308e+02, 1.645e+03, 0.000e+00, 0.000e+00, 3.116e+02, 0.000e+00 }, // CO2(total)
+        { 1.867e+03, 4.710e+02, 1.645e+03, 0.000e+00, 0.000e+00, 1.122e+03, 0.000e+00 }, // CO2(total)
         { 3.001e+00, 0.000e+00, 5.157e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 4.036e-03, 1.260e-04, 4.891e-03, 0.000e+00, 0.000e+00, 2.363e-04, 0.000e+00 }, // HC
-        { 6.001e+02, 4.205e+01, 5.288e+02, 0.000e+00, 0.000e+00, 1.001e+02, 0.000e+00 }, // FC
-        { 2.156e+01, 1.288e+00, 8.386e+00, 0.000e+00, 0.000e+00, 3.089e+00, 0.000e+00 }, // NOx
-        { 1.405e+00, 1.391e-03, 2.062e-02, 0.000e+00, 2.607e-06, 8.586e-06, 5.290e-06 }, // PM + PM (non-exhaust)
+        { 4.036e-03, 4.536e-04, 4.891e-03, 0.000e+00, 0.000e+00, 8.507e-04, 0.000e+00 }, // HC
+        { 6.001e+02, 1.514e+02, 5.288e+02, 0.000e+00, 0.000e+00, 3.605e+02, 0.000e+00 }, // FC
+        { 2.156e+01, 4.638e+00, 8.386e+00, 0.000e+00, 0.000e+00, 1.112e+01, 0.000e+00 }, // NOx
+        { 1.405e+00, 5.008e-03, 2.062e-02, 0.000e+00, 1.216e-04, 3.091e-05, 6.856e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // UBus_Midi_le15t_Euro-VI_A-C
-        { 1.982e+03, 1.226e+02, 2.177e+03, 0.000e+00, 0.000e+00, 2.921e+02, 0.000e+00 }, // CO2(total)
-        { 1.512e+00, 1.413e-03, 2.157e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 8.797e-02, 1.500e-03, 4.717e-02, 0.000e+00, 0.000e+00, 3.476e-03, 0.000e+00 }, // HC
-        { 6.370e+02, 3.940e+01, 6.996e+02, 0.000e+00, 0.000e+00, 9.387e+01, 0.000e+00 }, // FC
-        { 2.993e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.007e-04 }, // NOx
-        { 1.467e+00, 1.413e-03, 1.325e-01, 0.000e+00, 2.608e-06, 0.000e+00, 4.541e-06 }, // PM + PM (non-exhaust)
+        { 1.982e+03, 4.413e+02, 2.177e+03, 0.000e+00, 0.000e+00, 1.052e+03, 0.000e+00 }, // CO2(total)
+        { 1.512e+00, 5.087e-03, 2.157e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
+        { 8.797e-02, 5.402e-03, 4.717e-02, 0.000e+00, 0.000e+00, 1.251e-02, 0.000e+00 }, // HC
+        { 6.370e+02, 1.418e+02, 6.996e+02, 0.000e+00, 0.000e+00, 3.379e+02, 0.000e+00 }, // FC
+        { 2.993e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.305e-03 }, // NOx
+        { 1.467e+00, 5.087e-03, 1.325e-01, 0.000e+00, 1.217e-04, 0.000e+00, 5.885e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // UBus_Midi_le15t_Euro-VIs_A-C
-        { 1.982e+03, 1.226e+02, 2.177e+03, 0.000e+00, 0.000e+00, 2.921e+02, 0.000e+00 }, // CO2(total)
-        { 1.512e+00, 1.413e-03, 2.157e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 8.797e-02, 1.500e-03, 4.717e-02, 0.000e+00, 0.000e+00, 3.476e-03, 0.000e+00 }, // HC
-        { 6.370e+02, 3.940e+01, 6.996e+02, 0.000e+00, 0.000e+00, 9.387e+01, 0.000e+00 }, // FC
-        { 1.496e+01, 8.367e-01, 2.046e+01, 0.000e+00, 0.000e+00, 1.960e+00, 0.000e+00 }, // NOx
-        { 1.467e+00, 1.413e-03, 1.325e-01, 0.000e+00, 2.608e-06, 0.000e+00, 4.541e-06 }, // PM + PM (non-exhaust)
+        { 1.982e+03, 4.413e+02, 2.177e+03, 0.000e+00, 0.000e+00, 1.052e+03, 0.000e+00 }, // CO2(total)
+        { 1.512e+00, 5.087e-03, 2.157e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
+        { 8.797e-02, 5.402e-03, 4.717e-02, 0.000e+00, 0.000e+00, 1.251e-02, 0.000e+00 }, // HC
+        { 6.370e+02, 1.418e+02, 6.996e+02, 0.000e+00, 0.000e+00, 3.379e+02, 0.000e+00 }, // FC
+        { 1.496e+01, 3.012e+00, 2.046e+01, 0.000e+00, 0.000e+00, 7.056e+00, 0.000e+00 }, // NOx
+        { 1.467e+00, 5.087e-03, 1.325e-01, 0.000e+00, 1.217e-04, 0.000e+00, 5.885e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // UBus_Midi_le15t_Euro-VI_D-E
-        { 1.712e+03, 1.268e+02, 1.551e+03, 0.000e+00, 0.000e+00, 3.027e+02, 0.000e+00 }, // CO2(total)
+        { 1.712e+03, 4.566e+02, 1.551e+03, 0.000e+00, 0.000e+00, 1.090e+03, 0.000e+00 }, // CO2(total)
         { 5.374e-01, 0.000e+00, 7.547e-01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 1.168e-01, 1.733e-03, 1.779e-02, 1.431e-06, 0.000e+00, 1.884e-03, 2.167e-05 }, // HC
-        { 5.502e+02, 4.076e+01, 4.985e+02, 0.000e+00, 0.000e+00, 9.727e+01, 0.000e+00 }, // FC
-        { 7.569e-01, 3.933e-03, 5.711e-01, 0.000e+00, 0.000e+00, 1.105e-02, 0.000e+00 }, // NOx
-        { 1.401e+00, 1.593e-03, 0.000e+00, 0.000e+00, 2.626e-06, 9.125e-04, 4.127e-06 }, // PM + PM (non-exhaust)
+        { 1.168e-01, 6.240e-03, 1.779e-02, 1.854e-05, 0.000e+00, 6.784e-03, 2.808e-04 }, // HC
+        { 5.502e+02, 1.468e+02, 4.985e+02, 0.000e+00, 0.000e+00, 3.502e+02, 0.000e+00 }, // FC
+        { 7.569e-01, 1.416e-02, 5.711e-01, 0.000e+00, 0.000e+00, 3.978e-02, 0.000e+00 }, // NOx
+        { 1.401e+00, 5.735e-03, 0.000e+00, 0.000e+00, 1.225e-04, 3.285e-03, 5.348e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // UBus_Midi_le15t_Euro-VIs_D-E
-        { 1.712e+03, 1.268e+02, 1.551e+03, 0.000e+00, 0.000e+00, 3.027e+02, 0.000e+00 }, // CO2(total)
+        { 1.712e+03, 4.566e+02, 1.551e+03, 0.000e+00, 0.000e+00, 1.090e+03, 0.000e+00 }, // CO2(total)
         { 5.374e-01, 0.000e+00, 7.547e-01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 1.168e-01, 1.733e-03, 1.779e-02, 1.431e-06, 0.000e+00, 1.884e-03, 2.167e-05 }, // HC
-        { 5.502e+02, 4.076e+01, 4.985e+02, 0.000e+00, 0.000e+00, 9.727e+01, 0.000e+00 }, // FC
-        { 2.103e+01, 8.775e-01, 3.428e+01, 0.000e+00, 0.000e+00, 1.894e+00, 0.000e+00 }, // NOx
-        { 1.401e+00, 1.593e-03, 0.000e+00, 0.000e+00, 2.626e-06, 9.125e-04, 4.127e-06 }, // PM + PM (non-exhaust)
+        { 1.168e-01, 6.240e-03, 1.779e-02, 1.854e-05, 0.000e+00, 6.784e-03, 2.808e-04 }, // HC
+        { 5.502e+02, 1.468e+02, 4.985e+02, 0.000e+00, 0.000e+00, 3.502e+02, 0.000e+00 }, // FC
+        { 2.103e+01, 3.159e+00, 3.428e+01, 0.000e+00, 0.000e+00, 6.820e+00, 0.000e+00 }, // NOx
+        { 1.401e+00, 5.735e-03, 0.000e+00, 0.000e+00, 1.225e-04, 3.285e-03, 5.348e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // UBus_Std_gt15-18t_50ties
-        { 3.275e+03, 2.120e+02, 1.062e+03, 0.000e+00, 0.000e+00, 5.373e+02, 0.000e+00 }, // CO2(total)
-        { 3.462e+01, 4.309e-01, 3.721e+00, 0.000e+00, 0.000e+00, 1.690e+00, 0.000e+00 }, // CO
-        { 1.374e+01, 0.000e+00, 0.000e+00, 0.000e+00, 8.257e-06, 0.000e+00, 3.150e-03 }, // HC
-        { 1.053e+03, 6.813e+01, 3.413e+02, 0.000e+00, 0.000e+00, 1.727e+02, 0.000e+00 }, // FC
-        { 7.089e+01, 2.898e+00, 3.161e+01, 0.000e+00, 0.000e+00, 8.309e+00, 0.000e+00 }, // NOx
-        { 6.273e+00, 6.960e-02, 0.000e+00, 0.000e+00, 2.767e-06, 2.480e-01, 1.864e-05 }, // PM + PM (non-exhaust)
+        { 3.275e+03, 7.631e+02, 1.062e+03, 0.000e+00, 0.000e+00, 1.934e+03, 0.000e+00 }, // CO2(total)
+        { 3.462e+01, 1.551e+00, 3.721e+00, 0.000e+00, 0.000e+00, 6.083e+00, 0.000e+00 }, // CO
+        { 1.374e+01, 0.000e+00, 0.000e+00, 0.000e+00, 3.853e-04, 0.000e+00, 4.082e-02 }, // HC
+        { 1.053e+03, 2.453e+02, 3.413e+02, 0.000e+00, 0.000e+00, 6.217e+02, 0.000e+00 }, // FC
+        { 7.089e+01, 1.043e+01, 3.161e+01, 0.000e+00, 0.000e+00, 2.991e+01, 0.000e+00 }, // NOx
+        { 6.273e+00, 2.506e-01, 0.000e+00, 0.000e+00, 1.291e-04, 8.929e-01, 2.416e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // UBus_Std_gt15-18t_60ties
-        { 3.275e+03, 2.120e+02, 1.062e+03, 0.000e+00, 0.000e+00, 5.373e+02, 0.000e+00 }, // CO2(total)
-        { 3.462e+01, 4.309e-01, 3.721e+00, 0.000e+00, 0.000e+00, 1.690e+00, 0.000e+00 }, // CO
-        { 1.374e+01, 0.000e+00, 0.000e+00, 0.000e+00, 8.257e-06, 0.000e+00, 3.150e-03 }, // HC
-        { 1.053e+03, 6.813e+01, 3.413e+02, 0.000e+00, 0.000e+00, 1.727e+02, 0.000e+00 }, // FC
-        { 7.089e+01, 2.898e+00, 3.161e+01, 0.000e+00, 0.000e+00, 8.309e+00, 0.000e+00 }, // NOx
-        { 6.273e+00, 6.960e-02, 0.000e+00, 0.000e+00, 2.767e-06, 2.480e-01, 1.864e-05 }, // PM + PM (non-exhaust)
+        { 3.275e+03, 7.631e+02, 1.062e+03, 0.000e+00, 0.000e+00, 1.934e+03, 0.000e+00 }, // CO2(total)
+        { 3.462e+01, 1.551e+00, 3.721e+00, 0.000e+00, 0.000e+00, 6.083e+00, 0.000e+00 }, // CO
+        { 1.374e+01, 0.000e+00, 0.000e+00, 0.000e+00, 3.853e-04, 0.000e+00, 4.082e-02 }, // HC
+        { 1.053e+03, 2.453e+02, 3.413e+02, 0.000e+00, 0.000e+00, 6.217e+02, 0.000e+00 }, // FC
+        { 7.089e+01, 1.043e+01, 3.161e+01, 0.000e+00, 0.000e+00, 2.991e+01, 0.000e+00 }, // NOx
+        { 6.273e+00, 2.506e-01, 0.000e+00, 0.000e+00, 1.291e-04, 8.929e-01, 2.416e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // UBus_Std_gt15-18t_70ties
-        { 3.275e+03, 2.120e+02, 1.062e+03, 0.000e+00, 0.000e+00, 5.373e+02, 0.000e+00 }, // CO2(total)
-        { 3.462e+01, 4.309e-01, 3.721e+00, 0.000e+00, 0.000e+00, 1.690e+00, 0.000e+00 }, // CO
-        { 1.374e+01, 0.000e+00, 0.000e+00, 0.000e+00, 8.257e-06, 0.000e+00, 3.150e-03 }, // HC
-        { 1.053e+03, 6.813e+01, 3.413e+02, 0.000e+00, 0.000e+00, 1.727e+02, 0.000e+00 }, // FC
-        { 7.089e+01, 2.898e+00, 3.161e+01, 0.000e+00, 0.000e+00, 8.309e+00, 0.000e+00 }, // NOx
-        { 6.273e+00, 6.960e-02, 0.000e+00, 0.000e+00, 2.767e-06, 2.480e-01, 1.864e-05 }, // PM + PM (non-exhaust)
+        { 3.275e+03, 7.631e+02, 1.062e+03, 0.000e+00, 0.000e+00, 1.934e+03, 0.000e+00 }, // CO2(total)
+        { 3.462e+01, 1.551e+00, 3.721e+00, 0.000e+00, 0.000e+00, 6.083e+00, 0.000e+00 }, // CO
+        { 1.374e+01, 0.000e+00, 0.000e+00, 0.000e+00, 3.853e-04, 0.000e+00, 4.082e-02 }, // HC
+        { 1.053e+03, 2.453e+02, 3.413e+02, 0.000e+00, 0.000e+00, 6.217e+02, 0.000e+00 }, // FC
+        { 7.089e+01, 1.043e+01, 3.161e+01, 0.000e+00, 0.000e+00, 2.991e+01, 0.000e+00 }, // NOx
+        { 6.273e+00, 2.506e-01, 0.000e+00, 0.000e+00, 1.291e-04, 8.929e-01, 2.416e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // UBus_Std_gt15-18t_80ties
-        { 3.275e+03, 2.120e+02, 1.062e+03, 0.000e+00, 0.000e+00, 5.373e+02, 0.000e+00 }, // CO2(total)
-        { 3.462e+01, 4.309e-01, 3.721e+00, 0.000e+00, 0.000e+00, 1.690e+00, 0.000e+00 }, // CO
-        { 1.374e+01, 0.000e+00, 0.000e+00, 0.000e+00, 8.257e-06, 0.000e+00, 3.150e-03 }, // HC
-        { 1.053e+03, 6.813e+01, 3.413e+02, 0.000e+00, 0.000e+00, 1.727e+02, 0.000e+00 }, // FC
-        { 7.089e+01, 2.898e+00, 3.161e+01, 0.000e+00, 0.000e+00, 8.309e+00, 0.000e+00 }, // NOx
-        { 6.273e+00, 6.960e-02, 0.000e+00, 0.000e+00, 2.767e-06, 2.480e-01, 1.864e-05 }, // PM + PM (non-exhaust)
+        { 3.275e+03, 7.631e+02, 1.062e+03, 0.000e+00, 0.000e+00, 1.934e+03, 0.000e+00 }, // CO2(total)
+        { 3.462e+01, 1.551e+00, 3.721e+00, 0.000e+00, 0.000e+00, 6.083e+00, 0.000e+00 }, // CO
+        { 1.374e+01, 0.000e+00, 0.000e+00, 0.000e+00, 3.853e-04, 0.000e+00, 4.082e-02 }, // HC
+        { 1.053e+03, 2.453e+02, 3.413e+02, 0.000e+00, 0.000e+00, 6.217e+02, 0.000e+00 }, // FC
+        { 7.089e+01, 1.043e+01, 3.161e+01, 0.000e+00, 0.000e+00, 2.991e+01, 0.000e+00 }, // NOx
+        { 6.273e+00, 2.506e-01, 0.000e+00, 0.000e+00, 1.291e-04, 8.929e-01, 2.416e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // UBus_Std_gt15-18t_Euro-I
-        { 3.199e+03, 2.052e+02, 1.301e+03, 0.000e+00, 0.000e+00, 5.154e+02, 0.000e+00 }, // CO2(total)
-        { 1.847e+01, 1.105e-01, 6.184e+00, 0.000e+00, 0.000e+00, 4.802e-01, 0.000e+00 }, // CO
-        { 5.774e+00, 0.000e+00, 8.938e-01, 1.631e-04, 7.966e-06, 0.000e+00, 2.518e-03 }, // HC
-        { 1.028e+03, 6.595e+01, 4.180e+02, 0.000e+00, 0.000e+00, 1.656e+02, 0.000e+00 }, // FC
-        { 4.979e+01, 1.558e+00, 3.145e+01, 0.000e+00, 0.000e+00, 4.692e+00, 0.000e+00 }, // NOx
-        { 4.253e+00, 4.737e-02, 0.000e+00, 9.555e-05, 2.662e-06, 9.283e-02, 8.075e-04 }, // PM + PM (non-exhaust)
+        { 3.199e+03, 7.388e+02, 1.301e+03, 0.000e+00, 0.000e+00, 1.855e+03, 0.000e+00 }, // CO2(total)
+        { 1.847e+01, 3.978e-01, 6.184e+00, 0.000e+00, 0.000e+00, 1.729e+00, 0.000e+00 }, // CO
+        { 5.774e+00, 0.000e+00, 8.938e-01, 2.113e-03, 3.716e-04, 0.000e+00, 3.264e-02 }, // HC
+        { 1.028e+03, 2.374e+02, 4.180e+02, 0.000e+00, 0.000e+00, 5.963e+02, 0.000e+00 }, // FC
+        { 4.979e+01, 5.610e+00, 3.145e+01, 0.000e+00, 0.000e+00, 1.689e+01, 0.000e+00 }, // NOx
+        { 4.253e+00, 1.705e-01, 0.000e+00, 1.238e-03, 1.242e-04, 3.342e-01, 1.047e-02 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // UBus_Std_gt15-18t_Euro-I_(DPF)
-        { 3.231e+03, 2.073e+02, 1.314e+03, 0.000e+00, 0.000e+00, 5.206e+02, 0.000e+00 }, // CO2(total)
-        { 6.094e+00, 3.647e-02, 2.041e+00, 0.000e+00, 0.000e+00, 1.585e-01, 0.000e+00 }, // CO
-        { 1.905e+00, 0.000e+00, 2.949e-01, 5.381e-05, 2.629e-06, 0.000e+00, 8.311e-04 }, // HC
-        { 1.038e+03, 6.661e+01, 4.222e+02, 0.000e+00, 0.000e+00, 1.673e+02, 0.000e+00 }, // FC
-        { 4.979e+01, 1.558e+00, 3.145e+01, 0.000e+00, 0.000e+00, 4.692e+00, 0.000e+00 }, // NOx
-        { 2.186e+00, 1.284e-02, 0.000e+00, 2.484e-05, 2.662e-06, 2.413e-02, 2.235e-04 }, // PM + PM (non-exhaust)
+        { 3.231e+03, 7.461e+02, 1.314e+03, 0.000e+00, 0.000e+00, 1.874e+03, 0.000e+00 }, // CO2(total)
+        { 6.094e+00, 1.313e-01, 2.041e+00, 0.000e+00, 0.000e+00, 5.704e-01, 0.000e+00 }, // CO
+        { 1.905e+00, 0.000e+00, 2.949e-01, 6.974e-04, 1.226e-04, 0.000e+00, 1.077e-02 }, // HC
+        { 1.038e+03, 2.398e+02, 4.222e+02, 0.000e+00, 0.000e+00, 6.023e+02, 0.000e+00 }, // FC
+        { 4.979e+01, 5.610e+00, 3.145e+01, 0.000e+00, 0.000e+00, 1.689e+01, 0.000e+00 }, // NOx
+        { 2.186e+00, 4.621e-02, 0.000e+00, 3.219e-04, 1.242e-04, 8.689e-02, 2.896e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // UBus_Std_gt15-18t_Euro-II
-        { 3.101e+03, 1.954e+02, 1.420e+03, 0.000e+00, 0.000e+00, 4.903e+02, 0.000e+00 }, // CO2(total)
-        { 1.652e+01, 0.000e+00, 1.139e+01, 4.253e-04, 0.000e+00, 0.000e+00, 2.841e-03 }, // CO
-        { 3.473e+00, 0.000e+00, 8.762e-01, 3.578e-04, 1.092e-06, 0.000e+00, 1.320e-03 }, // HC
-        { 9.965e+02, 6.281e+01, 4.564e+02, 0.000e+00, 0.000e+00, 1.576e+02, 0.000e+00 }, // FC
-        { 5.662e+01, 1.386e+00, 4.516e+01, 0.000e+00, 0.000e+00, 4.208e+00, 0.000e+00 }, // NOx
-        { 2.887e+00, 1.580e-02, 1.083e+00, 1.002e-04, 2.561e-06, 1.005e-03, 7.260e-04 }, // PM + PM (non-exhaust)
+        { 3.101e+03, 7.035e+02, 1.420e+03, 0.000e+00, 0.000e+00, 1.765e+03, 0.000e+00 }, // CO2(total)
+        { 1.652e+01, 0.000e+00, 1.139e+01, 5.511e-03, 0.000e+00, 0.000e+00, 3.682e-02 }, // CO
+        { 3.473e+00, 0.000e+00, 8.762e-01, 4.638e-03, 5.096e-05, 0.000e+00, 1.710e-02 }, // HC
+        { 9.965e+02, 2.261e+02, 4.564e+02, 0.000e+00, 0.000e+00, 5.673e+02, 0.000e+00 }, // FC
+        { 5.662e+01, 4.990e+00, 4.516e+01, 0.000e+00, 0.000e+00, 1.515e+01, 0.000e+00 }, // NOx
+        { 2.887e+00, 5.687e-02, 1.083e+00, 1.298e-03, 1.195e-04, 3.617e-03, 9.409e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // UBus_Std_gt15-18t_Euro-II_(DPF)
-        { 3.132e+03, 1.974e+02, 1.434e+03, 0.000e+00, 0.000e+00, 4.953e+02, 0.000e+00 }, // CO2(total)
-        { 5.453e+00, 0.000e+00, 3.759e+00, 1.403e-04, 0.000e+00, 0.000e+00, 9.376e-04 }, // CO
-        { 1.146e+00, 0.000e+00, 2.891e-01, 1.181e-04, 3.605e-07, 0.000e+00, 4.355e-04 }, // HC
-        { 1.006e+03, 6.343e+01, 4.609e+02, 0.000e+00, 0.000e+00, 1.592e+02, 0.000e+00 }, // FC
-        { 5.662e+01, 1.386e+00, 4.516e+01, 0.000e+00, 0.000e+00, 4.208e+00, 0.000e+00 }, // NOx
-        { 1.820e+00, 5.087e-03, 2.816e-01, 2.604e-05, 2.561e-06, 2.612e-04, 2.012e-04 }, // PM + PM (non-exhaust)
+        { 3.132e+03, 7.106e+02, 1.434e+03, 0.000e+00, 0.000e+00, 1.783e+03, 0.000e+00 }, // CO2(total)
+        { 5.453e+00, 0.000e+00, 3.759e+00, 1.819e-03, 0.000e+00, 0.000e+00, 1.215e-02 }, // CO
+        { 1.146e+00, 0.000e+00, 2.891e-01, 1.530e-03, 1.682e-05, 0.000e+00, 5.644e-03 }, // HC
+        { 1.006e+03, 2.284e+02, 4.609e+02, 0.000e+00, 0.000e+00, 5.730e+02, 0.000e+00 }, // FC
+        { 5.662e+01, 4.990e+00, 4.516e+01, 0.000e+00, 0.000e+00, 1.515e+01, 0.000e+00 }, // NOx
+        { 1.820e+00, 1.831e-02, 2.816e-01, 3.375e-04, 1.195e-04, 9.404e-04, 2.608e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // UBus_Std_gt15-18t_Euro-III
-        { 3.164e+03, 1.994e+02, 1.461e+03, 0.000e+00, 0.000e+00, 5.024e+02, 0.000e+00 }, // CO2(total)
-        { 1.866e+01, 0.000e+00, 6.405e+00, 0.000e+00, 5.415e-06, 0.000e+00, 3.000e-03 }, // CO
-        { 3.230e+00, 0.000e+00, 4.379e-01, 0.000e+00, 3.678e-06, 0.000e+00, 1.153e-03 }, // HC
-        { 1.017e+03, 6.407e+01, 4.695e+02, 0.000e+00, 0.000e+00, 1.615e+02, 0.000e+00 }, // FC
-        { 4.937e+01, 1.052e+00, 2.393e+01, 0.000e+00, 0.000e+00, 3.685e+00, 0.000e+00 }, // NOx
-        { 2.798e+00, 1.303e-02, 2.452e-01, 1.157e-04, 2.489e-06, 0.000e+00, 6.915e-04 }, // PM + PM (non-exhaust)
+        { 3.164e+03, 7.177e+02, 1.461e+03, 0.000e+00, 0.000e+00, 1.809e+03, 0.000e+00 }, // CO2(total)
+        { 1.866e+01, 0.000e+00, 6.405e+00, 0.000e+00, 2.526e-04, 0.000e+00, 3.887e-02 }, // CO
+        { 3.230e+00, 0.000e+00, 4.379e-01, 0.000e+00, 1.716e-04, 0.000e+00, 1.494e-02 }, // HC
+        { 1.017e+03, 2.306e+02, 4.695e+02, 0.000e+00, 0.000e+00, 5.813e+02, 0.000e+00 }, // FC
+        { 4.937e+01, 3.787e+00, 2.393e+01, 0.000e+00, 0.000e+00, 1.327e+01, 0.000e+00 }, // NOx
+        { 2.798e+00, 4.692e-02, 2.452e-01, 1.499e-03, 1.161e-04, 0.000e+00, 8.962e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // UBus_Std_gt15-18t_Euro-III_(DPF)
-        { 3.196e+03, 2.013e+02, 1.476e+03, 0.000e+00, 0.000e+00, 5.074e+02, 0.000e+00 }, // CO2(total)
-        { 6.157e+00, 0.000e+00, 2.114e+00, 0.000e+00, 1.787e-06, 0.000e+00, 9.898e-04 }, // CO
-        { 1.066e+00, 0.000e+00, 1.445e-01, 0.000e+00, 1.214e-06, 0.000e+00, 3.804e-04 }, // HC
-        { 1.027e+03, 6.471e+01, 4.742e+02, 0.000e+00, 0.000e+00, 1.631e+02, 0.000e+00 }, // FC
-        { 4.937e+01, 1.052e+00, 2.393e+01, 0.000e+00, 0.000e+00, 3.685e+00, 0.000e+00 }, // NOx
-        { 1.794e+00, 4.571e-03, 6.375e-02, 3.007e-05, 2.489e-06, 0.000e+00, 1.880e-04 }, // PM + PM (non-exhaust)
+        { 3.196e+03, 7.249e+02, 1.476e+03, 0.000e+00, 0.000e+00, 1.827e+03, 0.000e+00 }, // CO2(total)
+        { 6.157e+00, 0.000e+00, 2.114e+00, 0.000e+00, 8.337e-05, 0.000e+00, 1.283e-02 }, // CO
+        { 1.066e+00, 0.000e+00, 1.445e-01, 0.000e+00, 5.663e-05, 0.000e+00, 4.930e-03 }, // HC
+        { 1.027e+03, 2.330e+02, 4.742e+02, 0.000e+00, 0.000e+00, 5.871e+02, 0.000e+00 }, // FC
+        { 4.937e+01, 3.787e+00, 2.393e+01, 0.000e+00, 0.000e+00, 1.327e+01, 0.000e+00 }, // NOx
+        { 1.794e+00, 1.646e-02, 6.375e-02, 3.897e-04, 1.161e-04, 0.000e+00, 2.436e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // UBus_Std_gt15-18t_Euro-IV_EGR
-        { 2.687e+03, 2.035e+02, 1.754e+03, 0.000e+00, 0.000e+00, 5.056e+02, 0.000e+00 }, // CO2(total)
-        { 1.014e+01, 6.263e-02, 1.319e+01, 0.000e+00, 0.000e+00, 1.376e-01, 0.000e+00 }, // CO
-        { 3.653e-01, 5.882e-03, 5.792e-01, 0.000e+00, 8.309e-07, 5.554e-03, 3.213e-05 }, // HC
-        { 8.636e+02, 6.539e+01, 5.638e+02, 0.000e+00, 0.000e+00, 1.625e+02, 0.000e+00 }, // FC
-        { 4.877e+01, 5.498e-01, 6.222e+01, 0.000e+00, 0.000e+00, 1.766e+00, 0.000e+00 }, // NOx
-        { 1.864e+00, 1.756e-03, 4.503e-01, 0.000e+00, 3.092e-06, 0.000e+00, 8.717e-05 }, // PM + PM (non-exhaust)
+        { 2.687e+03, 7.324e+02, 1.754e+03, 0.000e+00, 0.000e+00, 1.820e+03, 0.000e+00 }, // CO2(total)
+        { 1.014e+01, 2.255e-01, 1.319e+01, 0.000e+00, 0.000e+00, 4.954e-01, 0.000e+00 }, // CO
+        { 3.653e-01, 2.118e-02, 5.792e-01, 0.000e+00, 3.877e-05, 1.999e-02, 4.164e-04 }, // HC
+        { 8.636e+02, 2.354e+02, 5.638e+02, 0.000e+00, 0.000e+00, 5.849e+02, 0.000e+00 }, // FC
+        { 4.877e+01, 1.979e+00, 6.222e+01, 0.000e+00, 0.000e+00, 6.357e+00, 0.000e+00 }, // NOx
+        { 1.864e+00, 6.321e-03, 4.503e-01, 0.000e+00, 1.443e-04, 0.000e+00, 1.130e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // UBus_Std_gt15-18t_Euro-IV_SCR
-        { 2.773e+03, 1.960e+02, 2.134e+03, 0.000e+00, 0.000e+00, 4.801e+02, 0.000e+00 }, // CO2(total)
+        { 2.773e+03, 7.057e+02, 2.134e+03, 0.000e+00, 0.000e+00, 1.728e+03, 0.000e+00 }, // CO2(total)
         { 2.754e+01, 0.000e+00, 4.827e+01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 1.442e-01, 8.493e-04, 1.727e-01, 7.357e-05, 0.000e+00, 0.000e+00, 1.322e-04 }, // HC
-        { 8.911e+02, 6.300e+01, 6.858e+02, 0.000e+00, 0.000e+00, 1.543e+02, 0.000e+00 }, // FC
-        { 3.281e+01, 2.884e-01, 0.000e+00, 2.270e-03, 0.000e+00, 1.003e+00, 6.520e-03 }, // NOx
-        { 1.992e+00, 2.304e-04, 6.590e-01, 0.000e+00, 3.162e-06, 4.573e-03, 5.210e-06 }, // PM + PM (non-exhaust)
+        { 1.442e-01, 3.058e-03, 1.727e-01, 9.535e-04, 0.000e+00, 0.000e+00, 1.713e-03 }, // HC
+        { 8.911e+02, 2.268e+02, 6.858e+02, 0.000e+00, 0.000e+00, 5.554e+02, 0.000e+00 }, // FC
+        { 3.281e+01, 1.038e+00, 0.000e+00, 2.942e-02, 0.000e+00, 3.610e+00, 8.450e-02 }, // NOx
+        { 1.992e+00, 8.294e-04, 6.590e-01, 0.000e+00, 1.475e-04, 1.646e-02, 6.752e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // UBus_Std_gt15-18t_Euro-IV_SCRs
-        { 2.773e+03, 1.960e+02, 2.134e+03, 0.000e+00, 0.000e+00, 4.801e+02, 0.000e+00 }, // CO2(total)
+        { 2.773e+03, 7.057e+02, 2.134e+03, 0.000e+00, 0.000e+00, 1.728e+03, 0.000e+00 }, // CO2(total)
         { 2.754e+01, 0.000e+00, 4.827e+01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 1.442e-01, 8.493e-04, 1.727e-01, 7.357e-05, 0.000e+00, 0.000e+00, 1.322e-04 }, // HC
-        { 8.911e+02, 6.300e+01, 6.858e+02, 0.000e+00, 0.000e+00, 1.543e+02, 0.000e+00 }, // FC
-        { 5.138e+01, 1.413e+00, 4.511e+01, 0.000e+00, 0.000e+00, 4.045e+00, 0.000e+00 }, // NOx
-        { 1.992e+00, 2.304e-04, 6.590e-01, 0.000e+00, 3.162e-06, 4.573e-03, 5.210e-06 }, // PM + PM (non-exhaust)
+        { 1.442e-01, 3.058e-03, 1.727e-01, 9.535e-04, 0.000e+00, 0.000e+00, 1.713e-03 }, // HC
+        { 8.911e+02, 2.268e+02, 6.858e+02, 0.000e+00, 0.000e+00, 5.554e+02, 0.000e+00 }, // FC
+        { 5.138e+01, 5.087e+00, 4.511e+01, 0.000e+00, 0.000e+00, 1.456e+01, 0.000e+00 }, // NOx
+        { 1.992e+00, 8.294e-04, 6.590e-01, 0.000e+00, 1.475e-04, 1.646e-02, 6.752e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // UBus_Std_gt15-18t_Euro-IV_EGR_(DPF)
-        { 2.746e+03, 2.079e+02, 1.793e+03, 0.000e+00, 0.000e+00, 5.167e+02, 0.000e+00 }, // CO2(total)
-        { 1.724e+00, 1.065e-02, 2.243e+00, 0.000e+00, 0.000e+00, 2.339e-02, 0.000e+00 }, // CO
-        { 1.826e-02, 2.941e-04, 2.896e-02, 0.000e+00, 4.155e-08, 2.777e-04, 1.607e-06 }, // HC
-        { 8.826e+02, 6.682e+01, 5.762e+02, 0.000e+00, 0.000e+00, 1.661e+02, 0.000e+00 }, // FC
-        { 4.877e+01, 5.498e-01, 6.222e+01, 0.000e+00, 0.000e+00, 1.766e+00, 0.000e+00 }, // NOx
-        { 1.463e+00, 1.756e-03, 3.152e-02, 0.000e+00, 2.526e-06, 0.000e+00, 1.671e-05 }, // PM + PM (non-exhaust)
+        { 2.746e+03, 7.485e+02, 1.793e+03, 0.000e+00, 0.000e+00, 1.860e+03, 0.000e+00 }, // CO2(total)
+        { 1.724e+00, 3.833e-02, 2.243e+00, 0.000e+00, 0.000e+00, 8.421e-02, 0.000e+00 }, // CO
+        { 1.826e-02, 1.059e-03, 2.896e-02, 0.000e+00, 1.938e-06, 9.997e-04, 2.082e-05 }, // HC
+        { 8.826e+02, 2.406e+02, 5.762e+02, 0.000e+00, 0.000e+00, 5.978e+02, 0.000e+00 }, // FC
+        { 4.877e+01, 1.979e+00, 6.222e+01, 0.000e+00, 0.000e+00, 6.357e+00, 0.000e+00 }, // NOx
+        { 1.463e+00, 6.321e-03, 3.152e-02, 0.000e+00, 1.178e-04, 0.000e+00, 2.166e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // UBus_Std_gt15-18t_Euro-IV_SCR_(DPF)
-        { 2.834e+03, 2.003e+02, 2.181e+03, 0.000e+00, 0.000e+00, 4.906e+02, 0.000e+00 }, // CO2(total)
+        { 2.834e+03, 7.213e+02, 2.181e+03, 0.000e+00, 0.000e+00, 1.766e+03, 0.000e+00 }, // CO2(total)
         { 4.683e+00, 0.000e+00, 8.206e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 7.209e-03, 4.247e-05, 8.635e-03, 3.679e-06, 0.000e+00, 0.000e+00, 6.608e-06 }, // HC
-        { 9.107e+02, 6.439e+01, 7.009e+02, 0.000e+00, 0.000e+00, 1.577e+02, 0.000e+00 }, // FC
-        { 3.281e+01, 2.884e-01, 0.000e+00, 2.270e-03, 0.000e+00, 1.003e+00, 6.520e-03 }, // NOx
-        { 1.478e+00, 2.304e-04, 2.636e-02, 0.000e+00, 2.671e-06, 1.829e-04, 5.210e-06 }, // PM + PM (non-exhaust)
+        { 7.209e-03, 1.529e-04, 8.635e-03, 4.768e-05, 0.000e+00, 0.000e+00, 8.564e-05 }, // HC
+        { 9.107e+02, 2.318e+02, 7.009e+02, 0.000e+00, 0.000e+00, 5.676e+02, 0.000e+00 }, // FC
+        { 3.281e+01, 1.038e+00, 0.000e+00, 2.942e-02, 0.000e+00, 3.610e+00, 8.450e-02 }, // NOx
+        { 1.478e+00, 8.294e-04, 2.636e-02, 0.000e+00, 1.246e-04, 6.585e-04, 6.752e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // UBus_Std_gt15-18t_Euro-IV_SCRs_(DPF)
-        { 2.834e+03, 2.003e+02, 2.181e+03, 0.000e+00, 0.000e+00, 4.906e+02, 0.000e+00 }, // CO2(total)
+        { 2.834e+03, 7.213e+02, 2.181e+03, 0.000e+00, 0.000e+00, 1.766e+03, 0.000e+00 }, // CO2(total)
         { 4.683e+00, 0.000e+00, 8.206e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 7.209e-03, 4.247e-05, 8.635e-03, 3.679e-06, 0.000e+00, 0.000e+00, 6.608e-06 }, // HC
-        { 9.107e+02, 6.439e+01, 7.009e+02, 0.000e+00, 0.000e+00, 1.577e+02, 0.000e+00 }, // FC
-        { 5.138e+01, 1.413e+00, 4.511e+01, 0.000e+00, 0.000e+00, 4.045e+00, 0.000e+00 }, // NOx
-        { 1.478e+00, 2.304e-04, 2.636e-02, 0.000e+00, 2.671e-06, 1.829e-04, 5.210e-06 }, // PM + PM (non-exhaust)
+        { 7.209e-03, 1.529e-04, 8.635e-03, 4.768e-05, 0.000e+00, 0.000e+00, 8.564e-05 }, // HC
+        { 9.107e+02, 2.318e+02, 7.009e+02, 0.000e+00, 0.000e+00, 5.676e+02, 0.000e+00 }, // FC
+        { 5.138e+01, 5.087e+00, 4.511e+01, 0.000e+00, 0.000e+00, 1.456e+01, 0.000e+00 }, // NOx
+        { 1.478e+00, 8.294e-04, 2.636e-02, 0.000e+00, 1.246e-04, 6.585e-04, 6.752e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // UBus_Std_gt15-18t_Euro-V_EGR
-        { 2.708e+03, 1.907e+02, 2.282e+03, 0.000e+00, 0.000e+00, 4.713e+02, 0.000e+00 }, // CO2(total)
+        { 2.708e+03, 6.864e+02, 2.282e+03, 0.000e+00, 0.000e+00, 1.697e+03, 0.000e+00 }, // CO2(total)
         { 8.872e+00, 0.000e+00, 1.117e+01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 5.757e-01, 9.186e-03, 4.211e-01, 0.000e+00, 7.347e-07, 2.212e-02, 0.000e+00 }, // HC
-        { 8.704e+02, 6.128e+01, 7.335e+02, 0.000e+00, 0.000e+00, 1.515e+02, 0.000e+00 }, // FC
-        { 4.323e+01, 3.706e-01, 8.117e+01, 0.000e+00, 0.000e+00, 5.683e-01, 0.000e+00 }, // NOx
-        { 1.592e+00, 2.683e-03, 1.891e-01, 8.360e-05, 2.631e-06, 0.000e+00, 2.048e-04 }, // PM + PM (non-exhaust)
+        { 5.757e-01, 3.307e-02, 4.211e-01, 0.000e+00, 3.428e-05, 7.963e-02, 0.000e+00 }, // HC
+        { 8.704e+02, 2.206e+02, 7.335e+02, 0.000e+00, 0.000e+00, 5.452e+02, 0.000e+00 }, // FC
+        { 4.323e+01, 1.334e+00, 8.117e+01, 0.000e+00, 0.000e+00, 2.046e+00, 0.000e+00 }, // NOx
+        { 1.592e+00, 9.658e-03, 1.891e-01, 1.083e-03, 1.227e-04, 0.000e+00, 2.654e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // UBus_Std_gt15-18t_Euro-V_SCR
-        { 2.645e+03, 1.861e+02, 2.210e+03, 0.000e+00, 0.000e+00, 4.587e+02, 0.000e+00 }, // CO2(total)
+        { 2.645e+03, 6.701e+02, 2.210e+03, 0.000e+00, 0.000e+00, 1.651e+03, 0.000e+00 }, // CO2(total)
         { 2.794e+01, 0.000e+00, 5.108e+01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 1.416e-01, 1.023e-03, 5.926e-02, 7.321e-05, 0.000e+00, 9.455e-03, 0.000e+00 }, // HC
-        { 8.499e+02, 5.982e+01, 7.103e+02, 0.000e+00, 0.000e+00, 1.474e+02, 0.000e+00 }, // FC
-        { 2.686e+01, 1.261e-01, 0.000e+00, 2.477e-04, 0.000e+00, 1.353e-02, 7.973e-03 }, // NOx
-        { 1.959e+00, 2.163e-03, 8.410e-01, 0.000e+00, 3.071e-06, 0.000e+00, 3.085e-06 }, // PM + PM (non-exhaust)
+        { 1.416e-01, 3.683e-03, 5.926e-02, 9.487e-04, 0.000e+00, 3.404e-02, 0.000e+00 }, // HC
+        { 8.499e+02, 2.154e+02, 7.103e+02, 0.000e+00, 0.000e+00, 5.307e+02, 0.000e+00 }, // FC
+        { 2.686e+01, 4.541e-01, 0.000e+00, 3.210e-03, 0.000e+00, 4.871e-02, 1.033e-01 }, // NOx
+        { 1.959e+00, 7.786e-03, 8.410e-01, 0.000e+00, 1.433e-04, 0.000e+00, 3.998e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // UBus_Std_gt15-18t_Euro-V_SCRs
-        { 2.645e+03, 1.861e+02, 2.210e+03, 0.000e+00, 0.000e+00, 4.587e+02, 0.000e+00 }, // CO2(total)
+        { 2.645e+03, 6.701e+02, 2.210e+03, 0.000e+00, 0.000e+00, 1.651e+03, 0.000e+00 }, // CO2(total)
         { 2.794e+01, 0.000e+00, 5.108e+01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 1.416e-01, 1.023e-03, 5.926e-02, 7.321e-05, 0.000e+00, 9.455e-03, 0.000e+00 }, // HC
-        { 8.499e+02, 5.982e+01, 7.103e+02, 0.000e+00, 0.000e+00, 1.474e+02, 0.000e+00 }, // FC
-        { 5.270e+01, 1.323e+00, 4.571e+01, 0.000e+00, 0.000e+00, 3.809e+00, 0.000e+00 }, // NOx
-        { 1.959e+00, 2.163e-03, 8.410e-01, 0.000e+00, 3.071e-06, 0.000e+00, 3.085e-06 }, // PM + PM (non-exhaust)
+        { 1.416e-01, 3.683e-03, 5.926e-02, 9.487e-04, 0.000e+00, 3.404e-02, 0.000e+00 }, // HC
+        { 8.499e+02, 2.154e+02, 7.103e+02, 0.000e+00, 0.000e+00, 5.307e+02, 0.000e+00 }, // FC
+        { 5.270e+01, 4.763e+00, 4.571e+01, 0.000e+00, 0.000e+00, 1.371e+01, 0.000e+00 }, // NOx
+        { 1.959e+00, 7.786e-03, 8.410e-01, 0.000e+00, 1.433e-04, 0.000e+00, 3.998e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // UBus_Std_gt15-18t_Euro-V_EGR_(DPF)
-        { 2.768e+03, 1.949e+02, 2.333e+03, 0.000e+00, 0.000e+00, 4.816e+02, 0.000e+00 }, // CO2(total)
+        { 2.768e+03, 7.015e+02, 2.333e+03, 0.000e+00, 0.000e+00, 1.734e+03, 0.000e+00 }, // CO2(total)
         { 1.508e+00, 0.000e+00, 1.899e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 2.879e-02, 4.593e-04, 2.105e-02, 0.000e+00, 3.673e-08, 1.106e-03, 0.000e+00 }, // HC
-        { 8.895e+02, 6.263e+01, 7.497e+02, 0.000e+00, 0.000e+00, 1.548e+02, 0.000e+00 }, // FC
-        { 4.323e+01, 3.706e-01, 8.117e+01, 0.000e+00, 0.000e+00, 5.683e-01, 0.000e+00 }, // NOx
-        { 1.466e+00, 4.842e-04, 1.324e-02, 5.852e-06, 2.631e-06, 0.000e+00, 1.849e-05 }, // PM + PM (non-exhaust)
+        { 2.879e-02, 1.653e-03, 2.105e-02, 0.000e+00, 1.714e-06, 3.981e-03, 0.000e+00 }, // HC
+        { 8.895e+02, 2.255e+02, 7.497e+02, 0.000e+00, 0.000e+00, 5.572e+02, 0.000e+00 }, // FC
+        { 4.323e+01, 1.334e+00, 8.117e+01, 0.000e+00, 0.000e+00, 2.046e+00, 0.000e+00 }, // NOx
+        { 1.466e+00, 1.743e-03, 1.324e-02, 7.584e-05, 1.227e-04, 0.000e+00, 2.396e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // UBus_Std_gt15-18t_Euro-V_SCR_(DPF)
-        { 2.703e+03, 1.902e+02, 2.259e+03, 0.000e+00, 0.000e+00, 4.688e+02, 0.000e+00 }, // CO2(total)
+        { 2.703e+03, 6.849e+02, 2.259e+03, 0.000e+00, 0.000e+00, 1.688e+03, 0.000e+00 }, // CO2(total)
         { 4.749e+00, 0.000e+00, 8.683e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 7.082e-03, 5.115e-05, 2.963e-03, 3.660e-06, 0.000e+00, 4.727e-04, 0.000e+00 }, // HC
-        { 8.686e+02, 6.114e+01, 7.260e+02, 0.000e+00, 0.000e+00, 1.507e+02, 0.000e+00 }, // FC
-        { 2.686e+01, 1.261e-01, 0.000e+00, 2.477e-04, 0.000e+00, 1.353e-02, 7.973e-03 }, // NOx
-        { 1.474e+00, 8.651e-05, 3.364e-02, 0.000e+00, 2.696e-06, 0.000e+00, 3.085e-06 }, // PM + PM (non-exhaust)
+        { 7.082e-03, 1.842e-04, 2.963e-03, 4.744e-05, 0.000e+00, 1.702e-03, 0.000e+00 }, // HC
+        { 8.686e+02, 2.201e+02, 7.260e+02, 0.000e+00, 0.000e+00, 5.424e+02, 0.000e+00 }, // FC
+        { 2.686e+01, 4.541e-01, 0.000e+00, 3.210e-03, 0.000e+00, 4.871e-02, 1.033e-01 }, // NOx
+        { 1.474e+00, 3.114e-04, 3.364e-02, 0.000e+00, 1.258e-04, 0.000e+00, 3.998e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // UBus_Std_gt15-18t_Euro-V_SCRs_(DPF)
-        { 2.703e+03, 1.902e+02, 2.259e+03, 0.000e+00, 0.000e+00, 4.688e+02, 0.000e+00 }, // CO2(total)
+        { 2.703e+03, 6.849e+02, 2.259e+03, 0.000e+00, 0.000e+00, 1.688e+03, 0.000e+00 }, // CO2(total)
         { 4.749e+00, 0.000e+00, 8.683e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 7.082e-03, 5.115e-05, 2.963e-03, 3.660e-06, 0.000e+00, 4.727e-04, 0.000e+00 }, // HC
-        { 8.686e+02, 6.114e+01, 7.260e+02, 0.000e+00, 0.000e+00, 1.507e+02, 0.000e+00 }, // FC
-        { 5.270e+01, 1.323e+00, 4.571e+01, 0.000e+00, 0.000e+00, 3.809e+00, 0.000e+00 }, // NOx
-        { 1.474e+00, 8.651e-05, 3.364e-02, 0.000e+00, 2.696e-06, 0.000e+00, 3.085e-06 }, // PM + PM (non-exhaust)
+        { 7.082e-03, 1.842e-04, 2.963e-03, 4.744e-05, 0.000e+00, 1.702e-03, 0.000e+00 }, // HC
+        { 8.686e+02, 2.201e+02, 7.260e+02, 0.000e+00, 0.000e+00, 5.424e+02, 0.000e+00 }, // FC
+        { 5.270e+01, 4.763e+00, 4.571e+01, 0.000e+00, 0.000e+00, 1.371e+01, 0.000e+00 }, // NOx
+        { 1.474e+00, 3.114e-04, 3.364e-02, 0.000e+00, 1.258e-04, 0.000e+00, 3.998e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // UBus_Std_gt15-18t_Euro-VI_A-C
-        { 2.775e+03, 1.808e+02, 2.643e+03, 0.000e+00, 0.000e+00, 4.519e+02, 0.000e+00 }, // CO2(total)
-        { 2.079e+00, 0.000e+00, 1.816e+00, 1.084e-04, 2.609e-07, 0.000e+00, 2.105e-04 }, // CO
-        { 1.277e-01, 2.431e-03, 5.046e-02, 0.000e+00, 0.000e+00, 0.000e+00, 8.730e-05 }, // HC
-        { 8.918e+02, 5.812e+01, 8.493e+02, 0.000e+00, 0.000e+00, 1.452e+02, 0.000e+00 }, // FC
-        { 4.335e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.411e-05, 0.000e+00, 1.255e-03 }, // NOx
-        { 1.487e+00, 0.000e+00, 0.000e+00, 0.000e+00, 3.727e-06, 0.000e+00, 1.320e-04 }, // PM + PM (non-exhaust)
+        { 2.775e+03, 6.510e+02, 2.643e+03, 0.000e+00, 0.000e+00, 1.627e+03, 0.000e+00 }, // CO2(total)
+        { 2.079e+00, 0.000e+00, 1.816e+00, 1.405e-03, 1.217e-05, 0.000e+00, 2.728e-03 }, // CO
+        { 1.277e-01, 8.753e-03, 5.046e-02, 0.000e+00, 0.000e+00, 0.000e+00, 1.131e-03 }, // HC
+        { 8.918e+02, 2.092e+02, 8.493e+02, 0.000e+00, 0.000e+00, 5.229e+02, 0.000e+00 }, // FC
+        { 4.335e+00, 0.000e+00, 0.000e+00, 0.000e+00, 6.582e-04, 0.000e+00, 1.626e-02 }, // NOx
+        { 1.487e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.739e-04, 0.000e+00, 1.711e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // UBus_Std_gt15-18t_Euro-VIs_A-C
-        { 2.775e+03, 1.808e+02, 2.643e+03, 0.000e+00, 0.000e+00, 4.519e+02, 0.000e+00 }, // CO2(total)
-        { 2.079e+00, 0.000e+00, 1.816e+00, 1.084e-04, 2.609e-07, 0.000e+00, 2.105e-04 }, // CO
-        { 1.277e-01, 2.431e-03, 5.046e-02, 0.000e+00, 0.000e+00, 0.000e+00, 8.730e-05 }, // HC
-        { 8.918e+02, 5.812e+01, 8.493e+02, 0.000e+00, 0.000e+00, 1.452e+02, 0.000e+00 }, // FC
-        { 3.453e+01, 1.058e+00, 7.273e+01, 0.000e+00, 0.000e+00, 2.509e+00, 0.000e+00 }, // NOx
-        { 1.487e+00, 0.000e+00, 0.000e+00, 0.000e+00, 3.727e-06, 0.000e+00, 1.320e-04 }, // PM + PM (non-exhaust)
+        { 2.775e+03, 6.510e+02, 2.643e+03, 0.000e+00, 0.000e+00, 1.627e+03, 0.000e+00 }, // CO2(total)
+        { 2.079e+00, 0.000e+00, 1.816e+00, 1.405e-03, 1.217e-05, 0.000e+00, 2.728e-03 }, // CO
+        { 1.277e-01, 8.753e-03, 5.046e-02, 0.000e+00, 0.000e+00, 0.000e+00, 1.131e-03 }, // HC
+        { 8.918e+02, 2.092e+02, 8.493e+02, 0.000e+00, 0.000e+00, 5.229e+02, 0.000e+00 }, // FC
+        { 3.453e+01, 3.810e+00, 7.273e+01, 0.000e+00, 0.000e+00, 9.032e+00, 0.000e+00 }, // NOx
+        { 1.487e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.739e-04, 0.000e+00, 1.711e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // UBus_Std_gt15-18t_Euro-VI_D-E
-        { 2.471e+03, 1.848e+02, 2.176e+03, 0.000e+00, 0.000e+00, 4.585e+02, 0.000e+00 }, // CO2(total)
+        { 2.471e+03, 6.651e+02, 2.176e+03, 0.000e+00, 0.000e+00, 1.651e+03, 0.000e+00 }, // CO2(total)
         { 6.469e-01, 0.000e+00, 5.184e-01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 2.044e-01, 0.000e+00, 0.000e+00, 0.000e+00, 1.692e-06, 0.000e+00, 0.000e+00 }, // HC
-        { 7.941e+02, 5.938e+01, 6.993e+02, 0.000e+00, 0.000e+00, 1.473e+02, 0.000e+00 }, // FC
-        { 1.960e+00, 0.000e+00, 0.000e+00, 0.000e+00, 2.261e-06, 0.000e+00, 0.000e+00 }, // NOx
-        { 1.466e+00, 1.254e-03, 1.026e-02, 8.065e-07, 2.570e-06, 5.928e-04, 1.270e-05 }, // PM + PM (non-exhaust)
+        { 2.044e-01, 0.000e+00, 0.000e+00, 0.000e+00, 7.896e-05, 0.000e+00, 0.000e+00 }, // HC
+        { 7.941e+02, 2.138e+02, 6.993e+02, 0.000e+00, 0.000e+00, 5.304e+02, 0.000e+00 }, // FC
+        { 1.960e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.055e-04, 0.000e+00, 0.000e+00 }, // NOx
+        { 1.466e+00, 4.514e-03, 1.026e-02, 1.045e-05, 1.199e-04, 2.134e-03, 1.646e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // UBus_Std_gt15-18t_Euro-VIs_D-E
-        { 2.471e+03, 1.848e+02, 2.176e+03, 0.000e+00, 0.000e+00, 4.585e+02, 0.000e+00 }, // CO2(total)
+        { 2.471e+03, 6.651e+02, 2.176e+03, 0.000e+00, 0.000e+00, 1.651e+03, 0.000e+00 }, // CO2(total)
         { 6.469e-01, 0.000e+00, 5.184e-01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 2.044e-01, 0.000e+00, 0.000e+00, 0.000e+00, 1.692e-06, 0.000e+00, 0.000e+00 }, // HC
-        { 7.941e+02, 5.938e+01, 6.993e+02, 0.000e+00, 0.000e+00, 1.473e+02, 0.000e+00 }, // FC
-        { 4.982e+01, 8.955e-01, 1.028e+02, 0.000e+00, 0.000e+00, 2.027e+00, 0.000e+00 }, // NOx
-        { 1.466e+00, 1.254e-03, 1.026e-02, 8.065e-07, 2.570e-06, 5.928e-04, 1.270e-05 }, // PM + PM (non-exhaust)
+        { 2.044e-01, 0.000e+00, 0.000e+00, 0.000e+00, 7.896e-05, 0.000e+00, 0.000e+00 }, // HC
+        { 7.941e+02, 2.138e+02, 6.993e+02, 0.000e+00, 0.000e+00, 5.304e+02, 0.000e+00 }, // FC
+        { 4.982e+01, 3.224e+00, 1.028e+02, 0.000e+00, 0.000e+00, 7.296e+00, 0.000e+00 }, // NOx
+        { 1.466e+00, 4.514e-03, 1.026e-02, 1.045e-05, 1.199e-04, 2.134e-03, 1.646e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // UBus_Artic_gt18t_50ties
-        { 5.721e+03, 2.500e+02, 4.222e+03, 0.000e+00, 0.000e+00, 6.906e+02, 0.000e+00 }, // CO2(total)
-        { 3.043e+01, 8.166e-03, 1.394e+01, 1.018e-03, 0.000e+00, 2.267e-01, 3.915e-03 }, // CO
-        { 8.305e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.368e-05, 0.000e+00, 2.162e-03 }, // HC
-        { 1.839e+03, 8.033e+01, 1.357e+03, 0.000e+00, 0.000e+00, 2.219e+02, 0.000e+00 }, // FC
-        { 9.973e+01, 3.159e+00, 8.470e+01, 0.000e+00, 0.000e+00, 9.685e+00, 0.000e+00 }, // NOx
-        { 6.270e+00, 7.306e-02, 2.007e+00, 0.000e+00, 3.007e-06, 1.451e-01, 1.124e-05 }, // PM + PM (non-exhaust)
+        { 5.721e+03, 8.999e+02, 4.222e+03, 0.000e+00, 0.000e+00, 2.486e+03, 0.000e+00 }, // CO2(total)
+        { 3.043e+01, 2.940e-02, 1.394e+01, 1.319e-02, 0.000e+00, 8.160e-01, 5.074e-02 }, // CO
+        { 8.305e+00, 0.000e+00, 0.000e+00, 0.000e+00, 6.382e-04, 0.000e+00, 2.802e-02 }, // HC
+        { 1.839e+03, 2.892e+02, 1.357e+03, 0.000e+00, 0.000e+00, 7.990e+02, 0.000e+00 }, // FC
+        { 9.973e+01, 1.137e+01, 8.470e+01, 0.000e+00, 0.000e+00, 3.487e+01, 0.000e+00 }, // NOx
+        { 6.270e+00, 2.630e-01, 2.007e+00, 0.000e+00, 1.403e-04, 5.224e-01, 1.457e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // UBus_Artic_gt18t_60ties
-        { 5.721e+03, 2.500e+02, 4.222e+03, 0.000e+00, 0.000e+00, 6.906e+02, 0.000e+00 }, // CO2(total)
-        { 3.043e+01, 8.166e-03, 1.394e+01, 1.018e-03, 0.000e+00, 2.267e-01, 3.915e-03 }, // CO
-        { 8.305e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.368e-05, 0.000e+00, 2.162e-03 }, // HC
-        { 1.839e+03, 8.033e+01, 1.357e+03, 0.000e+00, 0.000e+00, 2.219e+02, 0.000e+00 }, // FC
-        { 9.973e+01, 3.159e+00, 8.470e+01, 0.000e+00, 0.000e+00, 9.685e+00, 0.000e+00 }, // NOx
-        { 6.270e+00, 7.306e-02, 2.007e+00, 0.000e+00, 3.007e-06, 1.451e-01, 1.124e-05 }, // PM + PM (non-exhaust)
+        { 5.721e+03, 8.999e+02, 4.222e+03, 0.000e+00, 0.000e+00, 2.486e+03, 0.000e+00 }, // CO2(total)
+        { 3.043e+01, 2.940e-02, 1.394e+01, 1.319e-02, 0.000e+00, 8.160e-01, 5.074e-02 }, // CO
+        { 8.305e+00, 0.000e+00, 0.000e+00, 0.000e+00, 6.382e-04, 0.000e+00, 2.802e-02 }, // HC
+        { 1.839e+03, 2.892e+02, 1.357e+03, 0.000e+00, 0.000e+00, 7.990e+02, 0.000e+00 }, // FC
+        { 9.973e+01, 1.137e+01, 8.470e+01, 0.000e+00, 0.000e+00, 3.487e+01, 0.000e+00 }, // NOx
+        { 6.270e+00, 2.630e-01, 2.007e+00, 0.000e+00, 1.403e-04, 5.224e-01, 1.457e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // UBus_Artic_gt18t_70ties
-        { 5.721e+03, 2.500e+02, 4.222e+03, 0.000e+00, 0.000e+00, 6.906e+02, 0.000e+00 }, // CO2(total)
-        { 3.043e+01, 8.166e-03, 1.394e+01, 1.018e-03, 0.000e+00, 2.267e-01, 3.915e-03 }, // CO
-        { 8.305e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.368e-05, 0.000e+00, 2.162e-03 }, // HC
-        { 1.839e+03, 8.033e+01, 1.357e+03, 0.000e+00, 0.000e+00, 2.219e+02, 0.000e+00 }, // FC
-        { 9.973e+01, 3.159e+00, 8.470e+01, 0.000e+00, 0.000e+00, 9.685e+00, 0.000e+00 }, // NOx
-        { 6.270e+00, 7.306e-02, 2.007e+00, 0.000e+00, 3.007e-06, 1.451e-01, 1.124e-05 }, // PM + PM (non-exhaust)
+        { 5.721e+03, 8.999e+02, 4.222e+03, 0.000e+00, 0.000e+00, 2.486e+03, 0.000e+00 }, // CO2(total)
+        { 3.043e+01, 2.940e-02, 1.394e+01, 1.319e-02, 0.000e+00, 8.160e-01, 5.074e-02 }, // CO
+        { 8.305e+00, 0.000e+00, 0.000e+00, 0.000e+00, 6.382e-04, 0.000e+00, 2.802e-02 }, // HC
+        { 1.839e+03, 2.892e+02, 1.357e+03, 0.000e+00, 0.000e+00, 7.990e+02, 0.000e+00 }, // FC
+        { 9.973e+01, 1.137e+01, 8.470e+01, 0.000e+00, 0.000e+00, 3.487e+01, 0.000e+00 }, // NOx
+        { 6.270e+00, 2.630e-01, 2.007e+00, 0.000e+00, 1.403e-04, 5.224e-01, 1.457e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // UBus_Artic_gt18t_80ties
-        { 5.721e+03, 2.500e+02, 4.222e+03, 0.000e+00, 0.000e+00, 6.906e+02, 0.000e+00 }, // CO2(total)
-        { 3.043e+01, 8.166e-03, 1.394e+01, 1.018e-03, 0.000e+00, 2.267e-01, 3.915e-03 }, // CO
-        { 8.305e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.368e-05, 0.000e+00, 2.162e-03 }, // HC
-        { 1.839e+03, 8.033e+01, 1.357e+03, 0.000e+00, 0.000e+00, 2.219e+02, 0.000e+00 }, // FC
-        { 9.973e+01, 3.159e+00, 8.470e+01, 0.000e+00, 0.000e+00, 9.685e+00, 0.000e+00 }, // NOx
-        { 6.270e+00, 7.306e-02, 2.007e+00, 0.000e+00, 3.007e-06, 1.451e-01, 1.124e-05 }, // PM + PM (non-exhaust)
+        { 5.721e+03, 8.999e+02, 4.222e+03, 0.000e+00, 0.000e+00, 2.486e+03, 0.000e+00 }, // CO2(total)
+        { 3.043e+01, 2.940e-02, 1.394e+01, 1.319e-02, 0.000e+00, 8.160e-01, 5.074e-02 }, // CO
+        { 8.305e+00, 0.000e+00, 0.000e+00, 0.000e+00, 6.382e-04, 0.000e+00, 2.802e-02 }, // HC
+        { 1.839e+03, 2.892e+02, 1.357e+03, 0.000e+00, 0.000e+00, 7.990e+02, 0.000e+00 }, // FC
+        { 9.973e+01, 1.137e+01, 8.470e+01, 0.000e+00, 0.000e+00, 3.487e+01, 0.000e+00 }, // NOx
+        { 6.270e+00, 2.630e-01, 2.007e+00, 0.000e+00, 1.403e-04, 5.224e-01, 1.457e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // UBus_Artic_gt18t_Euro-I
-        { 5.648e+03, 2.406e+02, 4.762e+03, 0.000e+00, 0.000e+00, 6.546e+02, 0.000e+00 }, // CO2(total)
-        { 2.583e+01, 8.190e-02, 1.442e+01, 0.000e+00, 0.000e+00, 6.309e-01, 0.000e+00 }, // CO
-        { 7.057e+00, 0.000e+00, 5.691e-01, 6.731e-04, 5.900e-06, 0.000e+00, 4.231e-03 }, // HC
-        { 1.815e+03, 7.731e+01, 1.530e+03, 0.000e+00, 0.000e+00, 2.104e+02, 0.000e+00 }, // FC
-        { 8.370e+01, 1.687e+00, 8.153e+01, 0.000e+00, 0.000e+00, 5.768e+00, 0.000e+00 }, // NOx
-        { 5.227e+00, 6.133e-02, 0.000e+00, 0.000e+00, 2.932e-06, 1.752e-01, 5.594e-04 }, // PM + PM (non-exhaust)
+        { 5.648e+03, 8.660e+02, 4.762e+03, 0.000e+00, 0.000e+00, 2.356e+03, 0.000e+00 }, // CO2(total)
+        { 2.583e+01, 2.948e-01, 1.442e+01, 0.000e+00, 0.000e+00, 2.271e+00, 0.000e+00 }, // CO
+        { 7.057e+00, 0.000e+00, 5.691e-01, 8.723e-03, 2.753e-04, 0.000e+00, 5.483e-02 }, // HC
+        { 1.815e+03, 2.783e+02, 1.530e+03, 0.000e+00, 0.000e+00, 7.573e+02, 0.000e+00 }, // FC
+        { 8.370e+01, 6.073e+00, 8.153e+01, 0.000e+00, 0.000e+00, 2.076e+01, 0.000e+00 }, // NOx
+        { 5.227e+00, 2.208e-01, 0.000e+00, 0.000e+00, 1.368e-04, 6.307e-01, 7.249e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // UBus_Artic_gt18t_Euro-I_(DPF)
-        { 5.705e+03, 2.430e+02, 4.809e+03, 0.000e+00, 0.000e+00, 6.611e+02, 0.000e+00 }, // CO2(total)
-        { 8.522e+00, 2.703e-02, 4.760e+00, 0.000e+00, 0.000e+00, 2.082e-01, 0.000e+00 }, // CO
-        { 2.329e+00, 0.000e+00, 1.878e-01, 2.221e-04, 1.947e-06, 0.000e+00, 1.396e-03 }, // HC
-        { 1.833e+03, 7.809e+01, 1.546e+03, 0.000e+00, 0.000e+00, 2.125e+02, 0.000e+00 }, // FC
-        { 8.370e+01, 1.687e+00, 8.153e+01, 0.000e+00, 0.000e+00, 5.768e+00, 0.000e+00 }, // NOx
-        { 2.438e+00, 1.595e-02, 0.000e+00, 0.000e+00, 2.932e-06, 4.555e-02, 1.544e-04 }, // PM + PM (non-exhaust)
+        { 5.705e+03, 8.747e+02, 4.809e+03, 0.000e+00, 0.000e+00, 2.380e+03, 0.000e+00 }, // CO2(total)
+        { 8.522e+00, 9.730e-02, 4.760e+00, 0.000e+00, 0.000e+00, 7.495e-01, 0.000e+00 }, // CO
+        { 2.329e+00, 0.000e+00, 1.878e-01, 2.879e-03, 9.084e-05, 0.000e+00, 1.809e-02 }, // HC
+        { 1.833e+03, 2.811e+02, 1.546e+03, 0.000e+00, 0.000e+00, 7.649e+02, 0.000e+00 }, // FC
+        { 8.370e+01, 6.073e+00, 8.153e+01, 0.000e+00, 0.000e+00, 2.076e+01, 0.000e+00 }, // NOx
+        { 2.438e+00, 5.741e-02, 0.000e+00, 0.000e+00, 1.368e-04, 1.640e-01, 2.001e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // UBus_Artic_gt18t_Euro-II
-        { 5.483e+03, 2.305e+02, 4.931e+03, 0.000e+00, 0.000e+00, 6.191e+02, 0.000e+00 }, // CO2(total)
-        { 2.099e+01, 1.782e-03, 1.366e+01, 0.000e+00, 0.000e+00, 1.850e-01, 1.773e-03 }, // CO
-        { 4.418e+00, 0.000e+00, 7.508e-01, 5.887e-04, 0.000e+00, 0.000e+00, 2.270e-03 }, // HC
-        { 1.762e+03, 7.408e+01, 1.585e+03, 0.000e+00, 0.000e+00, 1.990e+02, 0.000e+00 }, // FC
-        { 8.993e+01, 1.500e+00, 9.442e+01, 0.000e+00, 0.000e+00, 5.145e+00, 0.000e+00 }, // NOx
-        { 3.148e+00, 2.752e-02, 1.059e+00, 0.000e+00, 2.892e-06, 3.091e-02, 7.171e-04 }, // PM + PM (non-exhaust)
+        { 5.483e+03, 8.298e+02, 4.931e+03, 0.000e+00, 0.000e+00, 2.229e+03, 0.000e+00 }, // CO2(total)
+        { 2.099e+01, 6.414e-03, 1.366e+01, 0.000e+00, 0.000e+00, 6.660e-01, 2.298e-02 }, // CO
+        { 4.418e+00, 0.000e+00, 7.508e-01, 7.629e-03, 0.000e+00, 0.000e+00, 2.942e-02 }, // HC
+        { 1.762e+03, 2.667e+02, 1.585e+03, 0.000e+00, 0.000e+00, 7.162e+02, 0.000e+00 }, // FC
+        { 8.993e+01, 5.398e+00, 9.442e+01, 0.000e+00, 0.000e+00, 1.852e+01, 0.000e+00 }, // NOx
+        { 3.148e+00, 9.906e-02, 1.059e+00, 0.000e+00, 1.349e-04, 1.113e-01, 9.293e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // UBus_Artic_gt18t_Euro-II_(DPF)
-        { 5.538e+03, 2.328e+02, 4.980e+03, 0.000e+00, 0.000e+00, 6.253e+02, 0.000e+00 }, // CO2(total)
-        { 6.928e+00, 5.879e-04, 4.507e+00, 0.000e+00, 0.000e+00, 6.105e-02, 5.852e-04 }, // CO
-        { 1.458e+00, 0.000e+00, 2.478e-01, 1.943e-04, 0.000e+00, 0.000e+00, 7.491e-04 }, // HC
-        { 1.780e+03, 7.482e+01, 1.601e+03, 0.000e+00, 0.000e+00, 2.009e+02, 0.000e+00 }, // FC
-        { 8.993e+01, 1.500e+00, 9.442e+01, 0.000e+00, 0.000e+00, 5.145e+00, 0.000e+00 }, // NOx
-        { 1.896e+00, 7.154e-03, 2.754e-01, 0.000e+00, 2.892e-06, 8.036e-03, 1.965e-04 }, // PM + PM (non-exhaust)
+        { 5.538e+03, 8.381e+02, 4.980e+03, 0.000e+00, 0.000e+00, 2.251e+03, 0.000e+00 }, // CO2(total)
+        { 6.928e+00, 2.117e-03, 4.507e+00, 0.000e+00, 0.000e+00, 2.198e-01, 7.584e-03 }, // CO
+        { 1.458e+00, 0.000e+00, 2.478e-01, 2.518e-03, 0.000e+00, 0.000e+00, 9.709e-03 }, // HC
+        { 1.780e+03, 2.693e+02, 1.601e+03, 0.000e+00, 0.000e+00, 7.234e+02, 0.000e+00 }, // FC
+        { 8.993e+01, 5.398e+00, 9.442e+01, 0.000e+00, 0.000e+00, 1.852e+01, 0.000e+00 }, // NOx
+        { 1.896e+00, 2.576e-02, 2.754e-01, 0.000e+00, 1.349e-04, 2.893e-02, 2.547e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // UBus_Artic_gt18t_Euro-III
-        { 5.624e+03, 2.304e+02, 5.427e+03, 0.000e+00, 0.000e+00, 6.003e+02, 0.000e+00 }, // CO2(total)
-        { 2.552e+01, 0.000e+00, 1.987e+01, 0.000e+00, 0.000e+00, 2.522e-01, 0.000e+00 }, // CO
-        { 4.095e+00, 0.000e+00, 4.805e-01, 0.000e+00, 5.114e-06, 0.000e+00, 1.887e-03 }, // HC
-        { 1.807e+03, 7.405e+01, 1.744e+03, 0.000e+00, 0.000e+00, 1.929e+02, 0.000e+00 }, // FC
-        { 8.080e+01, 1.034e+00, 8.232e+01, 0.000e+00, 0.000e+00, 4.000e+00, 0.000e+00 }, // NOx
-        { 2.937e+00, 2.868e-02, 0.000e+00, 0.000e+00, 2.852e-06, 3.219e-02, 6.964e-04 }, // PM + PM (non-exhaust)
+        { 5.624e+03, 8.295e+02, 5.427e+03, 0.000e+00, 0.000e+00, 2.161e+03, 0.000e+00 }, // CO2(total)
+        { 2.552e+01, 0.000e+00, 1.987e+01, 0.000e+00, 0.000e+00, 9.079e-01, 0.000e+00 }, // CO
+        { 4.095e+00, 0.000e+00, 4.805e-01, 0.000e+00, 2.386e-04, 0.000e+00, 2.446e-02 }, // HC
+        { 1.807e+03, 2.666e+02, 1.744e+03, 0.000e+00, 0.000e+00, 6.946e+02, 0.000e+00 }, // FC
+        { 8.080e+01, 3.724e+00, 8.232e+01, 0.000e+00, 0.000e+00, 1.440e+01, 0.000e+00 }, // NOx
+        { 2.937e+00, 1.033e-01, 0.000e+00, 0.000e+00, 1.331e-04, 1.159e-01, 9.025e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // UBus_Artic_gt18t_Euro-III_(DPF)
-        { 5.680e+03, 2.327e+02, 5.482e+03, 0.000e+00, 0.000e+00, 6.063e+02, 0.000e+00 }, // CO2(total)
-        { 8.423e+00, 0.000e+00, 6.557e+00, 0.000e+00, 0.000e+00, 8.323e-02, 0.000e+00 }, // CO
-        { 1.351e+00, 0.000e+00, 1.586e-01, 0.000e+00, 1.688e-06, 0.000e+00, 6.228e-04 }, // HC
-        { 1.826e+03, 7.479e+01, 1.762e+03, 0.000e+00, 0.000e+00, 1.949e+02, 0.000e+00 }, // FC
-        { 8.080e+01, 1.034e+00, 8.232e+01, 0.000e+00, 0.000e+00, 4.000e+00, 0.000e+00 }, // NOx
-        { 1.818e+00, 7.458e-03, 0.000e+00, 0.000e+00, 2.852e-06, 8.369e-03, 1.859e-04 }, // PM + PM (non-exhaust)
+        { 5.680e+03, 8.378e+02, 5.482e+03, 0.000e+00, 0.000e+00, 2.183e+03, 0.000e+00 }, // CO2(total)
+        { 8.423e+00, 0.000e+00, 6.557e+00, 0.000e+00, 0.000e+00, 2.996e-01, 0.000e+00 }, // CO
+        { 1.351e+00, 0.000e+00, 1.586e-01, 0.000e+00, 7.874e-05, 0.000e+00, 8.071e-03 }, // HC
+        { 1.826e+03, 2.692e+02, 1.762e+03, 0.000e+00, 0.000e+00, 7.015e+02, 0.000e+00 }, // FC
+        { 8.080e+01, 3.724e+00, 8.232e+01, 0.000e+00, 0.000e+00, 1.440e+01, 0.000e+00 }, // NOx
+        { 1.818e+00, 2.685e-02, 0.000e+00, 0.000e+00, 1.331e-04, 3.013e-02, 2.410e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // UBus_Artic_gt18t_Euro-IV_EGR
-        { 5.176e+03, 2.331e+02, 6.595e+03, 0.000e+00, 0.000e+00, 5.876e+02, 0.000e+00 }, // CO2(total)
-        { 1.332e+01, 7.869e-02, 1.775e+01, 0.000e+00, 0.000e+00, 1.971e-01, 0.000e+00 }, // CO
-        { 3.683e-01, 1.595e-02, 7.493e-01, 0.000e+00, 0.000e+00, 1.709e-02, 0.000e+00 }, // HC
-        { 1.664e+03, 7.492e+01, 2.119e+03, 0.000e+00, 0.000e+00, 1.888e+02, 0.000e+00 }, // FC
-        { 8.149e+01, 4.695e-01, 1.440e+02, 0.000e+00, 0.000e+00, 1.617e+00, 0.000e+00 }, // NOx
-        { 1.883e+00, 6.665e-03, 5.684e-01, 0.000e+00, 3.014e-06, 1.050e-02, 5.938e-05 }, // PM + PM (non-exhaust)
+        { 5.176e+03, 8.393e+02, 6.595e+03, 0.000e+00, 0.000e+00, 2.115e+03, 0.000e+00 }, // CO2(total)
+        { 1.332e+01, 2.833e-01, 1.775e+01, 0.000e+00, 0.000e+00, 7.095e-01, 0.000e+00 }, // CO
+        { 3.683e-01, 5.744e-02, 7.493e-01, 0.000e+00, 0.000e+00, 6.153e-02, 0.000e+00 }, // HC
+        { 1.664e+03, 2.697e+02, 2.119e+03, 0.000e+00, 0.000e+00, 6.798e+02, 0.000e+00 }, // FC
+        { 8.149e+01, 1.690e+00, 1.440e+02, 0.000e+00, 0.000e+00, 5.821e+00, 0.000e+00 }, // NOx
+        { 1.883e+00, 2.400e-02, 5.684e-01, 0.000e+00, 1.406e-04, 3.780e-02, 7.696e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // UBus_Artic_gt18t_Euro-IV_SCR
-        { 5.029e+03, 2.338e+02, 6.205e+03, 0.000e+00, 0.000e+00, 5.874e+02, 0.000e+00 }, // CO2(total)
+        { 5.029e+03, 8.416e+02, 6.205e+03, 0.000e+00, 0.000e+00, 2.115e+03, 0.000e+00 }, // CO2(total)
         { 3.516e+01, 0.000e+00, 6.793e+01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 1.521e-01, 4.194e-03, 2.322e-01, 7.451e-05, 0.000e+00, 3.070e-03, 1.739e-04 }, // HC
-        { 1.616e+03, 7.513e+01, 1.994e+03, 0.000e+00, 0.000e+00, 1.888e+02, 0.000e+00 }, // FC
-        { 4.024e+01, 6.017e-01, 0.000e+00, 0.000e+00, 0.000e+00, 1.529e+00, 6.800e-03 }, // NOx
-        { 2.086e+00, 0.000e+00, 8.313e-01, 0.000e+00, 4.136e-06, 6.767e-03, 4.071e-05 }, // PM + PM (non-exhaust)
+        { 1.521e-01, 1.510e-02, 2.322e-01, 9.656e-04, 0.000e+00, 1.105e-02, 2.254e-03 }, // HC
+        { 1.616e+03, 2.705e+02, 1.994e+03, 0.000e+00, 0.000e+00, 6.796e+02, 0.000e+00 }, // FC
+        { 4.024e+01, 2.166e+00, 0.000e+00, 0.000e+00, 0.000e+00, 5.505e+00, 8.813e-02 }, // NOx
+        { 2.086e+00, 0.000e+00, 8.313e-01, 0.000e+00, 1.929e-04, 2.436e-02, 5.275e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // UBus_Artic_gt18t_Euro-IV_SCRs
-        { 5.029e+03, 2.338e+02, 6.205e+03, 0.000e+00, 0.000e+00, 5.874e+02, 0.000e+00 }, // CO2(total)
+        { 5.029e+03, 8.416e+02, 6.205e+03, 0.000e+00, 0.000e+00, 2.115e+03, 0.000e+00 }, // CO2(total)
         { 3.516e+01, 0.000e+00, 6.793e+01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 1.521e-01, 4.194e-03, 2.322e-01, 7.451e-05, 0.000e+00, 3.070e-03, 1.739e-04 }, // HC
-        { 1.616e+03, 7.513e+01, 1.994e+03, 0.000e+00, 0.000e+00, 1.888e+02, 0.000e+00 }, // FC
-        { 8.530e+01, 1.456e+00, 1.009e+02, 0.000e+00, 0.000e+00, 4.621e+00, 0.000e+00 }, // NOx
-        { 2.086e+00, 0.000e+00, 8.313e-01, 0.000e+00, 4.136e-06, 6.767e-03, 4.071e-05 }, // PM + PM (non-exhaust)
+        { 1.521e-01, 1.510e-02, 2.322e-01, 9.656e-04, 0.000e+00, 1.105e-02, 2.254e-03 }, // HC
+        { 1.616e+03, 2.705e+02, 1.994e+03, 0.000e+00, 0.000e+00, 6.796e+02, 0.000e+00 }, // FC
+        { 8.530e+01, 5.241e+00, 1.009e+02, 0.000e+00, 0.000e+00, 1.663e+01, 0.000e+00 }, // NOx
+        { 2.086e+00, 0.000e+00, 8.313e-01, 0.000e+00, 1.929e-04, 2.436e-02, 5.275e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // UBus_Artic_gt18t_Euro-IV_EGR_(DPF)
-        { 5.290e+03, 2.383e+02, 6.740e+03, 0.000e+00, 0.000e+00, 6.005e+02, 0.000e+00 }, // CO2(total)
-        { 2.265e+00, 1.338e-02, 3.018e+00, 0.000e+00, 0.000e+00, 3.350e-02, 0.000e+00 }, // CO
-        { 1.841e-02, 7.977e-04, 3.746e-02, 0.000e+00, 0.000e+00, 8.546e-04, 0.000e+00 }, // HC
-        { 1.700e+03, 7.657e+01, 2.166e+03, 0.000e+00, 0.000e+00, 1.930e+02, 0.000e+00 }, // FC
-        { 8.149e+01, 4.695e-01, 1.440e+02, 0.000e+00, 0.000e+00, 1.617e+00, 0.000e+00 }, // NOx
-        { 1.455e+00, 4.666e-04, 3.979e-02, 0.000e+00, 2.877e-06, 7.350e-04, 1.581e-05 }, // PM + PM (non-exhaust)
+        { 5.290e+03, 8.577e+02, 6.740e+03, 0.000e+00, 0.000e+00, 2.162e+03, 0.000e+00 }, // CO2(total)
+        { 2.265e+00, 4.816e-02, 3.018e+00, 0.000e+00, 0.000e+00, 1.206e-01, 0.000e+00 }, // CO
+        { 1.841e-02, 2.872e-03, 3.746e-02, 0.000e+00, 0.000e+00, 3.076e-03, 0.000e+00 }, // HC
+        { 1.700e+03, 2.757e+02, 2.166e+03, 0.000e+00, 0.000e+00, 6.948e+02, 0.000e+00 }, // FC
+        { 8.149e+01, 1.690e+00, 1.440e+02, 0.000e+00, 0.000e+00, 5.821e+00, 0.000e+00 }, // NOx
+        { 1.455e+00, 1.680e-03, 3.979e-02, 0.000e+00, 1.342e-04, 2.646e-03, 2.049e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // UBus_Artic_gt18t_Euro-IV_SCR_(DPF)
-        { 5.140e+03, 2.389e+02, 6.342e+03, 0.000e+00, 0.000e+00, 6.003e+02, 0.000e+00 }, // CO2(total)
+        { 5.140e+03, 8.601e+02, 6.342e+03, 0.000e+00, 0.000e+00, 2.161e+03, 0.000e+00 }, // CO2(total)
         { 5.977e+00, 0.000e+00, 1.155e+01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 7.605e-03, 2.097e-04, 1.161e-02, 3.725e-06, 0.000e+00, 1.535e-04, 8.697e-06 }, // HC
-        { 1.652e+03, 7.678e+01, 2.038e+03, 0.000e+00, 0.000e+00, 1.929e+02, 0.000e+00 }, // FC
-        { 4.024e+01, 6.017e-01, 0.000e+00, 0.000e+00, 0.000e+00, 1.529e+00, 6.800e-03 }, // NOx
-        { 1.448e+00, 0.000e+00, 3.325e-02, 0.000e+00, 2.906e-06, 2.707e-04, 1.240e-05 }, // PM + PM (non-exhaust)
+        { 7.605e-03, 7.548e-04, 1.161e-02, 4.828e-05, 0.000e+00, 5.526e-04, 1.127e-04 }, // HC
+        { 1.652e+03, 2.764e+02, 2.038e+03, 0.000e+00, 0.000e+00, 6.946e+02, 0.000e+00 }, // FC
+        { 4.024e+01, 2.166e+00, 0.000e+00, 0.000e+00, 0.000e+00, 5.505e+00, 8.813e-02 }, // NOx
+        { 1.448e+00, 0.000e+00, 3.325e-02, 0.000e+00, 1.356e-04, 9.745e-04, 1.607e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // UBus_Artic_gt18t_Euro-IV_SCRs_(DPF)
-        { 5.140e+03, 2.389e+02, 6.342e+03, 0.000e+00, 0.000e+00, 6.003e+02, 0.000e+00 }, // CO2(total)
+        { 5.140e+03, 8.601e+02, 6.342e+03, 0.000e+00, 0.000e+00, 2.161e+03, 0.000e+00 }, // CO2(total)
         { 5.977e+00, 0.000e+00, 1.155e+01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 7.605e-03, 2.097e-04, 1.161e-02, 3.725e-06, 0.000e+00, 1.535e-04, 8.697e-06 }, // HC
-        { 1.652e+03, 7.678e+01, 2.038e+03, 0.000e+00, 0.000e+00, 1.929e+02, 0.000e+00 }, // FC
-        { 8.530e+01, 1.456e+00, 1.009e+02, 0.000e+00, 0.000e+00, 4.621e+00, 0.000e+00 }, // NOx
-        { 1.448e+00, 0.000e+00, 3.325e-02, 0.000e+00, 2.906e-06, 2.707e-04, 1.240e-05 }, // PM + PM (non-exhaust)
+        { 7.605e-03, 7.548e-04, 1.161e-02, 4.828e-05, 0.000e+00, 5.526e-04, 1.127e-04 }, // HC
+        { 1.652e+03, 2.764e+02, 2.038e+03, 0.000e+00, 0.000e+00, 6.946e+02, 0.000e+00 }, // FC
+        { 8.530e+01, 5.241e+00, 1.009e+02, 0.000e+00, 0.000e+00, 1.663e+01, 0.000e+00 }, // NOx
+        { 1.448e+00, 0.000e+00, 3.325e-02, 0.000e+00, 1.356e-04, 9.745e-04, 1.607e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // UBus_Artic_gt18t_Euro-V_EGR
-        { 4.868e+03, 2.290e+02, 6.334e+03, 0.000e+00, 0.000e+00, 5.759e+02, 0.000e+00 }, // CO2(total)
+        { 4.868e+03, 8.245e+02, 6.334e+03, 0.000e+00, 0.000e+00, 2.073e+03, 0.000e+00 }, // CO2(total)
         { 1.291e+01, 0.000e+00, 1.763e+01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 8.026e-01, 9.705e-03, 6.059e-01, 0.000e+00, 1.672e-06, 2.801e-02, 0.000e+00 }, // HC
-        { 1.564e+03, 7.360e+01, 2.036e+03, 0.000e+00, 0.000e+00, 1.851e+02, 0.000e+00 }, // FC
-        { 5.772e+01, 4.233e-01, 1.066e+02, 0.000e+00, 0.000e+00, 6.597e-01, 0.000e+00 }, // NOx
-        { 1.577e+00, 8.282e-03, 3.636e-01, 0.000e+00, 3.568e-06, 0.000e+00, 2.765e-04 }, // PM + PM (non-exhaust)
+        { 8.026e-01, 3.494e-02, 6.059e-01, 0.000e+00, 7.801e-05, 1.008e-01, 0.000e+00 }, // HC
+        { 1.564e+03, 2.650e+02, 2.036e+03, 0.000e+00, 0.000e+00, 6.663e+02, 0.000e+00 }, // FC
+        { 5.772e+01, 1.524e+00, 1.066e+02, 0.000e+00, 0.000e+00, 2.375e+00, 0.000e+00 }, // NOx
+        { 1.577e+00, 2.981e-02, 3.636e-01, 0.000e+00, 1.665e-04, 0.000e+00, 3.584e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // UBus_Artic_gt18t_Euro-V_SCR
-        { 4.740e+03, 2.261e+02, 6.079e+03, 0.000e+00, 0.000e+00, 5.683e+02, 0.000e+00 }, // CO2(total)
+        { 4.740e+03, 8.139e+02, 6.079e+03, 0.000e+00, 0.000e+00, 2.046e+03, 0.000e+00 }, // CO2(total)
         { 3.308e+01, 0.000e+00, 5.883e+01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 1.388e-01, 4.635e-03, 1.245e-01, 7.684e-05, 0.000e+00, 1.224e-02, 0.000e+00 }, // HC
-        { 1.523e+03, 7.266e+01, 1.954e+03, 0.000e+00, 0.000e+00, 1.826e+02, 0.000e+00 }, // FC
-        { 3.482e+01, 1.718e-01, 0.000e+00, 0.000e+00, 0.000e+00, 9.949e-02, 1.032e-02 }, // NOx
-        { 2.067e+00, 0.000e+00, 7.276e-01, 0.000e+00, 4.862e-06, 0.000e+00, 1.092e-05 }, // PM + PM (non-exhaust)
+        { 1.388e-01, 1.669e-02, 1.245e-01, 9.959e-04, 0.000e+00, 4.405e-02, 0.000e+00 }, // HC
+        { 1.523e+03, 2.616e+02, 1.954e+03, 0.000e+00, 0.000e+00, 6.575e+02, 0.000e+00 }, // FC
+        { 3.482e+01, 6.186e-01, 0.000e+00, 0.000e+00, 0.000e+00, 3.582e-01, 1.337e-01 }, // NOx
+        { 2.067e+00, 0.000e+00, 7.276e-01, 0.000e+00, 2.269e-04, 0.000e+00, 1.416e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // UBus_Artic_gt18t_Euro-V_SCRs
-        { 4.740e+03, 2.261e+02, 6.079e+03, 0.000e+00, 0.000e+00, 5.683e+02, 0.000e+00 }, // CO2(total)
+        { 4.740e+03, 8.139e+02, 6.079e+03, 0.000e+00, 0.000e+00, 2.046e+03, 0.000e+00 }, // CO2(total)
         { 3.308e+01, 0.000e+00, 5.883e+01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 1.388e-01, 4.635e-03, 1.245e-01, 7.684e-05, 0.000e+00, 1.224e-02, 0.000e+00 }, // HC
-        { 1.523e+03, 7.266e+01, 1.954e+03, 0.000e+00, 0.000e+00, 1.826e+02, 0.000e+00 }, // FC
-        { 8.827e+01, 1.328e+00, 1.069e+02, 0.000e+00, 0.000e+00, 4.248e+00, 0.000e+00 }, // NOx
-        { 2.067e+00, 0.000e+00, 7.276e-01, 0.000e+00, 4.862e-06, 0.000e+00, 1.092e-05 }, // PM + PM (non-exhaust)
+        { 1.388e-01, 1.669e-02, 1.245e-01, 9.959e-04, 0.000e+00, 4.405e-02, 0.000e+00 }, // HC
+        { 1.523e+03, 2.616e+02, 1.954e+03, 0.000e+00, 0.000e+00, 6.575e+02, 0.000e+00 }, // FC
+        { 8.827e+01, 4.779e+00, 1.069e+02, 0.000e+00, 0.000e+00, 1.529e+01, 0.000e+00 }, // NOx
+        { 2.067e+00, 0.000e+00, 7.276e-01, 0.000e+00, 2.269e-04, 0.000e+00, 1.416e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // UBus_Artic_gt18t_Euro-V_EGR_(DPF)
-        { 4.975e+03, 2.341e+02, 6.474e+03, 0.000e+00, 0.000e+00, 5.886e+02, 0.000e+00 }, // CO2(total)
+        { 4.975e+03, 8.426e+02, 6.474e+03, 0.000e+00, 0.000e+00, 2.119e+03, 0.000e+00 }, // CO2(total)
         { 2.194e+00, 0.000e+00, 2.998e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 4.013e-02, 4.853e-04, 3.029e-02, 0.000e+00, 8.360e-08, 1.401e-03, 0.000e+00 }, // HC
-        { 1.599e+03, 7.522e+01, 2.080e+03, 0.000e+00, 0.000e+00, 1.891e+02, 0.000e+00 }, // FC
-        { 5.772e+01, 4.233e-01, 1.066e+02, 0.000e+00, 0.000e+00, 6.597e-01, 0.000e+00 }, // NOx
-        { 1.439e+00, 5.797e-04, 2.545e-02, 0.000e+00, 2.866e-06, 0.000e+00, 3.101e-05 }, // PM + PM (non-exhaust)
+        { 4.013e-02, 1.747e-03, 3.029e-02, 0.000e+00, 3.900e-06, 5.042e-03, 0.000e+00 }, // HC
+        { 1.599e+03, 2.708e+02, 2.080e+03, 0.000e+00, 0.000e+00, 6.809e+02, 0.000e+00 }, // FC
+        { 5.772e+01, 1.524e+00, 1.066e+02, 0.000e+00, 0.000e+00, 2.375e+00, 0.000e+00 }, // NOx
+        { 1.439e+00, 2.087e-03, 2.545e-02, 0.000e+00, 1.337e-04, 0.000e+00, 4.019e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // UBus_Artic_gt18t_Euro-V_SCR_(DPF)
-        { 4.844e+03, 2.310e+02, 6.213e+03, 0.000e+00, 0.000e+00, 5.808e+02, 0.000e+00 }, // CO2(total)
+        { 4.844e+03, 8.318e+02, 6.213e+03, 0.000e+00, 0.000e+00, 2.091e+03, 0.000e+00 }, // CO2(total)
         { 5.623e+00, 0.000e+00, 1.000e+01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 6.941e-03, 2.317e-04, 6.223e-03, 3.842e-06, 0.000e+00, 6.118e-04, 0.000e+00 }, // HC
-        { 1.557e+03, 7.425e+01, 1.997e+03, 0.000e+00, 0.000e+00, 1.867e+02, 0.000e+00 }, // FC
-        { 3.482e+01, 1.718e-01, 0.000e+00, 0.000e+00, 0.000e+00, 9.949e-02, 1.032e-02 }, // NOx
-        { 1.457e+00, 0.000e+00, 2.910e-02, 0.000e+00, 2.877e-06, 0.000e+00, 1.092e-05 }, // PM + PM (non-exhaust)
+        { 6.941e-03, 8.343e-04, 6.223e-03, 4.979e-05, 0.000e+00, 2.203e-03, 0.000e+00 }, // HC
+        { 1.557e+03, 2.673e+02, 1.997e+03, 0.000e+00, 0.000e+00, 6.720e+02, 0.000e+00 }, // FC
+        { 3.482e+01, 6.186e-01, 0.000e+00, 0.000e+00, 0.000e+00, 3.582e-01, 1.337e-01 }, // NOx
+        { 1.457e+00, 0.000e+00, 2.910e-02, 0.000e+00, 1.342e-04, 0.000e+00, 1.416e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // UBus_Artic_gt18t_Euro-V_SCRs_(DPF)
-        { 4.844e+03, 2.310e+02, 6.213e+03, 0.000e+00, 0.000e+00, 5.808e+02, 0.000e+00 }, // CO2(total)
+        { 4.844e+03, 8.318e+02, 6.213e+03, 0.000e+00, 0.000e+00, 2.091e+03, 0.000e+00 }, // CO2(total)
         { 5.623e+00, 0.000e+00, 1.000e+01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 6.941e-03, 2.317e-04, 6.223e-03, 3.842e-06, 0.000e+00, 6.118e-04, 0.000e+00 }, // HC
-        { 1.557e+03, 7.425e+01, 1.997e+03, 0.000e+00, 0.000e+00, 1.867e+02, 0.000e+00 }, // FC
-        { 8.827e+01, 1.328e+00, 1.069e+02, 0.000e+00, 0.000e+00, 4.248e+00, 0.000e+00 }, // NOx
-        { 1.457e+00, 0.000e+00, 2.910e-02, 0.000e+00, 2.877e-06, 0.000e+00, 1.092e-05 }, // PM + PM (non-exhaust)
+        { 6.941e-03, 8.343e-04, 6.223e-03, 4.979e-05, 0.000e+00, 2.203e-03, 0.000e+00 }, // HC
+        { 1.557e+03, 2.673e+02, 1.997e+03, 0.000e+00, 0.000e+00, 6.720e+02, 0.000e+00 }, // FC
+        { 8.827e+01, 4.779e+00, 1.069e+02, 0.000e+00, 0.000e+00, 1.529e+01, 0.000e+00 }, // NOx
+        { 1.457e+00, 0.000e+00, 2.910e-02, 0.000e+00, 1.342e-04, 0.000e+00, 1.416e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // UBus_Artic_gt18t_Euro-VI_A-C
-        { 5.018e+03, 2.162e+02, 6.529e+03, 0.000e+00, 0.000e+00, 5.608e+02, 0.000e+00 }, // CO2(total)
-        { 2.616e+00, 2.217e-02, 3.031e+00, 0.000e+00, 1.332e-06, 0.000e+00, 0.000e+00 }, // CO
-        { 2.027e-01, 3.016e-03, 0.000e+00, 0.000e+00, 0.000e+00, 1.161e-02, 0.000e+00 }, // HC
-        { 1.613e+03, 6.947e+01, 2.098e+03, 0.000e+00, 0.000e+00, 1.802e+02, 0.000e+00 }, // FC
-        { 5.234e+00, 0.000e+00, 0.000e+00, 0.000e+00, 2.254e-05, 0.000e+00, 2.955e-03 }, // NOx
-        { 1.432e+00, 1.793e-04, 0.000e+00, 0.000e+00, 5.419e-06, 0.000e+00, 3.802e-04 }, // PM + PM (non-exhaust)
+        { 5.018e+03, 7.782e+02, 6.529e+03, 0.000e+00, 0.000e+00, 2.019e+03, 0.000e+00 }, // CO2(total)
+        { 2.616e+00, 7.980e-02, 3.031e+00, 0.000e+00, 6.215e-05, 0.000e+00, 0.000e+00 }, // CO
+        { 2.027e-01, 1.086e-02, 0.000e+00, 0.000e+00, 0.000e+00, 4.178e-02, 0.000e+00 }, // HC
+        { 1.613e+03, 2.501e+02, 2.098e+03, 0.000e+00, 0.000e+00, 6.488e+02, 0.000e+00 }, // FC
+        { 5.234e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.052e-03, 0.000e+00, 3.830e-02 }, // NOx
+        { 1.432e+00, 6.455e-04, 0.000e+00, 0.000e+00, 2.528e-04, 0.000e+00, 4.927e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // UBus_Artic_gt18t_Euro-VIs_A-C
-        { 5.018e+03, 2.162e+02, 6.529e+03, 0.000e+00, 0.000e+00, 5.608e+02, 0.000e+00 }, // CO2(total)
-        { 2.616e+00, 2.217e-02, 3.031e+00, 0.000e+00, 1.332e-06, 0.000e+00, 0.000e+00 }, // CO
-        { 2.027e-01, 3.016e-03, 0.000e+00, 0.000e+00, 0.000e+00, 1.161e-02, 0.000e+00 }, // HC
-        { 1.613e+03, 6.947e+01, 2.098e+03, 0.000e+00, 0.000e+00, 1.802e+02, 0.000e+00 }, // FC
-        { 4.552e+01, 1.301e+00, 7.791e+01, 0.000e+00, 0.000e+00, 3.312e+00, 0.000e+00 }, // NOx
-        { 1.432e+00, 1.793e-04, 0.000e+00, 0.000e+00, 5.419e-06, 0.000e+00, 3.802e-04 }, // PM + PM (non-exhaust)
+        { 5.018e+03, 7.782e+02, 6.529e+03, 0.000e+00, 0.000e+00, 2.019e+03, 0.000e+00 }, // CO2(total)
+        { 2.616e+00, 7.980e-02, 3.031e+00, 0.000e+00, 6.215e-05, 0.000e+00, 0.000e+00 }, // CO
+        { 2.027e-01, 1.086e-02, 0.000e+00, 0.000e+00, 0.000e+00, 4.178e-02, 0.000e+00 }, // HC
+        { 1.613e+03, 2.501e+02, 2.098e+03, 0.000e+00, 0.000e+00, 6.488e+02, 0.000e+00 }, // FC
+        { 4.552e+01, 4.683e+00, 7.791e+01, 0.000e+00, 0.000e+00, 1.192e+01, 0.000e+00 }, // NOx
+        { 1.432e+00, 6.455e-04, 0.000e+00, 0.000e+00, 2.528e-04, 0.000e+00, 4.927e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // UBus_Artic_gt18t_Euro-VI_D-E
-        { 7.752e+03, 1.273e+02, 1.136e+04, 0.000e+00, 0.000e+00, 4.092e+02, 0.000e+00 }, // CO2(total)
+        { 7.752e+03, 4.582e+02, 1.136e+04, 0.000e+00, 0.000e+00, 1.473e+03, 0.000e+00 }, // CO2(total)
         { 8.926e-01, 0.000e+00, 1.283e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 3.220e-01, 3.178e-04, 0.000e+00, 0.000e+00, 2.231e-06, 0.000e+00, 0.000e+00 }, // HC
-        { 2.491e+03, 4.090e+01, 3.652e+03, 0.000e+00, 0.000e+00, 1.315e+02, 0.000e+00 }, // FC
-        { 2.719e+00, 0.000e+00, 0.000e+00, 0.000e+00, 2.796e-06, 0.000e+00, 0.000e+00 }, // NOx
-        { 1.458e+00, 7.164e-04, 9.054e-04, 0.000e+00, 2.729e-06, 1.912e-03, 6.335e-06 }, // PM + PM (non-exhaust)
+        { 3.220e-01, 1.144e-03, 0.000e+00, 0.000e+00, 1.041e-04, 0.000e+00, 0.000e+00 }, // HC
+        { 2.491e+03, 1.472e+02, 3.652e+03, 0.000e+00, 0.000e+00, 4.735e+02, 0.000e+00 }, // FC
+        { 2.719e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.304e-04, 0.000e+00, 0.000e+00 }, // NOx
+        { 1.458e+00, 2.579e-03, 9.054e-04, 0.000e+00, 1.273e-04, 6.884e-03, 8.211e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // UBus_Artic_gt18t_Euro-VIs_D-E
-        { 7.752e+03, 1.273e+02, 1.136e+04, 0.000e+00, 0.000e+00, 4.092e+02, 0.000e+00 }, // CO2(total)
+        { 7.752e+03, 4.582e+02, 1.136e+04, 0.000e+00, 0.000e+00, 1.473e+03, 0.000e+00 }, // CO2(total)
         { 8.926e-01, 0.000e+00, 1.283e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 3.220e-01, 3.178e-04, 0.000e+00, 0.000e+00, 2.231e-06, 0.000e+00, 0.000e+00 }, // HC
-        { 2.491e+03, 4.090e+01, 3.652e+03, 0.000e+00, 0.000e+00, 1.315e+02, 0.000e+00 }, // FC
-        { 6.581e+01, 1.136e+00, 1.296e+02, 0.000e+00, 0.000e+00, 2.592e+00, 0.000e+00 }, // NOx
-        { 1.458e+00, 7.164e-04, 9.054e-04, 0.000e+00, 2.729e-06, 1.912e-03, 6.335e-06 }, // PM + PM (non-exhaust)
+        { 3.220e-01, 1.144e-03, 0.000e+00, 0.000e+00, 1.041e-04, 0.000e+00, 0.000e+00 }, // HC
+        { 2.491e+03, 1.472e+02, 3.652e+03, 0.000e+00, 0.000e+00, 4.735e+02, 0.000e+00 }, // FC
+        { 6.581e+01, 4.091e+00, 1.296e+02, 0.000e+00, 0.000e+00, 9.332e+00, 0.000e+00 }, // NOx
+        { 1.458e+00, 2.579e-03, 9.054e-04, 0.000e+00, 1.273e-04, 6.884e-03, 8.211e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // UBus_Std_le18t_EE
-        { 3.275e+03, 2.120e+02, 1.062e+03, 0.000e+00, 0.000e+00, 5.373e+02, 0.000e+00 }, // CO2(total)
-        { 8.155e+01, 0.000e+00, 5.496e+01, 0.000e+00, 0.000e+00, 1.197e+00, 0.000e+00 }, // CO
-        { 2.317e+01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 3.471e-03 }, // HC
-        { 1.053e+03, 6.813e+01, 3.413e+02, 0.000e+00, 0.000e+00, 1.727e+02, 0.000e+00 }, // FC
-        { 4.721e+01, 1.930e+00, 2.105e+01, 0.000e+00, 0.000e+00, 5.534e+00, 0.000e+00 }, // NOx
-        { 1.348e+01, 1.737e-01, 0.000e+00, 0.000e+00, 2.767e-06, 6.201e-01, 1.864e-05 }, // PM + PM (non-exhaust)
+        { 3.275e+03, 7.631e+02, 1.062e+03, 0.000e+00, 0.000e+00, 1.934e+03, 0.000e+00 }, // CO2(total)
+        { 8.155e+01, 0.000e+00, 5.496e+01, 0.000e+00, 0.000e+00, 4.310e+00, 0.000e+00 }, // CO
+        { 2.317e+01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 4.499e-02 }, // HC
+        { 1.053e+03, 2.453e+02, 3.413e+02, 0.000e+00, 0.000e+00, 6.217e+02, 0.000e+00 }, // FC
+        { 4.721e+01, 6.949e+00, 2.105e+01, 0.000e+00, 0.000e+00, 1.992e+01, 0.000e+00 }, // NOx
+        { 1.348e+01, 6.254e-01, 0.000e+00, 0.000e+00, 1.291e-04, 2.232e+00, 2.416e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // UBus_Artic_gt18t_EE
-        { 5.721e+03, 2.500e+02, 4.222e+03, 0.000e+00, 0.000e+00, 6.906e+02, 0.000e+00 }, // CO2(total)
-        { 6.086e+01, 1.633e-02, 2.788e+01, 2.036e-03, 0.000e+00, 4.533e-01, 7.830e-03 }, // CO
-        { 1.661e+01, 0.000e+00, 0.000e+00, 0.000e+00, 2.736e-05, 0.000e+00, 4.324e-03 }, // HC
-        { 1.839e+03, 8.033e+01, 1.357e+03, 0.000e+00, 0.000e+00, 2.219e+02, 0.000e+00 }, // FC
-        { 4.987e+01, 1.579e+00, 4.235e+01, 0.000e+00, 0.000e+00, 4.843e+00, 0.000e+00 }, // NOx
-        { 1.350e+01, 1.827e-01, 5.017e+00, 0.000e+00, 3.007e-06, 3.628e-01, 1.124e-05 }, // PM + PM (non-exhaust)
+        { 5.721e+03, 8.999e+02, 4.222e+03, 0.000e+00, 0.000e+00, 2.486e+03, 0.000e+00 }, // CO2(total)
+        { 6.086e+01, 5.879e-02, 2.788e+01, 2.639e-02, 0.000e+00, 1.632e+00, 1.015e-01 }, // CO
+        { 1.661e+01, 0.000e+00, 0.000e+00, 0.000e+00, 1.276e-03, 0.000e+00, 5.604e-02 }, // HC
+        { 1.839e+03, 2.892e+02, 1.357e+03, 0.000e+00, 0.000e+00, 7.990e+02, 0.000e+00 }, // FC
+        { 4.987e+01, 5.686e+00, 4.235e+01, 0.000e+00, 0.000e+00, 1.743e+01, 0.000e+00 }, // NOx
+        { 1.350e+01, 6.575e-01, 5.017e+00, 0.000e+00, 1.403e-04, 1.306e+00, 1.457e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // UBus_Midi_lt15t_HEV_Euro-IV
-        { 1.073e+03, 1.596e+02, 4.442e+03, 0.000e+00, 0.000e+00, 3.042e+02, 0.000e+00 }, // CO2(total)
-        { 6.644e+00, 4.383e-02, 8.091e+00, 0.000e+00, 0.000e+00, 1.381e-01, 0.000e+00 }, // CO
-        { 2.447e-01, 4.666e-03, 3.840e-01, 0.000e+00, 0.000e+00, 8.363e-03, 0.000e+00 }, // HC
-        { 3.450e+02, 5.130e+01, 1.427e+03, 0.000e+00, 0.000e+00, 9.777e+01, 0.000e+00 }, // FC
-        { 3.682e+01, 4.137e-01, 5.682e+01, 0.000e+00, 0.000e+00, 1.179e+00, 0.000e+00 }, // NOx
-        { 1.719e+00, 2.457e-03, 3.689e-01, 0.000e+00, 2.543e-06, 3.866e-03, 1.485e-06 }, // PM + PM (non-exhaust)
+        { 1.073e+03, 5.747e+02, 4.442e+03, 0.000e+00, 0.000e+00, 1.095e+03, 0.000e+00 }, // CO2(total)
+        { 6.644e+00, 1.578e-01, 8.091e+00, 0.000e+00, 0.000e+00, 4.973e-01, 0.000e+00 }, // CO
+        { 2.447e-01, 1.680e-02, 3.840e-01, 0.000e+00, 0.000e+00, 3.011e-02, 0.000e+00 }, // HC
+        { 3.450e+02, 1.847e+02, 1.427e+03, 0.000e+00, 0.000e+00, 3.520e+02, 0.000e+00 }, // FC
+        { 3.682e+01, 1.489e+00, 5.682e+01, 0.000e+00, 0.000e+00, 4.245e+00, 0.000e+00 }, // NOx
+        { 1.719e+00, 8.845e-03, 3.689e-01, 0.000e+00, 1.186e-04, 1.392e-02, 1.924e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // UBus_Midi_lt15t_HEV_Euro-V
-        { 1.073e+03, 1.596e+02, 4.442e+03, 0.000e+00, 0.000e+00, 3.042e+02, 0.000e+00 }, // CO2(total)
+        { 1.073e+03, 5.747e+02, 4.442e+03, 0.000e+00, 0.000e+00, 1.095e+03, 0.000e+00 }, // CO2(total)
         { 1.779e+01, 0.000e+00, 3.149e+01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 8.736e-02, 2.347e-03, 1.197e-01, 0.000e+00, 0.000e+00, 4.228e-03, 0.000e+00 }, // HC
-        { 3.450e+02, 5.130e+01, 1.427e+03, 0.000e+00, 0.000e+00, 9.777e+01, 0.000e+00 }, // FC
-        { 1.644e+01, 7.096e-02, 0.000e+00, 9.224e-04, 0.000e+00, 0.000e+00, 5.490e-03 }, // NOx
-        { 1.758e+00, 1.461e-03, 5.151e-01, 0.000e+00, 2.543e-06, 4.869e-04, 1.485e-06 }, // PM + PM (non-exhaust)
+        { 8.736e-02, 8.449e-03, 1.197e-01, 0.000e+00, 0.000e+00, 1.522e-02, 0.000e+00 }, // HC
+        { 3.450e+02, 1.847e+02, 1.427e+03, 0.000e+00, 0.000e+00, 3.520e+02, 0.000e+00 }, // FC
+        { 1.644e+01, 2.554e-01, 0.000e+00, 1.195e-02, 0.000e+00, 0.000e+00, 7.115e-02 }, // NOx
+        { 1.758e+00, 5.258e-03, 5.151e-01, 0.000e+00, 1.186e-04, 1.753e-03, 1.924e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // UBus_Midi_lt15t_HEV_Euro-VI_A-C
-        { 1.026e+03, 1.579e+02, 4.443e+03, 0.000e+00, 0.000e+00, 3.025e+02, 0.000e+00 }, // CO2(total)
-        { 1.470e+00, 2.507e-03, 2.304e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 9.841e-02, 1.241e-03, 7.981e-02, 0.000e+00, 0.000e+00, 2.722e-03, 0.000e+00 }, // HC
-        { 3.296e+02, 5.074e+01, 1.428e+03, 0.000e+00, 0.000e+00, 9.722e+01, 0.000e+00 }, // FC
+        { 1.026e+03, 5.684e+02, 4.443e+03, 0.000e+00, 0.000e+00, 1.089e+03, 0.000e+00 }, // CO2(total)
+        { 1.470e+00, 9.025e-03, 2.304e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
+        { 9.841e-02, 4.468e-03, 7.981e-02, 0.000e+00, 0.000e+00, 9.800e-03, 0.000e+00 }, // HC
+        { 3.296e+02, 1.827e+02, 1.428e+03, 0.000e+00, 0.000e+00, 3.500e+02, 0.000e+00 }, // FC
         { 1.638e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // NOx
-        { 1.502e+00, 1.243e-03, 1.429e-01, 0.000e+00, 2.566e-06, 0.000e+00, 1.973e-06 }, // PM + PM (non-exhaust)
+        { 1.502e+00, 4.473e-03, 1.429e-01, 0.000e+00, 1.197e-04, 0.000e+00, 2.557e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // UBus_Midi_lt15t_HEV_Euro-VI_D-E
-        { 1.026e+03, 1.579e+02, 4.443e+03, 0.000e+00, 0.000e+00, 3.025e+02, 0.000e+00 }, // CO2(total)
-        { 1.470e+00, 2.507e-03, 2.304e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 9.841e-02, 1.241e-03, 7.981e-02, 0.000e+00, 0.000e+00, 2.722e-03, 0.000e+00 }, // HC
-        { 3.296e+02, 5.074e+01, 1.428e+03, 0.000e+00, 0.000e+00, 9.722e+01, 0.000e+00 }, // FC
+        { 1.026e+03, 5.684e+02, 4.443e+03, 0.000e+00, 0.000e+00, 1.089e+03, 0.000e+00 }, // CO2(total)
+        { 1.470e+00, 9.025e-03, 2.304e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
+        { 9.841e-02, 4.468e-03, 7.981e-02, 0.000e+00, 0.000e+00, 9.800e-03, 0.000e+00 }, // HC
+        { 3.296e+02, 1.827e+02, 1.428e+03, 0.000e+00, 0.000e+00, 3.500e+02, 0.000e+00 }, // FC
         { 1.638e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // NOx
-        { 1.502e+00, 1.243e-03, 1.429e-01, 0.000e+00, 2.566e-06, 0.000e+00, 1.973e-06 }, // PM + PM (non-exhaust)
+        { 1.502e+00, 4.473e-03, 1.429e-01, 0.000e+00, 1.197e-04, 0.000e+00, 2.557e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // UBus_Std_gt15-18t_HEV_Euro-IV
-        { 3.700e+03, 1.501e+02, 1.073e+04, 0.000e+00, 0.000e+00, 2.989e+02, 0.000e+00 }, // CO2(total)
-        { 6.644e+00, 4.383e-02, 8.091e+00, 0.000e+00, 0.000e+00, 1.381e-01, 0.000e+00 }, // CO
-        { 2.447e-01, 4.666e-03, 3.840e-01, 0.000e+00, 0.000e+00, 8.363e-03, 0.000e+00 }, // HC
-        { 1.189e+03, 4.823e+01, 3.447e+03, 0.000e+00, 0.000e+00, 9.606e+01, 0.000e+00 }, // FC
-        { 3.682e+01, 4.137e-01, 5.682e+01, 0.000e+00, 0.000e+00, 1.179e+00, 0.000e+00 }, // NOx
-        { 1.649e+00, 2.919e-03, 3.689e-01, 0.000e+00, 2.594e-06, 3.866e-03, 0.000e+00 }, // PM + PM (non-exhaust)
+        { 3.700e+03, 5.403e+02, 1.073e+04, 0.000e+00, 0.000e+00, 1.076e+03, 0.000e+00 }, // CO2(total)
+        { 6.644e+00, 1.578e-01, 8.091e+00, 0.000e+00, 0.000e+00, 4.973e-01, 0.000e+00 }, // CO
+        { 2.447e-01, 1.680e-02, 3.840e-01, 0.000e+00, 0.000e+00, 3.011e-02, 0.000e+00 }, // HC
+        { 1.189e+03, 1.736e+02, 3.447e+03, 0.000e+00, 0.000e+00, 3.458e+02, 0.000e+00 }, // FC
+        { 3.682e+01, 1.489e+00, 5.682e+01, 0.000e+00, 0.000e+00, 4.245e+00, 0.000e+00 }, // NOx
+        { 1.649e+00, 1.051e-02, 3.689e-01, 0.000e+00, 1.210e-04, 1.392e-02, 0.000e+00 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // UBus_Std_gt15-18t_HEV_Euro-V
-        { 3.700e+03, 1.501e+02, 1.073e+04, 0.000e+00, 0.000e+00, 2.989e+02, 0.000e+00 }, // CO2(total)
+        { 3.700e+03, 5.403e+02, 1.073e+04, 0.000e+00, 0.000e+00, 1.076e+03, 0.000e+00 }, // CO2(total)
         { 2.460e+01, 0.000e+00, 4.076e+01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 1.117e-01, 2.619e-03, 4.935e-02, 5.858e-05, 0.000e+00, 9.647e-03, 0.000e+00 }, // HC
-        { 1.189e+03, 4.823e+01, 3.447e+03, 0.000e+00, 0.000e+00, 9.606e+01, 0.000e+00 }, // FC
-        { 2.694e+01, 0.000e+00, 0.000e+00, 0.000e+00, 2.943e-05, 0.000e+00, 9.499e-03 }, // NOx
-        { 1.817e+00, 1.923e-03, 7.474e-01, 0.000e+00, 3.396e-06, 0.000e+00, 0.000e+00 }, // PM + PM (non-exhaust)
+        { 1.117e-01, 9.429e-03, 4.935e-02, 7.591e-04, 0.000e+00, 3.473e-02, 0.000e+00 }, // HC
+        { 1.189e+03, 1.736e+02, 3.447e+03, 0.000e+00, 0.000e+00, 3.458e+02, 0.000e+00 }, // FC
+        { 2.694e+01, 0.000e+00, 0.000e+00, 0.000e+00, 1.373e-03, 0.000e+00, 1.231e-01 }, // NOx
+        { 1.817e+00, 6.923e-03, 7.474e-01, 0.000e+00, 1.584e-04, 0.000e+00, 0.000e+00 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // UBus_Std_gt15-18t_HEV_Euro-VI_A-C
-        { 3.635e+03, 1.472e+02, 1.076e+04, 0.000e+00, 0.000e+00, 2.927e+02, 0.000e+00 }, // CO2(total)
-        { 1.978e+00, 4.619e-03, 1.632e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 2.017e-01, 2.594e-04, 5.993e-02, 0.000e+00, 0.000e+00, 3.234e-03, 0.000e+00 }, // HC
-        { 1.168e+03, 4.730e+01, 3.460e+03, 0.000e+00, 0.000e+00, 9.407e+01, 0.000e+00 }, // FC
-        { 2.544e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.255e-05, 0.000e+00, 9.964e-04 }, // NOx
-        { 1.350e+00, 1.761e-03, 0.000e+00, 6.517e-05, 3.311e-06, 0.000e+00, 2.277e-04 }, // PM + PM (non-exhaust)
+        { 3.635e+03, 5.299e+02, 1.076e+04, 0.000e+00, 0.000e+00, 1.054e+03, 0.000e+00 }, // CO2(total)
+        { 1.978e+00, 1.663e-02, 1.632e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
+        { 2.017e-01, 9.340e-04, 5.993e-02, 0.000e+00, 0.000e+00, 1.164e-02, 0.000e+00 }, // HC
+        { 1.168e+03, 1.703e+02, 3.460e+03, 0.000e+00, 0.000e+00, 3.386e+02, 0.000e+00 }, // FC
+        { 2.544e+00, 0.000e+00, 0.000e+00, 0.000e+00, 5.856e-04, 0.000e+00, 1.291e-02 }, // NOx
+        { 1.350e+00, 6.338e-03, 0.000e+00, 8.446e-04, 1.545e-04, 0.000e+00, 2.952e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // UBus_Std_gt15-18t_HEV_Euro-VI_D-E
-        { 3.635e+03, 1.472e+02, 1.076e+04, 0.000e+00, 0.000e+00, 2.927e+02, 0.000e+00 }, // CO2(total)
-        { 1.978e+00, 4.619e-03, 1.632e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 2.017e-01, 2.594e-04, 5.993e-02, 0.000e+00, 0.000e+00, 3.234e-03, 0.000e+00 }, // HC
-        { 1.168e+03, 4.730e+01, 3.460e+03, 0.000e+00, 0.000e+00, 9.407e+01, 0.000e+00 }, // FC
-        { 2.544e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.255e-05, 0.000e+00, 9.964e-04 }, // NOx
-        { 1.350e+00, 1.761e-03, 0.000e+00, 6.517e-05, 3.311e-06, 0.000e+00, 2.277e-04 }, // PM + PM (non-exhaust)
+        { 3.635e+03, 5.299e+02, 1.076e+04, 0.000e+00, 0.000e+00, 1.054e+03, 0.000e+00 }, // CO2(total)
+        { 1.978e+00, 1.663e-02, 1.632e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
+        { 2.017e-01, 9.340e-04, 5.993e-02, 0.000e+00, 0.000e+00, 1.164e-02, 0.000e+00 }, // HC
+        { 1.168e+03, 1.703e+02, 3.460e+03, 0.000e+00, 0.000e+00, 3.386e+02, 0.000e+00 }, // FC
+        { 2.544e+00, 0.000e+00, 0.000e+00, 0.000e+00, 5.856e-04, 0.000e+00, 1.291e-02 }, // NOx
+        { 1.350e+00, 6.338e-03, 0.000e+00, 8.446e-04, 1.545e-04, 0.000e+00, 2.952e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // UBus_Artic_gt18t_HEV_Euro-IV
-        { 6.699e+03, 1.256e+02, 1.593e+04, 0.000e+00, 0.000e+00, 2.821e+02, 0.000e+00 }, // CO2(total)
-        { 1.332e+01, 7.869e-02, 1.775e+01, 0.000e+00, 0.000e+00, 1.971e-01, 0.000e+00 }, // CO
-        { 3.683e-01, 1.595e-02, 7.493e-01, 0.000e+00, 0.000e+00, 1.709e-02, 0.000e+00 }, // HC
-        { 2.153e+03, 4.038e+01, 5.119e+03, 0.000e+00, 0.000e+00, 9.066e+01, 0.000e+00 }, // FC
-        { 8.149e+01, 4.695e-01, 1.440e+02, 0.000e+00, 0.000e+00, 1.617e+00, 0.000e+00 }, // NOx
-        { 1.533e+00, 1.497e-02, 5.687e-01, 0.000e+00, 2.281e-06, 1.050e-02, 4.688e-05 }, // PM + PM (non-exhaust)
+        { 6.699e+03, 4.523e+02, 1.593e+04, 0.000e+00, 0.000e+00, 1.016e+03, 0.000e+00 }, // CO2(total)
+        { 1.332e+01, 2.833e-01, 1.775e+01, 0.000e+00, 0.000e+00, 7.095e-01, 0.000e+00 }, // CO
+        { 3.683e-01, 5.744e-02, 7.493e-01, 0.000e+00, 0.000e+00, 6.153e-02, 0.000e+00 }, // HC
+        { 2.153e+03, 1.454e+02, 5.119e+03, 0.000e+00, 0.000e+00, 3.264e+02, 0.000e+00 }, // FC
+        { 8.149e+01, 1.690e+00, 1.440e+02, 0.000e+00, 0.000e+00, 5.821e+00, 0.000e+00 }, // NOx
+        { 1.533e+00, 5.390e-02, 5.687e-01, 0.000e+00, 1.064e-04, 3.782e-02, 6.075e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // UBus_Artic_gt18t_HEV_Euro-V
-        { 6.699e+03, 1.256e+02, 1.593e+04, 0.000e+00, 0.000e+00, 2.821e+02, 0.000e+00 }, // CO2(total)
+        { 6.699e+03, 4.523e+02, 1.593e+04, 0.000e+00, 0.000e+00, 1.016e+03, 0.000e+00 }, // CO2(total)
         { 2.645e+01, 0.000e+00, 3.726e+01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 9.810e-02, 6.665e-03, 9.875e-02, 5.469e-05, 0.000e+00, 1.191e-02, 0.000e+00 }, // HC
-        { 2.153e+03, 4.038e+01, 5.119e+03, 0.000e+00, 0.000e+00, 9.066e+01, 0.000e+00 }, // FC
-        { 3.207e+01, 0.000e+00, 0.000e+00, 0.000e+00, 4.709e-05, 0.000e+00, 1.436e-02 }, // NOx
-        { 1.541e+00, 8.304e-03, 6.902e-01, 0.000e+00, 4.762e-06, 0.000e+00, 0.000e+00 }, // PM + PM (non-exhaust)
+        { 9.810e-02, 2.400e-02, 9.875e-02, 7.087e-04, 0.000e+00, 4.288e-02, 0.000e+00 }, // HC
+        { 2.153e+03, 1.454e+02, 5.119e+03, 0.000e+00, 0.000e+00, 3.264e+02, 0.000e+00 }, // FC
+        { 3.207e+01, 0.000e+00, 0.000e+00, 0.000e+00, 2.197e-03, 0.000e+00, 1.862e-01 }, // NOx
+        { 1.541e+00, 2.989e-02, 6.902e-01, 0.000e+00, 2.222e-04, 0.000e+00, 0.000e+00 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // UBus_Artic_gt18t_HEV_Euro-VI_A-C
-        { 6.569e+03, 1.240e+02, 1.586e+04, 0.000e+00, 0.000e+00, 2.774e+02, 0.000e+00 }, // CO2(total)
-        { 2.688e+00, 0.000e+00, 1.606e+00, 0.000e+00, 3.858e-06, 0.000e+00, 0.000e+00 }, // CO
-        { 2.770e-01, 0.000e+00, 1.316e-01, 0.000e+00, 0.000e+00, 3.976e-03, 0.000e+00 }, // HC
-        { 2.111e+03, 3.985e+01, 5.099e+03, 0.000e+00, 0.000e+00, 8.916e+01, 0.000e+00 }, // FC
-        { 1.374e+00, 0.000e+00, 0.000e+00, 0.000e+00, 2.143e-05, 0.000e+00, 2.188e-03 }, // NOx
-        { 1.081e+00, 8.163e-03, 0.000e+00, 2.745e-04, 2.146e-06, 0.000e+00, 5.548e-04 }, // PM + PM (non-exhaust)
+        { 6.569e+03, 4.464e+02, 1.586e+04, 0.000e+00, 0.000e+00, 9.987e+02, 0.000e+00 }, // CO2(total)
+        { 2.688e+00, 0.000e+00, 1.606e+00, 0.000e+00, 1.800e-04, 0.000e+00, 0.000e+00 }, // CO
+        { 2.770e-01, 0.000e+00, 1.316e-01, 0.000e+00, 0.000e+00, 1.431e-02, 0.000e+00 }, // HC
+        { 2.111e+03, 1.435e+02, 5.099e+03, 0.000e+00, 0.000e+00, 3.210e+02, 0.000e+00 }, // FC
+        { 1.374e+00, 0.000e+00, 0.000e+00, 0.000e+00, 9.998e-04, 0.000e+00, 2.836e-02 }, // NOx
+        { 1.081e+00, 2.939e-02, 0.000e+00, 3.557e-03, 1.001e-04, 0.000e+00, 7.190e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // UBus_Artic_gt18t_HEV_Euro-VI_D-E
-        { 6.569e+03, 1.240e+02, 1.586e+04, 0.000e+00, 0.000e+00, 2.774e+02, 0.000e+00 }, // CO2(total)
-        { 2.688e+00, 0.000e+00, 1.606e+00, 0.000e+00, 3.858e-06, 0.000e+00, 0.000e+00 }, // CO
-        { 2.770e-01, 0.000e+00, 1.316e-01, 0.000e+00, 0.000e+00, 3.976e-03, 0.000e+00 }, // HC
-        { 2.111e+03, 3.985e+01, 5.099e+03, 0.000e+00, 0.000e+00, 8.916e+01, 0.000e+00 }, // FC
-        { 1.374e+00, 0.000e+00, 0.000e+00, 0.000e+00, 2.143e-05, 0.000e+00, 2.188e-03 }, // NOx
-        { 1.081e+00, 8.163e-03, 0.000e+00, 2.745e-04, 2.146e-06, 0.000e+00, 5.548e-04 }, // PM + PM (non-exhaust)
+        { 6.569e+03, 4.464e+02, 1.586e+04, 0.000e+00, 0.000e+00, 9.987e+02, 0.000e+00 }, // CO2(total)
+        { 2.688e+00, 0.000e+00, 1.606e+00, 0.000e+00, 1.800e-04, 0.000e+00, 0.000e+00 }, // CO
+        { 2.770e-01, 0.000e+00, 1.316e-01, 0.000e+00, 0.000e+00, 1.431e-02, 0.000e+00 }, // HC
+        { 2.111e+03, 1.435e+02, 5.099e+03, 0.000e+00, 0.000e+00, 3.210e+02, 0.000e+00 }, // FC
+        { 1.374e+00, 0.000e+00, 0.000e+00, 0.000e+00, 9.998e-04, 0.000e+00, 2.836e-02 }, // NOx
+        { 1.081e+00, 2.939e-02, 0.000e+00, 3.557e-03, 1.001e-04, 0.000e+00, 7.190e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // UBus_Midi_lt15t_CNG_Euro-II
-        { 2.362e+03, 1.382e+02, 6.672e+02, 0.000e+00, 0.000e+00, 3.411e+02, 0.000e+00 }, // CO2(total)
-        { 1.842e+01, 0.000e+00, 1.916e+01, 0.000e+00, 0.000e+00, 9.723e-02, 0.000e+00 }, // CO
-        { 2.223e+01, 3.641e-02, 0.000e+00, 2.933e-03, 0.000e+00, 3.584e-01, 4.925e-03 }, // HC
-        { 7.601e+02, 4.447e+01, 2.147e+02, 0.000e+00, 0.000e+00, 1.097e+02, 0.000e+00 }, // FC
-        { 3.404e+01, 1.641e+00, 1.441e+01, 0.000e+00, 0.000e+00, 4.051e+00, 0.000e+00 }, // NOx
-        { 1.547e+00, 1.844e-03, 5.099e-02, 0.000e+00, 2.628e-06, 3.386e-03, 3.906e-06 }, // PM + PM (non-exhaust)
+        { 2.362e+03, 4.976e+02, 6.672e+02, 0.000e+00, 0.000e+00, 1.228e+03, 0.000e+00 }, // CO2(total)
+        { 1.842e+01, 0.000e+00, 1.916e+01, 0.000e+00, 0.000e+00, 3.500e-01, 0.000e+00 }, // CO
+        { 2.223e+01, 1.311e-01, 0.000e+00, 3.801e-02, 0.000e+00, 1.290e+00, 6.382e-02 }, // HC
+        { 7.601e+02, 1.601e+02, 2.147e+02, 0.000e+00, 0.000e+00, 3.951e+02, 0.000e+00 }, // FC
+        { 3.404e+01, 5.907e+00, 1.441e+01, 0.000e+00, 0.000e+00, 1.458e+01, 0.000e+00 }, // NOx
+        { 1.547e+00, 6.640e-03, 5.099e-02, 0.000e+00, 1.226e-04, 1.219e-02, 5.063e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // UBus_Midi_lt15t_CNG_Euro-III
-        { 2.573e+03, 1.387e+02, 9.235e+02, 0.000e+00, 0.000e+00, 3.466e+02, 0.000e+00 }, // CO2(total)
-        { 1.839e+01, 0.000e+00, 1.397e+01, 0.000e+00, 0.000e+00, 8.351e-02, 0.000e+00 }, // CO
-        { 1.872e+01, 1.169e-01, 0.000e+00, 0.000e+00, 1.273e-05, 3.675e-01, 2.195e-03 }, // HC
-        { 8.278e+02, 4.461e+01, 2.972e+02, 0.000e+00, 0.000e+00, 1.115e+02, 0.000e+00 }, // FC
-        { 4.094e+01, 1.063e+00, 2.741e+01, 0.000e+00, 0.000e+00, 2.927e+00, 0.000e+00 }, // NOx
-        { 1.469e+00, 2.610e-03, 0.000e+00, 0.000e+00, 2.590e-06, 2.639e-03, 3.722e-06 }, // PM + PM (non-exhaust)
+        { 2.573e+03, 4.991e+02, 9.235e+02, 0.000e+00, 0.000e+00, 1.248e+03, 0.000e+00 }, // CO2(total)
+        { 1.839e+01, 0.000e+00, 1.397e+01, 0.000e+00, 0.000e+00, 3.007e-01, 0.000e+00 }, // CO
+        { 1.872e+01, 4.209e-01, 0.000e+00, 0.000e+00, 5.938e-04, 1.323e+00, 2.844e-02 }, // HC
+        { 8.278e+02, 1.606e+02, 2.972e+02, 0.000e+00, 0.000e+00, 4.015e+02, 0.000e+00 }, // FC
+        { 4.094e+01, 3.828e+00, 2.741e+01, 0.000e+00, 0.000e+00, 1.054e+01, 0.000e+00 }, // NOx
+        { 1.469e+00, 9.396e-03, 0.000e+00, 0.000e+00, 1.208e-04, 9.501e-03, 4.824e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // UBus_Midi_lt15t_CNG_Euro-IV
-        { 2.125e+03, 1.398e+02, 1.972e+03, 0.000e+00, 0.000e+00, 3.279e+02, 0.000e+00 }, // CO2(total)
-        { 7.973e+00, 5.260e-02, 9.709e+00, 0.000e+00, 0.000e+00, 1.658e-01, 0.000e+00 }, // CO
-        { 2.937e+00, 5.599e-02, 4.608e+00, 0.000e+00, 0.000e+00, 1.004e-01, 0.000e+00 }, // HC
-        { 6.838e+02, 4.497e+01, 6.347e+02, 0.000e+00, 0.000e+00, 1.055e+02, 0.000e+00 }, // FC
-        { 4.786e+01, 5.378e-01, 7.386e+01, 0.000e+00, 0.000e+00, 1.533e+00, 0.000e+00 }, // NOx
-        { 1.426e+00, 1.155e-03, 3.689e-02, 0.000e+00, 2.619e-06, 3.866e-04, 0.000e+00 }, // PM + PM (non-exhaust)
+        { 2.125e+03, 5.031e+02, 1.972e+03, 0.000e+00, 0.000e+00, 1.180e+03, 0.000e+00 }, // CO2(total)
+        { 7.973e+00, 1.894e-01, 9.709e+00, 0.000e+00, 0.000e+00, 5.968e-01, 0.000e+00 }, // CO
+        { 2.937e+00, 2.016e-01, 4.608e+00, 0.000e+00, 0.000e+00, 3.613e-01, 0.000e+00 }, // HC
+        { 6.838e+02, 1.619e+02, 6.347e+02, 0.000e+00, 0.000e+00, 3.798e+02, 0.000e+00 }, // FC
+        { 4.786e+01, 1.936e+00, 7.386e+01, 0.000e+00, 0.000e+00, 5.518e+00, 0.000e+00 }, // NOx
+        { 1.426e+00, 4.157e-03, 3.689e-02, 0.000e+00, 1.222e-04, 1.392e-03, 0.000e+00 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // UBus_Midi_lt15t_CNG_Euro-V
-        { 2.217e+03, 1.524e+02, 2.057e+03, 0.000e+00, 0.000e+00, 3.518e+02, 0.000e+00 }, // CO2(total)
-        { 1.647e+00, 1.132e-01, 1.528e+00, 0.000e+00, 0.000e+00, 2.614e-01, 0.000e+00 }, // CO
-        { 7.772e-01, 5.341e-02, 7.209e-01, 0.000e+00, 0.000e+00, 1.233e-01, 0.000e+00 }, // HC
-        { 7.135e+02, 4.903e+01, 6.618e+02, 0.000e+00, 0.000e+00, 1.132e+02, 0.000e+00 }, // FC
-        { 2.996e+00, 2.058e-01, 2.779e+00, 0.000e+00, 0.000e+00, 4.753e-01, 0.000e+00 }, // NOx
-        { 1.422e+00, 2.914e-03, 1.192e-02, 0.000e+00, 2.494e-06, 2.040e-03, 9.652e-06 }, // PM + PM (non-exhaust)
+        { 2.217e+03, 5.485e+02, 2.057e+03, 0.000e+00, 0.000e+00, 1.267e+03, 0.000e+00 }, // CO2(total)
+        { 1.647e+00, 4.075e-01, 1.528e+00, 0.000e+00, 0.000e+00, 9.410e-01, 0.000e+00 }, // CO
+        { 7.772e-01, 1.923e-01, 7.209e-01, 0.000e+00, 0.000e+00, 4.440e-01, 0.000e+00 }, // HC
+        { 7.135e+02, 1.765e+02, 6.618e+02, 0.000e+00, 0.000e+00, 4.076e+02, 0.000e+00 }, // FC
+        { 2.996e+00, 7.411e-01, 2.779e+00, 0.000e+00, 0.000e+00, 1.711e+00, 0.000e+00 }, // NOx
+        { 1.422e+00, 1.049e-02, 1.192e-02, 0.000e+00, 1.163e-04, 7.342e-03, 1.251e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // UBus_Midi_lt15t_CNG_Euro-VI
-        { 2.338e+03, 1.440e+02, 2.493e+03, 0.000e+00, 0.000e+00, 3.298e+02, 0.000e+00 }, // CO2(total)
-        { 1.514e+00, 9.324e-02, 1.615e+00, 0.000e+00, 0.000e+00, 2.136e-01, 0.000e+00 }, // CO
-        { 4.011e-01, 2.471e-02, 4.279e-01, 0.000e+00, 0.000e+00, 5.659e-02, 0.000e+00 }, // HC
-        { 7.522e+02, 4.633e+01, 8.023e+02, 0.000e+00, 0.000e+00, 1.061e+02, 0.000e+00 }, // FC
-        { 1.005e+00, 6.190e-02, 1.072e+00, 0.000e+00, 0.000e+00, 1.418e-01, 0.000e+00 }, // NOx
-        { 1.416e+00, 2.139e-03, 1.445e-02, 0.000e+00, 2.609e-06, 1.911e-03, 6.766e-06 }, // PM + PM (non-exhaust)
+        { 2.338e+03, 5.183e+02, 2.493e+03, 0.000e+00, 0.000e+00, 1.187e+03, 0.000e+00 }, // CO2(total)
+        { 1.514e+00, 3.357e-01, 1.615e+00, 0.000e+00, 0.000e+00, 7.689e-01, 0.000e+00 }, // CO
+        { 4.011e-01, 8.894e-02, 4.279e-01, 0.000e+00, 0.000e+00, 2.037e-01, 0.000e+00 }, // HC
+        { 7.522e+02, 1.668e+02, 8.023e+02, 0.000e+00, 0.000e+00, 3.820e+02, 0.000e+00 }, // FC
+        { 1.005e+00, 2.228e-01, 1.072e+00, 0.000e+00, 0.000e+00, 5.104e-01, 0.000e+00 }, // NOx
+        { 1.416e+00, 7.700e-03, 1.445e-02, 0.000e+00, 1.217e-04, 6.881e-03, 8.769e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // UBus_Std_gt15-18t_CNG_Euro-II
-        { 3.284e+03, 2.070e+02, 1.504e+03, 0.000e+00, 0.000e+00, 5.194e+02, 0.000e+00 }, // CO2(total)
-        { 2.034e+01, 0.000e+00, 1.402e+01, 5.234e-04, 0.000e+00, 0.000e+00, 3.497e-03 }, // CO
-        { 4.454e+01, 0.000e+00, 1.124e+01, 4.589e-03, 1.401e-05, 0.000e+00, 1.693e-02 }, // HC
-        { 1.057e+03, 6.661e+01, 4.840e+02, 0.000e+00, 0.000e+00, 1.671e+02, 0.000e+00 }, // FC
-        { 7.496e+01, 1.835e+00, 5.979e+01, 0.000e+00, 0.000e+00, 5.571e+00, 0.000e+00 }, // NOx
-        { 1.596e+00, 2.833e-03, 1.130e-01, 1.045e-05, 2.561e-06, 1.048e-04, 9.083e-05 }, // PM + PM (non-exhaust)
+        { 3.284e+03, 7.452e+02, 1.504e+03, 0.000e+00, 0.000e+00, 1.870e+03, 0.000e+00 }, // CO2(total)
+        { 2.034e+01, 0.000e+00, 1.402e+01, 6.784e-03, 0.000e+00, 0.000e+00, 4.533e-02 }, // CO
+        { 4.454e+01, 0.000e+00, 1.124e+01, 5.948e-02, 6.536e-04, 0.000e+00, 2.194e-01 }, // HC
+        { 1.057e+03, 2.398e+02, 4.840e+02, 0.000e+00, 0.000e+00, 6.017e+02, 0.000e+00 }, // FC
+        { 7.496e+01, 6.606e+00, 5.979e+01, 0.000e+00, 0.000e+00, 2.006e+01, 0.000e+00 }, // NOx
+        { 1.596e+00, 1.020e-02, 1.130e-01, 1.354e-04, 1.195e-04, 3.773e-04, 1.177e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // UBus_Std_gt15-18t_CNG_Euro-III
-        { 3.351e+03, 2.112e+02, 1.547e+03, 0.000e+00, 0.000e+00, 5.322e+02, 0.000e+00 }, // CO2(total)
-        { 2.280e+01, 0.000e+00, 7.828e+00, 0.000e+00, 6.617e-06, 0.000e+00, 3.666e-03 }, // CO
-        { 4.017e+01, 0.000e+00, 5.445e+00, 0.000e+00, 4.574e-05, 0.000e+00, 1.434e-02 }, // HC
-        { 1.078e+03, 6.795e+01, 4.979e+02, 0.000e+00, 0.000e+00, 1.712e+02, 0.000e+00 }, // FC
-        { 6.513e+01, 1.388e+00, 3.156e+01, 0.000e+00, 0.000e+00, 4.862e+00, 0.000e+00 }, // NOx
-        { 1.579e+00, 2.757e-03, 2.487e-02, 1.173e-05, 2.489e-06, 0.000e+00, 8.008e-05 }, // PM + PM (non-exhaust)
+        { 3.351e+03, 7.602e+02, 1.547e+03, 0.000e+00, 0.000e+00, 1.916e+03, 0.000e+00 }, // CO2(total)
+        { 2.280e+01, 0.000e+00, 7.828e+00, 0.000e+00, 3.087e-04, 0.000e+00, 4.751e-02 }, // CO
+        { 4.017e+01, 0.000e+00, 5.445e+00, 0.000e+00, 2.134e-03, 0.000e+00, 1.858e-01 }, // HC
+        { 1.078e+03, 2.446e+02, 4.979e+02, 0.000e+00, 0.000e+00, 6.165e+02, 0.000e+00 }, // FC
+        { 6.513e+01, 4.996e+00, 3.156e+01, 0.000e+00, 0.000e+00, 1.750e+01, 0.000e+00 }, // NOx
+        { 1.579e+00, 9.927e-03, 2.487e-02, 1.520e-04, 1.161e-04, 0.000e+00, 1.038e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // UBus_Std_gt15-18t_CNG_Euro-IV
-        { 2.846e+03, 2.155e+02, 1.858e+03, 0.000e+00, 0.000e+00, 5.355e+02, 0.000e+00 }, // CO2(total)
-        { 1.217e+01, 7.516e-02, 1.583e+01, 0.000e+00, 0.000e+00, 1.651e-01, 0.000e+00 }, // CO
-        { 4.383e+00, 7.058e-02, 6.951e+00, 0.000e+00, 9.971e-06, 6.665e-02, 3.856e-04 }, // HC
-        { 9.159e+02, 6.934e+01, 5.979e+02, 0.000e+00, 0.000e+00, 1.723e+02, 0.000e+00 }, // FC
-        { 6.340e+01, 7.148e-01, 8.088e+01, 0.000e+00, 0.000e+00, 2.295e+00, 0.000e+00 }, // NOx
-        { 1.476e+00, 1.756e-03, 4.505e-02, 0.000e+00, 2.544e-06, 0.000e+00, 1.899e-05 }, // PM + PM (non-exhaust)
+        { 2.846e+03, 7.758e+02, 1.858e+03, 0.000e+00, 0.000e+00, 1.928e+03, 0.000e+00 }, // CO2(total)
+        { 1.217e+01, 2.706e-01, 1.583e+01, 0.000e+00, 0.000e+00, 5.944e-01, 0.000e+00 }, // CO
+        { 4.383e+00, 2.541e-01, 6.951e+00, 0.000e+00, 4.652e-04, 2.399e-01, 4.997e-03 }, // HC
+        { 9.159e+02, 2.496e+02, 5.979e+02, 0.000e+00, 0.000e+00, 6.204e+02, 0.000e+00 }, // FC
+        { 6.340e+01, 2.573e+00, 8.088e+01, 0.000e+00, 0.000e+00, 8.264e+00, 0.000e+00 }, // NOx
+        { 1.476e+00, 6.321e-03, 4.505e-02, 0.000e+00, 1.187e-04, 0.000e+00, 2.461e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // UBus_Std_gt15-18t_CNG_Euro-V
-        { 2.942e+03, 2.020e+02, 2.407e+03, 0.000e+00, 0.000e+00, 4.996e+02, 0.000e+00 }, // CO2(total)
-        { 2.186e+00, 1.501e-01, 1.788e+00, 0.000e+00, 0.000e+00, 3.711e-01, 0.000e+00 }, // CO
-        { 1.031e+00, 7.080e-02, 8.435e-01, 0.000e+00, 0.000e+00, 1.751e-01, 0.000e+00 }, // HC
-        { 9.467e+02, 6.500e+01, 7.744e+02, 0.000e+00, 0.000e+00, 1.608e+02, 0.000e+00 }, // FC
-        { 3.975e+00, 2.729e-01, 3.251e+00, 0.000e+00, 0.000e+00, 6.750e-01, 0.000e+00 }, // NOx
-        { 1.475e+00, 1.171e-03, 1.395e-02, 0.000e+00, 2.672e-06, 2.896e-03, 2.948e-06 }, // PM + PM (non-exhaust)
+        { 2.942e+03, 7.272e+02, 2.407e+03, 0.000e+00, 0.000e+00, 1.799e+03, 0.000e+00 }, // CO2(total)
+        { 2.186e+00, 5.402e-01, 1.788e+00, 0.000e+00, 0.000e+00, 1.336e+00, 0.000e+00 }, // CO
+        { 1.031e+00, 2.549e-01, 8.435e-01, 0.000e+00, 0.000e+00, 6.304e-01, 0.000e+00 }, // HC
+        { 9.467e+02, 2.340e+02, 7.744e+02, 0.000e+00, 0.000e+00, 5.787e+02, 0.000e+00 }, // FC
+        { 3.975e+00, 9.824e-01, 3.251e+00, 0.000e+00, 0.000e+00, 2.430e+00, 0.000e+00 }, // NOx
+        { 1.475e+00, 4.215e-03, 1.395e-02, 0.000e+00, 1.247e-04, 1.043e-02, 3.820e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // UBus_Std_gt15-18t_CNG_Euro-VI
-        { 3.001e+03, 1.973e+02, 2.739e+03, 0.000e+00, 0.000e+00, 4.942e+02, 0.000e+00 }, // CO2(total)
-        { 1.944e+00, 1.278e-01, 1.774e+00, 0.000e+00, 0.000e+00, 3.201e-01, 0.000e+00 }, // CO
-        { 5.151e-01, 3.386e-02, 4.701e-01, 0.000e+00, 0.000e+00, 8.481e-02, 0.000e+00 }, // HC
-        { 9.657e+02, 6.349e+01, 8.815e+02, 0.000e+00, 0.000e+00, 1.590e+02, 0.000e+00 }, // FC
-        { 1.290e+00, 8.483e-02, 1.178e+00, 0.000e+00, 0.000e+00, 2.125e-01, 0.000e+00 }, // NOx
-        { 1.477e+00, 1.144e-03, 1.588e-02, 0.000e+00, 2.663e-06, 2.865e-03, 1.583e-06 }, // PM + PM (non-exhaust)
+        { 3.001e+03, 7.103e+02, 2.739e+03, 0.000e+00, 0.000e+00, 1.779e+03, 0.000e+00 }, // CO2(total)
+        { 1.944e+00, 4.600e-01, 1.774e+00, 0.000e+00, 0.000e+00, 1.152e+00, 0.000e+00 }, // CO
+        { 5.151e-01, 1.219e-01, 4.701e-01, 0.000e+00, 0.000e+00, 3.053e-01, 0.000e+00 }, // HC
+        { 9.657e+02, 2.286e+02, 8.815e+02, 0.000e+00, 0.000e+00, 5.725e+02, 0.000e+00 }, // FC
+        { 1.290e+00, 3.054e-01, 1.178e+00, 0.000e+00, 0.000e+00, 7.649e-01, 0.000e+00 }, // NOx
+        { 1.477e+00, 4.117e-03, 1.588e-02, 0.000e+00, 1.242e-04, 1.031e-02, 2.051e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // UBus_Artic_gt18t_CNG_Euro-II
-        { 5.808e+03, 2.441e+02, 5.223e+03, 0.000e+00, 0.000e+00, 6.557e+02, 0.000e+00 }, // CO2(total)
-        { 2.584e+01, 2.193e-03, 1.681e+01, 0.000e+00, 0.000e+00, 2.277e-01, 2.183e-03 }, // CO
-        { 5.667e+01, 0.000e+00, 9.630e+00, 7.550e-03, 0.000e+00, 0.000e+00, 2.912e-02 }, // HC
-        { 1.869e+03, 7.856e+01, 1.681e+03, 0.000e+00, 0.000e+00, 2.110e+02, 0.000e+00 }, // FC
-        { 1.191e+02, 1.985e+00, 1.250e+02, 0.000e+00, 0.000e+00, 6.812e+00, 0.000e+00 }, // NOx
-        { 1.632e+00, 2.871e-03, 1.105e-01, 0.000e+00, 2.892e-06, 3.224e-03, 8.703e-05 }, // PM + PM (non-exhaust)
+        { 5.808e+03, 8.789e+02, 5.223e+03, 0.000e+00, 0.000e+00, 2.361e+03, 0.000e+00 }, // CO2(total)
+        { 2.584e+01, 7.895e-03, 1.681e+01, 0.000e+00, 0.000e+00, 8.198e-01, 2.829e-02 }, // CO
+        { 5.667e+01, 0.000e+00, 9.630e+00, 9.785e-02, 0.000e+00, 0.000e+00, 3.773e-01 }, // HC
+        { 1.869e+03, 2.828e+02, 1.681e+03, 0.000e+00, 0.000e+00, 7.596e+02, 0.000e+00 }, // FC
+        { 1.191e+02, 7.147e+00, 1.250e+02, 0.000e+00, 0.000e+00, 2.452e+01, 0.000e+00 }, // NOx
+        { 1.632e+00, 1.033e-02, 1.105e-01, 0.000e+00, 1.349e-04, 1.161e-02, 1.128e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // UBus_Artic_gt18t_CNG_Euro-III
-        { 5.957e+03, 2.441e+02, 5.749e+03, 0.000e+00, 0.000e+00, 6.359e+02, 0.000e+00 }, // CO2(total)
-        { 3.119e+01, 0.000e+00, 2.428e+01, 0.000e+00, 0.000e+00, 3.082e-01, 0.000e+00 }, // CO
-        { 5.093e+01, 0.000e+00, 5.976e+00, 0.000e+00, 6.360e-05, 0.000e+00, 2.347e-02 }, // HC
-        { 1.917e+03, 7.853e+01, 1.850e+03, 0.000e+00, 0.000e+00, 2.046e+02, 0.000e+00 }, // FC
-        { 1.066e+02, 1.365e+00, 1.086e+02, 0.000e+00, 0.000e+00, 5.277e+00, 0.000e+00 }, // NOx
-        { 1.578e+00, 2.909e-03, 0.000e+00, 0.000e+00, 2.852e-06, 3.265e-03, 7.654e-05 }, // PM + PM (non-exhaust)
+        { 5.957e+03, 8.786e+02, 5.749e+03, 0.000e+00, 0.000e+00, 2.289e+03, 0.000e+00 }, // CO2(total)
+        { 3.119e+01, 0.000e+00, 2.428e+01, 0.000e+00, 0.000e+00, 1.110e+00, 0.000e+00 }, // CO
+        { 5.093e+01, 0.000e+00, 5.976e+00, 0.000e+00, 2.967e-03, 0.000e+00, 3.041e-01 }, // HC
+        { 1.917e+03, 2.827e+02, 1.850e+03, 0.000e+00, 0.000e+00, 7.366e+02, 0.000e+00 }, // FC
+        { 1.066e+02, 4.913e+00, 1.086e+02, 0.000e+00, 0.000e+00, 1.900e+01, 0.000e+00 }, // NOx
+        { 1.578e+00, 1.047e-02, 0.000e+00, 0.000e+00, 1.331e-04, 1.175e-02, 9.920e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // UBus_Artic_gt18t_CNG_Euro-IV
-        { 5.483e+03, 2.469e+02, 6.985e+03, 0.000e+00, 0.000e+00, 6.224e+02, 0.000e+00 }, // CO2(total)
-        { 1.599e+01, 9.443e-02, 2.130e+01, 0.000e+00, 0.000e+00, 2.365e-01, 0.000e+00 }, // CO
-        { 4.419e+00, 1.915e-01, 8.991e+00, 0.000e+00, 0.000e+00, 2.051e-01, 0.000e+00 }, // HC
-        { 1.764e+03, 7.946e+01, 2.248e+03, 0.000e+00, 0.000e+00, 2.003e+02, 0.000e+00 }, // FC
-        { 1.059e+02, 6.103e-01, 1.872e+02, 0.000e+00, 0.000e+00, 2.102e+00, 0.000e+00 }, // NOx
-        { 1.469e+00, 6.668e-04, 5.687e-02, 0.000e+00, 2.882e-06, 1.050e-03, 1.722e-05 }, // PM + PM (non-exhaust)
+        { 5.483e+03, 8.890e+02, 6.985e+03, 0.000e+00, 0.000e+00, 2.241e+03, 0.000e+00 }, // CO2(total)
+        { 1.599e+01, 3.399e-01, 2.130e+01, 0.000e+00, 0.000e+00, 8.514e-01, 0.000e+00 }, // CO
+        { 4.419e+00, 6.892e-01, 8.991e+00, 0.000e+00, 0.000e+00, 7.383e-01, 0.000e+00 }, // HC
+        { 1.764e+03, 2.860e+02, 2.248e+03, 0.000e+00, 0.000e+00, 7.209e+02, 0.000e+00 }, // FC
+        { 1.059e+02, 2.197e+00, 1.872e+02, 0.000e+00, 0.000e+00, 7.567e+00, 0.000e+00 }, // NOx
+        { 1.469e+00, 2.401e-03, 5.687e-02, 0.000e+00, 1.344e-04, 3.782e-03, 2.231e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // UBus_Artic_gt18t_CNG_Euro-V
-        { 5.219e+03, 2.455e+02, 6.599e+03, 0.000e+00, 0.000e+00, 6.192e+02, 0.000e+00 }, // CO2(total)
-        { 3.877e+00, 1.824e-01, 4.903e+00, 0.000e+00, 0.000e+00, 4.600e-01, 0.000e+00 }, // CO
-        { 1.829e+00, 8.607e-02, 2.313e+00, 0.000e+00, 0.000e+00, 2.171e-01, 0.000e+00 }, // HC
-        { 1.679e+03, 7.901e+01, 2.123e+03, 0.000e+00, 0.000e+00, 1.993e+02, 0.000e+00 }, // FC
-        { 7.051e+00, 3.317e-01, 8.916e+00, 0.000e+00, 0.000e+00, 8.366e-01, 0.000e+00 }, // NOx
-        { 1.463e+00, 1.423e-03, 3.825e-02, 0.000e+00, 2.791e-06, 3.589e-03, 1.096e-05 }, // PM + PM (non-exhaust)
+        { 5.219e+03, 8.839e+02, 6.599e+03, 0.000e+00, 0.000e+00, 2.229e+03, 0.000e+00 }, // CO2(total)
+        { 3.877e+00, 6.567e-01, 4.903e+00, 0.000e+00, 0.000e+00, 1.656e+00, 0.000e+00 }, // CO
+        { 1.829e+00, 3.098e-01, 2.313e+00, 0.000e+00, 0.000e+00, 7.814e-01, 0.000e+00 }, // HC
+        { 1.679e+03, 2.844e+02, 2.123e+03, 0.000e+00, 0.000e+00, 7.173e+02, 0.000e+00 }, // FC
+        { 7.051e+00, 1.194e+00, 8.916e+00, 0.000e+00, 0.000e+00, 3.012e+00, 0.000e+00 }, // NOx
+        { 1.463e+00, 5.124e-03, 3.825e-02, 0.000e+00, 1.302e-04, 1.292e-02, 1.420e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // UBus_Artic_gt18t_CNG_Euro-VI
-        { 5.434e+03, 2.360e+02, 6.996e+03, 0.000e+00, 0.000e+00, 6.127e+02, 0.000e+00 }, // CO2(total)
-        { 3.519e+00, 1.528e-01, 4.531e+00, 0.000e+00, 0.000e+00, 3.968e-01, 0.000e+00 }, // CO
-        { 9.325e-01, 4.050e-02, 1.201e+00, 0.000e+00, 0.000e+00, 1.051e-01, 0.000e+00 }, // HC
-        { 1.748e+03, 7.594e+01, 2.251e+03, 0.000e+00, 0.000e+00, 1.971e+02, 0.000e+00 }, // FC
-        { 2.336e+00, 1.015e-01, 3.008e+00, 0.000e+00, 0.000e+00, 2.634e-01, 0.000e+00 }, // NOx
-        { 1.468e+00, 1.452e-03, 4.056e-02, 0.000e+00, 2.723e-06, 3.551e-03, 6.783e-06 }, // PM + PM (non-exhaust)
+        { 5.434e+03, 8.496e+02, 6.996e+03, 0.000e+00, 0.000e+00, 2.206e+03, 0.000e+00 }, // CO2(total)
+        { 3.519e+00, 5.502e-01, 4.531e+00, 0.000e+00, 0.000e+00, 1.428e+00, 0.000e+00 }, // CO
+        { 9.325e-01, 1.458e-01, 1.201e+00, 0.000e+00, 0.000e+00, 3.785e-01, 0.000e+00 }, // HC
+        { 1.748e+03, 2.734e+02, 2.251e+03, 0.000e+00, 0.000e+00, 7.097e+02, 0.000e+00 }, // FC
+        { 2.336e+00, 3.653e-01, 3.008e+00, 0.000e+00, 0.000e+00, 9.483e-01, 0.000e+00 }, // NOx
+        { 1.468e+00, 5.226e-03, 4.056e-02, 0.000e+00, 1.271e-04, 1.279e-02, 8.791e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // UBus_Midi_lt15t_Ethanol_Euro-II
-        { 3.875e+03, 2.267e+02, 1.095e+03, 0.000e+00, 0.000e+00, 5.595e+02, 0.000e+00 }, // CO2(total)
-        { 1.535e+01, 0.000e+00, 1.597e+01, 0.000e+00, 0.000e+00, 8.103e-02, 0.000e+00 }, // CO
-        { 1.806e+01, 2.958e-02, 0.000e+00, 2.383e-03, 0.000e+00, 2.912e-01, 4.001e-03 }, // HC
-        { 2.011e+03, 1.176e+02, 5.679e+02, 0.000e+00, 0.000e+00, 2.903e+02, 0.000e+00 }, // FC
-        { 2.226e+01, 1.073e+00, 9.420e+00, 0.000e+00, 0.000e+00, 2.649e+00, 0.000e+00 }, // NOx
-        { 2.154e+00, 4.611e-03, 2.550e-01, 0.000e+00, 2.628e-06, 1.693e-02, 3.906e-06 }, // PM + PM (non-exhaust)
+        { 3.875e+03, 8.163e+02, 1.095e+03, 0.000e+00, 0.000e+00, 2.014e+03, 0.000e+00 }, // CO2(total)
+        { 1.535e+01, 0.000e+00, 1.597e+01, 0.000e+00, 0.000e+00, 2.917e-01, 0.000e+00 }, // CO
+        { 1.806e+01, 1.065e-01, 0.000e+00, 3.088e-02, 0.000e+00, 1.048e+00, 5.186e-02 }, // HC
+        { 2.011e+03, 4.235e+02, 5.679e+02, 0.000e+00, 0.000e+00, 1.045e+03, 0.000e+00 }, // FC
+        { 2.226e+01, 3.862e+00, 9.420e+00, 0.000e+00, 0.000e+00, 9.535e+00, 0.000e+00 }, // NOx
+        { 2.154e+00, 1.660e-02, 2.550e-01, 0.000e+00, 1.226e-04, 6.095e-02, 5.063e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // UBus_Midi_lt15t_Ethanol_Euro-III
-        { 4.221e+03, 2.275e+02, 1.515e+03, 0.000e+00, 0.000e+00, 5.686e+02, 0.000e+00 }, // CO2(total)
-        { 1.533e+01, 0.000e+00, 1.164e+01, 0.000e+00, 0.000e+00, 6.959e-02, 0.000e+00 }, // CO
-        { 1.521e+01, 9.499e-02, 0.000e+00, 0.000e+00, 1.034e-05, 2.986e-01, 1.783e-03 }, // HC
-        { 2.190e+03, 1.180e+02, 7.861e+02, 0.000e+00, 0.000e+00, 2.950e+02, 0.000e+00 }, // FC
-        { 2.677e+01, 6.953e-01, 1.792e+01, 0.000e+00, 0.000e+00, 1.914e+00, 0.000e+00 }, // NOx
-        { 1.861e+00, 6.178e-03, 0.000e+00, 0.000e+00, 2.590e-06, 1.320e-02, 3.722e-06 }, // PM + PM (non-exhaust)
+        { 4.221e+03, 8.189e+02, 1.515e+03, 0.000e+00, 0.000e+00, 2.047e+03, 0.000e+00 }, // CO2(total)
+        { 1.533e+01, 0.000e+00, 1.164e+01, 0.000e+00, 0.000e+00, 2.505e-01, 0.000e+00 }, // CO
+        { 1.521e+01, 3.420e-01, 0.000e+00, 0.000e+00, 4.824e-04, 1.075e+00, 2.311e-02 }, // HC
+        { 2.190e+03, 4.248e+02, 7.861e+02, 0.000e+00, 0.000e+00, 1.062e+03, 0.000e+00 }, // FC
+        { 2.677e+01, 2.503e+00, 1.792e+01, 0.000e+00, 0.000e+00, 6.889e+00, 0.000e+00 }, // NOx
+        { 1.861e+00, 2.224e-02, 0.000e+00, 0.000e+00, 1.208e-04, 4.750e-02, 4.824e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // UBus_Midi_lt15t_Ethanol_Euro-IV
-        { 3.487e+03, 2.293e+02, 3.236e+03, 0.000e+00, 0.000e+00, 5.379e+02, 0.000e+00 }, // CO2(total)
-        { 6.644e+00, 4.383e-02, 8.091e+00, 0.000e+00, 0.000e+00, 1.381e-01, 0.000e+00 }, // CO
-        { 2.386e+00, 4.549e-02, 3.744e+00, 0.000e+00, 0.000e+00, 8.154e-02, 0.000e+00 }, // HC
-        { 1.809e+03, 1.190e+02, 1.679e+03, 0.000e+00, 0.000e+00, 2.791e+02, 0.000e+00 }, // FC
-        { 3.129e+01, 3.516e-01, 4.830e+01, 0.000e+00, 0.000e+00, 1.002e+00, 0.000e+00 }, // NOx
-        { 1.548e+00, 1.553e-03, 1.844e-01, 0.000e+00, 2.619e-06, 1.933e-03, 0.000e+00 }, // PM + PM (non-exhaust)
+        { 3.487e+03, 8.254e+02, 3.236e+03, 0.000e+00, 0.000e+00, 1.937e+03, 0.000e+00 }, // CO2(total)
+        { 6.644e+00, 1.578e-01, 8.091e+00, 0.000e+00, 0.000e+00, 4.973e-01, 0.000e+00 }, // CO
+        { 2.386e+00, 1.638e-01, 3.744e+00, 0.000e+00, 0.000e+00, 2.935e-01, 0.000e+00 }, // HC
+        { 1.809e+03, 4.283e+02, 1.679e+03, 0.000e+00, 0.000e+00, 1.005e+03, 0.000e+00 }, // FC
+        { 3.129e+01, 1.266e+00, 4.830e+01, 0.000e+00, 0.000e+00, 3.608e+00, 0.000e+00 }, // NOx
+        { 1.548e+00, 5.591e-03, 1.844e-01, 0.000e+00, 1.222e-04, 6.959e-03, 0.000e+00 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // UBus_Midi_lt15t_Ethanol_Euro-V
-        { 3.191e+03, 2.283e+02, 2.698e+03, 0.000e+00, 0.000e+00, 5.443e+02, 0.000e+00 }, // CO2(total)
+        { 3.191e+03, 8.220e+02, 2.698e+03, 0.000e+00, 0.000e+00, 1.959e+03, 0.000e+00 }, // CO2(total)
         { 5.666e+00, 0.000e+00, 1.040e+01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 3.375e+00, 5.343e-02, 1.867e+00, 0.000e+00, 1.317e-06, 1.490e-01, 0.000e+00 }, // HC
-        { 1.655e+03, 1.185e+02, 1.400e+03, 0.000e+00, 0.000e+00, 2.824e+02, 0.000e+00 }, // FC
-        { 2.445e+01, 1.696e-01, 3.585e+01, 0.000e+00, 0.000e+00, 4.905e-01, 0.000e+00 }, // NOx
-        { 1.426e+00, 2.056e-03, 6.060e-03, 2.665e-05, 2.618e-06, 3.544e-03, 3.981e-05 }, // PM + PM (non-exhaust)
+        { 3.375e+00, 1.924e-01, 1.867e+00, 0.000e+00, 6.145e-05, 5.364e-01, 0.000e+00 }, // HC
+        { 1.655e+03, 4.265e+02, 1.400e+03, 0.000e+00, 0.000e+00, 1.017e+03, 0.000e+00 }, // FC
+        { 2.445e+01, 6.105e-01, 3.585e+01, 0.000e+00, 0.000e+00, 1.766e+00, 0.000e+00 }, // NOx
+        { 1.426e+00, 7.402e-03, 6.060e-03, 3.454e-04, 1.221e-04, 1.276e-02, 5.159e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // UBus_Midi_lt15t_Ethanol_Euro-VI
-        { 3.445e+03, 2.130e+02, 3.783e+03, 0.000e+00, 0.000e+00, 5.076e+02, 0.000e+00 }, // CO2(total)
-        { 1.512e+00, 1.413e-03, 2.157e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 8.577e-01, 1.463e-02, 4.599e-01, 0.000e+00, 0.000e+00, 3.389e-02, 0.000e+00 }, // HC
-        { 1.787e+03, 1.105e+02, 1.963e+03, 0.000e+00, 0.000e+00, 2.633e+02, 0.000e+00 }, // FC
-        { 2.544e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 8.558e-05 }, // NOx
-        { 1.427e+00, 1.413e-03, 6.626e-02, 0.000e+00, 2.608e-06, 0.000e+00, 4.541e-06 }, // PM + PM (non-exhaust)
+        { 3.445e+03, 7.669e+02, 3.783e+03, 0.000e+00, 0.000e+00, 1.827e+03, 0.000e+00 }, // CO2(total)
+        { 1.512e+00, 5.087e-03, 2.157e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
+        { 8.577e-01, 5.267e-02, 4.599e-01, 0.000e+00, 0.000e+00, 1.220e-01, 0.000e+00 }, // HC
+        { 1.787e+03, 3.979e+02, 1.963e+03, 0.000e+00, 0.000e+00, 9.480e+02, 0.000e+00 }, // FC
+        { 2.544e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.109e-03 }, // NOx
+        { 1.427e+00, 5.087e-03, 6.626e-02, 0.000e+00, 1.217e-04, 0.000e+00, 5.885e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // UBus_Std_gt15-18t_Ethanol_Euro-II
-        { 5.388e+03, 3.396e+02, 2.468e+03, 0.000e+00, 0.000e+00, 8.521e+02, 0.000e+00 }, // CO2(total)
-        { 1.695e+01, 0.000e+00, 1.169e+01, 4.362e-04, 0.000e+00, 0.000e+00, 2.914e-03 }, // CO
-        { 3.619e+01, 0.000e+00, 9.131e+00, 3.729e-03, 1.138e-05, 0.000e+00, 1.375e-02 }, // HC
-        { 2.795e+03, 1.762e+02, 1.280e+03, 0.000e+00, 0.000e+00, 4.421e+02, 0.000e+00 }, // FC
-        { 4.901e+01, 1.200e+00, 3.909e+01, 0.000e+00, 0.000e+00, 3.643e+00, 0.000e+00 }, // NOx
-        { 2.198e+00, 8.873e-03, 5.650e-01, 5.224e-05, 2.561e-06, 5.240e-04, 3.868e-04 }, // PM + PM (non-exhaust)
+        { 5.388e+03, 1.223e+03, 2.468e+03, 0.000e+00, 0.000e+00, 3.068e+03, 0.000e+00 }, // CO2(total)
+        { 1.695e+01, 0.000e+00, 1.169e+01, 5.653e-03, 0.000e+00, 0.000e+00, 3.777e-02 }, // CO
+        { 3.619e+01, 0.000e+00, 9.131e+00, 4.833e-02, 5.311e-04, 0.000e+00, 1.782e-01 }, // HC
+        { 2.795e+03, 6.343e+02, 1.280e+03, 0.000e+00, 0.000e+00, 1.592e+03, 0.000e+00 }, // FC
+        { 4.901e+01, 4.319e+00, 3.909e+01, 0.000e+00, 0.000e+00, 1.311e+01, 0.000e+00 }, // NOx
+        { 2.198e+00, 3.194e-02, 5.650e-01, 6.771e-04, 1.195e-04, 1.886e-03, 5.012e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // UBus_Std_gt15-18t_Ethanol_Euro-III
-        { 5.498e+03, 3.464e+02, 2.539e+03, 0.000e+00, 0.000e+00, 8.730e+02, 0.000e+00 }, // CO2(total)
-        { 1.900e+01, 0.000e+00, 6.523e+00, 0.000e+00, 5.514e-06, 0.000e+00, 3.055e-03 }, // CO
-        { 3.264e+01, 0.000e+00, 4.424e+00, 0.000e+00, 3.716e-05, 0.000e+00, 1.165e-02 }, // HC
-        { 2.852e+03, 1.797e+02, 1.317e+03, 0.000e+00, 0.000e+00, 4.530e+02, 0.000e+00 }, // FC
-        { 4.258e+01, 9.073e-01, 2.064e+01, 0.000e+00, 0.000e+00, 3.179e+00, 0.000e+00 }, // NOx
-        { 2.130e+00, 7.396e-03, 1.243e-01, 5.864e-05, 2.489e-06, 0.000e+00, 3.561e-04 }, // PM + PM (non-exhaust)
+        { 5.498e+03, 1.247e+03, 2.539e+03, 0.000e+00, 0.000e+00, 3.143e+03, 0.000e+00 }, // CO2(total)
+        { 1.900e+01, 0.000e+00, 6.523e+00, 0.000e+00, 2.573e-04, 0.000e+00, 3.959e-02 }, // CO
+        { 3.264e+01, 0.000e+00, 4.424e+00, 0.000e+00, 1.734e-03, 0.000e+00, 1.510e-01 }, // HC
+        { 2.852e+03, 6.470e+02, 1.317e+03, 0.000e+00, 0.000e+00, 1.631e+03, 0.000e+00 }, // FC
+        { 4.258e+01, 3.266e+00, 2.064e+01, 0.000e+00, 0.000e+00, 1.144e+01, 0.000e+00 }, // NOx
+        { 2.130e+00, 2.663e-02, 1.243e-01, 7.600e-04, 1.161e-04, 0.000e+00, 4.615e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // UBus_Std_gt15-18t_Ethanol_Euro-IV
-        { 4.670e+03, 3.535e+02, 3.048e+03, 0.000e+00, 0.000e+00, 8.786e+02, 0.000e+00 }, // CO2(total)
-        { 1.014e+01, 6.263e-02, 1.319e+01, 0.000e+00, 0.000e+00, 1.376e-01, 0.000e+00 }, // CO
-        { 3.561e+00, 5.735e-02, 5.647e+00, 0.000e+00, 8.102e-06, 5.415e-02, 3.133e-04 }, // HC
-        { 2.423e+03, 1.834e+02, 1.582e+03, 0.000e+00, 0.000e+00, 4.558e+02, 0.000e+00 }, // FC
-        { 4.146e+01, 4.673e-01, 5.288e+01, 0.000e+00, 0.000e+00, 1.501e+00, 0.000e+00 }, // NOx
-        { 1.649e+00, 1.756e-03, 2.252e-01, 0.000e+00, 2.788e-06, 0.000e+00, 4.930e-05 }, // PM + PM (non-exhaust)
+        { 4.670e+03, 1.273e+03, 3.048e+03, 0.000e+00, 0.000e+00, 3.163e+03, 0.000e+00 }, // CO2(total)
+        { 1.014e+01, 2.255e-01, 1.319e+01, 0.000e+00, 0.000e+00, 4.954e-01, 0.000e+00 }, // CO
+        { 3.561e+00, 2.065e-01, 5.647e+00, 0.000e+00, 3.780e-04, 1.949e-01, 4.060e-03 }, // HC
+        { 2.423e+03, 6.603e+02, 1.582e+03, 0.000e+00, 0.000e+00, 1.641e+03, 0.000e+00 }, // FC
+        { 4.146e+01, 1.682e+00, 5.288e+01, 0.000e+00, 0.000e+00, 5.403e+00, 0.000e+00 }, // NOx
+        { 1.649e+00, 6.321e-03, 2.252e-01, 0.000e+00, 1.301e-04, 0.000e+00, 6.390e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // UBus_Std_gt15-18t_Ethanol_Euro-V
-        { 4.706e+03, 3.313e+02, 3.966e+03, 0.000e+00, 0.000e+00, 8.189e+02, 0.000e+00 }, // CO2(total)
+        { 4.706e+03, 1.193e+03, 3.966e+03, 0.000e+00, 0.000e+00, 2.948e+03, 0.000e+00 }, // CO2(total)
         { 8.872e+00, 0.000e+00, 1.117e+01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 5.613e+00, 8.956e-02, 4.105e+00, 0.000e+00, 7.163e-06, 2.157e-01, 0.000e+00 }, // HC
-        { 2.442e+03, 1.719e+02, 2.058e+03, 0.000e+00, 0.000e+00, 4.249e+02, 0.000e+00 }, // FC
-        { 3.674e+01, 3.150e-01, 6.899e+01, 0.000e+00, 0.000e+00, 4.830e-01, 0.000e+00 }, // NOx
-        { 1.525e+00, 1.501e-03, 9.456e-02, 4.180e-05, 2.631e-06, 0.000e+00, 1.046e-04 }, // PM + PM (non-exhaust)
+        { 5.613e+00, 3.224e-01, 4.105e+00, 0.000e+00, 3.342e-04, 7.764e-01, 0.000e+00 }, // HC
+        { 2.442e+03, 6.188e+02, 2.058e+03, 0.000e+00, 0.000e+00, 1.530e+03, 0.000e+00 }, // FC
+        { 3.674e+01, 1.134e+00, 6.899e+01, 0.000e+00, 0.000e+00, 1.739e+00, 0.000e+00 }, // NOx
+        { 1.525e+00, 5.402e-03, 9.456e-02, 5.417e-04, 1.227e-04, 0.000e+00, 1.356e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // UBus_Std_gt15-18t_Ethanol_Euro-VI
-        { 4.822e+03, 3.142e+02, 4.592e+03, 0.000e+00, 0.000e+00, 7.853e+02, 0.000e+00 }, // CO2(total)
-        { 2.079e+00, 0.000e+00, 1.816e+00, 1.084e-04, 2.609e-07, 0.000e+00, 2.105e-04 }, // CO
-        { 1.245e+00, 2.371e-02, 4.919e-01, 0.000e+00, 0.000e+00, 0.000e+00, 8.511e-04 }, // HC
-        { 2.502e+03, 1.630e+02, 2.383e+03, 0.000e+00, 0.000e+00, 4.074e+02, 0.000e+00 }, // FC
-        { 3.685e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.199e-05, 0.000e+00, 1.067e-03 }, // NOx
-        { 1.473e+00, 0.000e+00, 0.000e+00, 0.000e+00, 3.196e-06, 0.000e+00, 6.684e-05 }, // PM + PM (non-exhaust)
+        { 4.822e+03, 1.131e+03, 4.592e+03, 0.000e+00, 0.000e+00, 2.827e+03, 0.000e+00 }, // CO2(total)
+        { 2.079e+00, 0.000e+00, 1.816e+00, 1.405e-03, 1.217e-05, 0.000e+00, 2.728e-03 }, // CO
+        { 1.245e+00, 8.534e-02, 4.919e-01, 0.000e+00, 0.000e+00, 0.000e+00, 1.103e-02 }, // HC
+        { 2.502e+03, 5.869e+02, 2.383e+03, 0.000e+00, 0.000e+00, 1.467e+03, 0.000e+00 }, // FC
+        { 3.685e+00, 0.000e+00, 0.000e+00, 0.000e+00, 5.595e-04, 0.000e+00, 1.382e-02 }, // NOx
+        { 1.473e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.491e-04, 0.000e+00, 8.662e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // UBus_Artic_gt18t_Ethanol_Euro-II
-        { 9.528e+03, 4.005e+02, 8.569e+03, 0.000e+00, 0.000e+00, 1.076e+03, 0.000e+00 }, // CO2(total)
-        { 2.153e+01, 1.827e-03, 1.401e+01, 0.000e+00, 0.000e+00, 1.898e-01, 1.819e-03 }, // CO
-        { 4.604e+01, 0.000e+00, 7.824e+00, 6.134e-03, 0.000e+00, 0.000e+00, 2.366e-02 }, // HC
-        { 4.943e+03, 2.078e+02, 4.446e+03, 0.000e+00, 0.000e+00, 5.581e+02, 0.000e+00 }, // FC
-        { 7.785e+01, 1.298e+00, 8.174e+01, 0.000e+00, 0.000e+00, 4.454e+00, 0.000e+00 }, // NOx
-        { 2.339e+00, 1.435e-02, 5.525e-01, 0.000e+00, 2.892e-06, 1.612e-02, 3.806e-04 }, // PM + PM (non-exhaust)
+        { 9.528e+03, 1.442e+03, 8.569e+03, 0.000e+00, 0.000e+00, 3.873e+03, 0.000e+00 }, // CO2(total)
+        { 2.153e+01, 6.579e-03, 1.401e+01, 0.000e+00, 0.000e+00, 6.831e-01, 2.357e-02 }, // CO
+        { 4.604e+01, 0.000e+00, 7.824e+00, 7.950e-02, 0.000e+00, 0.000e+00, 3.066e-01 }, // HC
+        { 4.943e+03, 7.481e+02, 4.446e+03, 0.000e+00, 0.000e+00, 2.009e+03, 0.000e+00 }, // FC
+        { 7.785e+01, 4.673e+00, 8.174e+01, 0.000e+00, 0.000e+00, 1.603e+01, 0.000e+00 }, // NOx
+        { 2.339e+00, 5.167e-02, 5.525e-01, 0.000e+00, 1.349e-04, 5.803e-02, 4.932e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // UBus_Artic_gt18t_Ethanol_Euro-III
-        { 9.773e+03, 4.004e+02, 9.431e+03, 0.000e+00, 0.000e+00, 1.043e+03, 0.000e+00 }, // CO2(total)
-        { 2.600e+01, 0.000e+00, 2.024e+01, 0.000e+00, 0.000e+00, 2.569e-01, 0.000e+00 }, // CO
-        { 4.138e+01, 0.000e+00, 4.855e+00, 0.000e+00, 5.167e-05, 0.000e+00, 1.907e-02 }, // HC
-        { 5.071e+03, 2.077e+02, 4.893e+03, 0.000e+00, 0.000e+00, 5.412e+02, 0.000e+00 }, // FC
-        { 6.970e+01, 8.922e-01, 7.100e+01, 0.000e+00, 0.000e+00, 3.450e+00, 0.000e+00 }, // NOx
-        { 2.191e+00, 1.454e-02, 0.000e+00, 0.000e+00, 2.852e-06, 1.632e-02, 3.564e-04 }, // PM + PM (non-exhaust)
+        { 9.773e+03, 1.441e+03, 9.431e+03, 0.000e+00, 0.000e+00, 3.756e+03, 0.000e+00 }, // CO2(total)
+        { 2.600e+01, 0.000e+00, 2.024e+01, 0.000e+00, 0.000e+00, 9.247e-01, 0.000e+00 }, // CO
+        { 4.138e+01, 0.000e+00, 4.855e+00, 0.000e+00, 2.411e-03, 0.000e+00, 2.471e-01 }, // HC
+        { 5.071e+03, 7.478e+02, 4.893e+03, 0.000e+00, 0.000e+00, 1.948e+03, 0.000e+00 }, // FC
+        { 6.970e+01, 3.212e+00, 7.100e+01, 0.000e+00, 0.000e+00, 1.242e+01, 0.000e+00 }, // NOx
+        { 2.191e+00, 5.236e-02, 0.000e+00, 0.000e+00, 1.331e-04, 5.876e-02, 4.618e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // UBus_Artic_gt18t_Ethanol_Euro-IV
-        { 8.995e+03, 4.051e+02, 1.146e+04, 0.000e+00, 0.000e+00, 1.021e+03, 0.000e+00 }, // CO2(total)
-        { 1.332e+01, 7.869e-02, 1.775e+01, 0.000e+00, 0.000e+00, 1.971e-01, 0.000e+00 }, // CO
-        { 3.591e+00, 1.556e-01, 7.305e+00, 0.000e+00, 0.000e+00, 1.666e-01, 0.000e+00 }, // HC
-        { 4.667e+03, 2.102e+02, 5.945e+03, 0.000e+00, 0.000e+00, 5.297e+02, 0.000e+00 }, // FC
-        { 6.926e+01, 3.990e-01, 1.224e+02, 0.000e+00, 0.000e+00, 1.374e+00, 0.000e+00 }, // NOx
-        { 1.653e+00, 3.334e-03, 2.843e-01, 0.000e+00, 2.940e-06, 5.252e-03, 3.597e-05 }, // PM + PM (non-exhaust)
+        { 8.995e+03, 1.458e+03, 1.146e+04, 0.000e+00, 0.000e+00, 3.676e+03, 0.000e+00 }, // CO2(total)
+        { 1.332e+01, 2.833e-01, 1.775e+01, 0.000e+00, 0.000e+00, 7.095e-01, 0.000e+00 }, // CO
+        { 3.591e+00, 5.600e-01, 7.305e+00, 0.000e+00, 0.000e+00, 5.999e-01, 0.000e+00 }, // HC
+        { 4.667e+03, 7.566e+02, 5.945e+03, 0.000e+00, 0.000e+00, 1.907e+03, 0.000e+00 }, // FC
+        { 6.926e+01, 1.437e+00, 1.224e+02, 0.000e+00, 0.000e+00, 4.948e+00, 0.000e+00 }, // NOx
+        { 1.653e+00, 1.200e-02, 2.843e-01, 0.000e+00, 1.372e-04, 1.891e-02, 4.661e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // UBus_Artic_gt18t_Ethanol_Euro-V
-        { 8.458e+03, 3.980e+02, 1.101e+04, 0.000e+00, 0.000e+00, 1.001e+03, 0.000e+00 }, // CO2(total)
+        { 8.458e+03, 1.433e+03, 1.101e+04, 0.000e+00, 0.000e+00, 3.603e+03, 0.000e+00 }, // CO2(total)
         { 1.291e+01, 0.000e+00, 1.763e+01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 7.825e+00, 9.463e-02, 5.907e+00, 0.000e+00, 1.630e-05, 2.731e-01, 0.000e+00 }, // HC
-        { 4.388e+03, 2.065e+02, 5.711e+03, 0.000e+00, 0.000e+00, 5.192e+02, 0.000e+00 }, // FC
-        { 4.906e+01, 3.598e-01, 9.059e+01, 0.000e+00, 0.000e+00, 5.607e-01, 0.000e+00 }, // NOx
-        { 1.503e+00, 4.141e-03, 1.818e-01, 0.000e+00, 3.190e-06, 0.000e+00, 1.445e-04 }, // PM + PM (non-exhaust)
+        { 7.825e+00, 3.407e-01, 5.907e+00, 0.000e+00, 7.606e-04, 9.832e-01, 0.000e+00 }, // HC
+        { 4.388e+03, 7.433e+02, 5.711e+03, 0.000e+00, 0.000e+00, 1.869e+03, 0.000e+00 }, // FC
+        { 4.906e+01, 1.295e+00, 9.059e+01, 0.000e+00, 0.000e+00, 2.019e+00, 0.000e+00 }, // NOx
+        { 1.503e+00, 1.491e-02, 1.818e-01, 0.000e+00, 1.489e-04, 0.000e+00, 1.873e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // UBus_Artic_gt18t_Ethanol_Euro-VI
-        { 8.720e+03, 3.756e+02, 1.134e+04, 0.000e+00, 0.000e+00, 9.745e+02, 0.000e+00 }, // CO2(total)
-        { 2.616e+00, 2.217e-02, 3.031e+00, 0.000e+00, 1.332e-06, 0.000e+00, 0.000e+00 }, // CO
-        { 1.976e+00, 2.941e-02, 0.000e+00, 0.000e+00, 0.000e+00, 1.132e-01, 0.000e+00 }, // HC
-        { 4.524e+03, 1.949e+02, 5.886e+03, 0.000e+00, 0.000e+00, 5.056e+02, 0.000e+00 }, // FC
-        { 4.449e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.916e-05, 0.000e+00, 2.512e-03 }, // NOx
-        { 1.432e+00, 1.793e-04, 0.000e+00, 0.000e+00, 4.068e-06, 0.000e+00, 1.935e-04 }, // PM + PM (non-exhaust)
+        { 8.720e+03, 1.352e+03, 1.134e+04, 0.000e+00, 0.000e+00, 3.508e+03, 0.000e+00 }, // CO2(total)
+        { 2.616e+00, 7.980e-02, 3.031e+00, 0.000e+00, 6.215e-05, 0.000e+00, 0.000e+00 }, // CO
+        { 1.976e+00, 1.059e-01, 0.000e+00, 0.000e+00, 0.000e+00, 4.074e-01, 0.000e+00 }, // HC
+        { 4.524e+03, 7.016e+02, 5.886e+03, 0.000e+00, 0.000e+00, 1.820e+03, 0.000e+00 }, // FC
+        { 4.449e+00, 0.000e+00, 0.000e+00, 0.000e+00, 8.939e-04, 0.000e+00, 3.256e-02 }, // NOx
+        { 1.432e+00, 6.455e-04, 0.000e+00, 0.000e+00, 1.898e-04, 0.000e+00, 2.507e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
@@ -4519,9 +4519,9 @@
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO2(total)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // HC
-        { 1.940e+02, 7.636e+00, 9.302e+01, 6.013e-02, 0.000e+00, 3.694e+01, 6.967e-02 }, // FC
+        { 1.940e+02, 2.749e+01, 9.302e+01, 7.792e-01, 0.000e+00, 1.330e+02, 9.029e-01 }, // FC
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // NOx
-        { 7.938e-01, 1.562e-02, 0.000e+00, 0.000e+00, 1.570e-06, 0.000e+00, 0.000e+00 }, // PM + PM (non-exhaust)
+        { 7.938e-01, 5.622e-02, 0.000e+00, 0.000e+00, 7.323e-05, 0.000e+00, 0.000e+00 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
@@ -4529,9 +4529,9 @@
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO2(total)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // HC
-        { 2.998e+02, 1.331e+01, 1.308e+02, 0.000e+00, 0.000e+00, 5.861e+01, 0.000e+00 }, // FC
+        { 2.998e+02, 4.793e+01, 1.308e+02, 0.000e+00, 0.000e+00, 2.110e+02, 0.000e+00 }, // FC
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // NOx
-        { 1.197e+00, 3.889e-03, 0.000e+00, 0.000e+00, 2.582e-06, 0.000e+00, 0.000e+00 }, // PM + PM (non-exhaust)
+        { 1.197e+00, 1.400e-02, 0.000e+00, 0.000e+00, 1.205e-04, 0.000e+00, 0.000e+00 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
@@ -4539,9 +4539,9 @@
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO2(total)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // HC
-        { 5.849e+02, 1.430e+01, 2.805e+02, 0.000e+00, 0.000e+00, 8.455e+01, 0.000e+00 }, // FC
+        { 5.849e+02, 5.149e+01, 2.805e+02, 0.000e+00, 0.000e+00, 3.044e+02, 0.000e+00 }, // FC
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // NOx
-        { 1.326e+00, 4.013e-03, 0.000e+00, 0.000e+00, 2.314e-06, 0.000e+00, 3.928e-07 }, // PM + PM (non-exhaust)
+        { 1.326e+00, 1.445e-02, 0.000e+00, 0.000e+00, 1.079e-04, 0.000e+00, 5.091e-06 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
@@ -4551,8 +4551,8 @@
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // HC
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // NOx
-        { 7.938e-01, 1.562e-02, 0.000e+00, 0.000e+00, 1.570e-06, 0.000e+00, 0.000e+00 }, // PM + PM (non-exhaust)
-        { 3.503e+00, 1.379e-01, 1.680e+00, 1.086e-03, 0.000e+00, 6.669e-01, 1.258e-03 }, // FC_MJ
+        { 7.938e-01, 5.622e-02, 0.000e+00, 0.000e+00, 7.323e-05, 0.000e+00, 0.000e+00 }, // PM + PM (non-exhaust)
+        { 3.503e+00, 4.964e-01, 1.680e+00, 1.407e-02, 0.000e+00, 2.401e+00, 1.630e-02 }, // FC_MJ
     },
     {
         // UBus_Electric_Std_gt15-18t
@@ -4561,8 +4561,8 @@
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // HC
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // NOx
-        { 1.197e+00, 3.889e-03, 0.000e+00, 0.000e+00, 2.582e-06, 0.000e+00, 0.000e+00 }, // PM + PM (non-exhaust)
-        { 5.412e+00, 2.404e-01, 2.362e+00, 0.000e+00, 0.000e+00, 1.058e+00, 0.000e+00 }, // FC_MJ
+        { 1.197e+00, 1.400e-02, 0.000e+00, 0.000e+00, 1.205e-04, 0.000e+00, 0.000e+00 }, // PM + PM (non-exhaust)
+        { 5.412e+00, 8.654e-01, 2.362e+00, 0.000e+00, 0.000e+00, 3.810e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // UBus_Electric_Artic_gt18t
@@ -4571,427 +4571,427 @@
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // HC
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // NOx
-        { 1.326e+00, 4.013e-03, 0.000e+00, 0.000e+00, 2.314e-06, 0.000e+00, 3.928e-07 }, // PM + PM (non-exhaust)
-        { 1.056e+01, 2.582e-01, 5.064e+00, 0.000e+00, 0.000e+00, 1.527e+00, 0.000e+00 }, // FC_MJ
+        { 1.326e+00, 1.445e-02, 0.000e+00, 0.000e+00, 1.079e-04, 0.000e+00, 5.091e-06 }, // PM + PM (non-exhaust)
+        { 1.056e+01, 9.296e-01, 5.064e+00, 0.000e+00, 0.000e+00, 5.496e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // UBus_Midi_lt15t_LNG_Euro-IV
-        { 2.125e+03, 1.398e+02, 1.972e+03, 0.000e+00, 0.000e+00, 3.279e+02, 0.000e+00 }, // CO2(total)
-        { 7.973e+00, 5.260e-02, 9.709e+00, 0.000e+00, 0.000e+00, 1.658e-01, 0.000e+00 }, // CO
-        { 2.937e+00, 5.599e-02, 4.608e+00, 0.000e+00, 0.000e+00, 1.004e-01, 0.000e+00 }, // HC
-        { 6.838e+02, 4.497e+01, 6.347e+02, 0.000e+00, 0.000e+00, 1.055e+02, 0.000e+00 }, // FC
-        { 4.786e+01, 5.378e-01, 7.386e+01, 0.000e+00, 0.000e+00, 1.533e+00, 0.000e+00 }, // NOx
-        { 1.426e+00, 1.155e-03, 3.689e-02, 0.000e+00, 2.619e-06, 3.866e-04, 0.000e+00 }, // PM + PM (non-exhaust)
+        { 2.125e+03, 5.031e+02, 1.972e+03, 0.000e+00, 0.000e+00, 1.180e+03, 0.000e+00 }, // CO2(total)
+        { 7.973e+00, 1.894e-01, 9.709e+00, 0.000e+00, 0.000e+00, 5.968e-01, 0.000e+00 }, // CO
+        { 2.937e+00, 2.016e-01, 4.608e+00, 0.000e+00, 0.000e+00, 3.613e-01, 0.000e+00 }, // HC
+        { 6.838e+02, 1.619e+02, 6.347e+02, 0.000e+00, 0.000e+00, 3.798e+02, 0.000e+00 }, // FC
+        { 4.786e+01, 1.936e+00, 7.386e+01, 0.000e+00, 0.000e+00, 5.518e+00, 0.000e+00 }, // NOx
+        { 1.426e+00, 4.157e-03, 3.689e-02, 0.000e+00, 1.222e-04, 1.392e-03, 0.000e+00 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // UBus_Midi_lt15t_LNG_Euro-V
-        { 2.217e+03, 1.524e+02, 2.057e+03, 0.000e+00, 0.000e+00, 3.518e+02, 0.000e+00 }, // CO2(total)
-        { 1.647e+00, 1.132e-01, 1.528e+00, 0.000e+00, 0.000e+00, 2.614e-01, 0.000e+00 }, // CO
-        { 7.772e-01, 5.341e-02, 7.209e-01, 0.000e+00, 0.000e+00, 1.233e-01, 0.000e+00 }, // HC
-        { 7.135e+02, 4.903e+01, 6.618e+02, 0.000e+00, 0.000e+00, 1.132e+02, 0.000e+00 }, // FC
-        { 2.996e+00, 2.058e-01, 2.779e+00, 0.000e+00, 0.000e+00, 4.753e-01, 0.000e+00 }, // NOx
-        { 1.422e+00, 2.914e-03, 1.192e-02, 0.000e+00, 2.494e-06, 2.040e-03, 9.652e-06 }, // PM + PM (non-exhaust)
+        { 2.217e+03, 5.485e+02, 2.057e+03, 0.000e+00, 0.000e+00, 1.267e+03, 0.000e+00 }, // CO2(total)
+        { 1.647e+00, 4.075e-01, 1.528e+00, 0.000e+00, 0.000e+00, 9.410e-01, 0.000e+00 }, // CO
+        { 7.772e-01, 1.923e-01, 7.209e-01, 0.000e+00, 0.000e+00, 4.440e-01, 0.000e+00 }, // HC
+        { 7.135e+02, 1.765e+02, 6.618e+02, 0.000e+00, 0.000e+00, 4.076e+02, 0.000e+00 }, // FC
+        { 2.996e+00, 7.411e-01, 2.779e+00, 0.000e+00, 0.000e+00, 1.711e+00, 0.000e+00 }, // NOx
+        { 1.422e+00, 1.049e-02, 1.192e-02, 0.000e+00, 1.163e-04, 7.342e-03, 1.251e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // UBus_Midi_lt15t_LNG_Euro-VI
-        { 2.338e+03, 1.440e+02, 2.493e+03, 0.000e+00, 0.000e+00, 3.298e+02, 0.000e+00 }, // CO2(total)
-        { 1.514e+00, 9.324e-02, 1.615e+00, 0.000e+00, 0.000e+00, 2.136e-01, 0.000e+00 }, // CO
-        { 4.011e-01, 2.471e-02, 4.279e-01, 0.000e+00, 0.000e+00, 5.659e-02, 0.000e+00 }, // HC
-        { 7.522e+02, 4.633e+01, 8.023e+02, 0.000e+00, 0.000e+00, 1.061e+02, 0.000e+00 }, // FC
-        { 1.005e+00, 6.190e-02, 1.072e+00, 0.000e+00, 0.000e+00, 1.418e-01, 0.000e+00 }, // NOx
-        { 1.416e+00, 2.139e-03, 1.445e-02, 0.000e+00, 2.609e-06, 1.911e-03, 6.766e-06 }, // PM + PM (non-exhaust)
+        { 2.338e+03, 5.183e+02, 2.493e+03, 0.000e+00, 0.000e+00, 1.187e+03, 0.000e+00 }, // CO2(total)
+        { 1.514e+00, 3.357e-01, 1.615e+00, 0.000e+00, 0.000e+00, 7.689e-01, 0.000e+00 }, // CO
+        { 4.011e-01, 8.894e-02, 4.279e-01, 0.000e+00, 0.000e+00, 2.037e-01, 0.000e+00 }, // HC
+        { 7.522e+02, 1.668e+02, 8.023e+02, 0.000e+00, 0.000e+00, 3.820e+02, 0.000e+00 }, // FC
+        { 1.005e+00, 2.228e-01, 1.072e+00, 0.000e+00, 0.000e+00, 5.104e-01, 0.000e+00 }, // NOx
+        { 1.416e+00, 7.700e-03, 1.445e-02, 0.000e+00, 1.217e-04, 6.881e-03, 8.769e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // UBus_Std_gt15-18t_LNG_Euro-IV
-        { 2.846e+03, 2.155e+02, 1.858e+03, 0.000e+00, 0.000e+00, 5.355e+02, 0.000e+00 }, // CO2(total)
-        { 1.217e+01, 7.516e-02, 1.583e+01, 0.000e+00, 0.000e+00, 1.651e-01, 0.000e+00 }, // CO
-        { 4.383e+00, 7.058e-02, 6.951e+00, 0.000e+00, 9.971e-06, 6.665e-02, 3.856e-04 }, // HC
-        { 9.159e+02, 6.934e+01, 5.979e+02, 0.000e+00, 0.000e+00, 1.723e+02, 0.000e+00 }, // FC
-        { 6.340e+01, 7.148e-01, 8.088e+01, 0.000e+00, 0.000e+00, 2.295e+00, 0.000e+00 }, // NOx
-        { 1.476e+00, 1.756e-03, 4.505e-02, 0.000e+00, 2.544e-06, 0.000e+00, 1.899e-05 }, // PM + PM (non-exhaust)
+        { 2.846e+03, 7.758e+02, 1.858e+03, 0.000e+00, 0.000e+00, 1.928e+03, 0.000e+00 }, // CO2(total)
+        { 1.217e+01, 2.706e-01, 1.583e+01, 0.000e+00, 0.000e+00, 5.944e-01, 0.000e+00 }, // CO
+        { 4.383e+00, 2.541e-01, 6.951e+00, 0.000e+00, 4.652e-04, 2.399e-01, 4.997e-03 }, // HC
+        { 9.159e+02, 2.496e+02, 5.979e+02, 0.000e+00, 0.000e+00, 6.204e+02, 0.000e+00 }, // FC
+        { 6.340e+01, 2.573e+00, 8.088e+01, 0.000e+00, 0.000e+00, 8.264e+00, 0.000e+00 }, // NOx
+        { 1.476e+00, 6.321e-03, 4.505e-02, 0.000e+00, 1.187e-04, 0.000e+00, 2.461e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // UBus_Std_gt15-18t_LNG_Euro-V
-        { 2.942e+03, 2.020e+02, 2.407e+03, 0.000e+00, 0.000e+00, 4.996e+02, 0.000e+00 }, // CO2(total)
-        { 2.186e+00, 1.501e-01, 1.788e+00, 0.000e+00, 0.000e+00, 3.711e-01, 0.000e+00 }, // CO
-        { 1.031e+00, 7.080e-02, 8.435e-01, 0.000e+00, 0.000e+00, 1.751e-01, 0.000e+00 }, // HC
-        { 9.467e+02, 6.500e+01, 7.744e+02, 0.000e+00, 0.000e+00, 1.608e+02, 0.000e+00 }, // FC
-        { 3.975e+00, 2.729e-01, 3.251e+00, 0.000e+00, 0.000e+00, 6.750e-01, 0.000e+00 }, // NOx
-        { 1.475e+00, 1.171e-03, 1.395e-02, 0.000e+00, 2.672e-06, 2.896e-03, 2.948e-06 }, // PM + PM (non-exhaust)
+        { 2.942e+03, 7.272e+02, 2.407e+03, 0.000e+00, 0.000e+00, 1.799e+03, 0.000e+00 }, // CO2(total)
+        { 2.186e+00, 5.402e-01, 1.788e+00, 0.000e+00, 0.000e+00, 1.336e+00, 0.000e+00 }, // CO
+        { 1.031e+00, 2.549e-01, 8.435e-01, 0.000e+00, 0.000e+00, 6.304e-01, 0.000e+00 }, // HC
+        { 9.467e+02, 2.340e+02, 7.744e+02, 0.000e+00, 0.000e+00, 5.787e+02, 0.000e+00 }, // FC
+        { 3.975e+00, 9.824e-01, 3.251e+00, 0.000e+00, 0.000e+00, 2.430e+00, 0.000e+00 }, // NOx
+        { 1.475e+00, 4.215e-03, 1.395e-02, 0.000e+00, 1.247e-04, 1.043e-02, 3.820e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // UBus_Std_gt15-18t_LNG_Euro-VI
-        { 3.001e+03, 1.973e+02, 2.739e+03, 0.000e+00, 0.000e+00, 4.942e+02, 0.000e+00 }, // CO2(total)
-        { 1.944e+00, 1.278e-01, 1.774e+00, 0.000e+00, 0.000e+00, 3.201e-01, 0.000e+00 }, // CO
-        { 5.151e-01, 3.386e-02, 4.701e-01, 0.000e+00, 0.000e+00, 8.481e-02, 0.000e+00 }, // HC
-        { 9.657e+02, 6.349e+01, 8.815e+02, 0.000e+00, 0.000e+00, 1.590e+02, 0.000e+00 }, // FC
-        { 1.290e+00, 8.483e-02, 1.178e+00, 0.000e+00, 0.000e+00, 2.125e-01, 0.000e+00 }, // NOx
-        { 1.477e+00, 1.144e-03, 1.588e-02, 0.000e+00, 2.663e-06, 2.865e-03, 1.583e-06 }, // PM + PM (non-exhaust)
+        { 3.001e+03, 7.103e+02, 2.739e+03, 0.000e+00, 0.000e+00, 1.779e+03, 0.000e+00 }, // CO2(total)
+        { 1.944e+00, 4.600e-01, 1.774e+00, 0.000e+00, 0.000e+00, 1.152e+00, 0.000e+00 }, // CO
+        { 5.151e-01, 1.219e-01, 4.701e-01, 0.000e+00, 0.000e+00, 3.053e-01, 0.000e+00 }, // HC
+        { 9.657e+02, 2.286e+02, 8.815e+02, 0.000e+00, 0.000e+00, 5.725e+02, 0.000e+00 }, // FC
+        { 1.290e+00, 3.054e-01, 1.178e+00, 0.000e+00, 0.000e+00, 7.649e-01, 0.000e+00 }, // NOx
+        { 1.477e+00, 4.117e-03, 1.588e-02, 0.000e+00, 1.242e-04, 1.031e-02, 2.051e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // UBus_Artic_gt18t_LNG_Euro-IV
-        { 5.483e+03, 2.469e+02, 6.985e+03, 0.000e+00, 0.000e+00, 6.224e+02, 0.000e+00 }, // CO2(total)
-        { 1.599e+01, 9.443e-02, 2.130e+01, 0.000e+00, 0.000e+00, 2.365e-01, 0.000e+00 }, // CO
-        { 4.419e+00, 1.915e-01, 8.991e+00, 0.000e+00, 0.000e+00, 2.051e-01, 0.000e+00 }, // HC
-        { 1.764e+03, 7.946e+01, 2.248e+03, 0.000e+00, 0.000e+00, 2.003e+02, 0.000e+00 }, // FC
-        { 1.059e+02, 6.103e-01, 1.872e+02, 0.000e+00, 0.000e+00, 2.102e+00, 0.000e+00 }, // NOx
-        { 1.469e+00, 6.668e-04, 5.687e-02, 0.000e+00, 2.882e-06, 1.050e-03, 1.722e-05 }, // PM + PM (non-exhaust)
+        { 5.483e+03, 8.890e+02, 6.985e+03, 0.000e+00, 0.000e+00, 2.241e+03, 0.000e+00 }, // CO2(total)
+        { 1.599e+01, 3.399e-01, 2.130e+01, 0.000e+00, 0.000e+00, 8.514e-01, 0.000e+00 }, // CO
+        { 4.419e+00, 6.892e-01, 8.991e+00, 0.000e+00, 0.000e+00, 7.383e-01, 0.000e+00 }, // HC
+        { 1.764e+03, 2.860e+02, 2.248e+03, 0.000e+00, 0.000e+00, 7.209e+02, 0.000e+00 }, // FC
+        { 1.059e+02, 2.197e+00, 1.872e+02, 0.000e+00, 0.000e+00, 7.567e+00, 0.000e+00 }, // NOx
+        { 1.469e+00, 2.401e-03, 5.687e-02, 0.000e+00, 1.344e-04, 3.782e-03, 2.231e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // UBus_Artic_gt18t_LNG_Euro-V
-        { 5.219e+03, 2.455e+02, 6.599e+03, 0.000e+00, 0.000e+00, 6.192e+02, 0.000e+00 }, // CO2(total)
-        { 3.877e+00, 1.824e-01, 4.903e+00, 0.000e+00, 0.000e+00, 4.600e-01, 0.000e+00 }, // CO
-        { 1.829e+00, 8.607e-02, 2.313e+00, 0.000e+00, 0.000e+00, 2.171e-01, 0.000e+00 }, // HC
-        { 1.679e+03, 7.901e+01, 2.123e+03, 0.000e+00, 0.000e+00, 1.993e+02, 0.000e+00 }, // FC
-        { 7.051e+00, 3.317e-01, 8.916e+00, 0.000e+00, 0.000e+00, 8.366e-01, 0.000e+00 }, // NOx
-        { 1.463e+00, 1.423e-03, 3.825e-02, 0.000e+00, 2.791e-06, 3.589e-03, 1.096e-05 }, // PM + PM (non-exhaust)
+        { 5.219e+03, 8.839e+02, 6.599e+03, 0.000e+00, 0.000e+00, 2.229e+03, 0.000e+00 }, // CO2(total)
+        { 3.877e+00, 6.567e-01, 4.903e+00, 0.000e+00, 0.000e+00, 1.656e+00, 0.000e+00 }, // CO
+        { 1.829e+00, 3.098e-01, 2.313e+00, 0.000e+00, 0.000e+00, 7.814e-01, 0.000e+00 }, // HC
+        { 1.679e+03, 2.844e+02, 2.123e+03, 0.000e+00, 0.000e+00, 7.173e+02, 0.000e+00 }, // FC
+        { 7.051e+00, 1.194e+00, 8.916e+00, 0.000e+00, 0.000e+00, 3.012e+00, 0.000e+00 }, // NOx
+        { 1.463e+00, 5.124e-03, 3.825e-02, 0.000e+00, 1.302e-04, 1.292e-02, 1.420e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // UBus_Artic_gt18t_LNG_Euro-VI
-        { 5.434e+03, 2.360e+02, 6.996e+03, 0.000e+00, 0.000e+00, 6.127e+02, 0.000e+00 }, // CO2(total)
-        { 3.519e+00, 1.528e-01, 4.531e+00, 0.000e+00, 0.000e+00, 3.968e-01, 0.000e+00 }, // CO
-        { 9.325e-01, 4.050e-02, 1.201e+00, 0.000e+00, 0.000e+00, 1.051e-01, 0.000e+00 }, // HC
-        { 1.748e+03, 7.594e+01, 2.251e+03, 0.000e+00, 0.000e+00, 1.971e+02, 0.000e+00 }, // FC
-        { 2.336e+00, 1.015e-01, 3.008e+00, 0.000e+00, 0.000e+00, 2.634e-01, 0.000e+00 }, // NOx
-        { 1.468e+00, 1.452e-03, 4.056e-02, 0.000e+00, 2.723e-06, 3.551e-03, 6.783e-06 }, // PM + PM (non-exhaust)
+        { 5.434e+03, 8.496e+02, 6.996e+03, 0.000e+00, 0.000e+00, 2.206e+03, 0.000e+00 }, // CO2(total)
+        { 3.519e+00, 5.502e-01, 4.531e+00, 0.000e+00, 0.000e+00, 1.428e+00, 0.000e+00 }, // CO
+        { 9.325e-01, 1.458e-01, 1.201e+00, 0.000e+00, 0.000e+00, 3.785e-01, 0.000e+00 }, // HC
+        { 1.748e+03, 2.734e+02, 2.251e+03, 0.000e+00, 0.000e+00, 7.097e+02, 0.000e+00 }, // FC
+        { 2.336e+00, 3.653e-01, 3.008e+00, 0.000e+00, 0.000e+00, 9.483e-01, 0.000e+00 }, // NOx
+        { 1.468e+00, 5.226e-03, 4.056e-02, 0.000e+00, 1.271e-04, 1.279e-02, 8.791e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // MC_4S_le250cc_preEuro
-        { 2.341e+02, 2.044e+00, 0.000e+00, 4.591e-02, 9.853e-04, 7.309e+00, 3.845e-02 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 5.561e+00, 0.000e+00, 7.071e-04, 0.000e+00, 1.880e-02 }, // CO
-        { 0.000e+00, 0.000e+00, 3.450e+00, 2.357e-03, 1.310e-05, 0.000e+00, 3.736e-04 }, // HC
-        { 7.588e+01, 6.627e-01, 0.000e+00, 1.488e-02, 3.194e-04, 2.369e+00, 1.246e-02 }, // FC
-        { 1.448e+00, 0.000e+00, 0.000e+00, 0.000e+00, 9.453e-06, 1.566e-02, 7.029e-04 }, // NOx
-        { 1.356e-01, 3.936e-04, 0.000e+00, 0.000e+00, 9.083e-07, 1.612e-03, 1.000e-05 }, // PM + PM (non-exhaust)
+        { 2.341e+02, 7.359e+00, 0.000e+00, 5.950e-01, 4.597e-02, 2.631e+01, 4.983e-01 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 5.561e+00, 0.000e+00, 3.299e-02, 0.000e+00, 2.437e-01 }, // CO
+        { 0.000e+00, 0.000e+00, 3.450e+00, 3.055e-02, 6.113e-04, 0.000e+00, 4.842e-03 }, // HC
+        { 7.588e+01, 2.386e+00, 0.000e+00, 1.929e-01, 1.490e-02, 8.530e+00, 1.615e-01 }, // FC
+        { 1.448e+00, 0.000e+00, 0.000e+00, 0.000e+00, 4.411e-04, 5.638e-02, 9.110e-03 }, // NOx
+        { 1.356e-01, 1.417e-03, 0.000e+00, 0.000e+00, 4.238e-05, 5.803e-03, 1.297e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // MC_4S_le250cc_Euro-1
-        { 2.123e+02, 1.854e+00, 0.000e+00, 4.165e-02, 8.937e-04, 6.630e+00, 3.488e-02 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 3.806e+00, 0.000e+00, 4.839e-04, 0.000e+00, 1.287e-02 }, // CO
-        { 0.000e+00, 0.000e+00, 2.272e+00, 1.552e-03, 8.629e-06, 0.000e+00, 2.460e-04 }, // HC
-        { 6.883e+01, 6.011e-01, 0.000e+00, 1.350e-02, 2.897e-04, 2.149e+00, 1.131e-02 }, // FC
-        { 1.346e+00, 0.000e+00, 0.000e+00, 0.000e+00, 8.786e-06, 1.456e-02, 6.533e-04 }, // NOx
-        { 1.356e-01, 3.936e-04, 0.000e+00, 0.000e+00, 9.083e-07, 1.612e-03, 1.000e-05 }, // PM + PM (non-exhaust)
+        { 2.123e+02, 6.676e+00, 0.000e+00, 5.398e-01, 4.170e-02, 2.387e+01, 4.520e-01 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 3.806e+00, 0.000e+00, 2.258e-02, 0.000e+00, 1.668e-01 }, // CO
+        { 0.000e+00, 0.000e+00, 2.272e+00, 2.012e-02, 4.026e-04, 0.000e+00, 3.188e-03 }, // HC
+        { 6.883e+01, 2.164e+00, 0.000e+00, 1.750e-01, 1.352e-02, 7.738e+00, 1.465e-01 }, // FC
+        { 1.346e+00, 0.000e+00, 0.000e+00, 0.000e+00, 4.099e-04, 5.240e-02, 8.467e-03 }, // NOx
+        { 1.356e-01, 1.417e-03, 0.000e+00, 0.000e+00, 4.238e-05, 5.803e-03, 1.297e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // MC_4S_le250cc_Euro-2
-        { 2.345e+02, 2.048e+00, 0.000e+00, 4.600e-02, 9.871e-04, 7.323e+00, 3.852e-02 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 3.745e+00, 0.000e+00, 4.762e-04, 0.000e+00, 1.266e-02 }, // CO
-        { 0.000e+00, 0.000e+00, 1.498e+00, 1.024e-03, 5.689e-06, 0.000e+00, 1.622e-04 }, // HC
-        { 7.602e+01, 6.639e-01, 0.000e+00, 1.491e-02, 3.200e-04, 2.374e+00, 1.249e-02 }, // FC
-        { 1.180e+00, 0.000e+00, 0.000e+00, 0.000e+00, 7.703e-06, 1.276e-02, 5.728e-04 }, // NOx
-        { 1.356e-01, 3.936e-04, 0.000e+00, 0.000e+00, 2.271e-07, 4.030e-04, 2.501e-06 }, // PM + PM (non-exhaust)
+        { 2.345e+02, 7.373e+00, 0.000e+00, 5.962e-01, 4.605e-02, 2.636e+01, 4.992e-01 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 3.745e+00, 0.000e+00, 2.222e-02, 0.000e+00, 1.641e-01 }, // CO
+        { 0.000e+00, 0.000e+00, 1.498e+00, 1.327e-02, 2.654e-04, 0.000e+00, 2.102e-03 }, // HC
+        { 7.602e+01, 2.390e+00, 0.000e+00, 1.933e-01, 1.493e-02, 8.546e+00, 1.618e-01 }, // FC
+        { 1.180e+00, 0.000e+00, 0.000e+00, 0.000e+00, 3.594e-04, 4.594e-02, 7.423e-03 }, // NOx
+        { 1.356e-01, 1.417e-03, 0.000e+00, 0.000e+00, 1.059e-05, 1.451e-03, 3.242e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // MC_4S_le250cc_Euro-3
-        { 2.290e+02, 2.000e+00, 0.000e+00, 4.492e-02, 9.639e-04, 7.151e+00, 3.761e-02 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 6.359e-01, 0.000e+00, 8.086e-05, 0.000e+00, 2.150e-03 }, // CO
-        { 0.000e+00, 0.000e+00, 3.029e-01, 2.070e-04, 1.150e-06, 0.000e+00, 3.280e-05 }, // HC
-        { 7.424e+01, 6.484e-01, 0.000e+00, 1.456e-02, 3.125e-04, 2.318e+00, 1.219e-02 }, // FC
-        { 3.884e-01, 0.000e+00, 0.000e+00, 0.000e+00, 2.535e-06, 4.199e-03, 1.885e-04 }, // NOx
-        { 1.356e-01, 3.936e-04, 0.000e+00, 0.000e+00, 2.271e-07, 4.030e-04, 2.501e-06 }, // PM + PM (non-exhaust)
+        { 2.290e+02, 7.200e+00, 0.000e+00, 5.821e-01, 4.497e-02, 2.574e+01, 4.875e-01 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 6.359e-01, 0.000e+00, 3.773e-03, 0.000e+00, 2.787e-02 }, // CO
+        { 0.000e+00, 0.000e+00, 3.029e-01, 2.682e-03, 5.367e-05, 0.000e+00, 4.251e-04 }, // HC
+        { 7.424e+01, 2.334e+00, 0.000e+00, 1.887e-01, 1.458e-02, 8.345e+00, 1.580e-01 }, // FC
+        { 3.884e-01, 0.000e+00, 0.000e+00, 0.000e+00, 1.183e-04, 1.512e-02, 2.443e-03 }, // NOx
+        { 1.356e-01, 1.417e-03, 0.000e+00, 0.000e+00, 1.059e-05, 1.451e-03, 3.242e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // MC_4S_le250cc_Euro-4
-        { 2.285e+02, 3.243e+00, 1.939e+02, 0.000e+00, 1.273e-03, 1.100e-01, 9.680e-02 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 6.211e-05, 0.000e+00, 3.730e-03 }, // CO
-        { 0.000e+00, 7.097e-04, 0.000e+00, 3.334e-04, 0.000e+00, 0.000e+00, 1.064e-04 }, // HC
-        { 7.408e+01, 1.051e+00, 6.284e+01, 0.000e+00, 4.127e-04, 3.566e-02, 3.138e-02 }, // FC
-        { 0.000e+00, 8.402e-03, 3.726e-01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // NOx
-        { 2.402e-01, 4.413e-04, 1.454e-01, 0.000e+00, 0.000e+00, 7.549e-04, 0.000e+00 }, // PM + PM (non-exhaust)
+        { 2.285e+02, 1.167e+01, 1.939e+02, 0.000e+00, 5.939e-02, 3.960e-01, 1.255e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 2.898e-03, 0.000e+00, 4.835e-02 }, // CO
+        { 0.000e+00, 2.555e-03, 0.000e+00, 4.321e-03, 0.000e+00, 0.000e+00, 1.378e-03 }, // HC
+        { 7.408e+01, 3.784e+00, 6.284e+01, 0.000e+00, 1.925e-02, 1.284e-01, 4.067e-01 }, // FC
+        { 0.000e+00, 3.025e-02, 3.726e-01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // NOx
+        { 2.402e-01, 1.589e-03, 1.454e-01, 0.000e+00, 0.000e+00, 2.718e-03, 0.000e+00 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // MC_4S_le250cc_Euro-5
-        { 2.285e+02, 3.243e+00, 1.939e+02, 0.000e+00, 1.273e-03, 1.100e-01, 9.680e-02 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 5.452e-05, 0.000e+00, 3.274e-03 }, // CO
-        { 0.000e+00, 4.177e-04, 0.000e+00, 1.962e-04, 0.000e+00, 0.000e+00, 6.261e-05 }, // HC
-        { 7.408e+01, 1.051e+00, 6.284e+01, 0.000e+00, 4.127e-04, 3.566e-02, 3.138e-02 }, // FC
-        { 0.000e+00, 5.605e-03, 2.486e-01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // NOx
-        { 2.402e-01, 4.413e-04, 1.454e-01, 0.000e+00, 0.000e+00, 7.549e-04, 0.000e+00 }, // PM + PM (non-exhaust)
+        { 2.285e+02, 1.167e+01, 1.939e+02, 0.000e+00, 5.939e-02, 3.960e-01, 1.255e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 2.544e-03, 0.000e+00, 4.243e-02 }, // CO
+        { 0.000e+00, 1.504e-03, 0.000e+00, 2.543e-03, 0.000e+00, 0.000e+00, 8.114e-04 }, // HC
+        { 7.408e+01, 3.784e+00, 6.284e+01, 0.000e+00, 1.925e-02, 1.284e-01, 4.067e-01 }, // FC
+        { 0.000e+00, 2.018e-02, 2.486e-01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // NOx
+        { 2.402e-01, 1.589e-03, 1.454e-01, 0.000e+00, 0.000e+00, 2.718e-03, 0.000e+00 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // MC_4S_le250cc_Euro-6
-        { 2.285e+02, 3.243e+00, 1.939e+02, 0.000e+00, 1.273e-03, 1.100e-01, 9.680e-02 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 5.452e-05, 0.000e+00, 3.274e-03 }, // CO
-        { 0.000e+00, 4.177e-04, 0.000e+00, 1.962e-04, 0.000e+00, 0.000e+00, 6.261e-05 }, // HC
-        { 7.408e+01, 1.051e+00, 6.284e+01, 0.000e+00, 4.127e-04, 3.566e-02, 3.138e-02 }, // FC
-        { 0.000e+00, 5.605e-03, 2.486e-01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // NOx
-        { 2.402e-01, 4.413e-04, 1.454e-01, 0.000e+00, 0.000e+00, 7.549e-04, 0.000e+00 }, // PM + PM (non-exhaust)
+        { 2.285e+02, 1.167e+01, 1.939e+02, 0.000e+00, 5.939e-02, 3.960e-01, 1.255e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 2.544e-03, 0.000e+00, 4.243e-02 }, // CO
+        { 0.000e+00, 1.504e-03, 0.000e+00, 2.543e-03, 0.000e+00, 0.000e+00, 8.114e-04 }, // HC
+        { 7.408e+01, 3.784e+00, 6.284e+01, 0.000e+00, 1.925e-02, 1.284e-01, 4.067e-01 }, // FC
+        { 0.000e+00, 2.018e-02, 2.486e-01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // NOx
+        { 2.402e-01, 1.589e-03, 1.454e-01, 0.000e+00, 0.000e+00, 2.718e-03, 0.000e+00 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // MC_4S_gt250cc_preEuro
-        { 1.405e+03, 0.000e+00, 7.442e+02, 1.814e-01, 6.310e-04, 0.000e+00, 4.768e-02 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 5.785e-04, 0.000e+00, 1.789e-02 }, // CO
-        { 2.344e+01, 3.795e-02, 0.000e+00, 0.000e+00, 0.000e+00, 1.549e-01, 0.000e+00 }, // HC
-        { 4.556e+02, 0.000e+00, 2.413e+02, 5.879e-02, 2.046e-04, 0.000e+00, 1.546e-02 }, // FC
-        { 5.242e-01, 0.000e+00, 0.000e+00, 7.745e-04, 1.468e-07, 3.713e-02, 1.405e-04 }, // NOx
-        { 4.903e-01, 1.158e-03, 8.529e-02, 0.000e+00, 2.242e-08, 0.000e+00, 0.000e+00 }, // PM + PM (non-exhaust)
+        { 1.405e+03, 0.000e+00, 7.442e+02, 2.350e+00, 2.944e-02, 0.000e+00, 6.179e-01 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 2.699e-02, 0.000e+00, 2.318e-01 }, // CO
+        { 2.344e+01, 1.366e-01, 0.000e+00, 0.000e+00, 0.000e+00, 5.577e-01, 0.000e+00 }, // HC
+        { 4.556e+02, 0.000e+00, 2.413e+02, 7.620e-01, 9.544e-03, 0.000e+00, 2.003e-01 }, // FC
+        { 5.242e-01, 0.000e+00, 0.000e+00, 1.004e-02, 6.851e-06, 1.337e-01, 1.821e-03 }, // NOx
+        { 4.903e-01, 4.170e-03, 8.529e-02, 0.000e+00, 1.046e-06, 8.244e-19, 7.039e-21 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // MC_4S_gt250cc_Euro-1
-        { 1.347e+03, 0.000e+00, 7.130e+02, 1.738e-01, 6.046e-04, 0.000e+00, 4.568e-02 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 3.603e-04, 0.000e+00, 1.114e-02 }, // CO
-        { 1.164e+01, 1.884e-02, 0.000e+00, 0.000e+00, 0.000e+00, 7.690e-02, 0.000e+00 }, // HC
-        { 4.365e+02, 0.000e+00, 2.312e+02, 5.633e-02, 1.960e-04, 0.000e+00, 1.481e-02 }, // FC
-        { 5.015e-01, 0.000e+00, 0.000e+00, 7.409e-04, 1.405e-07, 3.552e-02, 1.344e-04 }, // NOx
-        { 4.903e-01, 1.158e-03, 8.529e-02, 0.000e+00, 2.242e-08, 0.000e+00, 0.000e+00 }, // PM + PM (non-exhaust)
+        { 1.347e+03, 0.000e+00, 7.130e+02, 2.252e+00, 2.821e-02, 0.000e+00, 5.920e-01 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.681e-02, 0.000e+00, 1.444e-01 }, // CO
+        { 1.164e+01, 6.781e-02, 0.000e+00, 0.000e+00, 0.000e+00, 2.768e-01, 0.000e+00 }, // HC
+        { 4.365e+02, 0.000e+00, 2.312e+02, 7.301e-01, 9.144e-03, 0.000e+00, 1.919e-01 }, // FC
+        { 5.015e-01, 0.000e+00, 0.000e+00, 9.602e-03, 6.554e-06, 1.279e-01, 1.742e-03 }, // NOx
+        { 4.903e-01, 4.170e-03, 8.529e-02, 0.000e+00, 1.046e-06, 8.244e-19, 7.039e-21 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // MC_4S_gt250cc_Euro-2
-        { 1.292e+03, 0.000e+00, 6.839e+02, 1.667e-01, 5.799e-04, 0.000e+00, 4.382e-02 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 2.102e-04, 0.000e+00, 6.501e-03 }, // CO
-        { 9.865e+00, 1.597e-02, 0.000e+00, 0.000e+00, 0.000e+00, 6.519e-02, 0.000e+00 }, // HC
-        { 4.187e+02, 0.000e+00, 2.217e+02, 5.403e-02, 1.880e-04, 0.000e+00, 1.420e-02 }, // FC
-        { 6.618e-01, 0.000e+00, 0.000e+00, 9.778e-04, 1.854e-07, 4.688e-02, 1.774e-04 }, // NOx
-        { 2.303e-01, 4.098e-04, 2.132e-02, 0.000e+00, 2.242e-08, 0.000e+00, 0.000e+00 }, // PM + PM (non-exhaust)
+        { 1.292e+03, 0.000e+00, 6.839e+02, 2.160e+00, 2.706e-02, 0.000e+00, 5.679e-01 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 9.808e-03, 0.000e+00, 8.425e-02 }, // CO
+        { 9.865e+00, 5.748e-02, 0.000e+00, 0.000e+00, 0.000e+00, 2.347e-01, 0.000e+00 }, // HC
+        { 4.187e+02, 0.000e+00, 2.217e+02, 7.003e-01, 8.771e-03, 0.000e+00, 1.841e-01 }, // FC
+        { 6.618e-01, 0.000e+00, 0.000e+00, 1.267e-02, 8.649e-06, 1.688e-01, 2.299e-03 }, // NOx
+        { 2.303e-01, 1.475e-03, 2.132e-02, 0.000e+00, 1.046e-06, 8.244e-19, 7.039e-21 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // MC_4S_gt250cc_Euro-3
-        { 1.363e+03, 0.000e+00, 7.216e+02, 1.759e-01, 6.118e-04, 0.000e+00, 4.623e-02 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 2.270e-05, 0.000e+00, 7.020e-04 }, // CO
-        { 2.362e+00, 3.823e-03, 0.000e+00, 0.000e+00, 0.000e+00, 1.561e-02, 0.000e+00 }, // HC
-        { 4.417e+02, 0.000e+00, 2.339e+02, 5.701e-02, 1.983e-04, 0.000e+00, 1.499e-02 }, // FC
-        { 1.507e-01, 0.000e+00, 0.000e+00, 2.226e-04, 4.220e-08, 1.067e-02, 4.039e-05 }, // NOx
-        { 2.303e-01, 4.098e-04, 2.132e-02, 0.000e+00, 2.242e-08, 0.000e+00, 0.000e+00 }, // PM + PM (non-exhaust)
+        { 1.363e+03, 0.000e+00, 7.216e+02, 2.279e+00, 2.855e-02, 0.000e+00, 5.991e-01 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.059e-03, 0.000e+00, 9.097e-03 }, // CO
+        { 2.362e+00, 1.376e-02, 0.000e+00, 0.000e+00, 0.000e+00, 5.618e-02, 0.000e+00 }, // HC
+        { 4.417e+02, 0.000e+00, 2.339e+02, 7.388e-01, 9.254e-03, 0.000e+00, 1.942e-01 }, // FC
+        { 1.507e-01, 0.000e+00, 0.000e+00, 2.885e-03, 1.969e-06, 3.842e-02, 5.235e-04 }, // NOx
+        { 2.303e-01, 1.475e-03, 2.132e-02, 0.000e+00, 1.046e-06, 8.244e-19, 7.039e-21 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // MC_4S_gt250cc_Euro-4
-        { 1.008e+03, 0.000e+00, 3.401e+01, 8.194e-02, 1.604e-03, 7.057e+00, 8.126e-02 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 2.618e-05, 0.000e+00, 1.108e-03 }, // CO
-        { 4.186e-02, 0.000e+00, 1.447e-02, 1.575e-04, 0.000e+00, 5.074e-03, 0.000e+00 }, // HC
-        { 3.268e+02, 0.000e+00, 1.102e+01, 2.656e-02, 5.199e-04, 2.288e+00, 2.634e-02 }, // FC
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.270e-06, 3.556e-04, 8.624e-05 }, // NOx
-        { 2.206e-01, 5.451e-04, 0.000e+00, 0.000e+00, 2.242e-08, 0.000e+00, 0.000e+00 }, // PM + PM (non-exhaust)
+        { 1.008e+03, 0.000e+00, 3.401e+01, 1.062e+00, 7.482e-02, 2.541e+01, 1.053e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.221e-03, 0.000e+00, 1.436e-02 }, // CO
+        { 4.186e-02, 0.000e+00, 1.447e-02, 2.041e-03, 0.000e+00, 1.827e-02, 0.000e+00 }, // HC
+        { 3.268e+02, 0.000e+00, 1.102e+01, 3.443e-01, 2.425e-02, 8.236e+00, 3.414e-01 }, // FC
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 5.923e-05, 1.280e-03, 1.118e-03 }, // NOx
+        { 2.206e-01, 1.962e-03, 0.000e+00, 0.000e+00, 1.046e-06, 8.244e-19, 7.039e-21 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // MC_4S_gt250cc_Euro-5
-        { 1.008e+03, 0.000e+00, 3.401e+01, 8.194e-02, 1.604e-03, 7.057e+00, 8.126e-02 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 2.298e-05, 0.000e+00, 9.723e-04 }, // CO
-        { 2.464e-02, 0.000e+00, 8.519e-03, 9.272e-05, 0.000e+00, 2.987e-03, 0.000e+00 }, // HC
-        { 3.268e+02, 0.000e+00, 1.102e+01, 2.656e-02, 5.199e-04, 2.288e+00, 2.634e-02 }, // FC
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 8.470e-07, 2.373e-04, 5.754e-05 }, // NOx
-        { 2.206e-01, 5.451e-04, 0.000e+00, 0.000e+00, 2.242e-08, 0.000e+00, 0.000e+00 }, // PM + PM (non-exhaust)
+        { 1.008e+03, 0.000e+00, 3.401e+01, 1.062e+00, 7.482e-02, 2.541e+01, 1.053e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.072e-03, 0.000e+00, 1.260e-02 }, // CO
+        { 2.464e-02, 0.000e+00, 8.519e-03, 1.202e-03, 0.000e+00, 1.075e-02, 0.000e+00 }, // HC
+        { 3.268e+02, 0.000e+00, 1.102e+01, 3.443e-01, 2.425e-02, 8.236e+00, 3.414e-01 }, // FC
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 3.952e-05, 8.542e-04, 7.457e-04 }, // NOx
+        { 2.206e-01, 1.962e-03, 0.000e+00, 0.000e+00, 1.046e-06, 8.244e-19, 7.039e-21 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // MC_4S_gt250cc_Euro-6
-        { 1.008e+03, 0.000e+00, 3.401e+01, 8.194e-02, 1.604e-03, 7.057e+00, 8.126e-02 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 2.298e-05, 0.000e+00, 9.723e-04 }, // CO
-        { 2.464e-02, 0.000e+00, 8.519e-03, 9.272e-05, 0.000e+00, 2.987e-03, 0.000e+00 }, // HC
-        { 3.268e+02, 0.000e+00, 1.102e+01, 2.656e-02, 5.199e-04, 2.288e+00, 2.634e-02 }, // FC
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 8.470e-07, 2.373e-04, 5.754e-05 }, // NOx
-        { 2.206e-01, 5.451e-04, 0.000e+00, 0.000e+00, 2.242e-08, 0.000e+00, 0.000e+00 }, // PM + PM (non-exhaust)
+        { 1.008e+03, 0.000e+00, 3.401e+01, 1.062e+00, 7.482e-02, 2.541e+01, 1.053e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.072e-03, 0.000e+00, 1.260e-02 }, // CO
+        { 2.464e-02, 0.000e+00, 8.519e-03, 1.202e-03, 0.000e+00, 1.075e-02, 0.000e+00 }, // HC
+        { 3.268e+02, 0.000e+00, 1.102e+01, 3.443e-01, 2.425e-02, 8.236e+00, 3.414e-01 }, // FC
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 3.952e-05, 8.542e-04, 7.457e-04 }, // NOx
+        { 2.206e-01, 1.962e-03, 0.000e+00, 0.000e+00, 1.046e-06, 8.244e-19, 7.039e-21 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // Moped_le50cc_(vlt30)_without_cat
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.937e-02, 0.000e+00, 0.000e+00 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 3.512e-03, 0.000e+00, 0.000e+00 }, // CO
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.494e-03, 0.000e+00, 0.000e+00 }, // HC
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 6.109e-03, 0.000e+00, 0.000e+00 }, // FC
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 6.173e-06, 0.000e+00, 0.000e+00 }, // NOx
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 6.430e-05, 0.000e+00, 0.000e+00 }, // PM + PM (non-exhaust)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 9.038e-01, 0.000e+00, 0.000e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.639e-01, 0.000e+00, 0.000e+00 }, // CO
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 6.970e-02, 0.000e+00, 0.000e+00 }, // HC
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 2.850e-01, 0.000e+00, 0.000e+00 }, // FC
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 2.880e-04, 0.000e+00, 0.000e+00 }, // NOx
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 3.000e-03, 1.857e-32, 0.000e+00 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // Moped_le50cc_(vlt30)_with_cat___FAV4
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.799e-02, 0.000e+00, 0.000e+00 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.543e-03, 0.000e+00, 0.000e+00 }, // CO
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.151e-03, 0.000e+00, 6.877e-34 }, // HC
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 5.673e-03, 0.000e+00, 0.000e+00 }, // FC
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 6.173e-06, 0.000e+00, 0.000e+00 }, // NOx
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 6.430e-05, 0.000e+00, 0.000e+00 }, // PM + PM (non-exhaust)
+        { 0.000e+00, 0.000e+00, 1.980e-29, 0.000e+00, 8.393e-01, 0.000e+00, 0.000e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 7.200e-02, 0.000e+00, 0.000e+00 }, // CO
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 5.371e-02, 0.000e+00, 0.000e+00 }, // HC
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 2.647e-01, 0.000e+00, 0.000e+00 }, // FC
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 2.880e-04, 0.000e+00, 0.000e+00 }, // NOx
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 3.000e-03, 1.857e-32, 0.000e+00 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // Moped_le50cc_(vlt30)_EU2
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.799e-02, 0.000e+00, 0.000e+00 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 8.580e-04, 0.000e+00, 0.000e+00 }, // CO
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 6.574e-04, 0.000e+00, 0.000e+00 }, // HC
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 5.673e-03, 0.000e+00, 0.000e+00 }, // FC
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.852e-05, 0.000e+00, 0.000e+00 }, // NOx
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 6.430e-05, 0.000e+00, 0.000e+00 }, // PM + PM (non-exhaust)
+        { 0.000e+00, 0.000e+00, 1.980e-29, 0.000e+00, 8.393e-01, 0.000e+00, 0.000e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 4.003e-02, 0.000e+00, 0.000e+00 }, // CO
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 3.067e-02, 0.000e+00, 0.000e+00 }, // HC
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 2.647e-01, 0.000e+00, 0.000e+00 }, // FC
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 8.640e-04, 0.000e+00, 0.000e+00 }, // NOx
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 3.000e-03, 1.857e-32, 0.000e+00 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // Moped_le50cc_(vlt30)_EU3
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.799e-02, 0.000e+00, 0.000e+00 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 6.864e-04, 0.000e+00, 0.000e+00 }, // CO
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 5.259e-04, 0.000e+00, 0.000e+00 }, // HC
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 5.673e-03, 0.000e+00, 0.000e+00 }, // FC
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.481e-05, 0.000e+00, 0.000e+00 }, // NOx
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 6.430e-05, 0.000e+00, 0.000e+00 }, // PM + PM (non-exhaust)
+        { 0.000e+00, 0.000e+00, 1.980e-29, 0.000e+00, 8.393e-01, 0.000e+00, 0.000e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 1.238e-30, 0.000e+00, 3.203e-02, 0.000e+00, 0.000e+00 }, // CO
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 2.454e-02, 0.000e+00, 0.000e+00 }, // HC
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 2.647e-01, 0.000e+00, 0.000e+00 }, // FC
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 6.912e-04, 0.000e+00, 0.000e+00 }, // NOx
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 3.000e-03, 1.857e-32, 0.000e+00 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // Moped_le50cc_(vlt30)_EU4
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.799e-02, 0.000e+00, 0.000e+00 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 6.864e-04, 0.000e+00, 0.000e+00 }, // CO
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 4.207e-04, 0.000e+00, 0.000e+00 }, // HC
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 5.673e-03, 0.000e+00, 0.000e+00 }, // FC
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.185e-05, 0.000e+00, 0.000e+00 }, // NOx
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 6.430e-05, 0.000e+00, 0.000e+00 }, // PM + PM (non-exhaust)
+        { 0.000e+00, 0.000e+00, 1.980e-29, 0.000e+00, 8.393e-01, 0.000e+00, 0.000e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 1.238e-30, 0.000e+00, 3.203e-02, 0.000e+00, 0.000e+00 }, // CO
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.963e-02, 0.000e+00, 0.000e+00 }, // HC
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 2.647e-01, 0.000e+00, 0.000e+00 }, // FC
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 5.530e-04, 0.000e+00, 0.000e+00 }, // NOx
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 3.000e-03, 1.857e-32, 0.000e+00 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // Moped_le50cc_(vlt30)_EU5
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.799e-02, 0.000e+00, 0.000e+00 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 4.805e-04, 0.000e+00, 0.000e+00 }, // CO
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.644e-04, 0.000e+00, 0.000e+00 }, // HC
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 5.673e-03, 0.000e+00, 0.000e+00 }, // FC
-        { 0.000e+00, 0.000e+00, 9.670e-33, 0.000e+00, 8.148e-06, 0.000e+00, 0.000e+00 }, // NOx
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 6.430e-05, 0.000e+00, 0.000e+00 }, // PM + PM (non-exhaust)
+        { 0.000e+00, 0.000e+00, 1.980e-29, 0.000e+00, 8.393e-01, 0.000e+00, 0.000e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 2.242e-02, 0.000e+00, 0.000e+00 }, // CO
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 7.668e-03, 0.000e+00, 0.000e+00 }, // HC
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 2.647e-01, 0.000e+00, 0.000e+00 }, // FC
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 3.802e-04, 0.000e+00, 0.000e+00 }, // NOx
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 3.000e-03, 1.857e-32, 0.000e+00 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // Moped_le50cc_preEuro
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.799e-02, 0.000e+00, 0.000e+00 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.929e-03, 0.000e+00, 0.000e+00 }, // CO
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.099e-03, 0.000e+00, 0.000e+00 }, // HC
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 5.673e-03, 0.000e+00, 0.000e+00 }, // FC
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 2.275e-05, 0.000e+00, 0.000e+00 }, // NOx
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 6.430e-05, 0.000e+00, 0.000e+00 }, // PM + PM (non-exhaust)
+        { 0.000e+00, 0.000e+00, 1.980e-29, 0.000e+00, 8.393e-01, 0.000e+00, 0.000e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 2.476e-30, 0.000e+00, 9.000e-02, 0.000e+00, 0.000e+00 }, // CO
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 5.126e-02, 0.000e+00, 0.000e+00 }, // HC
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 2.647e-01, 0.000e+00, 0.000e+00 }, // FC
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.061e-03, 0.000e+00, 0.000e+00 }, // NOx
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 3.000e-03, 1.857e-32, 0.000e+00 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // Moped_le50cc_Euro-1
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.799e-02, 0.000e+00, 0.000e+00 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.929e-03, 0.000e+00, 0.000e+00 }, // CO
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.099e-03, 0.000e+00, 0.000e+00 }, // HC
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 5.673e-03, 0.000e+00, 0.000e+00 }, // FC
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 2.275e-05, 0.000e+00, 0.000e+00 }, // NOx
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 6.430e-05, 0.000e+00, 0.000e+00 }, // PM + PM (non-exhaust)
+        { 0.000e+00, 0.000e+00, 1.980e-29, 0.000e+00, 8.393e-01, 0.000e+00, 0.000e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 2.476e-30, 0.000e+00, 9.000e-02, 0.000e+00, 0.000e+00 }, // CO
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 5.126e-02, 0.000e+00, 0.000e+00 }, // HC
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 2.647e-01, 0.000e+00, 0.000e+00 }, // FC
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.061e-03, 0.000e+00, 0.000e+00 }, // NOx
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 3.000e-03, 1.857e-32, 0.000e+00 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // Moped_le50cc_Euro-2
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.799e-02, 0.000e+00, 0.000e+00 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 8.565e-04, 0.000e+00, 0.000e+00 }, // CO
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 6.593e-04, 0.000e+00, 0.000e+00 }, // HC
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 5.673e-03, 0.000e+00, 0.000e+00 }, // FC
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.820e-05, 0.000e+00, 0.000e+00 }, // NOx
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 6.430e-05, 0.000e+00, 0.000e+00 }, // PM + PM (non-exhaust)
+        { 0.000e+00, 0.000e+00, 1.980e-29, 0.000e+00, 8.393e-01, 0.000e+00, 0.000e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 3.996e-02, 0.000e+00, 0.000e+00 }, // CO
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 3.076e-02, 0.000e+00, 0.000e+00 }, // HC
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 2.647e-01, 0.000e+00, 0.000e+00 }, // FC
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 8.490e-04, 0.000e+00, 0.000e+00 }, // NOx
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 3.000e-03, 1.857e-32, 0.000e+00 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // Moped_le50cc_Euro-3
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.799e-02, 0.000e+00, 0.000e+00 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 6.867e-04, 0.000e+00, 6.877e-34 }, // CO
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 5.274e-04, 0.000e+00, 0.000e+00 }, // HC
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 5.673e-03, 0.000e+00, 0.000e+00 }, // FC
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.456e-05, 0.000e+00, 0.000e+00 }, // NOx
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 6.430e-05, 0.000e+00, 0.000e+00 }, // PM + PM (non-exhaust)
+        { 0.000e+00, 0.000e+00, 1.980e-29, 0.000e+00, 8.393e-01, 0.000e+00, 0.000e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 3.204e-02, 1.485e-31, 0.000e+00 }, // CO
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 2.461e-02, 0.000e+00, 0.000e+00 }, // HC
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 2.647e-01, 0.000e+00, 0.000e+00 }, // FC
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 6.792e-04, 0.000e+00, 0.000e+00 }, // NOx
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 3.000e-03, 1.857e-32, 0.000e+00 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // Moped_le50cc_Euro-4
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.799e-02, 0.000e+00, 0.000e+00 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 6.867e-04, 0.000e+00, 6.877e-34 }, // CO
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 4.208e-04, 0.000e+00, 0.000e+00 }, // HC
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 5.673e-03, 0.000e+00, 0.000e+00 }, // FC
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.165e-05, 0.000e+00, 0.000e+00 }, // NOx
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 6.430e-05, 0.000e+00, 0.000e+00 }, // PM + PM (non-exhaust)
+        { 0.000e+00, 0.000e+00, 1.980e-29, 0.000e+00, 8.393e-01, 0.000e+00, 0.000e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 3.204e-02, 1.485e-31, 0.000e+00 }, // CO
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.963e-02, 0.000e+00, 0.000e+00 }, // HC
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 2.647e-01, 0.000e+00, 0.000e+00 }, // FC
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 5.434e-04, 0.000e+00, 0.000e+00 }, // NOx
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 3.000e-03, 1.857e-32, 0.000e+00 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // Moped_le50cc_Euro-5
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.799e-02, 0.000e+00, 0.000e+00 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 4.823e-04, 0.000e+00, 0.000e+00 }, // CO
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.648e-04, 0.000e+00, 0.000e+00 }, // HC
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 5.673e-03, 0.000e+00, 0.000e+00 }, // FC
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 7.961e-06, 0.000e+00, 0.000e+00 }, // NOx
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 6.430e-05, 0.000e+00, 0.000e+00 }, // PM + PM (non-exhaust)
+        { 0.000e+00, 0.000e+00, 1.980e-29, 0.000e+00, 8.393e-01, 0.000e+00, 0.000e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 6.189e-31, 0.000e+00, 2.250e-02, 0.000e+00, 0.000e+00 }, // CO
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 7.690e-03, 0.000e+00, 0.000e+00 }, // HC
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 2.647e-01, 0.000e+00, 0.000e+00 }, // FC
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 3.714e-04, 0.000e+00, 0.000e+00 }, // NOx
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 3.000e-03, 1.857e-32, 0.000e+00 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // MC_2S_le250cc_preEuro
-        { 3.464e+02, 3.025e+00, 0.000e+00, 6.794e-02, 1.458e-03, 1.082e+01, 5.690e-02 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 7.064e+00, 0.000e+00, 8.982e-04, 0.000e+00, 2.388e-02 }, // CO
-        { 0.000e+00, 0.000e+00, 2.348e+01, 1.604e-02, 8.917e-05, 0.000e+00, 2.542e-03 }, // HC
-        { 1.092e+02, 9.540e-01, 0.000e+00, 2.143e-02, 4.598e-04, 3.411e+00, 1.794e-02 }, // FC
-        { 3.380e-01, 0.000e+00, 0.000e+00, 0.000e+00, 2.206e-06, 3.655e-03, 1.640e-04 }, // NOx
-        { 1.356e-01, 5.595e-02, 0.000e+00, 0.000e+00, 2.975e-21, 0.000e+00, 0.000e+00 }, // PM + PM (non-exhaust)
+        { 3.464e+02, 1.089e+01, 0.000e+00, 8.806e-01, 6.803e-02, 3.894e+01, 7.374e-01 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 7.064e+00, 0.000e+00, 4.191e-02, 0.000e+00, 3.095e-01 }, // CO
+        { 0.000e+00, 0.000e+00, 2.348e+01, 2.079e-01, 4.160e-03, 0.000e+00, 3.295e-02 }, // HC
+        { 1.092e+02, 3.434e+00, 0.000e+00, 2.777e-01, 2.145e-02, 1.228e+01, 2.325e-01 }, // FC
+        { 3.380e-01, 0.000e+00, 0.000e+00, 0.000e+00, 1.029e-04, 1.316e-02, 2.126e-03 }, // NOx
+        { 1.356e-01, 2.014e-01, 0.000e+00, 0.000e+00, 1.682e-19, 0.000e+00, 0.000e+00 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // MC_2S_le250cc_Euro-1
-        { 3.252e+02, 2.840e+00, 0.000e+00, 6.380e-02, 1.369e-03, 1.016e+01, 5.342e-02 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 6.041e+00, 0.000e+00, 7.682e-04, 0.000e+00, 2.043e-02 }, // CO
-        { 0.000e+00, 0.000e+00, 1.331e+01, 9.099e-03, 5.057e-05, 0.000e+00, 1.442e-03 }, // HC
-        { 1.026e+02, 8.958e-01, 0.000e+00, 2.012e-02, 4.317e-04, 3.203e+00, 1.685e-02 }, // FC
-        { 2.595e-01, 0.000e+00, 0.000e+00, 0.000e+00, 1.693e-06, 2.805e-03, 1.259e-04 }, // NOx
-        { 1.356e-01, 2.262e-02, 0.000e+00, 0.000e+00, 8.206e-22, 0.000e+00, 0.000e+00 }, // PM + PM (non-exhaust)
+        { 3.252e+02, 1.023e+01, 0.000e+00, 8.268e-01, 6.387e-02, 3.656e+01, 6.924e-01 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 6.041e+00, 0.000e+00, 3.584e-02, 0.000e+00, 2.647e-01 }, // CO
+        { 0.000e+00, 0.000e+00, 1.331e+01, 1.179e-01, 2.360e-03, 0.000e+00, 1.869e-02 }, // HC
+        { 1.026e+02, 3.225e+00, 0.000e+00, 2.607e-01, 2.014e-02, 1.153e+01, 2.183e-01 }, // FC
+        { 2.595e-01, 0.000e+00, 0.000e+00, 0.000e+00, 7.900e-05, 1.010e-02, 1.632e-03 }, // NOx
+        { 1.356e-01, 8.142e-02, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // MC_2S_le250cc_Euro-2
-        { 2.806e+02, 2.450e+00, 0.000e+00, 5.503e-02, 1.181e-03, 8.761e+00, 4.608e-02 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 4.868e+00, 0.000e+00, 6.190e-04, 0.000e+00, 1.646e-02 }, // CO
-        { 0.000e+00, 0.000e+00, 6.568e+00, 4.488e-03, 2.495e-05, 0.000e+00, 7.112e-04 }, // HC
-        { 8.847e+01, 7.727e-01, 0.000e+00, 1.735e-02, 3.724e-04, 2.763e+00, 1.453e-02 }, // FC
-        { 3.133e-01, 0.000e+00, 0.000e+00, 0.000e+00, 2.045e-06, 3.388e-03, 1.521e-04 }, // NOx
-        { 1.356e-01, 1.150e-02, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // PM + PM (non-exhaust)
+        { 2.806e+02, 8.821e+00, 0.000e+00, 7.132e-01, 5.510e-02, 3.154e+01, 5.972e-01 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 4.868e+00, 0.000e+00, 2.888e-02, 0.000e+00, 2.133e-01 }, // CO
+        { 0.000e+00, 0.000e+00, 6.568e+00, 5.817e-02, 1.164e-03, 0.000e+00, 9.218e-03 }, // HC
+        { 8.847e+01, 2.782e+00, 0.000e+00, 2.249e-01, 1.738e-02, 9.946e+00, 1.883e-01 }, // FC
+        { 3.133e-01, 0.000e+00, 0.000e+00, 0.000e+00, 9.541e-05, 1.220e-02, 1.971e-03 }, // NOx
+        { 1.356e-01, 4.142e-02, 0.000e+00, 0.000e+00, 0.000e+00, 1.691e-18, 0.000e+00 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // MC_2S_le250cc_Euro-3
-        { 2.356e+02, 2.058e+00, 0.000e+00, 4.622e-02, 9.917e-04, 7.357e+00, 3.870e-02 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 2.777e+00, 0.000e+00, 3.531e-04, 0.000e+00, 9.390e-03 }, // CO
-        { 0.000e+00, 0.000e+00, 4.263e+00, 2.913e-03, 1.619e-05, 0.000e+00, 4.617e-04 }, // HC
-        { 7.430e+01, 6.489e-01, 0.000e+00, 1.457e-02, 3.128e-04, 2.320e+00, 1.220e-02 }, // FC
-        { 2.930e-01, 0.000e+00, 0.000e+00, 0.000e+00, 1.912e-06, 3.168e-03, 1.422e-04 }, // NOx
-        { 1.356e-01, 3.727e-03, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.883e-20 }, // PM + PM (non-exhaust)
+        { 2.356e+02, 7.408e+00, 0.000e+00, 5.989e-01, 4.627e-02, 2.649e+01, 5.016e-01 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 2.777e+00, 0.000e+00, 1.647e-02, 0.000e+00, 1.217e-01 }, // CO
+        { 0.000e+00, 0.000e+00, 4.263e+00, 3.776e-02, 7.555e-04, 0.000e+00, 5.983e-03 }, // HC
+        { 7.430e+01, 2.336e+00, 0.000e+00, 1.889e-01, 1.459e-02, 8.352e+00, 1.582e-01 }, // FC
+        { 2.930e-01, 0.000e+00, 0.000e+00, 0.000e+00, 8.921e-05, 1.140e-02, 1.843e-03 }, // NOx
+        { 1.356e-01, 1.342e-02, 8.381e-18, 0.000e+00, 0.000e+00, 3.920e-18, 0.000e+00 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // MC_2S_le250cc_Euro-4
-        { 2.351e+02, 3.336e+00, 1.994e+02, 0.000e+00, 1.310e-03, 1.132e-01, 9.959e-02 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 3.026e-04, 0.000e+00, 1.817e-02 }, // CO
-        { 0.000e+00, 7.222e-03, 0.000e+00, 3.393e-03, 0.000e+00, 0.000e+00, 1.082e-03 }, // HC
-        { 7.414e+01, 1.052e+00, 6.290e+01, 0.000e+00, 4.130e-04, 3.569e-02, 3.141e-02 }, // FC
-        { 0.000e+00, 1.432e-02, 6.351e-01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // NOx
-        { 1.329e-01, 3.775e-03, 0.000e+00, 0.000e+00, 3.667e-23, 0.000e+00, 0.000e+00 }, // PM + PM (non-exhaust)
+        { 2.351e+02, 1.201e+01, 1.994e+02, 0.000e+00, 6.110e-02, 4.074e-01, 1.291e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.412e-02, 0.000e+00, 2.355e-01 }, // CO
+        { 0.000e+00, 2.600e-02, 0.000e+00, 4.397e-02, 0.000e+00, 0.000e+00, 1.403e-02 }, // HC
+        { 7.414e+01, 3.788e+00, 6.290e+01, 0.000e+00, 1.927e-02, 1.285e-01, 4.070e-01 }, // FC
+        { 0.000e+00, 5.155e-02, 6.351e-01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // NOx
+        { 1.329e-01, 1.359e-02, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 5.243e-19 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // MC_2S_le250cc_Euro-5
-        { 2.351e+02, 3.336e+00, 1.994e+02, 0.000e+00, 1.310e-03, 1.132e-01, 9.959e-02 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 2.654e-04, 0.000e+00, 1.594e-02 }, // CO
-        { 0.000e+00, 4.248e-03, 0.000e+00, 1.996e-03, 0.000e+00, 0.000e+00, 6.367e-04 }, // HC
-        { 7.414e+01, 1.052e+00, 6.290e+01, 0.000e+00, 4.130e-04, 3.569e-02, 3.141e-02 }, // FC
-        { 0.000e+00, 9.546e-03, 4.234e-01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // NOx
-        { 1.329e-01, 3.775e-03, 0.000e+00, 0.000e+00, 3.667e-23, 0.000e+00, 0.000e+00 }, // PM + PM (non-exhaust)
+        { 2.351e+02, 1.201e+01, 1.994e+02, 0.000e+00, 6.110e-02, 4.074e-01, 1.291e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.238e-02, 0.000e+00, 2.066e-01 }, // CO
+        { 0.000e+00, 1.529e-02, 0.000e+00, 2.586e-02, 0.000e+00, 0.000e+00, 8.252e-03 }, // HC
+        { 7.414e+01, 3.788e+00, 6.290e+01, 0.000e+00, 1.927e-02, 1.285e-01, 4.070e-01 }, // FC
+        { 0.000e+00, 3.437e-02, 4.234e-01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // NOx
+        { 1.329e-01, 1.359e-02, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 5.243e-19 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // MC_2S_le250cc_Euro-6
-        { 2.351e+02, 3.336e+00, 1.994e+02, 0.000e+00, 1.310e-03, 1.132e-01, 9.959e-02 }, // CO2(total)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 2.654e-04, 0.000e+00, 1.594e-02 }, // CO
-        { 0.000e+00, 4.248e-03, 0.000e+00, 1.996e-03, 0.000e+00, 0.000e+00, 6.367e-04 }, // HC
-        { 7.414e+01, 1.052e+00, 6.290e+01, 0.000e+00, 4.130e-04, 3.569e-02, 3.141e-02 }, // FC
-        { 0.000e+00, 9.546e-03, 4.234e-01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // NOx
-        { 1.329e-01, 3.775e-03, 0.000e+00, 0.000e+00, 3.667e-23, 0.000e+00, 0.000e+00 }, // PM + PM (non-exhaust)
+        { 2.351e+02, 1.201e+01, 1.994e+02, 0.000e+00, 6.110e-02, 4.074e-01, 1.291e+00 }, // CO2(total)
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.238e-02, 0.000e+00, 2.066e-01 }, // CO
+        { 0.000e+00, 1.529e-02, 0.000e+00, 2.586e-02, 0.000e+00, 0.000e+00, 8.252e-03 }, // HC
+        { 7.414e+01, 3.788e+00, 6.290e+01, 0.000e+00, 1.927e-02, 1.285e-01, 4.070e-01 }, // FC
+        { 0.000e+00, 3.437e-02, 4.234e-01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // NOx
+        { 1.329e-01, 1.359e-02, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 5.243e-19 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
@@ -5001,8 +5001,8 @@
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // HC
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // NOx
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 2.576e-06, 0.000e+00, 0.000e+00 }, // PM + PM (non-exhaust)
-        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 4.025e-07, 0.000e+00, 0.000e+00 }, // FC_MJ
+        { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.202e-04, 0.000e+00, 0.000e+00 }, // PM + PM (non-exhaust)
+        { 0.000e+00, 0.000e+00, 1.343e-33, 0.000e+00, 1.878e-05, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // eScooter
@@ -5011,8 +5011,8 @@
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // HC
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // NOx
-        { 1.531e-01, 2.954e-05, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // PM + PM (non-exhaust)
-        { 8.187e-02, 1.061e-03, 1.524e-02, 0.000e+00, 8.981e-07, 6.807e-03, 9.662e-06 }, // FC_MJ
+        { 1.531e-01, 1.063e-04, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // PM + PM (non-exhaust)
+        { 8.187e-02, 3.821e-03, 1.524e-02, 0.000e+00, 4.190e-05, 2.451e-02, 1.252e-04 }, // FC_MJ
     },
     {
         // MC_BEV
@@ -5021,3187 +5021,3187 @@
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // HC
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // NOx
-        { 1.436e-01, 1.603e-04, 0.000e+00, 0.000e+00, 2.242e-08, 0.000e+00, 0.000e+00 }, // PM + PM (non-exhaust)
-        { 2.268e-01, 8.211e-04, 1.132e-01, 3.223e-05, 1.927e-06, 1.388e-02, 3.808e-05 }, // FC_MJ
+        { 1.436e-01, 5.770e-04, 0.000e+00, 0.000e+00, 1.046e-06, 8.244e-19, 7.039e-21 }, // PM + PM (non-exhaust)
+        { 2.268e-01, 2.956e-03, 1.132e-01, 4.177e-04, 8.993e-05, 4.996e-02, 4.935e-04 }, // FC_MJ
     },
     {
         // RT_petrol
-        { 3.592e+03, 2.155e+01, 0.000e+00, 5.493e-01, 1.153e-02, 1.840e+02, 1.546e+00 }, // CO2(total)
-        { 6.343e+01, 0.000e+00, 0.000e+00, 0.000e+00, 8.903e-05, 1.550e+00, 1.093e-03 }, // CO
-        { 6.301e+01, 0.000e+00, 1.155e+01, 0.000e+00, 1.214e-05, 0.000e+00, 0.000e+00 }, // HC
-        { 1.164e+03, 6.985e+00, 0.000e+00, 1.781e-01, 3.739e-03, 5.963e+01, 5.011e-01 }, // FC
-        { 3.895e+01, 4.365e-01, 0.000e+00, 0.000e+00, 1.603e-04, 2.292e+00, 1.017e-02 }, // NOx
-        { 1.433e+00, 0.000e+00, 0.000e+00, 0.000e+00, 2.692e-06, 6.646e-04, 0.000e+00 }, // PM + PM (non-exhaust)
+        { 3.592e+03, 7.757e+01, 0.000e+00, 7.120e+00, 5.381e-01, 6.622e+02, 2.003e+01 }, // CO2(total)
+        { 6.343e+01, 0.000e+00, 0.000e+00, 0.000e+00, 4.154e-03, 5.578e+00, 1.416e-02 }, // CO
+        { 6.301e+01, 0.000e+00, 1.155e+01, 0.000e+00, 5.664e-04, 0.000e+00, 0.000e+00 }, // HC
+        { 1.164e+03, 2.515e+01, 0.000e+00, 2.308e+00, 1.744e-01, 2.147e+02, 6.495e+00 }, // FC
+        { 3.895e+01, 1.571e+00, 0.000e+00, 0.000e+00, 7.481e-03, 8.251e+00, 1.319e-01 }, // NOx
+        { 1.433e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.256e-04, 2.393e-03, 0.000e+00 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RT_le7.5t_50ties
-        { 2.842e+03, 1.705e+01, 0.000e+00, 4.347e-01, 9.126e-03, 1.456e+02, 1.223e+00 }, // CO2(total)
-        { 3.064e+01, 0.000e+00, 0.000e+00, 0.000e+00, 4.301e-05, 7.486e-01, 5.280e-04 }, // CO
-        { 1.873e+01, 0.000e+00, 3.433e+00, 0.000e+00, 3.608e-06, 0.000e+00, 0.000e+00 }, // HC
-        { 9.134e+02, 5.480e+00, 0.000e+00, 1.397e-01, 2.933e-03, 4.678e+01, 3.931e-01 }, // FC
-        { 3.743e+01, 4.194e-01, 0.000e+00, 0.000e+00, 1.541e-04, 2.203e+00, 9.778e-03 }, // NOx
-        { 5.952e+00, 0.000e+00, 0.000e+00, 2.921e-04, 6.327e-06, 9.752e-02, 3.138e-04 }, // PM + PM (non-exhaust)
+        { 2.842e+03, 6.138e+01, 0.000e+00, 5.634e+00, 4.258e-01, 5.240e+02, 1.585e+01 }, // CO2(total)
+        { 3.064e+01, 0.000e+00, 0.000e+00, 0.000e+00, 2.007e-03, 2.695e+00, 6.843e-03 }, // CO
+        { 1.873e+01, 0.000e+00, 3.433e+00, 0.000e+00, 1.683e-04, 0.000e+00, 0.000e+00 }, // HC
+        { 9.134e+02, 1.973e+01, 0.000e+00, 1.811e+00, 1.368e-01, 1.684e+02, 5.095e+00 }, // FC
+        { 3.743e+01, 1.510e+00, 0.000e+00, 0.000e+00, 7.189e-03, 7.929e+00, 1.267e-01 }, // NOx
+        { 5.952e+00, 0.000e+00, 0.000e+00, 3.785e-03, 2.952e-04, 3.511e-01, 4.067e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RT_le7.5t_60ties
-        { 2.842e+03, 1.705e+01, 0.000e+00, 4.347e-01, 9.126e-03, 1.456e+02, 1.223e+00 }, // CO2(total)
-        { 3.064e+01, 0.000e+00, 0.000e+00, 0.000e+00, 4.301e-05, 7.486e-01, 5.280e-04 }, // CO
-        { 1.873e+01, 0.000e+00, 3.433e+00, 0.000e+00, 3.608e-06, 0.000e+00, 0.000e+00 }, // HC
-        { 9.134e+02, 5.480e+00, 0.000e+00, 1.397e-01, 2.933e-03, 4.678e+01, 3.931e-01 }, // FC
-        { 3.743e+01, 4.194e-01, 0.000e+00, 0.000e+00, 1.541e-04, 2.203e+00, 9.778e-03 }, // NOx
-        { 5.952e+00, 0.000e+00, 0.000e+00, 2.921e-04, 6.327e-06, 9.752e-02, 3.138e-04 }, // PM + PM (non-exhaust)
+        { 2.842e+03, 6.138e+01, 0.000e+00, 5.634e+00, 4.258e-01, 5.240e+02, 1.585e+01 }, // CO2(total)
+        { 3.064e+01, 0.000e+00, 0.000e+00, 0.000e+00, 2.007e-03, 2.695e+00, 6.843e-03 }, // CO
+        { 1.873e+01, 0.000e+00, 3.433e+00, 0.000e+00, 1.683e-04, 0.000e+00, 0.000e+00 }, // HC
+        { 9.134e+02, 1.973e+01, 0.000e+00, 1.811e+00, 1.368e-01, 1.684e+02, 5.095e+00 }, // FC
+        { 3.743e+01, 1.510e+00, 0.000e+00, 0.000e+00, 7.189e-03, 7.929e+00, 1.267e-01 }, // NOx
+        { 5.952e+00, 0.000e+00, 0.000e+00, 3.785e-03, 2.952e-04, 3.511e-01, 4.067e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RT_le7.5t_70ties
-        { 2.842e+03, 1.705e+01, 0.000e+00, 4.347e-01, 9.126e-03, 1.456e+02, 1.223e+00 }, // CO2(total)
-        { 3.064e+01, 0.000e+00, 0.000e+00, 0.000e+00, 4.301e-05, 7.486e-01, 5.280e-04 }, // CO
-        { 1.873e+01, 0.000e+00, 3.433e+00, 0.000e+00, 3.608e-06, 0.000e+00, 0.000e+00 }, // HC
-        { 9.134e+02, 5.480e+00, 0.000e+00, 1.397e-01, 2.933e-03, 4.678e+01, 3.931e-01 }, // FC
-        { 3.743e+01, 4.194e-01, 0.000e+00, 0.000e+00, 1.541e-04, 2.203e+00, 9.778e-03 }, // NOx
-        { 5.952e+00, 0.000e+00, 0.000e+00, 2.921e-04, 6.327e-06, 9.752e-02, 3.138e-04 }, // PM + PM (non-exhaust)
+        { 2.842e+03, 6.138e+01, 0.000e+00, 5.634e+00, 4.258e-01, 5.240e+02, 1.585e+01 }, // CO2(total)
+        { 3.064e+01, 0.000e+00, 0.000e+00, 0.000e+00, 2.007e-03, 2.695e+00, 6.843e-03 }, // CO
+        { 1.873e+01, 0.000e+00, 3.433e+00, 0.000e+00, 1.683e-04, 0.000e+00, 0.000e+00 }, // HC
+        { 9.134e+02, 1.973e+01, 0.000e+00, 1.811e+00, 1.368e-01, 1.684e+02, 5.095e+00 }, // FC
+        { 3.743e+01, 1.510e+00, 0.000e+00, 0.000e+00, 7.189e-03, 7.929e+00, 1.267e-01 }, // NOx
+        { 5.952e+00, 0.000e+00, 0.000e+00, 3.785e-03, 2.952e-04, 3.511e-01, 4.067e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RT_le7.5t_80ties
-        { 2.842e+03, 1.705e+01, 0.000e+00, 4.347e-01, 9.126e-03, 1.456e+02, 1.223e+00 }, // CO2(total)
-        { 3.064e+01, 0.000e+00, 0.000e+00, 0.000e+00, 4.301e-05, 7.486e-01, 5.280e-04 }, // CO
-        { 1.873e+01, 0.000e+00, 3.433e+00, 0.000e+00, 3.608e-06, 0.000e+00, 0.000e+00 }, // HC
-        { 9.134e+02, 5.480e+00, 0.000e+00, 1.397e-01, 2.933e-03, 4.678e+01, 3.931e-01 }, // FC
-        { 3.743e+01, 4.194e-01, 0.000e+00, 0.000e+00, 1.541e-04, 2.203e+00, 9.778e-03 }, // NOx
-        { 5.952e+00, 0.000e+00, 0.000e+00, 2.921e-04, 6.327e-06, 9.752e-02, 3.138e-04 }, // PM + PM (non-exhaust)
+        { 2.842e+03, 6.138e+01, 0.000e+00, 5.634e+00, 4.258e-01, 5.240e+02, 1.585e+01 }, // CO2(total)
+        { 3.064e+01, 0.000e+00, 0.000e+00, 0.000e+00, 2.007e-03, 2.695e+00, 6.843e-03 }, // CO
+        { 1.873e+01, 0.000e+00, 3.433e+00, 0.000e+00, 1.683e-04, 0.000e+00, 0.000e+00 }, // HC
+        { 9.134e+02, 1.973e+01, 0.000e+00, 1.811e+00, 1.368e-01, 1.684e+02, 5.095e+00 }, // FC
+        { 3.743e+01, 1.510e+00, 0.000e+00, 0.000e+00, 7.189e-03, 7.929e+00, 1.267e-01 }, // NOx
+        { 5.952e+00, 0.000e+00, 0.000e+00, 3.785e-03, 2.952e-04, 3.511e-01, 4.067e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RT_le7_5t_EE
-        { 2.842e+03, 1.705e+01, 0.000e+00, 4.347e-01, 9.126e-03, 1.456e+02, 1.223e+00 }, // CO2(total)
-        { 1.532e+01, 0.000e+00, 0.000e+00, 0.000e+00, 2.151e-05, 3.743e-01, 2.640e-04 }, // CO
-        { 1.247e+01, 0.000e+00, 2.286e+00, 0.000e+00, 2.403e-06, 0.000e+00, 0.000e+00 }, // HC
-        { 9.134e+02, 5.480e+00, 0.000e+00, 1.397e-01, 2.933e-03, 4.678e+01, 3.931e-01 }, // FC
-        { 2.246e+01, 2.516e-01, 0.000e+00, 0.000e+00, 9.245e-05, 1.322e+00, 5.867e-03 }, // NOx
-        { 5.500e+00, 0.000e+00, 0.000e+00, 2.629e-04, 5.964e-06, 8.784e-02, 2.825e-04 }, // PM + PM (non-exhaust)
+        { 2.842e+03, 6.138e+01, 0.000e+00, 5.634e+00, 4.258e-01, 5.240e+02, 1.585e+01 }, // CO2(total)
+        { 1.532e+01, 0.000e+00, 0.000e+00, 0.000e+00, 1.003e-03, 1.348e+00, 3.422e-03 }, // CO
+        { 1.247e+01, 0.000e+00, 2.286e+00, 0.000e+00, 1.121e-04, 0.000e+00, 0.000e+00 }, // HC
+        { 9.134e+02, 1.973e+01, 0.000e+00, 1.811e+00, 1.368e-01, 1.684e+02, 5.095e+00 }, // FC
+        { 2.246e+01, 9.059e-01, 0.000e+00, 0.000e+00, 4.314e-03, 4.758e+00, 7.603e-02 }, // NOx
+        { 5.500e+00, 0.000e+00, 0.000e+00, 3.407e-03, 2.782e-04, 3.162e-01, 3.661e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RT_le7.5t_Euro-I
-        { 2.829e+03, 9.035e+00, 0.000e+00, 4.455e-01, 8.320e-03, 1.317e+02, 1.287e+00 }, // CO2(total)
-        { 1.140e+01, 0.000e+00, 0.000e+00, 5.147e-04, 8.695e-06, 2.681e-01, 6.495e-04 }, // CO
-        { 3.440e+00, 0.000e+00, 1.738e+00, 0.000e+00, 2.496e-06, 0.000e+00, 2.710e-04 }, // HC
-        { 9.091e+02, 2.904e+00, 0.000e+00, 1.432e-01, 2.674e-03, 4.232e+01, 4.136e-01 }, // FC
-        { 1.983e+01, 4.589e-01, 0.000e+00, 0.000e+00, 9.755e-05, 1.401e+00, 1.099e-02 }, // NOx
-        { 3.697e+00, 0.000e+00, 4.790e-01, 0.000e+00, 4.844e-06, 3.532e-04, 5.235e-04 }, // PM + PM (non-exhaust)
+        { 2.829e+03, 3.253e+01, 0.000e+00, 5.774e+00, 3.882e-01, 4.741e+02, 1.668e+01 }, // CO2(total)
+        { 1.140e+01, 0.000e+00, 0.000e+00, 6.671e-03, 4.057e-04, 9.650e-01, 8.418e-03 }, // CO
+        { 3.440e+00, 0.000e+00, 1.738e+00, 0.000e+00, 1.165e-04, 0.000e+00, 3.512e-03 }, // HC
+        { 9.091e+02, 1.045e+01, 0.000e+00, 1.856e+00, 1.248e-01, 1.524e+02, 5.360e+00 }, // FC
+        { 1.983e+01, 1.652e+00, 0.000e+00, 0.000e+00, 4.551e-03, 5.045e+00, 1.425e-01 }, // NOx
+        { 3.697e+00, 0.000e+00, 4.790e-01, 0.000e+00, 2.260e-04, 1.272e-03, 6.785e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RT_le7.5t_Euro-II
-        { 2.368e+03, 2.809e+01, 0.000e+00, 3.628e-02, 1.001e-02, 1.224e+02, 1.262e+00 }, // CO2(total)
-        { 8.994e+00, 1.471e-02, 7.244e+00, 4.578e-04, 0.000e+00, 8.470e-02, 0.000e+00 }, // CO
-        { 2.113e+00, 0.000e+00, 9.123e-01, 0.000e+00, 1.628e-06, 0.000e+00, 2.248e-04 }, // HC
-        { 7.611e+02, 9.027e+00, 0.000e+00, 1.166e-02, 3.218e-03, 3.935e+01, 4.056e-01 }, // FC
-        { 2.168e+01, 4.894e-01, 0.000e+00, 0.000e+00, 8.555e-05, 1.653e+00, 6.476e-03 }, // NOx
-        { 2.546e+00, 0.000e+00, 4.633e-01, 0.000e+00, 3.675e-06, 2.057e-02, 3.646e-06 }, // PM + PM (non-exhaust)
+        { 2.368e+03, 1.011e+02, 0.000e+00, 4.702e-01, 4.672e-01, 4.408e+02, 1.636e+01 }, // CO2(total)
+        { 8.994e+00, 5.296e-02, 7.244e+00, 5.933e-03, 0.000e+00, 3.049e-01, 0.000e+00 }, // CO
+        { 2.113e+00, 0.000e+00, 9.123e-01, 0.000e+00, 7.595e-05, 0.000e+00, 2.913e-03 }, // HC
+        { 7.611e+02, 3.250e+01, 0.000e+00, 1.511e-01, 1.501e-01, 1.417e+02, 5.256e+00 }, // FC
+        { 2.168e+01, 1.762e+00, 0.000e+00, 0.000e+00, 3.992e-03, 5.950e+00, 8.394e-02 }, // NOx
+        { 2.546e+00, 0.000e+00, 4.633e-01, 0.000e+00, 1.715e-04, 7.406e-02, 4.725e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RT_le7.5t_Euro-III
-        { 2.726e+03, 5.297e+00, 0.000e+00, 6.394e-01, 5.691e-03, 1.313e+02, 1.244e+00 }, // CO2(total)
-        { 1.177e+01, 0.000e+00, 5.048e+00, 2.767e-04, 0.000e+00, 6.156e-02, 0.000e+00 }, // CO
-        { 2.028e+00, 0.000e+00, 7.814e-01, 0.000e+00, 9.706e-07, 0.000e+00, 1.219e-04 }, // HC
-        { 8.762e+02, 1.702e+00, 0.000e+00, 2.055e-01, 1.829e-03, 4.220e+01, 3.998e-01 }, // FC
-        { 2.194e+01, 0.000e+00, 0.000e+00, 8.281e-03, 1.238e-05, 1.155e+00, 7.005e-03 }, // NOx
-        { 2.546e+00, 0.000e+00, 2.817e-01, 0.000e+00, 3.203e-06, 3.209e-04, 1.405e-04 }, // PM + PM (non-exhaust)
+        { 2.726e+03, 1.907e+01, 0.000e+00, 8.286e+00, 2.655e-01, 4.727e+02, 1.612e+01 }, // CO2(total)
+        { 1.177e+01, 0.000e+00, 5.048e+00, 3.587e-03, 0.000e+00, 2.216e-01, 0.000e+00 }, // CO
+        { 2.028e+00, 0.000e+00, 7.814e-01, 0.000e+00, 4.529e-05, 0.000e+00, 1.580e-03 }, // HC
+        { 8.762e+02, 6.129e+00, 0.000e+00, 2.663e+00, 8.533e-02, 1.519e+02, 5.181e+00 }, // FC
+        { 2.194e+01, 0.000e+00, 0.000e+00, 1.073e-01, 5.775e-04, 4.157e+00, 9.078e-02 }, // NOx
+        { 2.546e+00, 0.000e+00, 2.817e-01, 0.000e+00, 1.495e-04, 1.155e-03, 1.821e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RT_le7.5t_Euro-IV_EGR
-        { 2.050e+03, 0.000e+00, 0.000e+00, 1.333e+00, 5.046e-04, 1.564e+02, 1.029e+00 }, // CO2(total)
-        { 2.256e+00, 9.445e-02, 3.917e+00, 0.000e+00, 0.000e+00, 1.103e-01, 0.000e+00 }, // CO
-        { 1.757e-01, 1.848e-03, 2.423e-01, 0.000e+00, 6.105e-07, 0.000e+00, 1.071e-04 }, // HC
-        { 6.590e+02, 0.000e+00, 0.000e+00, 4.285e-01, 1.622e-04, 5.028e+01, 3.307e-01 }, // FC
-        { 1.178e+00, 7.639e-01, 0.000e+00, 1.493e-03, 0.000e+00, 1.440e+00, 8.690e-04 }, // NOx
-        { 1.527e+00, 4.219e-03, 2.806e-01, 0.000e+00, 2.724e-06, 1.335e-03, 3.868e-05 }, // PM + PM (non-exhaust)
+        { 2.050e+03, 0.000e+00, 0.000e+00, 1.728e+01, 2.354e-02, 5.632e+02, 1.334e+01 }, // CO2(total)
+        { 2.256e+00, 3.400e-01, 3.917e+00, 0.000e+00, 0.000e+00, 3.972e-01, 0.000e+00 }, // CO
+        { 1.757e-01, 6.652e-03, 2.423e-01, 0.000e+00, 2.848e-05, 0.000e+00, 1.389e-03 }, // HC
+        { 6.590e+02, 0.000e+00, 0.000e+00, 5.553e+00, 7.566e-03, 1.810e+02, 4.286e+00 }, // FC
+        { 1.178e+00, 2.750e+00, 0.000e+00, 1.935e-02, 0.000e+00, 5.186e+00, 1.126e-02 }, // NOx
+        { 1.527e+00, 1.519e-02, 2.806e-01, 0.000e+00, 1.271e-04, 4.807e-03, 5.013e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RT_le7.5t_Euro-IV_SCR
-        { 2.073e+03, 0.000e+00, 0.000e+00, 1.267e+00, 1.009e-03, 1.535e+02, 1.021e+00 }, // CO2(total)
-        { 1.038e+01, 1.395e-01, 2.514e+01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 5.168e-02, 1.457e-03, 0.000e+00, 0.000e+00, 1.594e-07, 4.366e-03, 5.087e-07 }, // HC
-        { 6.662e+02, 0.000e+00, 0.000e+00, 4.071e-01, 3.244e-04, 4.934e+01, 3.281e-01 }, // FC
-        { 2.024e+01, 0.000e+00, 0.000e+00, 1.170e-04, 3.772e-05, 2.803e-01, 3.824e-03 }, // NOx
-        { 1.598e+00, 3.436e-03, 4.685e-01, 0.000e+00, 2.718e-06, 0.000e+00, 1.026e-05 }, // PM + PM (non-exhaust)
+        { 2.073e+03, 0.000e+00, 0.000e+00, 1.642e+01, 4.710e-02, 5.527e+02, 1.323e+01 }, // CO2(total)
+        { 1.038e+01, 5.021e-01, 2.514e+01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
+        { 5.168e-02, 5.245e-03, 0.000e+00, 0.000e+00, 7.439e-06, 1.572e-02, 6.593e-06 }, // HC
+        { 6.662e+02, 0.000e+00, 0.000e+00, 5.277e+00, 1.514e-02, 1.776e+02, 4.252e+00 }, // FC
+        { 2.024e+01, 0.000e+00, 0.000e+00, 1.517e-03, 1.760e-03, 1.009e+00, 4.956e-02 }, // NOx
+        { 1.598e+00, 1.237e-02, 4.685e-01, 0.000e+00, 1.268e-04, 0.000e+00, 1.330e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RT_le7.5t_Euro-IV_SCRs
-        { 2.073e+03, 0.000e+00, 0.000e+00, 1.267e+00, 1.009e-03, 1.535e+02, 1.021e+00 }, // CO2(total)
-        { 1.038e+01, 1.395e-01, 2.514e+01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 5.168e-02, 1.457e-03, 0.000e+00, 0.000e+00, 1.594e-07, 4.366e-03, 5.087e-07 }, // HC
-        { 6.662e+02, 0.000e+00, 0.000e+00, 4.071e-01, 3.244e-04, 4.934e+01, 3.281e-01 }, // FC
-        { 1.797e+01, 5.657e-01, 2.668e+00, 0.000e+00, 8.638e-05, 1.711e+00, 5.773e-03 }, // NOx
-        { 1.598e+00, 3.436e-03, 4.685e-01, 0.000e+00, 2.718e-06, 0.000e+00, 1.026e-05 }, // PM + PM (non-exhaust)
+        { 2.073e+03, 0.000e+00, 0.000e+00, 1.642e+01, 4.710e-02, 5.527e+02, 1.323e+01 }, // CO2(total)
+        { 1.038e+01, 5.021e-01, 2.514e+01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
+        { 5.168e-02, 5.245e-03, 0.000e+00, 0.000e+00, 7.439e-06, 1.572e-02, 6.593e-06 }, // HC
+        { 6.662e+02, 0.000e+00, 0.000e+00, 5.277e+00, 1.514e-02, 1.776e+02, 4.252e+00 }, // FC
+        { 1.797e+01, 2.036e+00, 2.668e+00, 0.000e+00, 4.030e-03, 6.159e+00, 7.481e-02 }, // NOx
+        { 1.598e+00, 1.237e-02, 4.685e-01, 0.000e+00, 1.268e-04, 0.000e+00, 1.330e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RT_le7.5t_Euro-V_EGR
-        { 2.018e+03, 0.000e+00, 0.000e+00, 1.250e+00, 7.821e-04, 1.494e+02, 1.053e+00 }, // CO2(total)
-        { 4.304e+00, 8.346e-03, 4.893e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 4.411e-01, 9.420e-04, 4.309e-01, 0.000e+00, 7.356e-07, 1.510e-03, 5.961e-05 }, // HC
-        { 6.485e+02, 0.000e+00, 0.000e+00, 4.019e-01, 2.514e-04, 4.802e+01, 3.385e-01 }, // FC
-        { 1.729e+00, 4.068e-01, 0.000e+00, 6.260e-03, 0.000e+00, 9.077e-01, 1.056e-02 }, // NOx
-        { 1.531e+00, 8.320e-04, 2.102e-02, 0.000e+00, 3.081e-06, 6.518e-03, 9.302e-06 }, // PM + PM (non-exhaust)
+        { 2.018e+03, 0.000e+00, 0.000e+00, 1.621e+01, 3.649e-02, 5.379e+02, 1.365e+01 }, // CO2(total)
+        { 4.304e+00, 3.005e-02, 4.893e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
+        { 4.411e-01, 3.391e-03, 4.309e-01, 0.000e+00, 3.432e-05, 5.437e-03, 7.725e-04 }, // HC
+        { 6.485e+02, 0.000e+00, 0.000e+00, 5.208e+00, 1.173e-02, 1.729e+02, 4.387e+00 }, // FC
+        { 1.729e+00, 1.464e+00, 0.000e+00, 8.112e-02, 0.000e+00, 3.268e+00, 1.368e-01 }, // NOx
+        { 1.531e+00, 2.995e-03, 2.102e-02, 0.000e+00, 1.437e-04, 2.346e-02, 1.205e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RT_le7.5t_Euro-V_SCR
-        { 1.943e+03, 0.000e+00, 0.000e+00, 1.275e+00, 1.888e-04, 1.485e+02, 9.978e-01 }, // CO2(total)
-        { 7.617e+00, 1.766e-01, 1.810e+01, 0.000e+00, 0.000e+00, 1.050e-01, 0.000e+00 }, // CO
-        { 7.667e-02, 2.529e-04, 0.000e+00, 2.387e-05, 0.000e+00, 3.481e-03, 1.015e-05 }, // HC
-        { 6.244e+02, 0.000e+00, 0.000e+00, 4.098e-01, 6.068e-05, 4.772e+01, 3.207e-01 }, // FC
-        { 1.710e+01, 0.000e+00, 0.000e+00, 0.000e+00, 1.383e-05, 0.000e+00, 2.692e-03 }, // NOx
-        { 1.578e+00, 4.012e-03, 3.675e-01, 0.000e+00, 2.720e-06, 1.859e-03, 1.103e-05 }, // PM + PM (non-exhaust)
+        { 1.943e+03, 0.000e+00, 0.000e+00, 1.653e+01, 8.809e-03, 5.346e+02, 1.293e+01 }, // CO2(total)
+        { 7.617e+00, 6.359e-01, 1.810e+01, 0.000e+00, 0.000e+00, 3.779e-01, 0.000e+00 }, // CO
+        { 7.667e-02, 9.104e-04, 0.000e+00, 3.093e-04, 0.000e+00, 1.253e-02, 1.315e-04 }, // HC
+        { 6.244e+02, 0.000e+00, 0.000e+00, 5.311e+00, 2.831e-03, 1.718e+02, 4.156e+00 }, // FC
+        { 1.710e+01, 0.000e+00, 0.000e+00, 0.000e+00, 6.453e-04, 0.000e+00, 3.489e-02 }, // NOx
+        { 1.578e+00, 1.444e-02, 3.675e-01, 0.000e+00, 1.269e-04, 6.693e-03, 1.429e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RT_le7.5t_Euro-V_SCRs
-        { 1.943e+03, 0.000e+00, 0.000e+00, 1.275e+00, 1.888e-04, 1.485e+02, 9.978e-01 }, // CO2(total)
-        { 7.617e+00, 1.766e-01, 1.810e+01, 0.000e+00, 0.000e+00, 1.050e-01, 0.000e+00 }, // CO
-        { 7.667e-02, 2.529e-04, 0.000e+00, 2.387e-05, 0.000e+00, 3.481e-03, 1.015e-05 }, // HC
-        { 6.244e+02, 0.000e+00, 0.000e+00, 4.098e-01, 6.068e-05, 4.772e+01, 3.207e-01 }, // FC
-        { 1.994e+01, 5.587e-01, 0.000e+00, 0.000e+00, 8.081e-05, 1.690e+00, 5.986e-03 }, // NOx
-        { 1.578e+00, 4.012e-03, 3.675e-01, 0.000e+00, 2.720e-06, 1.859e-03, 1.103e-05 }, // PM + PM (non-exhaust)
+        { 1.943e+03, 0.000e+00, 0.000e+00, 1.653e+01, 8.809e-03, 5.346e+02, 1.293e+01 }, // CO2(total)
+        { 7.617e+00, 6.359e-01, 1.810e+01, 0.000e+00, 0.000e+00, 3.779e-01, 0.000e+00 }, // CO
+        { 7.667e-02, 9.104e-04, 0.000e+00, 3.093e-04, 0.000e+00, 1.253e-02, 1.315e-04 }, // HC
+        { 6.244e+02, 0.000e+00, 0.000e+00, 5.311e+00, 2.831e-03, 1.718e+02, 4.156e+00 }, // FC
+        { 1.994e+01, 2.011e+00, 0.000e+00, 0.000e+00, 3.770e-03, 6.083e+00, 7.758e-02 }, // NOx
+        { 1.578e+00, 1.444e-02, 3.675e-01, 0.000e+00, 1.269e-04, 6.693e-03, 1.429e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RT_le7.5t_Euro-VI_A-C
-        { 1.936e+03, 0.000e+00, 0.000e+00, 1.251e+00, 1.372e-04, 1.531e+02, 9.282e-01 }, // CO2(total)
-        { 1.053e+00, 1.003e-03, 1.179e+00, 6.279e-05, 0.000e+00, 0.000e+00, 2.462e-05 }, // CO
-        { 8.609e-02, 0.000e+00, 1.124e-02, 1.401e-05, 1.868e-08, 1.272e-03, 2.040e-05 }, // HC
-        { 6.221e+02, 0.000e+00, 0.000e+00, 4.021e-01, 4.410e-05, 4.920e+01, 2.983e-01 }, // FC
-        { 1.158e-01, 6.448e-02, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 7.758e-04 }, // NOx
-        { 1.483e+00, 0.000e+00, 4.753e-02, 0.000e+00, 2.742e-06, 0.000e+00, 9.802e-06 }, // PM + PM (non-exhaust)
+        { 1.936e+03, 0.000e+00, 0.000e+00, 1.621e+01, 6.403e-03, 5.511e+02, 1.203e+01 }, // CO2(total)
+        { 1.053e+00, 3.609e-03, 1.179e+00, 8.138e-04, 0.000e+00, 0.000e+00, 3.190e-04 }, // CO
+        { 8.609e-02, 0.000e+00, 1.124e-02, 1.815e-04, 8.715e-07, 4.578e-03, 2.644e-04 }, // HC
+        { 6.221e+02, 0.000e+00, 0.000e+00, 5.211e+00, 2.058e-03, 1.771e+02, 3.866e+00 }, // FC
+        { 1.158e-01, 2.321e-01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.005e-02 }, // NOx
+        { 1.483e+00, 0.000e+00, 4.753e-02, 0.000e+00, 1.279e-04, 0.000e+00, 1.270e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RT_le7.5t_Euro-VIs_A-C
-        { 1.936e+03, 0.000e+00, 0.000e+00, 1.251e+00, 1.372e-04, 1.531e+02, 9.282e-01 }, // CO2(total)
-        { 1.053e+00, 1.003e-03, 1.179e+00, 6.279e-05, 0.000e+00, 0.000e+00, 2.462e-05 }, // CO
-        { 8.609e-02, 0.000e+00, 1.124e-02, 1.401e-05, 1.868e-08, 1.272e-03, 2.040e-05 }, // HC
-        { 6.221e+02, 0.000e+00, 0.000e+00, 4.021e-01, 4.410e-05, 4.920e+01, 2.983e-01 }, // FC
-        { 6.537e+00, 5.234e-02, 0.000e+00, 1.191e-02, 0.000e+00, 7.274e-01, 1.836e-02 }, // NOx
-        { 1.483e+00, 0.000e+00, 4.753e-02, 0.000e+00, 2.742e-06, 0.000e+00, 9.802e-06 }, // PM + PM (non-exhaust)
+        { 1.936e+03, 0.000e+00, 0.000e+00, 1.621e+01, 6.403e-03, 5.511e+02, 1.203e+01 }, // CO2(total)
+        { 1.053e+00, 3.609e-03, 1.179e+00, 8.138e-04, 0.000e+00, 0.000e+00, 3.190e-04 }, // CO
+        { 8.609e-02, 0.000e+00, 1.124e-02, 1.815e-04, 8.715e-07, 4.578e-03, 2.644e-04 }, // HC
+        { 6.221e+02, 0.000e+00, 0.000e+00, 5.211e+00, 2.058e-03, 1.771e+02, 3.866e+00 }, // FC
+        { 6.537e+00, 1.884e-01, 0.000e+00, 1.544e-01, 0.000e+00, 2.619e+00, 2.379e-01 }, // NOx
+        { 1.483e+00, 0.000e+00, 4.753e-02, 0.000e+00, 1.279e-04, 0.000e+00, 1.270e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RT_le7.5t_Euro-VI_D-E
-        { 1.632e+03, 9.171e+00, 0.000e+00, 1.152e+00, 0.000e+00, 1.452e+02, 1.001e+00 }, // CO2(total)
+        { 1.632e+03, 3.302e+01, 0.000e+00, 1.493e+01, 0.000e+00, 5.226e+02, 1.297e+01 }, // CO2(total)
         { 4.487e-01, 0.000e+00, 3.677e-01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 1.666e-01, 2.530e-04, 6.593e-02, 0.000e+00, 1.026e-07, 0.000e+00, 1.309e-05 }, // HC
-        { 5.246e+02, 2.947e+00, 0.000e+00, 3.703e-01, 0.000e+00, 4.666e+01, 3.216e-01 }, // FC
-        { 7.422e-01, 0.000e+00, 5.967e-01, 7.898e-05, 1.809e-07, 0.000e+00, 0.000e+00 }, // NOx
-        { 1.435e+00, 1.345e-04, 0.000e+00, 1.830e-06, 2.712e-06, 4.681e-04, 1.072e-05 }, // PM + PM (non-exhaust)
+        { 1.666e-01, 9.109e-04, 6.593e-02, 0.000e+00, 4.788e-06, 0.000e+00, 1.697e-04 }, // HC
+        { 5.246e+02, 1.061e+01, 0.000e+00, 4.799e+00, 0.000e+00, 1.680e+02, 4.168e+00 }, // FC
+        { 7.422e-01, 0.000e+00, 5.967e-01, 1.024e-03, 8.439e-06, 0.000e+00, 0.000e+00 }, // NOx
+        { 1.435e+00, 4.843e-04, 0.000e+00, 2.371e-05, 1.265e-04, 1.685e-03, 1.389e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RT_le7.5t_Euro-VIs_D-E
-        { 1.632e+03, 9.171e+00, 0.000e+00, 1.152e+00, 0.000e+00, 1.452e+02, 1.001e+00 }, // CO2(total)
+        { 1.632e+03, 3.302e+01, 0.000e+00, 1.493e+01, 0.000e+00, 5.226e+02, 1.297e+01 }, // CO2(total)
         { 4.487e-01, 0.000e+00, 3.677e-01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 1.666e-01, 2.530e-04, 6.593e-02, 0.000e+00, 1.026e-07, 0.000e+00, 1.309e-05 }, // HC
-        { 5.246e+02, 2.947e+00, 0.000e+00, 3.703e-01, 0.000e+00, 4.666e+01, 3.216e-01 }, // FC
-        { 1.693e+01, 3.098e-01, 2.838e+01, 0.000e+00, 8.663e-05, 2.323e-01, 1.572e-02 }, // NOx
-        { 1.435e+00, 1.345e-04, 0.000e+00, 1.830e-06, 2.712e-06, 4.681e-04, 1.072e-05 }, // PM + PM (non-exhaust)
+        { 1.666e-01, 9.109e-04, 6.593e-02, 0.000e+00, 4.788e-06, 0.000e+00, 1.697e-04 }, // HC
+        { 5.246e+02, 1.061e+01, 0.000e+00, 4.799e+00, 0.000e+00, 1.680e+02, 4.168e+00 }, // FC
+        { 1.693e+01, 1.115e+00, 2.838e+01, 0.000e+00, 4.042e-03, 8.362e-01, 2.038e-01 }, // NOx
+        { 1.435e+00, 4.843e-04, 0.000e+00, 2.371e-05, 1.265e-04, 1.685e-03, 1.389e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RT_gt7_5-12t_50ties
-        { 0.000e+00, 1.626e+02, 0.000e+00, 1.985e-01, 0.000e+00, 3.520e+02, 1.818e-02 }, // CO2(total)
-        { 1.565e+01, 3.569e-01, 0.000e+00, 5.657e-03, 0.000e+00, 1.128e+00, 8.149e-03 }, // CO
-        { 1.569e+01, 0.000e+00, 4.644e+00, 0.000e+00, 1.609e-05, 0.000e+00, 6.290e-04 }, // HC
-        { 0.000e+00, 5.227e+01, 0.000e+00, 6.378e-02, 0.000e+00, 1.131e+02, 5.843e-03 }, // FC
-        { 1.103e+01, 1.710e+00, 0.000e+00, 4.555e-03, 0.000e+00, 4.132e+00, 3.478e-03 }, // NOx
-        { 2.833e+00, 1.226e-01, 0.000e+00, 0.000e+00, 2.740e-06, 2.209e-01, 1.040e-05 }, // PM + PM (non-exhaust)
+        { 0.000e+00, 5.855e+02, 0.000e+00, 2.572e+00, 0.000e+00, 1.267e+03, 2.356e-01 }, // CO2(total)
+        { 1.565e+01, 1.285e+00, 0.000e+00, 7.331e-02, 0.000e+00, 4.061e+00, 1.056e-01 }, // CO
+        { 1.569e+01, 0.000e+00, 4.644e+00, 0.000e+00, 7.508e-04, 0.000e+00, 8.152e-03 }, // HC
+        { 0.000e+00, 1.882e+02, 0.000e+00, 8.266e-01, 0.000e+00, 4.073e+02, 7.572e-02 }, // FC
+        { 1.103e+01, 6.156e+00, 0.000e+00, 5.903e-02, 0.000e+00, 1.488e+01, 4.508e-02 }, // NOx
+        { 2.833e+00, 4.414e-01, 0.000e+00, 0.000e+00, 1.278e-04, 7.954e-01, 1.347e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RT_gt7_5-12t_60ties
-        { 0.000e+00, 1.626e+02, 0.000e+00, 1.985e-01, 0.000e+00, 3.520e+02, 1.818e-02 }, // CO2(total)
-        { 1.565e+01, 3.569e-01, 0.000e+00, 5.657e-03, 0.000e+00, 1.128e+00, 8.149e-03 }, // CO
-        { 1.569e+01, 0.000e+00, 4.644e+00, 0.000e+00, 1.609e-05, 0.000e+00, 6.290e-04 }, // HC
-        { 0.000e+00, 5.227e+01, 0.000e+00, 6.378e-02, 0.000e+00, 1.131e+02, 5.843e-03 }, // FC
-        { 1.103e+01, 1.710e+00, 0.000e+00, 4.555e-03, 0.000e+00, 4.132e+00, 3.478e-03 }, // NOx
-        { 2.833e+00, 1.226e-01, 0.000e+00, 0.000e+00, 2.740e-06, 2.209e-01, 1.040e-05 }, // PM + PM (non-exhaust)
+        { 0.000e+00, 5.855e+02, 0.000e+00, 2.572e+00, 0.000e+00, 1.267e+03, 2.356e-01 }, // CO2(total)
+        { 1.565e+01, 1.285e+00, 0.000e+00, 7.331e-02, 0.000e+00, 4.061e+00, 1.056e-01 }, // CO
+        { 1.569e+01, 0.000e+00, 4.644e+00, 0.000e+00, 7.508e-04, 0.000e+00, 8.152e-03 }, // HC
+        { 0.000e+00, 1.882e+02, 0.000e+00, 8.266e-01, 0.000e+00, 4.073e+02, 7.572e-02 }, // FC
+        { 1.103e+01, 6.156e+00, 0.000e+00, 5.903e-02, 0.000e+00, 1.488e+01, 4.508e-02 }, // NOx
+        { 2.833e+00, 4.414e-01, 0.000e+00, 0.000e+00, 1.278e-04, 7.954e-01, 1.347e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RT_gt7_5-12t_70ties
-        { 0.000e+00, 1.626e+02, 0.000e+00, 1.985e-01, 0.000e+00, 3.520e+02, 1.818e-02 }, // CO2(total)
-        { 1.565e+01, 3.569e-01, 0.000e+00, 5.657e-03, 0.000e+00, 1.128e+00, 8.149e-03 }, // CO
-        { 1.569e+01, 0.000e+00, 4.644e+00, 0.000e+00, 1.609e-05, 0.000e+00, 6.290e-04 }, // HC
-        { 0.000e+00, 5.227e+01, 0.000e+00, 6.378e-02, 0.000e+00, 1.131e+02, 5.843e-03 }, // FC
-        { 1.103e+01, 1.710e+00, 0.000e+00, 4.555e-03, 0.000e+00, 4.132e+00, 3.478e-03 }, // NOx
-        { 2.833e+00, 1.226e-01, 0.000e+00, 0.000e+00, 2.740e-06, 2.209e-01, 1.040e-05 }, // PM + PM (non-exhaust)
+        { 0.000e+00, 5.855e+02, 0.000e+00, 2.572e+00, 0.000e+00, 1.267e+03, 2.356e-01 }, // CO2(total)
+        { 1.565e+01, 1.285e+00, 0.000e+00, 7.331e-02, 0.000e+00, 4.061e+00, 1.056e-01 }, // CO
+        { 1.569e+01, 0.000e+00, 4.644e+00, 0.000e+00, 7.508e-04, 0.000e+00, 8.152e-03 }, // HC
+        { 0.000e+00, 1.882e+02, 0.000e+00, 8.266e-01, 0.000e+00, 4.073e+02, 7.572e-02 }, // FC
+        { 1.103e+01, 6.156e+00, 0.000e+00, 5.903e-02, 0.000e+00, 1.488e+01, 4.508e-02 }, // NOx
+        { 2.833e+00, 4.414e-01, 0.000e+00, 0.000e+00, 1.278e-04, 7.954e-01, 1.347e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RT_gt7_5-12t_80ties
-        { 0.000e+00, 1.626e+02, 0.000e+00, 1.985e-01, 0.000e+00, 3.520e+02, 1.818e-02 }, // CO2(total)
-        { 1.565e+01, 3.569e-01, 0.000e+00, 5.657e-03, 0.000e+00, 1.128e+00, 8.149e-03 }, // CO
-        { 1.569e+01, 0.000e+00, 4.644e+00, 0.000e+00, 1.609e-05, 0.000e+00, 6.290e-04 }, // HC
-        { 0.000e+00, 5.227e+01, 0.000e+00, 6.378e-02, 0.000e+00, 1.131e+02, 5.843e-03 }, // FC
-        { 1.103e+01, 1.710e+00, 0.000e+00, 4.555e-03, 0.000e+00, 4.132e+00, 3.478e-03 }, // NOx
-        { 2.833e+00, 1.226e-01, 0.000e+00, 0.000e+00, 2.740e-06, 2.209e-01, 1.040e-05 }, // PM + PM (non-exhaust)
+        { 0.000e+00, 5.855e+02, 0.000e+00, 2.572e+00, 0.000e+00, 1.267e+03, 2.356e-01 }, // CO2(total)
+        { 1.565e+01, 1.285e+00, 0.000e+00, 7.331e-02, 0.000e+00, 4.061e+00, 1.056e-01 }, // CO
+        { 1.569e+01, 0.000e+00, 4.644e+00, 0.000e+00, 7.508e-04, 0.000e+00, 8.152e-03 }, // HC
+        { 0.000e+00, 1.882e+02, 0.000e+00, 8.266e-01, 0.000e+00, 4.073e+02, 7.572e-02 }, // FC
+        { 1.103e+01, 6.156e+00, 0.000e+00, 5.903e-02, 0.000e+00, 1.488e+01, 4.508e-02 }, // NOx
+        { 2.833e+00, 4.414e-01, 0.000e+00, 0.000e+00, 1.278e-04, 7.954e-01, 1.347e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RT_gt7_5-12t_EE
-        { 0.000e+00, 1.626e+02, 0.000e+00, 1.985e-01, 0.000e+00, 3.520e+02, 1.818e-02 }, // CO2(total)
-        { 3.130e+01, 7.139e-01, 0.000e+00, 1.131e-02, 0.000e+00, 2.256e+00, 1.630e-02 }, // CO
-        { 3.921e+01, 0.000e+00, 1.161e+01, 0.000e+00, 4.023e-05, 0.000e+00, 1.572e-03 }, // HC
-        { 0.000e+00, 5.227e+01, 0.000e+00, 6.378e-02, 0.000e+00, 1.131e+02, 5.843e-03 }, // FC
-        { 1.324e+01, 2.052e+00, 0.000e+00, 5.466e-03, 0.000e+00, 4.959e+00, 4.174e-03 }, // NOx
-        { 7.072e+00, 4.905e-01, 0.000e+00, 0.000e+00, 2.740e-06, 8.837e-01, 1.040e-05 }, // PM + PM (non-exhaust)
+        { 0.000e+00, 5.855e+02, 0.000e+00, 2.572e+00, 0.000e+00, 1.267e+03, 2.356e-01 }, // CO2(total)
+        { 3.130e+01, 2.570e+00, 0.000e+00, 1.466e-01, 0.000e+00, 8.123e+00, 2.112e-01 }, // CO
+        { 3.921e+01, 0.000e+00, 1.161e+01, 0.000e+00, 1.877e-03, 0.000e+00, 2.038e-02 }, // HC
+        { 0.000e+00, 1.882e+02, 0.000e+00, 8.266e-01, 0.000e+00, 4.073e+02, 7.572e-02 }, // FC
+        { 1.324e+01, 7.387e+00, 0.000e+00, 7.084e-02, 0.000e+00, 1.785e+01, 5.410e-02 }, // NOx
+        { 7.072e+00, 1.766e+00, 0.000e+00, 0.000e+00, 1.278e-04, 3.181e+00, 1.347e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RT_gt7_5-12t_Euro-I
-        { 0.000e+00, 1.621e+02, 0.000e+00, 1.333e-01, 0.000e+00, 3.493e+02, 0.000e+00 }, // CO2(total)
-        { 1.017e+01, 3.462e-02, 1.151e+01, 1.206e-03, 0.000e+00, 0.000e+00, 2.844e-03 }, // CO
-        { 3.479e+00, 0.000e+00, 1.163e+00, 0.000e+00, 6.150e-06, 3.635e-02, 6.447e-04 }, // HC
-        { 0.000e+00, 5.208e+01, 0.000e+00, 4.283e-02, 0.000e+00, 1.123e+02, 0.000e+00 }, // FC
-        { 3.625e+00, 1.530e+00, 0.000e+00, 0.000e+00, 0.000e+00, 3.289e+00, 0.000e+00 }, // NOx
-        { 2.600e+00, 3.655e-02, 0.000e+00, 1.206e-04, 2.718e-06, 7.437e-02, 2.030e-04 }, // PM + PM (non-exhaust)
+        { 0.000e+00, 5.834e+02, 0.000e+00, 1.727e+00, 0.000e+00, 1.258e+03, 0.000e+00 }, // CO2(total)
+        { 1.017e+01, 1.246e-01, 1.151e+01, 1.563e-02, 0.000e+00, 0.000e+00, 3.686e-02 }, // CO
+        { 3.479e+00, 0.000e+00, 1.163e+00, 0.000e+00, 2.869e-04, 1.309e-01, 8.355e-03 }, // HC
+        { 0.000e+00, 1.875e+02, 0.000e+00, 5.550e-01, 0.000e+00, 4.041e+02, 0.000e+00 }, // FC
+        { 3.625e+00, 5.508e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.184e+01, 0.000e+00 }, // NOx
+        { 2.600e+00, 1.316e-01, 0.000e+00, 1.562e-03, 1.268e-04, 2.677e-01, 2.631e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RT_gt7_5-12t_Euro-II
-        { 1.016e+03, 1.106e+02, 0.000e+00, 5.319e-01, 0.000e+00, 3.089e+02, 3.441e-01 }, // CO2(total)
-        { 1.036e+01, 7.568e-02, 1.828e+01, 0.000e+00, 0.000e+00, 9.182e-02, 0.000e+00 }, // CO
-        { 2.383e+00, 0.000e+00, 6.374e-01, 0.000e+00, 3.836e-06, 0.000e+00, 6.188e-04 }, // HC
-        { 3.266e+02, 3.553e+01, 0.000e+00, 1.709e-01, 0.000e+00, 9.926e+01, 1.106e-01 }, // FC
-        { 1.044e+01, 1.458e+00, 8.778e+00, 0.000e+00, 0.000e+00, 3.129e+00, 0.000e+00 }, // NOx
-        { 2.254e+00, 1.203e-02, 5.531e-01, 8.838e-05, 2.685e-06, 3.747e-02, 0.000e+00 }, // PM + PM (non-exhaust)
+        { 1.016e+03, 3.980e+02, 0.000e+00, 6.894e+00, 0.000e+00, 1.112e+03, 4.459e+00 }, // CO2(total)
+        { 1.036e+01, 2.724e-01, 1.828e+01, 0.000e+00, 0.000e+00, 3.306e-01, 0.000e+00 }, // CO
+        { 2.383e+00, 0.000e+00, 6.374e-01, 0.000e+00, 1.790e-04, 0.000e+00, 8.020e-03 }, // HC
+        { 3.266e+02, 1.279e+02, 0.000e+00, 2.215e+00, 0.000e+00, 3.574e+02, 1.433e+00 }, // FC
+        { 1.044e+01, 5.247e+00, 8.778e+00, 0.000e+00, 0.000e+00, 1.127e+01, 0.000e+00 }, // NOx
+        { 2.254e+00, 4.329e-02, 5.531e-01, 1.145e-03, 1.253e-04, 1.349e-01, 0.000e+00 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RT_gt7_5-12t_Euro-III
-        { 6.886e+02, 1.330e+02, 0.000e+00, 3.253e-01, 0.000e+00, 3.255e+02, 2.236e-01 }, // CO2(total)
-        { 1.176e+01, 6.484e-02, 9.207e+00, 0.000e+00, 0.000e+00, 1.151e-01, 0.000e+00 }, // CO
-        { 2.324e+00, 0.000e+00, 8.327e-01, 0.000e+00, 2.437e-06, 0.000e+00, 4.303e-04 }, // HC
-        { 2.213e+02, 4.274e+01, 0.000e+00, 1.045e-01, 0.000e+00, 1.046e+02, 7.186e-02 }, // FC
-        { 1.000e+01, 1.084e+00, 7.203e+00, 0.000e+00, 0.000e+00, 2.503e+00, 0.000e+00 }, // NOx
-        { 2.724e+00, 0.000e+00, 3.934e-01, 0.000e+00, 4.120e-06, 3.247e-03, 2.526e-04 }, // PM + PM (non-exhaust)
+        { 6.886e+02, 4.788e+02, 0.000e+00, 4.216e+00, 0.000e+00, 1.172e+03, 2.898e+00 }, // CO2(total)
+        { 1.176e+01, 2.334e-01, 9.207e+00, 0.000e+00, 0.000e+00, 4.144e-01, 0.000e+00 }, // CO
+        { 2.324e+00, 0.000e+00, 8.327e-01, 0.000e+00, 1.137e-04, 0.000e+00, 5.577e-03 }, // HC
+        { 2.213e+02, 1.539e+02, 0.000e+00, 1.355e+00, 0.000e+00, 3.766e+02, 9.313e-01 }, // FC
+        { 1.000e+01, 3.902e+00, 7.203e+00, 0.000e+00, 0.000e+00, 9.012e+00, 0.000e+00 }, // NOx
+        { 2.724e+00, 0.000e+00, 3.934e-01, 0.000e+00, 1.922e-04, 1.169e-02, 3.273e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RT_gt7_5-12t_Euro-IV_EGR
-        { 0.000e+00, 1.457e+02, 0.000e+00, 2.553e-01, 0.000e+00, 3.387e+02, 1.293e-01 }, // CO2(total)
-        { 6.722e+00, 4.074e-02, 1.429e+01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 1.374e-01, 7.199e-03, 7.390e-01, 0.000e+00, 0.000e+00, 1.157e-03, 0.000e+00 }, // HC
-        { 0.000e+00, 4.682e+01, 0.000e+00, 8.206e-02, 0.000e+00, 1.089e+02, 4.156e-02 }, // FC
-        { 2.809e+01, 5.304e-01, 6.047e+01, 0.000e+00, 0.000e+00, 1.167e+00, 0.000e+00 }, // NOx
-        { 1.742e+00, 1.529e-03, 6.174e-01, 0.000e+00, 2.688e-06, 6.034e-04, 0.000e+00 }, // PM + PM (non-exhaust)
+        { 0.000e+00, 5.244e+02, 0.000e+00, 3.309e+00, 0.000e+00, 1.219e+03, 1.676e+00 }, // CO2(total)
+        { 6.722e+00, 1.467e-01, 1.429e+01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
+        { 1.374e-01, 2.592e-02, 7.390e-01, 0.000e+00, 0.000e+00, 4.166e-03, 0.000e+00 }, // HC
+        { 0.000e+00, 1.685e+02, 0.000e+00, 1.063e+00, 0.000e+00, 3.919e+02, 5.386e-01 }, // FC
+        { 2.809e+01, 1.909e+00, 6.047e+01, 0.000e+00, 0.000e+00, 4.202e+00, 0.000e+00 }, // NOx
+        { 1.742e+00, 5.504e-03, 6.174e-01, 0.000e+00, 1.254e-04, 2.172e-03, 0.000e+00 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RT_gt7_5-12t_Euro-IV_SCR
-        { 0.000e+00, 1.446e+02, 0.000e+00, 2.448e-01, 0.000e+00, 3.357e+02, 1.113e-01 }, // CO2(total)
+        { 0.000e+00, 5.204e+02, 0.000e+00, 3.173e+00, 0.000e+00, 1.209e+03, 1.443e+00 }, // CO2(total)
         { 2.111e+01, 0.000e+00, 4.039e+01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 9.162e-02, 1.244e-03, 7.566e-02, 0.000e+00, 3.998e-07, 5.731e-03, 0.000e+00 }, // HC
-        { 0.000e+00, 4.646e+01, 0.000e+00, 7.868e-02, 0.000e+00, 1.079e+02, 3.577e-02 }, // FC
-        { 1.052e+01, 3.918e-01, 0.000e+00, 1.174e-03, 0.000e+00, 7.360e-01, 3.116e-03 }, // NOx
-        { 1.805e+00, 7.668e-04, 7.167e-01, 0.000e+00, 2.763e-06, 6.443e-04, 0.000e+00 }, // PM + PM (non-exhaust)
+        { 9.162e-02, 4.479e-03, 7.566e-02, 0.000e+00, 1.865e-05, 2.063e-02, 0.000e+00 }, // HC
+        { 0.000e+00, 1.673e+02, 0.000e+00, 1.020e+00, 0.000e+00, 3.884e+02, 4.636e-01 }, // FC
+        { 1.052e+01, 1.411e+00, 0.000e+00, 1.521e-02, 0.000e+00, 2.650e+00, 4.038e-02 }, // NOx
+        { 1.805e+00, 2.760e-03, 7.167e-01, 0.000e+00, 1.289e-04, 2.319e-03, 0.000e+00 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RT_gt7_5-12t_Euro-IV_SCRs
-        { 0.000e+00, 1.446e+02, 0.000e+00, 2.448e-01, 0.000e+00, 3.357e+02, 1.113e-01 }, // CO2(total)
+        { 0.000e+00, 5.204e+02, 0.000e+00, 3.173e+00, 0.000e+00, 1.209e+03, 1.443e+00 }, // CO2(total)
         { 2.111e+01, 0.000e+00, 4.039e+01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 9.162e-02, 1.244e-03, 7.566e-02, 0.000e+00, 3.998e-07, 5.731e-03, 0.000e+00 }, // HC
-        { 0.000e+00, 4.646e+01, 0.000e+00, 7.868e-02, 0.000e+00, 1.079e+02, 3.577e-02 }, // FC
-        { 3.563e+00, 1.538e+00, 7.666e-01, 0.000e+00, 0.000e+00, 3.257e+00, 0.000e+00 }, // NOx
-        { 1.805e+00, 7.668e-04, 7.167e-01, 0.000e+00, 2.763e-06, 6.443e-04, 0.000e+00 }, // PM + PM (non-exhaust)
+        { 9.162e-02, 4.479e-03, 7.566e-02, 0.000e+00, 1.865e-05, 2.063e-02, 0.000e+00 }, // HC
+        { 0.000e+00, 1.673e+02, 0.000e+00, 1.020e+00, 0.000e+00, 3.884e+02, 4.636e-01 }, // FC
+        { 3.563e+00, 5.536e+00, 7.666e-01, 0.000e+00, 0.000e+00, 1.173e+01, 0.000e+00 }, // NOx
+        { 1.805e+00, 2.760e-03, 7.167e-01, 0.000e+00, 1.289e-04, 2.319e-03, 0.000e+00 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RT_gt7_5-12t_Euro-V_EGR
-        { 0.000e+00, 1.434e+02, 0.000e+00, 2.073e-01, 0.000e+00, 3.345e+02, 7.853e-02 }, // CO2(total)
+        { 0.000e+00, 5.161e+02, 0.000e+00, 2.687e+00, 0.000e+00, 1.204e+03, 1.018e+00 }, // CO2(total)
         { 6.291e+00, 0.000e+00, 1.024e+01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 4.937e-01, 2.049e-03, 3.758e-01, 0.000e+00, 7.562e-07, 1.326e-02, 0.000e+00 }, // HC
-        { 0.000e+00, 4.608e+01, 0.000e+00, 6.663e-02, 0.000e+00, 1.075e+02, 2.524e-02 }, // FC
-        { 2.603e+01, 2.795e-01, 5.663e+01, 0.000e+00, 0.000e+00, 3.990e-01, 0.000e+00 }, // NOx
-        { 1.554e+00, 0.000e+00, 9.193e-02, 0.000e+00, 3.777e-06, 7.784e-04, 1.547e-04 }, // PM + PM (non-exhaust)
+        { 4.937e-01, 7.378e-03, 3.758e-01, 0.000e+00, 3.528e-05, 4.773e-02, 0.000e+00 }, // HC
+        { 0.000e+00, 1.659e+02, 0.000e+00, 8.635e-01, 0.000e+00, 3.870e+02, 3.271e-01 }, // FC
+        { 2.603e+01, 1.006e+00, 5.663e+01, 0.000e+00, 0.000e+00, 1.436e+00, 0.000e+00 }, // NOx
+        { 1.554e+00, 0.000e+00, 9.193e-02, 0.000e+00, 1.762e-04, 2.802e-03, 2.004e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RT_gt7_5-12t_Euro-V_SCR
-        { 0.000e+00, 1.409e+02, 0.000e+00, 1.956e-01, 0.000e+00, 3.287e+02, 5.786e-02 }, // CO2(total)
+        { 0.000e+00, 5.072e+02, 0.000e+00, 2.535e+00, 0.000e+00, 1.183e+03, 7.498e-01 }, // CO2(total)
         { 1.941e+01, 0.000e+00, 3.546e+01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 8.249e-02, 1.958e-03, 3.485e-02, 0.000e+00, 2.514e-07, 6.336e-03, 0.000e+00 }, // HC
-        { 0.000e+00, 4.528e+01, 0.000e+00, 6.287e-02, 0.000e+00, 1.056e+02, 1.859e-02 }, // FC
-        { 1.518e+01, 7.876e-02, 0.000e+00, 1.224e-03, 0.000e+00, 0.000e+00, 5.562e-03 }, // NOx
-        { 1.827e+00, 5.557e-04, 6.742e-01, 0.000e+00, 2.729e-06, 8.115e-04, 0.000e+00 }, // PM + PM (non-exhaust)
+        { 8.249e-02, 7.048e-03, 3.485e-02, 0.000e+00, 1.173e-05, 2.281e-02, 0.000e+00 }, // HC
+        { 0.000e+00, 1.630e+02, 0.000e+00, 8.148e-01, 0.000e+00, 3.802e+02, 2.410e-01 }, // FC
+        { 1.518e+01, 2.835e-01, 0.000e+00, 1.586e-02, 0.000e+00, 0.000e+00, 7.208e-02 }, // NOx
+        { 1.827e+00, 2.001e-03, 6.742e-01, 0.000e+00, 1.273e-04, 2.921e-03, 0.000e+00 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RT_gt7_5-12t_Euro-V_SCRs
-        { 0.000e+00, 1.409e+02, 0.000e+00, 1.956e-01, 0.000e+00, 3.287e+02, 5.786e-02 }, // CO2(total)
+        { 0.000e+00, 5.072e+02, 0.000e+00, 2.535e+00, 0.000e+00, 1.183e+03, 7.498e-01 }, // CO2(total)
         { 1.941e+01, 0.000e+00, 3.546e+01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 8.249e-02, 1.958e-03, 3.485e-02, 0.000e+00, 2.514e-07, 6.336e-03, 0.000e+00 }, // HC
-        { 0.000e+00, 4.528e+01, 0.000e+00, 6.287e-02, 0.000e+00, 1.056e+02, 1.859e-02 }, // FC
-        { 5.880e+00, 1.513e+00, 0.000e+00, 0.000e+00, 0.000e+00, 2.994e+00, 3.099e-03 }, // NOx
-        { 1.827e+00, 5.557e-04, 6.742e-01, 0.000e+00, 2.729e-06, 8.115e-04, 0.000e+00 }, // PM + PM (non-exhaust)
+        { 8.249e-02, 7.048e-03, 3.485e-02, 0.000e+00, 1.173e-05, 2.281e-02, 0.000e+00 }, // HC
+        { 0.000e+00, 1.630e+02, 0.000e+00, 8.148e-01, 0.000e+00, 3.802e+02, 2.410e-01 }, // FC
+        { 5.880e+00, 5.446e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.078e+01, 4.016e-02 }, // NOx
+        { 1.827e+00, 2.001e-03, 6.742e-01, 0.000e+00, 1.273e-04, 2.921e-03, 0.000e+00 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RT_gt7_5-12t_Euro-VI_A-C
-        { 0.000e+00, 1.389e+02, 0.000e+00, 2.163e-01, 0.000e+00, 3.239e+02, 2.040e-01 }, // CO2(total)
-        { 1.383e+00, 7.105e-03, 2.189e+00, 0.000e+00, 2.370e-07, 0.000e+00, 0.000e+00 }, // CO
-        { 2.982e-02, 3.261e-03, 0.000e+00, 0.000e+00, 0.000e+00, 5.826e-03, 0.000e+00 }, // HC
-        { 0.000e+00, 4.463e+01, 0.000e+00, 6.952e-02, 0.000e+00, 1.041e+02, 6.556e-02 }, // FC
-        { 2.327e+00, 5.954e-03, 0.000e+00, 4.172e-04, 0.000e+00, 0.000e+00, 4.432e-04 }, // NOx
-        { 1.480e+00, 0.000e+00, 7.698e-02, 0.000e+00, 2.920e-06, 4.341e-04, 1.009e-05 }, // PM + PM (non-exhaust)
+        { 0.000e+00, 5.000e+02, 0.000e+00, 2.803e+00, 0.000e+00, 1.166e+03, 2.644e+00 }, // CO2(total)
+        { 1.383e+00, 2.558e-02, 2.189e+00, 0.000e+00, 1.106e-05, 0.000e+00, 0.000e+00 }, // CO
+        { 2.982e-02, 1.174e-02, 0.000e+00, 0.000e+00, 0.000e+00, 2.097e-02, 0.000e+00 }, // HC
+        { 0.000e+00, 1.607e+02, 0.000e+00, 9.009e-01, 0.000e+00, 3.747e+02, 8.497e-01 }, // FC
+        { 2.327e+00, 2.144e-02, 0.000e+00, 5.407e-03, 0.000e+00, 0.000e+00, 5.745e-03 }, // NOx
+        { 1.480e+00, 0.000e+00, 7.698e-02, 0.000e+00, 1.362e-04, 1.563e-03, 1.308e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RT_gt7_5-12t_Euro-VIs_A-C
-        { 0.000e+00, 1.389e+02, 0.000e+00, 2.163e-01, 0.000e+00, 3.239e+02, 2.040e-01 }, // CO2(total)
-        { 1.383e+00, 7.105e-03, 2.189e+00, 0.000e+00, 2.370e-07, 0.000e+00, 0.000e+00 }, // CO
-        { 2.982e-02, 3.261e-03, 0.000e+00, 0.000e+00, 0.000e+00, 5.826e-03, 0.000e+00 }, // HC
-        { 0.000e+00, 4.463e+01, 0.000e+00, 6.952e-02, 0.000e+00, 1.041e+02, 6.556e-02 }, // FC
-        { 5.888e-01, 9.088e-01, 0.000e+00, 1.513e-03, 0.000e+00, 2.021e+00, 2.325e-03 }, // NOx
-        { 1.480e+00, 0.000e+00, 7.698e-02, 0.000e+00, 2.920e-06, 4.341e-04, 1.009e-05 }, // PM + PM (non-exhaust)
+        { 0.000e+00, 5.000e+02, 0.000e+00, 2.803e+00, 0.000e+00, 1.166e+03, 2.644e+00 }, // CO2(total)
+        { 1.383e+00, 2.558e-02, 2.189e+00, 0.000e+00, 1.106e-05, 0.000e+00, 0.000e+00 }, // CO
+        { 2.982e-02, 1.174e-02, 0.000e+00, 0.000e+00, 0.000e+00, 2.097e-02, 0.000e+00 }, // HC
+        { 0.000e+00, 1.607e+02, 0.000e+00, 9.009e-01, 0.000e+00, 3.747e+02, 8.497e-01 }, // FC
+        { 5.888e-01, 3.272e+00, 0.000e+00, 1.961e-02, 0.000e+00, 7.277e+00, 3.013e-02 }, // NOx
+        { 1.480e+00, 0.000e+00, 7.698e-02, 0.000e+00, 1.362e-04, 1.563e-03, 1.308e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RT_gt7_5-12t_Euro-VI_D-E
-        { 0.000e+00, 1.362e+02, 0.000e+00, 2.357e-01, 0.000e+00, 3.168e+02, 2.690e-01 }, // CO2(total)
+        { 0.000e+00, 4.903e+02, 0.000e+00, 3.054e+00, 0.000e+00, 1.141e+03, 3.487e+00 }, // CO2(total)
         { 5.022e-01, 0.000e+00, 6.107e-01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 1.979e-01, 0.000e+00, 7.798e-02, 0.000e+00, 2.425e-07, 1.347e-03, 0.000e+00 }, // HC
-        { 0.000e+00, 4.377e+01, 0.000e+00, 7.574e-02, 0.000e+00, 1.018e+02, 8.647e-02 }, // FC
-        { 7.158e-01, 1.160e-02, 1.748e-01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // NOx
-        { 1.445e+00, 0.000e+00, 0.000e+00, 4.382e-06, 2.715e-06, 1.279e-03, 7.637e-06 }, // PM + PM (non-exhaust)
+        { 1.979e-01, 0.000e+00, 7.798e-02, 0.000e+00, 1.131e-05, 4.849e-03, 0.000e+00 }, // HC
+        { 0.000e+00, 1.576e+02, 0.000e+00, 9.816e-01, 0.000e+00, 3.665e+02, 1.121e+00 }, // FC
+        { 7.158e-01, 4.177e-02, 1.748e-01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // NOx
+        { 1.445e+00, 0.000e+00, 0.000e+00, 5.679e-05, 1.267e-04, 4.605e-03, 9.898e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RT_gt7_5-12t_Euro-VIs_D-E
-        { 0.000e+00, 1.362e+02, 0.000e+00, 2.357e-01, 0.000e+00, 3.168e+02, 2.690e-01 }, // CO2(total)
+        { 0.000e+00, 4.903e+02, 0.000e+00, 3.054e+00, 0.000e+00, 1.141e+03, 3.487e+00 }, // CO2(total)
         { 5.022e-01, 0.000e+00, 6.107e-01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 1.979e-01, 0.000e+00, 7.798e-02, 0.000e+00, 2.425e-07, 1.347e-03, 0.000e+00 }, // HC
-        { 0.000e+00, 4.377e+01, 0.000e+00, 7.574e-02, 0.000e+00, 1.018e+02, 8.647e-02 }, // FC
-        { 1.513e+01, 8.491e-01, 4.129e+01, 0.000e+00, 5.052e-06, 1.348e+00, 2.292e-03 }, // NOx
-        { 1.445e+00, 0.000e+00, 0.000e+00, 4.382e-06, 2.715e-06, 1.279e-03, 7.637e-06 }, // PM + PM (non-exhaust)
+        { 1.979e-01, 0.000e+00, 7.798e-02, 0.000e+00, 1.131e-05, 4.849e-03, 0.000e+00 }, // HC
+        { 0.000e+00, 1.576e+02, 0.000e+00, 9.816e-01, 0.000e+00, 3.665e+02, 1.121e+00 }, // FC
+        { 1.513e+01, 3.057e+00, 4.129e+01, 0.000e+00, 2.357e-04, 4.854e+00, 2.970e-02 }, // NOx
+        { 1.445e+00, 0.000e+00, 0.000e+00, 5.679e-05, 1.267e-04, 4.605e-03, 9.898e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RT_gt12-14t_50ties
-        { 1.881e+03, 1.559e+02, 3.944e+03, 0.000e+00, 0.000e+00, 3.244e+02, 0.000e+00 }, // CO2(total)
-        { 2.543e+01, 5.186e-01, 3.581e+01, 0.000e+00, 0.000e+00, 1.105e+00, 0.000e+00 }, // CO
-        { 1.528e+01, 0.000e+00, 1.912e+00, 0.000e+00, 7.880e-06, 0.000e+00, 2.087e-03 }, // HC
-        { 6.046e+02, 5.010e+01, 1.267e+03, 0.000e+00, 0.000e+00, 1.042e+02, 0.000e+00 }, // FC
-        { 2.414e+01, 1.923e+00, 4.490e+01, 0.000e+00, 0.000e+00, 3.990e+00, 0.000e+00 }, // NOx
-        { 5.482e+00, 7.547e-02, 4.585e+00, 0.000e+00, 2.809e-06, 1.651e-01, 1.627e-05 }, // PM + PM (non-exhaust)
+        { 1.881e+03, 5.612e+02, 3.944e+03, 0.000e+00, 0.000e+00, 1.168e+03, 0.000e+00 }, // CO2(total)
+        { 2.543e+01, 1.867e+00, 3.581e+01, 0.000e+00, 0.000e+00, 3.979e+00, 0.000e+00 }, // CO
+        { 1.528e+01, 0.000e+00, 1.912e+00, 0.000e+00, 3.676e-04, 0.000e+00, 2.704e-02 }, // HC
+        { 6.046e+02, 1.804e+02, 1.267e+03, 0.000e+00, 0.000e+00, 3.753e+02, 0.000e+00 }, // FC
+        { 2.414e+01, 6.923e+00, 4.490e+01, 0.000e+00, 0.000e+00, 1.437e+01, 0.000e+00 }, // NOx
+        { 5.482e+00, 2.717e-01, 4.585e+00, 0.000e+00, 1.310e-04, 5.945e-01, 2.109e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RT_gt12-14t_60ties
-        { 1.881e+03, 1.559e+02, 3.944e+03, 0.000e+00, 0.000e+00, 3.244e+02, 0.000e+00 }, // CO2(total)
-        { 2.543e+01, 5.186e-01, 3.581e+01, 0.000e+00, 0.000e+00, 1.105e+00, 0.000e+00 }, // CO
-        { 1.528e+01, 0.000e+00, 1.912e+00, 0.000e+00, 7.880e-06, 0.000e+00, 2.087e-03 }, // HC
-        { 6.046e+02, 5.010e+01, 1.267e+03, 0.000e+00, 0.000e+00, 1.042e+02, 0.000e+00 }, // FC
-        { 2.414e+01, 1.923e+00, 4.490e+01, 0.000e+00, 0.000e+00, 3.990e+00, 0.000e+00 }, // NOx
-        { 5.482e+00, 7.547e-02, 4.585e+00, 0.000e+00, 2.809e-06, 1.651e-01, 1.627e-05 }, // PM + PM (non-exhaust)
+        { 1.881e+03, 5.612e+02, 3.944e+03, 0.000e+00, 0.000e+00, 1.168e+03, 0.000e+00 }, // CO2(total)
+        { 2.543e+01, 1.867e+00, 3.581e+01, 0.000e+00, 0.000e+00, 3.979e+00, 0.000e+00 }, // CO
+        { 1.528e+01, 0.000e+00, 1.912e+00, 0.000e+00, 3.676e-04, 0.000e+00, 2.704e-02 }, // HC
+        { 6.046e+02, 1.804e+02, 1.267e+03, 0.000e+00, 0.000e+00, 3.753e+02, 0.000e+00 }, // FC
+        { 2.414e+01, 6.923e+00, 4.490e+01, 0.000e+00, 0.000e+00, 1.437e+01, 0.000e+00 }, // NOx
+        { 5.482e+00, 2.717e-01, 4.585e+00, 0.000e+00, 1.310e-04, 5.945e-01, 2.109e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RT_gt12-14t_70ties
-        { 1.881e+03, 1.559e+02, 3.944e+03, 0.000e+00, 0.000e+00, 3.244e+02, 0.000e+00 }, // CO2(total)
-        { 2.543e+01, 5.186e-01, 3.581e+01, 0.000e+00, 0.000e+00, 1.105e+00, 0.000e+00 }, // CO
-        { 1.528e+01, 0.000e+00, 1.912e+00, 0.000e+00, 7.880e-06, 0.000e+00, 2.087e-03 }, // HC
-        { 6.046e+02, 5.010e+01, 1.267e+03, 0.000e+00, 0.000e+00, 1.042e+02, 0.000e+00 }, // FC
-        { 2.414e+01, 1.923e+00, 4.490e+01, 0.000e+00, 0.000e+00, 3.990e+00, 0.000e+00 }, // NOx
-        { 5.482e+00, 7.547e-02, 4.585e+00, 0.000e+00, 2.809e-06, 1.651e-01, 1.627e-05 }, // PM + PM (non-exhaust)
+        { 1.881e+03, 5.612e+02, 3.944e+03, 0.000e+00, 0.000e+00, 1.168e+03, 0.000e+00 }, // CO2(total)
+        { 2.543e+01, 1.867e+00, 3.581e+01, 0.000e+00, 0.000e+00, 3.979e+00, 0.000e+00 }, // CO
+        { 1.528e+01, 0.000e+00, 1.912e+00, 0.000e+00, 3.676e-04, 0.000e+00, 2.704e-02 }, // HC
+        { 6.046e+02, 1.804e+02, 1.267e+03, 0.000e+00, 0.000e+00, 3.753e+02, 0.000e+00 }, // FC
+        { 2.414e+01, 6.923e+00, 4.490e+01, 0.000e+00, 0.000e+00, 1.437e+01, 0.000e+00 }, // NOx
+        { 5.482e+00, 2.717e-01, 4.585e+00, 0.000e+00, 1.310e-04, 5.945e-01, 2.109e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RT_gt12-14t_80ties
-        { 1.881e+03, 1.559e+02, 3.944e+03, 0.000e+00, 0.000e+00, 3.244e+02, 0.000e+00 }, // CO2(total)
-        { 2.543e+01, 5.186e-01, 3.581e+01, 0.000e+00, 0.000e+00, 1.105e+00, 0.000e+00 }, // CO
-        { 1.528e+01, 0.000e+00, 1.912e+00, 0.000e+00, 7.880e-06, 0.000e+00, 2.087e-03 }, // HC
-        { 6.046e+02, 5.010e+01, 1.267e+03, 0.000e+00, 0.000e+00, 1.042e+02, 0.000e+00 }, // FC
-        { 2.414e+01, 1.923e+00, 4.490e+01, 0.000e+00, 0.000e+00, 3.990e+00, 0.000e+00 }, // NOx
-        { 5.482e+00, 7.547e-02, 4.585e+00, 0.000e+00, 2.809e-06, 1.651e-01, 1.627e-05 }, // PM + PM (non-exhaust)
+        { 1.881e+03, 5.612e+02, 3.944e+03, 0.000e+00, 0.000e+00, 1.168e+03, 0.000e+00 }, // CO2(total)
+        { 2.543e+01, 1.867e+00, 3.581e+01, 0.000e+00, 0.000e+00, 3.979e+00, 0.000e+00 }, // CO
+        { 1.528e+01, 0.000e+00, 1.912e+00, 0.000e+00, 3.676e-04, 0.000e+00, 2.704e-02 }, // HC
+        { 6.046e+02, 1.804e+02, 1.267e+03, 0.000e+00, 0.000e+00, 3.753e+02, 0.000e+00 }, // FC
+        { 2.414e+01, 6.923e+00, 4.490e+01, 0.000e+00, 0.000e+00, 1.437e+01, 0.000e+00 }, // NOx
+        { 5.482e+00, 2.717e-01, 4.585e+00, 0.000e+00, 1.310e-04, 5.945e-01, 2.109e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RT_gt12-14t_Euro-I
-        { 2.107e+03, 1.461e+02, 4.590e+03, 0.000e+00, 0.000e+00, 3.077e+02, 0.000e+00 }, // CO2(total)
-        { 1.037e+01, 4.744e-02, 9.344e+00, 1.854e-03, 0.000e+00, 0.000e+00, 5.617e-03 }, // CO
-        { 3.874e+00, 1.425e-04, 1.713e+00, 0.000e+00, 2.036e-06, 6.690e-02, 0.000e+00 }, // HC
-        { 6.771e+02, 4.695e+01, 1.475e+03, 0.000e+00, 0.000e+00, 9.889e+01, 0.000e+00 }, // FC
-        { 1.832e+01, 1.445e+00, 3.673e+01, 0.000e+00, 0.000e+00, 3.053e+00, 0.000e+00 }, // NOx
-        { 3.419e+00, 2.777e-02, 1.123e+00, 0.000e+00, 2.761e-06, 7.245e-02, 1.840e-05 }, // PM + PM (non-exhaust)
+        { 2.107e+03, 5.259e+02, 4.590e+03, 0.000e+00, 0.000e+00, 1.108e+03, 0.000e+00 }, // CO2(total)
+        { 1.037e+01, 1.708e-01, 9.344e+00, 2.403e-02, 0.000e+00, 0.000e+00, 7.280e-02 }, // CO
+        { 3.874e+00, 5.130e-04, 1.713e+00, 0.000e+00, 9.497e-05, 2.408e-01, 0.000e+00 }, // HC
+        { 6.771e+02, 1.690e+02, 1.475e+03, 0.000e+00, 0.000e+00, 3.560e+02, 0.000e+00 }, // FC
+        { 1.832e+01, 5.203e+00, 3.673e+01, 0.000e+00, 0.000e+00, 1.099e+01, 0.000e+00 }, // NOx
+        { 3.419e+00, 9.997e-02, 1.123e+00, 0.000e+00, 1.288e-04, 2.608e-01, 2.384e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RT_gt12-14t_Euro-II
-        { 9.111e+02, 1.633e+02, 7.107e+02, 0.000e+00, 0.000e+00, 3.654e+02, 0.000e+00 }, // CO2(total)
-        { 1.276e+01, 5.704e-02, 2.463e+01, 0.000e+00, 0.000e+00, 4.044e-02, 0.000e+00 }, // CO
-        { 2.558e+00, 0.000e+00, 1.037e+00, 6.187e-05, 1.420e-06, 0.000e+00, 6.243e-04 }, // HC
-        { 2.928e+02, 5.247e+01, 2.284e+02, 0.000e+00, 0.000e+00, 1.174e+02, 0.000e+00 }, // FC
-        { 1.441e+01, 1.577e+00, 1.864e+01, 0.000e+00, 0.000e+00, 3.402e+00, 0.000e+00 }, // NOx
-        { 2.436e+00, 1.553e-02, 1.269e+00, 0.000e+00, 2.761e-06, 3.058e-02, 8.075e-06 }, // PM + PM (non-exhaust)
+        { 9.111e+02, 5.878e+02, 7.107e+02, 0.000e+00, 0.000e+00, 1.315e+03, 0.000e+00 }, // CO2(total)
+        { 1.276e+01, 2.053e-01, 2.463e+01, 0.000e+00, 0.000e+00, 1.456e-01, 0.000e+00 }, // CO
+        { 2.558e+00, 0.000e+00, 1.037e+00, 8.019e-04, 6.625e-05, 0.000e+00, 8.090e-03 }, // HC
+        { 2.928e+02, 1.889e+02, 2.284e+02, 0.000e+00, 0.000e+00, 4.227e+02, 0.000e+00 }, // FC
+        { 1.441e+01, 5.677e+00, 1.864e+01, 0.000e+00, 0.000e+00, 1.225e+01, 0.000e+00 }, // NOx
+        { 2.436e+00, 5.592e-02, 1.269e+00, 0.000e+00, 1.288e-04, 1.101e-01, 1.047e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RT_gt12-14t_Euro-III
-        { 1.184e+03, 1.626e+02, 1.349e+03, 0.000e+00, 0.000e+00, 3.651e+02, 0.000e+00 }, // CO2(total)
-        { 1.292e+01, 5.359e-02, 1.250e+01, 0.000e+00, 0.000e+00, 1.107e-01, 0.000e+00 }, // CO
-        { 2.364e+00, 0.000e+00, 1.161e+00, 2.478e-05, 1.038e-06, 0.000e+00, 3.924e-04 }, // HC
-        { 3.805e+02, 5.226e+01, 4.335e+02, 0.000e+00, 0.000e+00, 1.173e+02, 0.000e+00 }, // FC
-        { 1.216e+01, 1.236e+00, 2.645e+01, 0.000e+00, 0.000e+00, 2.547e+00, 0.000e+00 }, // NOx
-        { 2.459e+00, 1.018e-02, 5.797e-02, 0.000e+00, 2.752e-06, 2.868e-02, 9.441e-06 }, // PM + PM (non-exhaust)
+        { 1.184e+03, 5.854e+02, 1.349e+03, 0.000e+00, 0.000e+00, 1.314e+03, 0.000e+00 }, // CO2(total)
+        { 1.292e+01, 1.929e-01, 1.250e+01, 0.000e+00, 0.000e+00, 3.985e-01, 0.000e+00 }, // CO
+        { 2.364e+00, 0.000e+00, 1.161e+00, 3.212e-04, 4.845e-05, 0.000e+00, 5.085e-03 }, // HC
+        { 3.805e+02, 1.881e+02, 4.335e+02, 0.000e+00, 0.000e+00, 4.224e+02, 0.000e+00 }, // FC
+        { 1.216e+01, 4.450e+00, 2.645e+01, 0.000e+00, 0.000e+00, 9.168e+00, 0.000e+00 }, // NOx
+        { 2.459e+00, 3.666e-02, 5.797e-02, 0.000e+00, 1.284e-04, 1.033e-01, 1.224e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RT_gt12-14t_Euro-IV_EGR
-        { 6.013e+02, 1.700e+02, 1.748e+03, 0.000e+00, 0.000e+00, 3.678e+02, 0.000e+00 }, // CO2(total)
-        { 6.704e+00, 4.295e-02, 1.269e+01, 0.000e+00, 2.134e-06, 0.000e+00, 1.242e-03 }, // CO
-        { 3.213e-01, 1.833e-03, 6.049e-01, 0.000e+00, 4.805e-07, 0.000e+00, 1.058e-04 }, // HC
-        { 1.932e+02, 5.464e+01, 5.616e+02, 0.000e+00, 0.000e+00, 1.182e+02, 0.000e+00 }, // FC
-        { 2.208e+01, 7.915e-01, 4.211e+01, 0.000e+00, 0.000e+00, 1.700e+00, 0.000e+00 }, // NOx
-        { 1.763e+00, 5.778e-04, 5.226e-01, 0.000e+00, 2.870e-06, 0.000e+00, 4.382e-05 }, // PM + PM (non-exhaust)
+        { 6.013e+02, 6.121e+02, 1.748e+03, 0.000e+00, 0.000e+00, 1.324e+03, 0.000e+00 }, // CO2(total)
+        { 6.704e+00, 1.546e-01, 1.269e+01, 0.000e+00, 9.956e-05, 0.000e+00, 1.610e-02 }, // CO
+        { 3.213e-01, 6.598e-03, 6.049e-01, 0.000e+00, 2.242e-05, 0.000e+00, 1.371e-03 }, // HC
+        { 1.932e+02, 1.967e+02, 5.616e+02, 0.000e+00, 0.000e+00, 4.255e+02, 0.000e+00 }, // FC
+        { 2.208e+01, 2.849e+00, 4.211e+01, 0.000e+00, 0.000e+00, 6.121e+00, 0.000e+00 }, // NOx
+        { 1.763e+00, 2.080e-03, 5.226e-01, 0.000e+00, 1.339e-04, 0.000e+00, 5.678e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RT_gt12-14t_Euro-IV_SCR
-        { 7.974e+02, 1.636e+02, 2.220e+03, 0.000e+00, 0.000e+00, 3.525e+02, 0.000e+00 }, // CO2(total)
+        { 7.974e+02, 5.890e+02, 2.220e+03, 0.000e+00, 0.000e+00, 1.269e+03, 0.000e+00 }, // CO2(total)
         { 2.325e+01, 0.000e+00, 4.006e+01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 7.032e-02, 3.114e-03, 1.520e-01, 0.000e+00, 0.000e+00, 5.744e-03, 0.000e+00 }, // HC
-        { 2.563e+02, 5.258e+01, 7.133e+02, 0.000e+00, 0.000e+00, 1.133e+02, 0.000e+00 }, // FC
-        { 1.122e+01, 4.390e-01, 0.000e+00, 7.592e-04, 0.000e+00, 1.022e+00, 1.468e-03 }, // NOx
-        { 1.807e+00, 3.723e-04, 6.574e-01, 0.000e+00, 2.848e-06, 0.000e+00, 3.026e-05 }, // PM + PM (non-exhaust)
+        { 7.032e-02, 1.121e-02, 1.520e-01, 0.000e+00, 0.000e+00, 2.068e-02, 0.000e+00 }, // HC
+        { 2.563e+02, 1.893e+02, 7.133e+02, 0.000e+00, 0.000e+00, 4.079e+02, 0.000e+00 }, // FC
+        { 1.122e+01, 1.580e+00, 0.000e+00, 9.840e-03, 0.000e+00, 3.677e+00, 1.903e-02 }, // NOx
+        { 1.807e+00, 1.340e-03, 6.574e-01, 0.000e+00, 1.329e-04, 0.000e+00, 3.922e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RT_gt12-14t_Euro-IV_SCRs
-        { 7.974e+02, 1.636e+02, 2.220e+03, 0.000e+00, 0.000e+00, 3.525e+02, 0.000e+00 }, // CO2(total)
+        { 7.974e+02, 5.890e+02, 2.220e+03, 0.000e+00, 0.000e+00, 1.269e+03, 0.000e+00 }, // CO2(total)
         { 2.325e+01, 0.000e+00, 4.006e+01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 7.032e-02, 3.114e-03, 1.520e-01, 0.000e+00, 0.000e+00, 5.744e-03, 0.000e+00 }, // HC
-        { 2.563e+02, 5.258e+01, 7.133e+02, 0.000e+00, 0.000e+00, 1.133e+02, 0.000e+00 }, // FC
-        { 1.304e+01, 1.544e+00, 2.288e+01, 0.000e+00, 0.000e+00, 3.322e+00, 0.000e+00 }, // NOx
-        { 1.807e+00, 3.723e-04, 6.574e-01, 0.000e+00, 2.848e-06, 0.000e+00, 3.026e-05 }, // PM + PM (non-exhaust)
+        { 7.032e-02, 1.121e-02, 1.520e-01, 0.000e+00, 0.000e+00, 2.068e-02, 0.000e+00 }, // HC
+        { 2.563e+02, 1.893e+02, 7.133e+02, 0.000e+00, 0.000e+00, 4.079e+02, 0.000e+00 }, // FC
+        { 1.304e+01, 5.558e+00, 2.288e+01, 0.000e+00, 0.000e+00, 1.196e+01, 0.000e+00 }, // NOx
+        { 1.807e+00, 1.340e-03, 6.574e-01, 0.000e+00, 1.329e-04, 0.000e+00, 3.922e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RT_gt12-14t_Euro-V_EGR
-        { 1.471e+02, 1.736e+02, 2.060e+02, 0.000e+00, 0.000e+00, 3.876e+02, 0.000e+00 }, // CO2(total)
+        { 1.471e+02, 6.248e+02, 2.060e+02, 0.000e+00, 0.000e+00, 1.395e+03, 0.000e+00 }, // CO2(total)
         { 7.924e+00, 0.000e+00, 1.372e+01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 5.043e-01, 4.739e-03, 5.392e-01, 0.000e+00, 4.832e-07, 1.049e-02, 9.021e-05 }, // HC
-        { 4.728e+01, 5.578e+01, 6.622e+01, 0.000e+00, 0.000e+00, 1.246e+02, 0.000e+00 }, // FC
-        { 2.836e+01, 4.362e-01, 5.591e+01, 0.000e+00, 0.000e+00, 8.796e-01, 0.000e+00 }, // NOx
-        { 1.628e+00, 4.041e-05, 2.898e-01, 0.000e+00, 3.233e-06, 4.732e-04, 1.043e-04 }, // PM + PM (non-exhaust)
+        { 5.043e-01, 1.706e-02, 5.392e-01, 0.000e+00, 2.255e-05, 3.775e-02, 1.169e-03 }, // HC
+        { 4.728e+01, 2.008e+02, 6.622e+01, 0.000e+00, 0.000e+00, 4.484e+02, 0.000e+00 }, // FC
+        { 2.836e+01, 1.570e+00, 5.591e+01, 0.000e+00, 0.000e+00, 3.167e+00, 0.000e+00 }, // NOx
+        { 1.628e+00, 1.455e-04, 2.898e-01, 0.000e+00, 1.509e-04, 1.704e-03, 1.351e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RT_gt12-14t_Euro-V_SCR
-        { 1.499e+02, 1.697e+02, 2.251e+02, 0.000e+00, 0.000e+00, 3.784e+02, 0.000e+00 }, // CO2(total)
+        { 1.499e+02, 6.109e+02, 2.251e+02, 0.000e+00, 0.000e+00, 1.362e+03, 0.000e+00 }, // CO2(total)
         { 2.787e+01, 0.000e+00, 5.053e+01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 5.625e-02, 3.828e-03, 4.521e-02, 0.000e+00, 0.000e+00, 7.629e-03, 0.000e+00 }, // HC
-        { 4.816e+01, 5.454e+01, 7.234e+01, 0.000e+00, 0.000e+00, 1.216e+02, 0.000e+00 }, // FC
-        { 1.720e+01, 1.381e-01, 0.000e+00, 0.000e+00, 7.552e-06, 1.436e-01, 3.914e-03 }, // NOx
-        { 1.870e+00, 1.696e-03, 8.612e-01, 0.000e+00, 2.700e-06, 1.279e-03, 4.616e-06 }, // PM + PM (non-exhaust)
+        { 5.625e-02, 1.378e-02, 4.521e-02, 0.000e+00, 0.000e+00, 2.746e-02, 0.000e+00 }, // HC
+        { 4.816e+01, 1.963e+02, 7.234e+01, 0.000e+00, 0.000e+00, 4.378e+02, 0.000e+00 }, // FC
+        { 1.720e+01, 4.971e-01, 0.000e+00, 0.000e+00, 3.523e-04, 5.169e-01, 5.073e-02 }, // NOx
+        { 1.870e+00, 6.107e-03, 8.612e-01, 0.000e+00, 1.260e-04, 4.605e-03, 5.982e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RT_gt12-14t_Euro-V_SCRs
-        { 1.499e+02, 1.697e+02, 2.251e+02, 0.000e+00, 0.000e+00, 3.784e+02, 0.000e+00 }, // CO2(total)
+        { 1.499e+02, 6.109e+02, 2.251e+02, 0.000e+00, 0.000e+00, 1.362e+03, 0.000e+00 }, // CO2(total)
         { 2.787e+01, 0.000e+00, 5.053e+01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 5.625e-02, 3.828e-03, 4.521e-02, 0.000e+00, 0.000e+00, 7.629e-03, 0.000e+00 }, // HC
-        { 4.816e+01, 5.454e+01, 7.234e+01, 0.000e+00, 0.000e+00, 1.216e+02, 0.000e+00 }, // FC
-        { 1.605e+01, 1.527e+00, 6.782e+00, 6.611e-04, 0.000e+00, 3.550e+00, 0.000e+00 }, // NOx
-        { 1.870e+00, 1.696e-03, 8.612e-01, 0.000e+00, 2.700e-06, 1.279e-03, 4.616e-06 }, // PM + PM (non-exhaust)
+        { 5.625e-02, 1.378e-02, 4.521e-02, 0.000e+00, 0.000e+00, 2.746e-02, 0.000e+00 }, // HC
+        { 4.816e+01, 1.963e+02, 7.234e+01, 0.000e+00, 0.000e+00, 4.378e+02, 0.000e+00 }, // FC
+        { 1.605e+01, 5.496e+00, 6.782e+00, 8.568e-03, 0.000e+00, 1.278e+01, 0.000e+00 }, // NOx
+        { 1.870e+00, 6.107e-03, 8.612e-01, 0.000e+00, 1.260e-04, 4.605e-03, 5.982e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RT_gt12-14t_Euro-VI_A-C
-        { 4.116e+02, 1.640e+02, 9.977e+02, 0.000e+00, 0.000e+00, 3.658e+02, 0.000e+00 }, // CO2(total)
-        { 1.811e+00, 5.835e-03, 2.506e+00, 0.000e+00, 0.000e+00, 1.032e-02, 0.000e+00 }, // CO
-        { 9.688e-02, 1.307e-03, 8.203e-04, 1.293e-05, 0.000e+00, 3.541e-03, 3.259e-05 }, // HC
-        { 1.323e+02, 5.270e+01, 3.207e+02, 0.000e+00, 0.000e+00, 1.176e+02, 0.000e+00 }, // FC
-        { 2.919e+00, 7.278e-03, 1.861e-01, 8.814e-05, 0.000e+00, 0.000e+00, 1.267e-04 }, // NOx
-        { 1.531e+00, 0.000e+00, 1.583e-01, 0.000e+00, 2.697e-06, 3.750e-04, 6.921e-07 }, // PM + PM (non-exhaust)
+        { 4.116e+02, 5.903e+02, 9.977e+02, 0.000e+00, 0.000e+00, 1.317e+03, 0.000e+00 }, // CO2(total)
+        { 1.811e+00, 2.101e-02, 2.506e+00, 0.000e+00, 0.000e+00, 3.713e-02, 0.000e+00 }, // CO
+        { 9.688e-02, 4.705e-03, 8.203e-04, 1.676e-04, 0.000e+00, 1.275e-02, 4.223e-04 }, // HC
+        { 1.323e+02, 1.897e+02, 3.207e+02, 0.000e+00, 0.000e+00, 4.232e+02, 0.000e+00 }, // FC
+        { 2.919e+00, 2.620e-02, 1.861e-01, 1.142e-03, 0.000e+00, 0.000e+00, 1.642e-03 }, // NOx
+        { 1.531e+00, 0.000e+00, 1.583e-01, 0.000e+00, 1.258e-04, 1.350e-03, 8.970e-06 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RT_gt12-14t_Euro-VIs_A-C
-        { 4.116e+02, 1.640e+02, 9.977e+02, 0.000e+00, 0.000e+00, 3.658e+02, 0.000e+00 }, // CO2(total)
-        { 1.811e+00, 5.835e-03, 2.506e+00, 0.000e+00, 0.000e+00, 1.032e-02, 0.000e+00 }, // CO
-        { 9.688e-02, 1.307e-03, 8.203e-04, 1.293e-05, 0.000e+00, 3.541e-03, 3.259e-05 }, // HC
-        { 1.323e+02, 5.270e+01, 3.207e+02, 0.000e+00, 0.000e+00, 1.176e+02, 0.000e+00 }, // FC
-        { 7.645e+00, 1.075e+00, 2.215e+01, 0.000e+00, 0.000e+00, 2.316e+00, 0.000e+00 }, // NOx
-        { 1.531e+00, 0.000e+00, 1.583e-01, 0.000e+00, 2.697e-06, 3.750e-04, 6.921e-07 }, // PM + PM (non-exhaust)
+        { 4.116e+02, 5.903e+02, 9.977e+02, 0.000e+00, 0.000e+00, 1.317e+03, 0.000e+00 }, // CO2(total)
+        { 1.811e+00, 2.101e-02, 2.506e+00, 0.000e+00, 0.000e+00, 3.713e-02, 0.000e+00 }, // CO
+        { 9.688e-02, 4.705e-03, 8.203e-04, 1.676e-04, 0.000e+00, 1.275e-02, 4.223e-04 }, // HC
+        { 1.323e+02, 1.897e+02, 3.207e+02, 0.000e+00, 0.000e+00, 4.232e+02, 0.000e+00 }, // FC
+        { 7.645e+00, 3.872e+00, 2.215e+01, 0.000e+00, 0.000e+00, 8.339e+00, 0.000e+00 }, // NOx
+        { 1.531e+00, 0.000e+00, 1.583e-01, 0.000e+00, 1.258e-04, 1.350e-03, 8.970e-06 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RT_gt12-14t_Euro-VI_D-E
-        { 1.884e+02, 1.661e+02, 3.397e+02, 0.000e+00, 0.000e+00, 3.735e+02, 0.000e+00 }, // CO2(total)
+        { 1.884e+02, 5.980e+02, 3.397e+02, 0.000e+00, 0.000e+00, 1.345e+03, 0.000e+00 }, // CO2(total)
         { 8.133e-01, 0.000e+00, 1.002e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 2.375e-01, 0.000e+00, 1.084e-01, 0.000e+00, 1.496e-07, 0.000e+00, 2.621e-05 }, // HC
-        { 6.054e+01, 5.338e+01, 1.092e+02, 0.000e+00, 0.000e+00, 1.200e+02, 0.000e+00 }, // FC
-        { 1.101e+00, 9.231e-03, 9.399e-01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // NOx
-        { 1.438e+00, 3.353e-04, 0.000e+00, 1.209e-06, 2.696e-06, 1.354e-03, 1.203e-06 }, // PM + PM (non-exhaust)
+        { 2.375e-01, 0.000e+00, 1.084e-01, 0.000e+00, 6.980e-06, 0.000e+00, 3.397e-04 }, // HC
+        { 6.054e+01, 1.922e+02, 1.092e+02, 0.000e+00, 0.000e+00, 4.321e+02, 0.000e+00 }, // FC
+        { 1.101e+00, 3.323e-02, 9.399e-01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // NOx
+        { 1.438e+00, 1.207e-03, 0.000e+00, 1.566e-05, 1.258e-04, 4.876e-03, 1.560e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RT_gt12-14t_Euro-VIs_D-E
-        { 1.884e+02, 1.661e+02, 3.397e+02, 0.000e+00, 0.000e+00, 3.735e+02, 0.000e+00 }, // CO2(total)
+        { 1.884e+02, 5.980e+02, 3.397e+02, 0.000e+00, 0.000e+00, 1.345e+03, 0.000e+00 }, // CO2(total)
         { 8.133e-01, 0.000e+00, 1.002e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 2.375e-01, 0.000e+00, 1.084e-01, 0.000e+00, 1.496e-07, 0.000e+00, 2.621e-05 }, // HC
-        { 6.054e+01, 5.338e+01, 1.092e+02, 0.000e+00, 0.000e+00, 1.200e+02, 0.000e+00 }, // FC
-        { 1.956e+01, 1.126e+00, 6.143e+01, 0.000e+00, 0.000e+00, 2.073e+00, 0.000e+00 }, // NOx
-        { 1.438e+00, 3.353e-04, 0.000e+00, 1.209e-06, 2.696e-06, 1.354e-03, 1.203e-06 }, // PM + PM (non-exhaust)
+        { 2.375e-01, 0.000e+00, 1.084e-01, 0.000e+00, 6.980e-06, 0.000e+00, 3.397e-04 }, // HC
+        { 6.054e+01, 1.922e+02, 1.092e+02, 0.000e+00, 0.000e+00, 4.321e+02, 0.000e+00 }, // FC
+        { 1.956e+01, 4.053e+00, 6.143e+01, 0.000e+00, 0.000e+00, 7.462e+00, 0.000e+00 }, // NOx
+        { 1.438e+00, 1.207e-03, 0.000e+00, 1.566e-05, 1.258e-04, 4.876e-03, 1.560e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RT_gt14-20t_50ties
-        { 3.422e+03, 1.474e+02, 7.599e+03, 0.000e+00, 0.000e+00, 3.081e+02, 0.000e+00 }, // CO2(total)
-        { 2.687e+01, 5.877e-01, 3.482e+01, 0.000e+00, 0.000e+00, 1.371e+00, 0.000e+00 }, // CO
-        { 1.481e+01, 0.000e+00, 2.384e+00, 0.000e+00, 5.633e-06, 0.000e+00, 2.453e-03 }, // HC
-        { 1.100e+03, 4.738e+01, 2.442e+03, 0.000e+00, 0.000e+00, 9.902e+01, 0.000e+00 }, // FC
-        { 4.351e+01, 1.786e+00, 8.645e+01, 0.000e+00, 0.000e+00, 3.779e+00, 0.000e+00 }, // NOx
-        { 5.934e+00, 8.124e-02, 5.034e+00, 0.000e+00, 2.837e-06, 1.929e-01, 1.094e-06 }, // PM + PM (non-exhaust)
+        { 3.422e+03, 5.308e+02, 7.599e+03, 0.000e+00, 0.000e+00, 1.109e+03, 0.000e+00 }, // CO2(total)
+        { 2.687e+01, 2.116e+00, 3.482e+01, 0.000e+00, 0.000e+00, 4.934e+00, 0.000e+00 }, // CO
+        { 1.481e+01, 0.000e+00, 2.384e+00, 0.000e+00, 2.628e-04, 0.000e+00, 3.179e-02 }, // HC
+        { 1.100e+03, 1.706e+02, 2.442e+03, 0.000e+00, 0.000e+00, 3.565e+02, 0.000e+00 }, // FC
+        { 4.351e+01, 6.429e+00, 8.645e+01, 0.000e+00, 0.000e+00, 1.360e+01, 0.000e+00 }, // NOx
+        { 5.934e+00, 2.925e-01, 5.034e+00, 0.000e+00, 1.323e-04, 6.946e-01, 1.417e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RT_gt14-20t_60ties
-        { 3.422e+03, 1.474e+02, 7.599e+03, 0.000e+00, 0.000e+00, 3.081e+02, 0.000e+00 }, // CO2(total)
-        { 2.687e+01, 5.877e-01, 3.482e+01, 0.000e+00, 0.000e+00, 1.371e+00, 0.000e+00 }, // CO
-        { 1.481e+01, 0.000e+00, 2.384e+00, 0.000e+00, 5.633e-06, 0.000e+00, 2.453e-03 }, // HC
-        { 1.100e+03, 4.738e+01, 2.442e+03, 0.000e+00, 0.000e+00, 9.902e+01, 0.000e+00 }, // FC
-        { 4.351e+01, 1.786e+00, 8.645e+01, 0.000e+00, 0.000e+00, 3.779e+00, 0.000e+00 }, // NOx
-        { 5.934e+00, 8.124e-02, 5.034e+00, 0.000e+00, 2.837e-06, 1.929e-01, 1.094e-06 }, // PM + PM (non-exhaust)
+        { 3.422e+03, 5.308e+02, 7.599e+03, 0.000e+00, 0.000e+00, 1.109e+03, 0.000e+00 }, // CO2(total)
+        { 2.687e+01, 2.116e+00, 3.482e+01, 0.000e+00, 0.000e+00, 4.934e+00, 0.000e+00 }, // CO
+        { 1.481e+01, 0.000e+00, 2.384e+00, 0.000e+00, 2.628e-04, 0.000e+00, 3.179e-02 }, // HC
+        { 1.100e+03, 1.706e+02, 2.442e+03, 0.000e+00, 0.000e+00, 3.565e+02, 0.000e+00 }, // FC
+        { 4.351e+01, 6.429e+00, 8.645e+01, 0.000e+00, 0.000e+00, 1.360e+01, 0.000e+00 }, // NOx
+        { 5.934e+00, 2.925e-01, 5.034e+00, 0.000e+00, 1.323e-04, 6.946e-01, 1.417e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RT_gt14-20t_70ties
-        { 3.422e+03, 1.474e+02, 7.599e+03, 0.000e+00, 0.000e+00, 3.081e+02, 0.000e+00 }, // CO2(total)
-        { 2.687e+01, 5.877e-01, 3.482e+01, 0.000e+00, 0.000e+00, 1.371e+00, 0.000e+00 }, // CO
-        { 1.481e+01, 0.000e+00, 2.384e+00, 0.000e+00, 5.633e-06, 0.000e+00, 2.453e-03 }, // HC
-        { 1.100e+03, 4.738e+01, 2.442e+03, 0.000e+00, 0.000e+00, 9.902e+01, 0.000e+00 }, // FC
-        { 4.351e+01, 1.786e+00, 8.645e+01, 0.000e+00, 0.000e+00, 3.779e+00, 0.000e+00 }, // NOx
-        { 5.934e+00, 8.124e-02, 5.034e+00, 0.000e+00, 2.837e-06, 1.929e-01, 1.094e-06 }, // PM + PM (non-exhaust)
+        { 3.422e+03, 5.308e+02, 7.599e+03, 0.000e+00, 0.000e+00, 1.109e+03, 0.000e+00 }, // CO2(total)
+        { 2.687e+01, 2.116e+00, 3.482e+01, 0.000e+00, 0.000e+00, 4.934e+00, 0.000e+00 }, // CO
+        { 1.481e+01, 0.000e+00, 2.384e+00, 0.000e+00, 2.628e-04, 0.000e+00, 3.179e-02 }, // HC
+        { 1.100e+03, 1.706e+02, 2.442e+03, 0.000e+00, 0.000e+00, 3.565e+02, 0.000e+00 }, // FC
+        { 4.351e+01, 6.429e+00, 8.645e+01, 0.000e+00, 0.000e+00, 1.360e+01, 0.000e+00 }, // NOx
+        { 5.934e+00, 2.925e-01, 5.034e+00, 0.000e+00, 1.323e-04, 6.946e-01, 1.417e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RT_gt14-20t_80ties
-        { 3.422e+03, 1.474e+02, 7.599e+03, 0.000e+00, 0.000e+00, 3.081e+02, 0.000e+00 }, // CO2(total)
-        { 2.687e+01, 5.877e-01, 3.482e+01, 0.000e+00, 0.000e+00, 1.371e+00, 0.000e+00 }, // CO
-        { 1.481e+01, 0.000e+00, 2.384e+00, 0.000e+00, 5.633e-06, 0.000e+00, 2.453e-03 }, // HC
-        { 1.100e+03, 4.738e+01, 2.442e+03, 0.000e+00, 0.000e+00, 9.902e+01, 0.000e+00 }, // FC
-        { 4.351e+01, 1.786e+00, 8.645e+01, 0.000e+00, 0.000e+00, 3.779e+00, 0.000e+00 }, // NOx
-        { 5.934e+00, 8.124e-02, 5.034e+00, 0.000e+00, 2.837e-06, 1.929e-01, 1.094e-06 }, // PM + PM (non-exhaust)
+        { 3.422e+03, 5.308e+02, 7.599e+03, 0.000e+00, 0.000e+00, 1.109e+03, 0.000e+00 }, // CO2(total)
+        { 2.687e+01, 2.116e+00, 3.482e+01, 0.000e+00, 0.000e+00, 4.934e+00, 0.000e+00 }, // CO
+        { 1.481e+01, 0.000e+00, 2.384e+00, 0.000e+00, 2.628e-04, 0.000e+00, 3.179e-02 }, // HC
+        { 1.100e+03, 1.706e+02, 2.442e+03, 0.000e+00, 0.000e+00, 3.565e+02, 0.000e+00 }, // FC
+        { 4.351e+01, 6.429e+00, 8.645e+01, 0.000e+00, 0.000e+00, 1.360e+01, 0.000e+00 }, // NOx
+        { 5.934e+00, 2.925e-01, 5.034e+00, 0.000e+00, 1.323e-04, 6.946e-01, 1.417e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RT_gt14-20t_Euro-I
-        { 3.438e+03, 1.380e+02, 6.897e+03, 0.000e+00, 0.000e+00, 2.956e+02, 0.000e+00 }, // CO2(total)
-        { 1.096e+01, 1.915e-01, 1.656e+01, 8.151e-06, 0.000e+00, 3.692e-01, 0.000e+00 }, // CO
-        { 2.896e+00, 2.103e-02, 1.854e-01, 6.295e-05, 0.000e+00, 9.078e-02, 0.000e+00 }, // HC
-        { 1.105e+03, 4.436e+01, 2.217e+03, 0.000e+00, 0.000e+00, 9.500e+01, 0.000e+00 }, // FC
-        { 3.416e+01, 1.332e+00, 6.891e+01, 0.000e+00, 0.000e+00, 2.807e+00, 0.000e+00 }, // NOx
-        { 3.198e+00, 3.286e-02, 7.290e-01, 0.000e+00, 2.877e-06, 8.349e-02, 1.037e-06 }, // PM + PM (non-exhaust)
+        { 3.438e+03, 4.969e+02, 6.897e+03, 0.000e+00, 0.000e+00, 1.064e+03, 0.000e+00 }, // CO2(total)
+        { 1.096e+01, 6.894e-01, 1.656e+01, 1.056e-04, 0.000e+00, 1.329e+00, 0.000e+00 }, // CO
+        { 2.896e+00, 7.570e-02, 1.854e-01, 8.159e-04, 0.000e+00, 3.268e-01, 0.000e+00 }, // HC
+        { 1.105e+03, 1.597e+02, 2.217e+03, 0.000e+00, 0.000e+00, 3.420e+02, 0.000e+00 }, // FC
+        { 3.416e+01, 4.795e+00, 6.891e+01, 0.000e+00, 0.000e+00, 1.011e+01, 0.000e+00 }, // NOx
+        { 3.198e+00, 1.183e-01, 7.290e-01, 0.000e+00, 1.342e-04, 3.006e-01, 1.344e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RT_gt14-20t_Euro-II
-        { 2.401e+03, 1.594e+02, 4.316e+03, 0.000e+00, 0.000e+00, 3.575e+02, 0.000e+00 }, // CO2(total)
-        { 1.427e+01, 0.000e+00, 2.284e+01, 0.000e+00, 7.194e-06, 0.000e+00, 7.820e-04 }, // CO
-        { 2.346e+00, 2.825e-03, 0.000e+00, 1.921e-04, 0.000e+00, 5.800e-02, 1.486e-04 }, // HC
-        { 7.715e+02, 5.124e+01, 1.387e+03, 0.000e+00, 0.000e+00, 1.149e+02, 0.000e+00 }, // FC
-        { 2.947e+01, 1.543e+00, 4.958e+01, 0.000e+00, 0.000e+00, 3.427e+00, 0.000e+00 }, // NOx
-        { 2.546e+00, 9.464e-03, 1.756e+00, 7.815e-05, 2.824e-06, 4.008e-03, 3.010e-04 }, // PM + PM (non-exhaust)
+        { 2.401e+03, 5.740e+02, 4.316e+03, 0.000e+00, 0.000e+00, 1.287e+03, 0.000e+00 }, // CO2(total)
+        { 1.427e+01, 0.000e+00, 2.284e+01, 0.000e+00, 3.357e-04, 0.000e+00, 1.013e-02 }, // CO
+        { 2.346e+00, 1.017e-02, 0.000e+00, 2.490e-03, 0.000e+00, 2.088e-01, 1.926e-03 }, // HC
+        { 7.715e+02, 1.845e+02, 1.387e+03, 0.000e+00, 0.000e+00, 4.136e+02, 0.000e+00 }, // FC
+        { 2.947e+01, 5.554e+00, 4.958e+01, 0.000e+00, 0.000e+00, 1.234e+01, 0.000e+00 }, // NOx
+        { 2.546e+00, 3.407e-02, 1.756e+00, 1.013e-03, 1.318e-04, 1.443e-02, 3.901e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RT_gt14-20t_Euro-III
-        { 2.897e+03, 1.601e+02, 5.778e+03, 0.000e+00, 0.000e+00, 3.605e+02, 0.000e+00 }, // CO2(total)
-        { 1.207e+01, 0.000e+00, 3.366e+00, 0.000e+00, 1.385e-05, 0.000e+00, 3.494e-03 }, // CO
-        { 1.880e+00, 1.795e-02, 6.011e-01, 0.000e+00, 0.000e+00, 4.904e-02, 0.000e+00 }, // HC
-        { 9.309e+02, 5.145e+01, 1.857e+03, 0.000e+00, 0.000e+00, 1.159e+02, 0.000e+00 }, // FC
-        { 2.470e+01, 1.177e+00, 4.356e+01, 0.000e+00, 0.000e+00, 2.588e+00, 0.000e+00 }, // NOx
-        { 2.412e+00, 1.454e-02, 2.086e-01, 0.000e+00, 2.759e-06, 3.600e-02, 1.507e-05 }, // PM + PM (non-exhaust)
+        { 2.897e+03, 5.763e+02, 5.778e+03, 0.000e+00, 0.000e+00, 1.298e+03, 0.000e+00 }, // CO2(total)
+        { 1.207e+01, 0.000e+00, 3.366e+00, 0.000e+00, 6.463e-04, 0.000e+00, 4.528e-02 }, // CO
+        { 1.880e+00, 6.464e-02, 6.011e-01, 0.000e+00, 0.000e+00, 1.766e-01, 0.000e+00 }, // HC
+        { 9.309e+02, 1.852e+02, 1.857e+03, 0.000e+00, 0.000e+00, 4.171e+02, 0.000e+00 }, // FC
+        { 2.470e+01, 4.238e+00, 4.356e+01, 0.000e+00, 0.000e+00, 9.318e+00, 0.000e+00 }, // NOx
+        { 2.412e+00, 5.233e-02, 2.086e-01, 0.000e+00, 1.287e-04, 1.296e-01, 1.953e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RT_gt14-20t_Euro-IV_EGR
-        { 1.894e+03, 1.787e+02, 3.940e+03, 0.000e+00, 0.000e+00, 4.102e+02, 0.000e+00 }, // CO2(total)
-        { 4.449e+00, 1.239e-01, 3.725e+00, 0.000e+00, 3.700e-06, 3.489e-01, 0.000e+00 }, // CO
-        { 2.861e-01, 4.050e-03, 5.044e-01, 4.625e-05, 0.000e+00, 5.446e-03, 1.337e-04 }, // HC
-        { 6.087e+02, 5.742e+01, 1.266e+03, 0.000e+00, 0.000e+00, 1.318e+02, 0.000e+00 }, // FC
-        { 2.457e+01, 7.979e-01, 4.652e+01, 0.000e+00, 2.403e-05, 1.517e+00, 5.871e-03 }, // NOx
-        { 1.780e+00, 0.000e+00, 3.800e-01, 0.000e+00, 3.218e-06, 8.091e-04, 8.745e-05 }, // PM + PM (non-exhaust)
+        { 1.894e+03, 6.432e+02, 3.940e+03, 0.000e+00, 0.000e+00, 1.477e+03, 0.000e+00 }, // CO2(total)
+        { 4.449e+00, 4.459e-01, 3.725e+00, 0.000e+00, 1.726e-04, 1.256e+00, 0.000e+00 }, // CO
+        { 2.861e-01, 1.458e-02, 5.044e-01, 5.993e-04, 0.000e+00, 1.961e-02, 1.733e-03 }, // HC
+        { 6.087e+02, 2.067e+02, 1.266e+03, 0.000e+00, 0.000e+00, 4.746e+02, 0.000e+00 }, // FC
+        { 2.457e+01, 2.872e+00, 4.652e+01, 0.000e+00, 1.121e-03, 5.463e+00, 7.608e-02 }, // NOx
+        { 1.780e+00, 0.000e+00, 3.800e-01, 0.000e+00, 1.501e-04, 2.913e-03, 1.133e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RT_gt14-20t_Euro-IV_SCR
-        { 2.681e+03, 1.542e+02, 6.238e+03, 0.000e+00, 0.000e+00, 3.369e+02, 0.000e+00 }, // CO2(total)
-        { 1.630e+01, 1.775e-01, 1.756e+01, 0.000e+00, 1.926e-05, 7.093e-01, 0.000e+00 }, // CO
-        { 1.085e-01, 2.892e-03, 1.555e-01, 0.000e+00, 0.000e+00, 6.442e-03, 0.000e+00 }, // HC
-        { 8.617e+02, 4.956e+01, 2.005e+03, 0.000e+00, 0.000e+00, 1.083e+02, 0.000e+00 }, // FC
-        { 1.794e+01, 4.799e-01, 9.664e-01, 0.000e+00, 0.000e+00, 1.299e+00, 0.000e+00 }, // NOx
-        { 1.727e+00, 3.442e-03, 3.746e-01, 0.000e+00, 2.955e-06, 9.382e-03, 2.959e-05 }, // PM + PM (non-exhaust)
+        { 2.681e+03, 5.551e+02, 6.238e+03, 0.000e+00, 0.000e+00, 1.213e+03, 0.000e+00 }, // CO2(total)
+        { 1.630e+01, 6.392e-01, 1.756e+01, 0.000e+00, 8.984e-04, 2.554e+00, 0.000e+00 }, // CO
+        { 1.085e-01, 1.041e-02, 1.555e-01, 0.000e+00, 0.000e+00, 2.319e-02, 0.000e+00 }, // HC
+        { 8.617e+02, 1.784e+02, 2.005e+03, 0.000e+00, 0.000e+00, 3.898e+02, 0.000e+00 }, // FC
+        { 1.794e+01, 1.728e+00, 9.664e-01, 0.000e+00, 0.000e+00, 4.677e+00, 0.000e+00 }, // NOx
+        { 1.727e+00, 1.239e-02, 3.746e-01, 0.000e+00, 1.379e-04, 3.378e-02, 3.835e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RT_gt14-20t_Euro-IV_SCRs
-        { 2.681e+03, 1.542e+02, 6.238e+03, 0.000e+00, 0.000e+00, 3.369e+02, 0.000e+00 }, // CO2(total)
-        { 1.630e+01, 1.775e-01, 1.756e+01, 0.000e+00, 1.926e-05, 7.093e-01, 0.000e+00 }, // CO
-        { 1.085e-01, 2.892e-03, 1.555e-01, 0.000e+00, 0.000e+00, 6.442e-03, 0.000e+00 }, // HC
-        { 8.617e+02, 4.956e+01, 2.005e+03, 0.000e+00, 0.000e+00, 1.083e+02, 0.000e+00 }, // FC
-        { 2.967e+01, 1.528e+00, 5.750e+01, 0.000e+00, 0.000e+00, 3.362e+00, 0.000e+00 }, // NOx
-        { 1.727e+00, 3.442e-03, 3.746e-01, 0.000e+00, 2.955e-06, 9.382e-03, 2.959e-05 }, // PM + PM (non-exhaust)
+        { 2.681e+03, 5.551e+02, 6.238e+03, 0.000e+00, 0.000e+00, 1.213e+03, 0.000e+00 }, // CO2(total)
+        { 1.630e+01, 6.392e-01, 1.756e+01, 0.000e+00, 8.984e-04, 2.554e+00, 0.000e+00 }, // CO
+        { 1.085e-01, 1.041e-02, 1.555e-01, 0.000e+00, 0.000e+00, 2.319e-02, 0.000e+00 }, // HC
+        { 8.617e+02, 1.784e+02, 2.005e+03, 0.000e+00, 0.000e+00, 3.898e+02, 0.000e+00 }, // FC
+        { 2.967e+01, 5.502e+00, 5.750e+01, 0.000e+00, 0.000e+00, 1.210e+01, 0.000e+00 }, // NOx
+        { 1.727e+00, 1.239e-02, 3.746e-01, 0.000e+00, 1.379e-04, 3.378e-02, 3.835e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RT_gt14-20t_Euro-V_EGR
-        { 1.185e+03, 1.869e+02, 1.382e+03, 0.000e+00, 0.000e+00, 4.485e+02, 0.000e+00 }, // CO2(total)
-        { 5.617e+00, 6.602e-02, 1.130e+01, 0.000e+00, 0.000e+00, 6.500e-02, 0.000e+00 }, // CO
-        { 7.145e-01, 4.519e-03, 8.008e-01, 0.000e+00, 5.374e-07, 7.071e-03, 1.657e-04 }, // HC
-        { 3.808e+02, 6.006e+01, 4.442e+02, 0.000e+00, 0.000e+00, 1.441e+02, 0.000e+00 }, // FC
-        { 1.927e+01, 7.815e-01, 3.162e+01, 0.000e+00, 0.000e+00, 1.657e+00, 0.000e+00 }, // NOx
-        { 1.646e+00, 2.796e-03, 3.275e-01, 0.000e+00, 2.937e-06, 5.682e-03, 7.406e-05 }, // PM + PM (non-exhaust)
+        { 1.185e+03, 6.728e+02, 1.382e+03, 0.000e+00, 0.000e+00, 1.614e+03, 0.000e+00 }, // CO2(total)
+        { 5.617e+00, 2.377e-01, 1.130e+01, 0.000e+00, 0.000e+00, 2.340e-01, 0.000e+00 }, // CO
+        { 7.145e-01, 1.627e-02, 8.008e-01, 0.000e+00, 2.508e-05, 2.546e-02, 2.148e-03 }, // HC
+        { 3.808e+02, 2.162e+02, 4.442e+02, 0.000e+00, 0.000e+00, 5.189e+02, 0.000e+00 }, // FC
+        { 1.927e+01, 2.813e+00, 3.162e+01, 0.000e+00, 0.000e+00, 5.967e+00, 0.000e+00 }, // NOx
+        { 1.646e+00, 1.006e-02, 3.275e-01, 0.000e+00, 1.370e-04, 2.045e-02, 9.598e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RT_gt14-20t_Euro-V_SCR
-        { 1.130e+03, 1.838e+02, 1.274e+03, 0.000e+00, 0.000e+00, 4.416e+02, 0.000e+00 }, // CO2(total)
-        { 1.571e+01, 2.539e-01, 2.996e+01, 0.000e+00, 5.771e-06, 4.163e-01, 0.000e+00 }, // CO
-        { 1.070e-01, 3.866e-03, 2.613e-02, 0.000e+00, 0.000e+00, 9.602e-03, 0.000e+00 }, // HC
-        { 3.632e+02, 5.908e+01, 4.095e+02, 0.000e+00, 0.000e+00, 1.419e+02, 0.000e+00 }, // FC
-        { 2.422e+01, 1.685e-01, 0.000e+00, 0.000e+00, 0.000e+00, 2.934e-01, 3.145e-03 }, // NOx
-        { 1.810e+00, 4.098e-03, 6.721e-01, 0.000e+00, 2.810e-06, 4.890e-03, 3.881e-05 }, // PM + PM (non-exhaust)
+        { 1.130e+03, 6.618e+02, 1.274e+03, 0.000e+00, 0.000e+00, 1.590e+03, 0.000e+00 }, // CO2(total)
+        { 1.571e+01, 9.141e-01, 2.996e+01, 0.000e+00, 2.692e-04, 1.499e+00, 0.000e+00 }, // CO
+        { 1.070e-01, 1.392e-02, 2.613e-02, 0.000e+00, 0.000e+00, 3.457e-02, 0.000e+00 }, // HC
+        { 3.632e+02, 2.127e+02, 4.095e+02, 0.000e+00, 0.000e+00, 5.109e+02, 0.000e+00 }, // FC
+        { 2.422e+01, 6.067e-01, 0.000e+00, 0.000e+00, 0.000e+00, 1.056e+00, 4.076e-02 }, // NOx
+        { 1.810e+00, 1.475e-02, 6.721e-01, 0.000e+00, 1.311e-04, 1.760e-02, 5.030e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RT_gt14-20t_Euro-V_SCRs
-        { 1.130e+03, 1.838e+02, 1.274e+03, 0.000e+00, 0.000e+00, 4.416e+02, 0.000e+00 }, // CO2(total)
-        { 1.571e+01, 2.539e-01, 2.996e+01, 0.000e+00, 5.771e-06, 4.163e-01, 0.000e+00 }, // CO
-        { 1.070e-01, 3.866e-03, 2.613e-02, 0.000e+00, 0.000e+00, 9.602e-03, 0.000e+00 }, // HC
-        { 3.632e+02, 5.908e+01, 4.095e+02, 0.000e+00, 0.000e+00, 1.419e+02, 0.000e+00 }, // FC
-        { 2.553e+01, 1.810e+00, 2.100e+01, 0.000e+00, 0.000e+00, 4.222e+00, 0.000e+00 }, // NOx
-        { 1.810e+00, 4.098e-03, 6.721e-01, 0.000e+00, 2.810e-06, 4.890e-03, 3.881e-05 }, // PM + PM (non-exhaust)
+        { 1.130e+03, 6.618e+02, 1.274e+03, 0.000e+00, 0.000e+00, 1.590e+03, 0.000e+00 }, // CO2(total)
+        { 1.571e+01, 9.141e-01, 2.996e+01, 0.000e+00, 2.692e-04, 1.499e+00, 0.000e+00 }, // CO
+        { 1.070e-01, 1.392e-02, 2.613e-02, 0.000e+00, 0.000e+00, 3.457e-02, 0.000e+00 }, // HC
+        { 3.632e+02, 2.127e+02, 4.095e+02, 0.000e+00, 0.000e+00, 5.109e+02, 0.000e+00 }, // FC
+        { 2.553e+01, 6.517e+00, 2.100e+01, 0.000e+00, 0.000e+00, 1.520e+01, 0.000e+00 }, // NOx
+        { 1.810e+00, 1.475e-02, 6.721e-01, 0.000e+00, 1.311e-04, 1.760e-02, 5.030e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RT_gt14-20t_Euro-VI_A-C
-        { 6.377e+02, 1.901e+02, 0.000e+00, 0.000e+00, 0.000e+00, 4.627e+02, 0.000e+00 }, // CO2(total)
-        { 2.101e+00, 0.000e+00, 2.304e+00, 0.000e+00, 1.053e-06, 0.000e+00, 9.721e-05 }, // CO
-        { 1.393e-01, 2.036e-03, 4.641e-02, 0.000e+00, 0.000e+00, 4.805e-03, 0.000e+00 }, // HC
-        { 2.049e+02, 6.110e+01, 0.000e+00, 0.000e+00, 0.000e+00, 1.487e+02, 0.000e+00 }, // FC
-        { 4.529e+00, 0.000e+00, 5.443e-02, 0.000e+00, 2.672e-06, 0.000e+00, 0.000e+00 }, // NOx
-        { 1.549e+00, 0.000e+00, 1.283e-01, 0.000e+00, 2.708e-06, 7.700e-04, 1.358e-06 }, // PM + PM (non-exhaust)
+        { 6.377e+02, 6.844e+02, 0.000e+00, 0.000e+00, 0.000e+00, 1.666e+03, 0.000e+00 }, // CO2(total)
+        { 2.101e+00, 0.000e+00, 2.304e+00, 0.000e+00, 4.911e-05, 0.000e+00, 1.260e-03 }, // CO
+        { 1.393e-01, 7.328e-03, 4.641e-02, 0.000e+00, 0.000e+00, 1.730e-02, 0.000e+00 }, // HC
+        { 2.049e+02, 2.200e+02, 0.000e+00, 0.000e+00, 0.000e+00, 5.353e+02, 0.000e+00 }, // FC
+        { 4.529e+00, 0.000e+00, 5.443e-02, 0.000e+00, 1.247e-04, 0.000e+00, 0.000e+00 }, // NOx
+        { 1.549e+00, 0.000e+00, 1.283e-01, 0.000e+00, 1.263e-04, 2.772e-03, 1.759e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RT_gt14-20t_Euro-VIs_A-C
-        { 6.377e+02, 1.901e+02, 0.000e+00, 0.000e+00, 0.000e+00, 4.627e+02, 0.000e+00 }, // CO2(total)
-        { 2.101e+00, 0.000e+00, 2.304e+00, 0.000e+00, 1.053e-06, 0.000e+00, 9.721e-05 }, // CO
-        { 1.393e-01, 2.036e-03, 4.641e-02, 0.000e+00, 0.000e+00, 4.805e-03, 0.000e+00 }, // HC
-        { 2.049e+02, 6.110e+01, 0.000e+00, 0.000e+00, 0.000e+00, 1.487e+02, 0.000e+00 }, // FC
-        { 0.000e+00, 1.497e+00, 0.000e+00, 0.000e+00, 0.000e+00, 3.294e+00, 3.010e-03 }, // NOx
-        { 1.549e+00, 0.000e+00, 1.283e-01, 0.000e+00, 2.708e-06, 7.700e-04, 1.358e-06 }, // PM + PM (non-exhaust)
+        { 6.377e+02, 6.844e+02, 0.000e+00, 0.000e+00, 0.000e+00, 1.666e+03, 0.000e+00 }, // CO2(total)
+        { 2.101e+00, 0.000e+00, 2.304e+00, 0.000e+00, 4.911e-05, 0.000e+00, 1.260e-03 }, // CO
+        { 1.393e-01, 7.328e-03, 4.641e-02, 0.000e+00, 0.000e+00, 1.730e-02, 0.000e+00 }, // HC
+        { 2.049e+02, 2.200e+02, 0.000e+00, 0.000e+00, 0.000e+00, 5.353e+02, 0.000e+00 }, // FC
+        { 0.000e+00, 5.391e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.186e+01, 3.901e-02 }, // NOx
+        { 1.549e+00, 0.000e+00, 1.283e-01, 0.000e+00, 1.263e-04, 2.772e-03, 1.759e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RT_gt14-20t_Euro-VI_D-E
-        { 1.934e+02, 1.966e+02, 0.000e+00, 0.000e+00, 0.000e+00, 4.432e+02, 3.103e-01 }, // CO2(total)
-        { 9.441e-01, 0.000e+00, 7.025e-01, 0.000e+00, 4.428e-07, 0.000e+00, 0.000e+00 }, // CO
-        { 2.976e-01, 1.398e-03, 0.000e+00, 6.430e-06, 0.000e+00, 5.585e-03, 6.866e-08 }, // HC
-        { 6.216e+01, 6.317e+01, 0.000e+00, 0.000e+00, 0.000e+00, 1.424e+02, 9.971e-02 }, // FC
-        { 1.692e+00, 1.323e-02, 7.204e-02, 0.000e+00, 0.000e+00, 0.000e+00, 2.394e-04 }, // NOx
-        { 1.441e+00, 5.223e-04, 0.000e+00, 0.000e+00, 2.701e-06, 1.511e-03, 6.110e-06 }, // PM + PM (non-exhaust)
+        { 1.934e+02, 7.077e+02, 0.000e+00, 0.000e+00, 0.000e+00, 1.596e+03, 4.021e+00 }, // CO2(total)
+        { 9.441e-01, 0.000e+00, 7.025e-01, 0.000e+00, 2.066e-05, 0.000e+00, 0.000e+00 }, // CO
+        { 2.976e-01, 5.032e-03, 0.000e+00, 8.333e-05, 0.000e+00, 2.010e-02, 8.898e-07 }, // HC
+        { 6.216e+01, 2.274e+02, 0.000e+00, 0.000e+00, 0.000e+00, 5.128e+02, 1.292e+00 }, // FC
+        { 1.692e+00, 4.764e-02, 7.204e-02, 0.000e+00, 0.000e+00, 0.000e+00, 3.103e-03 }, // NOx
+        { 1.441e+00, 1.880e-03, 0.000e+00, 0.000e+00, 1.260e-04, 5.440e-03, 7.919e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RT_gt14-20t_Euro-VIs_D-E
-        { 1.934e+02, 1.966e+02, 0.000e+00, 0.000e+00, 0.000e+00, 4.432e+02, 3.103e-01 }, // CO2(total)
-        { 9.441e-01, 0.000e+00, 7.025e-01, 0.000e+00, 4.428e-07, 0.000e+00, 0.000e+00 }, // CO
-        { 2.976e-01, 1.398e-03, 0.000e+00, 6.430e-06, 0.000e+00, 5.585e-03, 6.866e-08 }, // HC
-        { 6.216e+01, 6.317e+01, 0.000e+00, 0.000e+00, 0.000e+00, 1.424e+02, 9.971e-02 }, // FC
-        { 1.022e+01, 1.638e+00, 0.000e+00, 0.000e+00, 4.739e-06, 4.007e+00, 0.000e+00 }, // NOx
-        { 1.441e+00, 5.223e-04, 0.000e+00, 0.000e+00, 2.701e-06, 1.511e-03, 6.110e-06 }, // PM + PM (non-exhaust)
+        { 1.934e+02, 7.077e+02, 0.000e+00, 0.000e+00, 0.000e+00, 1.596e+03, 4.021e+00 }, // CO2(total)
+        { 9.441e-01, 0.000e+00, 7.025e-01, 0.000e+00, 2.066e-05, 0.000e+00, 0.000e+00 }, // CO
+        { 2.976e-01, 5.032e-03, 0.000e+00, 8.333e-05, 0.000e+00, 2.010e-02, 8.898e-07 }, // HC
+        { 6.216e+01, 2.274e+02, 0.000e+00, 0.000e+00, 0.000e+00, 5.128e+02, 1.292e+00 }, // FC
+        { 1.022e+01, 5.899e+00, 0.000e+00, 0.000e+00, 2.211e-04, 1.443e+01, 0.000e+00 }, // NOx
+        { 1.441e+00, 1.880e-03, 0.000e+00, 0.000e+00, 1.260e-04, 5.440e-03, 7.919e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RT_gt20-26t_50ties
-        { 3.516e+03, 2.371e+02, 5.683e+03, 0.000e+00, 0.000e+00, 5.753e+02, 0.000e+00 }, // CO2(total)
-        { 2.316e+01, 3.073e-02, 2.222e+01, 1.600e-03, 0.000e+00, 0.000e+00, 4.581e-03 }, // CO
-        { 7.135e+00, 0.000e+00, 1.194e+00, 0.000e+00, 2.976e-06, 6.457e-02, 1.179e-04 }, // HC
-        { 1.130e+03, 7.619e+01, 1.826e+03, 0.000e+00, 0.000e+00, 1.849e+02, 0.000e+00 }, // FC
-        { 4.997e+01, 3.468e+00, 8.296e+01, 0.000e+00, 0.000e+00, 8.441e+00, 0.000e+00 }, // NOx
-        { 5.068e+00, 6.512e-02, 2.521e+00, 0.000e+00, 2.710e-06, 1.321e-01, 0.000e+00 }, // PM + PM (non-exhaust)
+        { 3.516e+03, 8.534e+02, 5.683e+03, 0.000e+00, 0.000e+00, 2.071e+03, 0.000e+00 }, // CO2(total)
+        { 2.316e+01, 1.106e-01, 2.222e+01, 2.073e-02, 0.000e+00, 0.000e+00, 5.937e-02 }, // CO
+        { 7.135e+00, 0.000e+00, 1.194e+00, 0.000e+00, 1.388e-04, 2.325e-01, 1.528e-03 }, // HC
+        { 1.130e+03, 2.743e+02, 1.826e+03, 0.000e+00, 0.000e+00, 6.656e+02, 0.000e+00 }, // FC
+        { 4.997e+01, 1.249e+01, 8.296e+01, 0.000e+00, 0.000e+00, 3.039e+01, 0.000e+00 }, // NOx
+        { 5.068e+00, 2.344e-01, 2.521e+00, 0.000e+00, 1.265e-04, 4.755e-01, 0.000e+00 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RT_gt20-26t_60ties
-        { 3.516e+03, 2.371e+02, 5.683e+03, 0.000e+00, 0.000e+00, 5.753e+02, 0.000e+00 }, // CO2(total)
-        { 2.316e+01, 3.073e-02, 2.222e+01, 1.600e-03, 0.000e+00, 0.000e+00, 4.581e-03 }, // CO
-        { 7.135e+00, 0.000e+00, 1.194e+00, 0.000e+00, 2.976e-06, 6.457e-02, 1.179e-04 }, // HC
-        { 1.130e+03, 7.619e+01, 1.826e+03, 0.000e+00, 0.000e+00, 1.849e+02, 0.000e+00 }, // FC
-        { 4.997e+01, 3.468e+00, 8.296e+01, 0.000e+00, 0.000e+00, 8.441e+00, 0.000e+00 }, // NOx
-        { 5.068e+00, 6.512e-02, 2.521e+00, 0.000e+00, 2.710e-06, 1.321e-01, 0.000e+00 }, // PM + PM (non-exhaust)
+        { 3.516e+03, 8.534e+02, 5.683e+03, 0.000e+00, 0.000e+00, 2.071e+03, 0.000e+00 }, // CO2(total)
+        { 2.316e+01, 1.106e-01, 2.222e+01, 2.073e-02, 0.000e+00, 0.000e+00, 5.937e-02 }, // CO
+        { 7.135e+00, 0.000e+00, 1.194e+00, 0.000e+00, 1.388e-04, 2.325e-01, 1.528e-03 }, // HC
+        { 1.130e+03, 2.743e+02, 1.826e+03, 0.000e+00, 0.000e+00, 6.656e+02, 0.000e+00 }, // FC
+        { 4.997e+01, 1.249e+01, 8.296e+01, 0.000e+00, 0.000e+00, 3.039e+01, 0.000e+00 }, // NOx
+        { 5.068e+00, 2.344e-01, 2.521e+00, 0.000e+00, 1.265e-04, 4.755e-01, 0.000e+00 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RT_gt20-26t_70ties
-        { 3.516e+03, 2.371e+02, 5.683e+03, 0.000e+00, 0.000e+00, 5.753e+02, 0.000e+00 }, // CO2(total)
-        { 2.316e+01, 3.073e-02, 2.222e+01, 1.600e-03, 0.000e+00, 0.000e+00, 4.581e-03 }, // CO
-        { 7.135e+00, 0.000e+00, 1.194e+00, 0.000e+00, 2.976e-06, 6.457e-02, 1.179e-04 }, // HC
-        { 1.130e+03, 7.619e+01, 1.826e+03, 0.000e+00, 0.000e+00, 1.849e+02, 0.000e+00 }, // FC
-        { 4.997e+01, 3.468e+00, 8.296e+01, 0.000e+00, 0.000e+00, 8.441e+00, 0.000e+00 }, // NOx
-        { 5.068e+00, 6.512e-02, 2.521e+00, 0.000e+00, 2.710e-06, 1.321e-01, 0.000e+00 }, // PM + PM (non-exhaust)
+        { 3.516e+03, 8.534e+02, 5.683e+03, 0.000e+00, 0.000e+00, 2.071e+03, 0.000e+00 }, // CO2(total)
+        { 2.316e+01, 1.106e-01, 2.222e+01, 2.073e-02, 0.000e+00, 0.000e+00, 5.937e-02 }, // CO
+        { 7.135e+00, 0.000e+00, 1.194e+00, 0.000e+00, 1.388e-04, 2.325e-01, 1.528e-03 }, // HC
+        { 1.130e+03, 2.743e+02, 1.826e+03, 0.000e+00, 0.000e+00, 6.656e+02, 0.000e+00 }, // FC
+        { 4.997e+01, 1.249e+01, 8.296e+01, 0.000e+00, 0.000e+00, 3.039e+01, 0.000e+00 }, // NOx
+        { 5.068e+00, 2.344e-01, 2.521e+00, 0.000e+00, 1.265e-04, 4.755e-01, 0.000e+00 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RT_gt20-26t_80ties
-        { 3.516e+03, 2.371e+02, 5.683e+03, 0.000e+00, 0.000e+00, 5.753e+02, 0.000e+00 }, // CO2(total)
-        { 2.316e+01, 3.073e-02, 2.222e+01, 1.600e-03, 0.000e+00, 0.000e+00, 4.581e-03 }, // CO
-        { 7.135e+00, 0.000e+00, 1.194e+00, 0.000e+00, 2.976e-06, 6.457e-02, 1.179e-04 }, // HC
-        { 1.130e+03, 7.619e+01, 1.826e+03, 0.000e+00, 0.000e+00, 1.849e+02, 0.000e+00 }, // FC
-        { 4.997e+01, 3.468e+00, 8.296e+01, 0.000e+00, 0.000e+00, 8.441e+00, 0.000e+00 }, // NOx
-        { 5.068e+00, 6.512e-02, 2.521e+00, 0.000e+00, 2.710e-06, 1.321e-01, 0.000e+00 }, // PM + PM (non-exhaust)
+        { 3.516e+03, 8.534e+02, 5.683e+03, 0.000e+00, 0.000e+00, 2.071e+03, 0.000e+00 }, // CO2(total)
+        { 2.316e+01, 1.106e-01, 2.222e+01, 2.073e-02, 0.000e+00, 0.000e+00, 5.937e-02 }, // CO
+        { 7.135e+00, 0.000e+00, 1.194e+00, 0.000e+00, 1.388e-04, 2.325e-01, 1.528e-03 }, // HC
+        { 1.130e+03, 2.743e+02, 1.826e+03, 0.000e+00, 0.000e+00, 6.656e+02, 0.000e+00 }, // FC
+        { 4.997e+01, 1.249e+01, 8.296e+01, 0.000e+00, 0.000e+00, 3.039e+01, 0.000e+00 }, // NOx
+        { 5.068e+00, 2.344e-01, 2.521e+00, 0.000e+00, 1.265e-04, 4.755e-01, 0.000e+00 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RT_gt20-26t_Euro-I
-        { 3.909e+03, 2.138e+02, 6.724e+03, 0.000e+00, 0.000e+00, 5.137e+02, 0.000e+00 }, // CO2(total)
-        { 1.527e+01, 3.130e-01, 2.020e+01, 0.000e+00, 0.000e+00, 7.119e-01, 0.000e+00 }, // CO
-        { 6.664e+00, 0.000e+00, 3.881e+00, 0.000e+00, 3.844e-06, 0.000e+00, 1.335e-03 }, // HC
-        { 1.256e+03, 6.871e+01, 2.161e+03, 0.000e+00, 0.000e+00, 1.651e+02, 0.000e+00 }, // FC
-        { 4.543e+01, 2.116e+00, 8.021e+01, 0.000e+00, 0.000e+00, 5.036e+00, 0.000e+00 }, // NOx
-        { 4.224e+00, 5.416e-02, 0.000e+00, 0.000e+00, 2.738e-06, 1.486e-01, 6.608e-06 }, // PM + PM (non-exhaust)
+        { 3.909e+03, 7.697e+02, 6.724e+03, 0.000e+00, 0.000e+00, 1.849e+03, 0.000e+00 }, // CO2(total)
+        { 1.527e+01, 1.127e+00, 2.020e+01, 0.000e+00, 0.000e+00, 2.563e+00, 0.000e+00 }, // CO
+        { 6.664e+00, 0.000e+00, 3.881e+00, 0.000e+00, 1.794e-04, 0.000e+00, 1.730e-02 }, // HC
+        { 1.256e+03, 2.474e+02, 2.161e+03, 0.000e+00, 0.000e+00, 5.944e+02, 0.000e+00 }, // FC
+        { 4.543e+01, 7.616e+00, 8.021e+01, 0.000e+00, 0.000e+00, 1.813e+01, 0.000e+00 }, // NOx
+        { 4.224e+00, 1.950e-01, 0.000e+00, 0.000e+00, 1.277e-04, 5.350e-01, 8.564e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RT_gt20-26t_Euro-II
-        { 2.829e+03, 2.298e+02, 2.869e+03, 0.000e+00, 0.000e+00, 5.864e+02, 0.000e+00 }, // CO2(total)
-        { 1.608e+01, 0.000e+00, 1.947e+01, 1.583e-03, 0.000e+00, 0.000e+00, 3.557e-03 }, // CO
-        { 4.124e+00, 1.628e-02, 2.992e-01, 9.514e-05, 0.000e+00, 1.032e-01, 0.000e+00 }, // HC
-        { 9.091e+02, 7.385e+01, 9.221e+02, 0.000e+00, 0.000e+00, 1.885e+02, 0.000e+00 }, // FC
-        { 4.249e+01, 2.273e+00, 4.922e+01, 0.000e+00, 0.000e+00, 5.731e+00, 0.000e+00 }, // NOx
-        { 2.520e+00, 3.086e-02, 9.988e-01, 0.000e+00, 2.705e-06, 5.100e-02, 1.566e-04 }, // PM + PM (non-exhaust)
+        { 2.829e+03, 8.273e+02, 2.869e+03, 0.000e+00, 0.000e+00, 2.111e+03, 0.000e+00 }, // CO2(total)
+        { 1.608e+01, 0.000e+00, 1.947e+01, 2.051e-02, 0.000e+00, 0.000e+00, 4.609e-02 }, // CO
+        { 4.124e+00, 5.862e-02, 2.992e-01, 1.233e-03, 0.000e+00, 3.717e-01, 0.000e+00 }, // HC
+        { 9.091e+02, 2.659e+02, 9.221e+02, 0.000e+00, 0.000e+00, 6.785e+02, 0.000e+00 }, // FC
+        { 4.249e+01, 8.182e+00, 4.922e+01, 0.000e+00, 0.000e+00, 2.063e+01, 0.000e+00 }, // NOx
+        { 2.520e+00, 1.111e-01, 9.988e-01, 0.000e+00, 1.262e-04, 1.836e-01, 2.030e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RT_gt20-26t_Euro-III
-        { 3.035e+03, 2.297e+02, 3.237e+03, 0.000e+00, 0.000e+00, 5.896e+02, 0.000e+00 }, // CO2(total)
-        { 1.936e+01, 0.000e+00, 1.018e+01, 0.000e+00, 1.658e-05, 0.000e+00, 3.796e-03 }, // CO
-        { 4.191e+00, 4.153e-03, 7.923e-01, 0.000e+00, 1.366e-06, 7.266e-02, 0.000e+00 }, // HC
-        { 9.753e+02, 7.381e+01, 1.040e+03, 0.000e+00, 0.000e+00, 1.895e+02, 0.000e+00 }, // FC
-        { 3.172e+01, 1.775e+00, 4.155e+01, 0.000e+00, 0.000e+00, 4.310e+00, 0.000e+00 }, // NOx
-        { 3.010e+00, 2.081e-02, 0.000e+00, 0.000e+00, 2.703e-06, 5.336e-02, 0.000e+00 }, // PM + PM (non-exhaust)
+        { 3.035e+03, 8.268e+02, 3.237e+03, 0.000e+00, 0.000e+00, 2.123e+03, 0.000e+00 }, // CO2(total)
+        { 1.936e+01, 0.000e+00, 1.018e+01, 0.000e+00, 7.737e-04, 0.000e+00, 4.920e-02 }, // CO
+        { 4.191e+00, 1.495e-02, 7.923e-01, 0.000e+00, 6.371e-05, 2.616e-01, 0.000e+00 }, // HC
+        { 9.753e+02, 2.657e+02, 1.040e+03, 0.000e+00, 0.000e+00, 6.822e+02, 0.000e+00 }, // FC
+        { 3.172e+01, 6.390e+00, 4.155e+01, 0.000e+00, 0.000e+00, 1.552e+01, 0.000e+00 }, // NOx
+        { 3.010e+00, 7.491e-02, 0.000e+00, 0.000e+00, 1.261e-04, 1.921e-01, 0.000e+00 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RT_gt20-26t_Euro-IV_EGR
-        { 2.459e+03, 2.374e+02, 3.458e+03, 0.000e+00, 0.000e+00, 5.985e+02, 0.000e+00 }, // CO2(total)
-        { 8.824e+00, 1.032e-01, 1.849e+01, 0.000e+00, 0.000e+00, 0.000e+00, 2.235e-03 }, // CO
-        { 6.557e-01, 0.000e+00, 9.909e-01, 0.000e+00, 7.468e-07, 0.000e+00, 1.392e-04 }, // HC
-        { 7.903e+02, 7.629e+01, 1.111e+03, 0.000e+00, 0.000e+00, 1.923e+02, 0.000e+00 }, // FC
-        { 3.614e+01, 1.160e+00, 5.652e+01, 0.000e+00, 0.000e+00, 2.885e+00, 0.000e+00 }, // NOx
-        { 1.991e+00, 0.000e+00, 7.106e-01, 0.000e+00, 2.980e-06, 9.934e-04, 6.662e-05 }, // PM + PM (non-exhaust)
+        { 2.459e+03, 8.546e+02, 3.458e+03, 0.000e+00, 0.000e+00, 2.154e+03, 0.000e+00 }, // CO2(total)
+        { 8.824e+00, 3.715e-01, 1.849e+01, 0.000e+00, 0.000e+00, 0.000e+00, 2.897e-02 }, // CO
+        { 6.557e-01, 0.000e+00, 9.909e-01, 0.000e+00, 3.484e-05, 0.000e+00, 1.804e-03 }, // HC
+        { 7.903e+02, 2.747e+02, 1.111e+03, 0.000e+00, 0.000e+00, 6.924e+02, 0.000e+00 }, // FC
+        { 3.614e+01, 4.176e+00, 5.652e+01, 0.000e+00, 0.000e+00, 1.039e+01, 0.000e+00 }, // NOx
+        { 1.991e+00, 0.000e+00, 7.106e-01, 0.000e+00, 1.391e-04, 3.576e-03, 8.635e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RT_gt20-26t_Euro-IV_SCR
-        { 2.614e+03, 2.310e+02, 4.038e+03, 0.000e+00, 0.000e+00, 5.787e+02, 0.000e+00 }, // CO2(total)
-        { 2.932e+01, 0.000e+00, 4.779e+01, 0.000e+00, 5.493e-06, 0.000e+00, 9.592e-04 }, // CO
-        { 1.206e-01, 5.026e-03, 1.310e-01, 0.000e+00, 0.000e+00, 1.168e-02, 0.000e+00 }, // HC
-        { 8.400e+02, 7.424e+01, 1.298e+03, 0.000e+00, 0.000e+00, 1.860e+02, 0.000e+00 }, // FC
-        { 2.950e+01, 5.848e-01, 0.000e+00, 0.000e+00, 0.000e+00, 1.957e+00, 0.000e+00 }, // NOx
-        { 2.017e+00, 0.000e+00, 8.747e-01, 0.000e+00, 2.946e-06, 9.939e-04, 4.907e-05 }, // PM + PM (non-exhaust)
+        { 2.614e+03, 8.316e+02, 4.038e+03, 0.000e+00, 0.000e+00, 2.083e+03, 0.000e+00 }, // CO2(total)
+        { 2.932e+01, 0.000e+00, 4.779e+01, 0.000e+00, 2.563e-04, 0.000e+00, 1.243e-02 }, // CO
+        { 1.206e-01, 1.809e-02, 1.310e-01, 0.000e+00, 0.000e+00, 4.204e-02, 0.000e+00 }, // HC
+        { 8.400e+02, 2.672e+02, 1.298e+03, 0.000e+00, 0.000e+00, 6.695e+02, 0.000e+00 }, // FC
+        { 2.950e+01, 2.105e+00, 0.000e+00, 0.000e+00, 0.000e+00, 7.045e+00, 0.000e+00 }, // NOx
+        { 2.017e+00, 0.000e+00, 8.747e-01, 0.000e+00, 1.374e-04, 3.578e-03, 6.359e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RT_gt20-26t_Euro-IV_SCRs
-        { 2.614e+03, 2.310e+02, 4.038e+03, 0.000e+00, 0.000e+00, 5.787e+02, 0.000e+00 }, // CO2(total)
-        { 2.932e+01, 0.000e+00, 4.779e+01, 0.000e+00, 5.493e-06, 0.000e+00, 9.592e-04 }, // CO
-        { 1.206e-01, 5.026e-03, 1.310e-01, 0.000e+00, 0.000e+00, 1.168e-02, 0.000e+00 }, // HC
-        { 8.400e+02, 7.424e+01, 1.298e+03, 0.000e+00, 0.000e+00, 1.860e+02, 0.000e+00 }, // FC
-        { 3.778e+01, 2.251e+00, 5.484e+01, 0.000e+00, 0.000e+00, 5.567e+00, 0.000e+00 }, // NOx
-        { 2.017e+00, 0.000e+00, 8.747e-01, 0.000e+00, 2.946e-06, 9.939e-04, 4.907e-05 }, // PM + PM (non-exhaust)
+        { 2.614e+03, 8.316e+02, 4.038e+03, 0.000e+00, 0.000e+00, 2.083e+03, 0.000e+00 }, // CO2(total)
+        { 2.932e+01, 0.000e+00, 4.779e+01, 0.000e+00, 2.563e-04, 0.000e+00, 1.243e-02 }, // CO
+        { 1.206e-01, 1.809e-02, 1.310e-01, 0.000e+00, 0.000e+00, 4.204e-02, 0.000e+00 }, // HC
+        { 8.400e+02, 2.672e+02, 1.298e+03, 0.000e+00, 0.000e+00, 6.695e+02, 0.000e+00 }, // FC
+        { 3.778e+01, 8.102e+00, 5.484e+01, 0.000e+00, 0.000e+00, 2.004e+01, 0.000e+00 }, // NOx
+        { 2.017e+00, 0.000e+00, 8.747e-01, 0.000e+00, 1.374e-04, 3.578e-03, 6.359e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RT_gt20-26t_Euro-V_EGR
-        { 2.554e+03, 2.248e+02, 3.915e+03, 0.000e+00, 0.000e+00, 5.650e+02, 0.000e+00 }, // CO2(total)
-        { 9.993e+00, 0.000e+00, 1.505e+01, 0.000e+00, 0.000e+00, 3.339e-02, 0.000e+00 }, // CO
-        { 1.026e+00, 4.006e-03, 1.321e+00, 0.000e+00, 7.724e-07, 3.183e-03, 2.495e-04 }, // HC
-        { 8.207e+02, 7.226e+01, 1.258e+03, 0.000e+00, 0.000e+00, 1.816e+02, 0.000e+00 }, // FC
-        { 3.564e+01, 7.459e-01, 5.146e+01, 0.000e+00, 0.000e+00, 1.893e+00, 0.000e+00 }, // NOx
-        { 1.637e+00, 6.323e-03, 2.355e-01, 9.798e-06, 2.682e-06, 1.850e-02, 0.000e+00 }, // PM + PM (non-exhaust)
+        { 2.554e+03, 8.094e+02, 3.915e+03, 0.000e+00, 0.000e+00, 2.034e+03, 0.000e+00 }, // CO2(total)
+        { 9.993e+00, 0.000e+00, 1.505e+01, 0.000e+00, 0.000e+00, 1.202e-01, 0.000e+00 }, // CO
+        { 1.026e+00, 1.442e-02, 1.321e+00, 0.000e+00, 3.604e-05, 1.146e-02, 3.234e-03 }, // HC
+        { 8.207e+02, 2.601e+02, 1.258e+03, 0.000e+00, 0.000e+00, 6.537e+02, 0.000e+00 }, // FC
+        { 3.564e+01, 2.685e+00, 5.146e+01, 0.000e+00, 0.000e+00, 6.816e+00, 0.000e+00 }, // NOx
+        { 1.637e+00, 2.276e-02, 2.355e-01, 1.270e-04, 1.251e-04, 6.661e-02, 0.000e+00 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RT_gt20-26t_Euro-V_SCR
-        { 1.817e+03, 2.348e+02, 1.343e+03, 0.000e+00, 0.000e+00, 6.065e+02, 0.000e+00 }, // CO2(total)
-        { 3.010e+01, 0.000e+00, 4.671e+01, 0.000e+00, 7.507e-06, 0.000e+00, 6.477e-04 }, // CO
-        { 1.309e-01, 5.509e-03, 3.369e-02, 0.000e+00, 0.000e+00, 1.322e-02, 0.000e+00 }, // HC
-        { 5.841e+02, 7.546e+01, 4.317e+02, 0.000e+00, 0.000e+00, 1.949e+02, 0.000e+00 }, // FC
-        { 3.160e+01, 2.154e-01, 0.000e+00, 0.000e+00, 0.000e+00, 3.379e-01, 6.120e-03 }, // NOx
-        { 2.081e+00, 0.000e+00, 9.407e-01, 0.000e+00, 2.980e-06, 8.935e-04, 4.620e-05 }, // PM + PM (non-exhaust)
+        { 1.817e+03, 8.453e+02, 1.343e+03, 0.000e+00, 0.000e+00, 2.183e+03, 0.000e+00 }, // CO2(total)
+        { 3.010e+01, 0.000e+00, 4.671e+01, 0.000e+00, 3.503e-04, 0.000e+00, 8.395e-03 }, // CO
+        { 1.309e-01, 1.983e-02, 3.369e-02, 0.000e+00, 0.000e+00, 4.759e-02, 0.000e+00 }, // HC
+        { 5.841e+02, 2.717e+02, 4.317e+02, 0.000e+00, 0.000e+00, 7.017e+02, 0.000e+00 }, // FC
+        { 3.160e+01, 7.755e-01, 0.000e+00, 0.000e+00, 0.000e+00, 1.216e+00, 7.932e-02 }, // NOx
+        { 2.081e+00, 0.000e+00, 9.407e-01, 0.000e+00, 1.390e-04, 3.217e-03, 5.987e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RT_gt20-26t_Euro-V_SCRs
-        { 1.817e+03, 2.348e+02, 1.343e+03, 0.000e+00, 0.000e+00, 6.065e+02, 0.000e+00 }, // CO2(total)
-        { 3.010e+01, 0.000e+00, 4.671e+01, 0.000e+00, 7.507e-06, 0.000e+00, 6.477e-04 }, // CO
-        { 1.309e-01, 5.509e-03, 3.369e-02, 0.000e+00, 0.000e+00, 1.322e-02, 0.000e+00 }, // HC
-        { 5.841e+02, 7.546e+01, 4.317e+02, 0.000e+00, 0.000e+00, 1.949e+02, 0.000e+00 }, // FC
-        { 4.108e+01, 2.300e+00, 3.218e+01, 0.000e+00, 0.000e+00, 5.823e+00, 0.000e+00 }, // NOx
-        { 2.081e+00, 0.000e+00, 9.407e-01, 0.000e+00, 2.980e-06, 8.935e-04, 4.620e-05 }, // PM + PM (non-exhaust)
+        { 1.817e+03, 8.453e+02, 1.343e+03, 0.000e+00, 0.000e+00, 2.183e+03, 0.000e+00 }, // CO2(total)
+        { 3.010e+01, 0.000e+00, 4.671e+01, 0.000e+00, 3.503e-04, 0.000e+00, 8.395e-03 }, // CO
+        { 1.309e-01, 1.983e-02, 3.369e-02, 0.000e+00, 0.000e+00, 4.759e-02, 0.000e+00 }, // HC
+        { 5.841e+02, 2.717e+02, 4.317e+02, 0.000e+00, 0.000e+00, 7.017e+02, 0.000e+00 }, // FC
+        { 4.108e+01, 8.279e+00, 3.218e+01, 0.000e+00, 0.000e+00, 2.096e+01, 0.000e+00 }, // NOx
+        { 2.081e+00, 0.000e+00, 9.407e-01, 0.000e+00, 1.390e-04, 3.217e-03, 5.987e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RT_gt20-26t_Euro-VI_A-C
-        { 1.888e+03, 2.298e+02, 1.920e+03, 0.000e+00, 0.000e+00, 5.908e+02, 0.000e+00 }, // CO2(total)
-        { 1.997e+00, 1.881e-02, 1.670e+00, 0.000e+00, 0.000e+00, 4.521e-02, 0.000e+00 }, // CO
-        { 1.300e-01, 4.253e-03, 0.000e+00, 0.000e+00, 0.000e+00, 1.109e-02, 0.000e+00 }, // HC
-        { 6.069e+02, 7.386e+01, 6.170e+02, 0.000e+00, 0.000e+00, 1.899e+02, 0.000e+00 }, // FC
-        { 5.685e+00, 0.000e+00, 5.773e-01, 0.000e+00, 1.007e-06, 0.000e+00, 0.000e+00 }, // NOx
-        { 1.570e+00, 0.000e+00, 1.545e-01, 0.000e+00, 2.700e-06, 8.969e-04, 4.031e-06 }, // PM + PM (non-exhaust)
+        { 1.888e+03, 8.273e+02, 1.920e+03, 0.000e+00, 0.000e+00, 2.127e+03, 0.000e+00 }, // CO2(total)
+        { 1.997e+00, 6.770e-02, 1.670e+00, 0.000e+00, 0.000e+00, 1.628e-01, 0.000e+00 }, // CO
+        { 1.300e-01, 1.531e-02, 0.000e+00, 0.000e+00, 0.000e+00, 3.994e-02, 0.000e+00 }, // HC
+        { 6.069e+02, 2.659e+02, 6.170e+02, 0.000e+00, 0.000e+00, 6.836e+02, 0.000e+00 }, // FC
+        { 5.685e+00, 0.000e+00, 5.773e-01, 0.000e+00, 4.700e-05, 0.000e+00, 0.000e+00 }, // NOx
+        { 1.570e+00, 0.000e+00, 1.545e-01, 0.000e+00, 1.260e-04, 3.229e-03, 5.224e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RT_gt20-26t_Euro-VIs_A-C
-        { 1.888e+03, 2.298e+02, 1.920e+03, 0.000e+00, 0.000e+00, 5.908e+02, 0.000e+00 }, // CO2(total)
-        { 1.997e+00, 1.881e-02, 1.670e+00, 0.000e+00, 0.000e+00, 4.521e-02, 0.000e+00 }, // CO
-        { 1.300e-01, 4.253e-03, 0.000e+00, 0.000e+00, 0.000e+00, 1.109e-02, 0.000e+00 }, // HC
-        { 6.069e+02, 7.386e+01, 6.170e+02, 0.000e+00, 0.000e+00, 1.899e+02, 0.000e+00 }, // FC
-        { 1.448e+01, 1.604e+00, 1.259e+01, 0.000e+00, 0.000e+00, 4.057e+00, 0.000e+00 }, // NOx
-        { 1.570e+00, 0.000e+00, 1.545e-01, 0.000e+00, 2.700e-06, 8.969e-04, 4.031e-06 }, // PM + PM (non-exhaust)
+        { 1.888e+03, 8.273e+02, 1.920e+03, 0.000e+00, 0.000e+00, 2.127e+03, 0.000e+00 }, // CO2(total)
+        { 1.997e+00, 6.770e-02, 1.670e+00, 0.000e+00, 0.000e+00, 1.628e-01, 0.000e+00 }, // CO
+        { 1.300e-01, 1.531e-02, 0.000e+00, 0.000e+00, 0.000e+00, 3.994e-02, 0.000e+00 }, // HC
+        { 6.069e+02, 2.659e+02, 6.170e+02, 0.000e+00, 0.000e+00, 6.836e+02, 0.000e+00 }, // FC
+        { 1.448e+01, 5.773e+00, 1.259e+01, 0.000e+00, 0.000e+00, 1.460e+01, 0.000e+00 }, // NOx
+        { 1.570e+00, 0.000e+00, 1.545e-01, 0.000e+00, 1.260e-04, 3.229e-03, 5.224e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RT_gt20-26t_Euro-VI_D-E
-        { 1.462e+03, 2.352e+02, 5.765e+02, 0.000e+00, 0.000e+00, 6.082e+02, 0.000e+00 }, // CO2(total)
+        { 1.462e+03, 8.469e+02, 5.765e+02, 0.000e+00, 0.000e+00, 2.189e+03, 0.000e+00 }, // CO2(total)
         { 6.939e-01, 0.000e+00, 7.279e-01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 3.679e-01, 1.734e-03, 8.448e-02, 2.414e-06, 0.000e+00, 4.886e-03, 0.000e+00 }, // HC
-        { 4.698e+02, 7.560e+01, 1.853e+02, 0.000e+00, 0.000e+00, 1.955e+02, 0.000e+00 }, // FC
-        { 2.207e+00, 0.000e+00, 2.240e-01, 0.000e+00, 3.919e-06, 0.000e+00, 0.000e+00 }, // NOx
-        { 1.449e+00, 6.928e-04, 1.690e-04, 0.000e+00, 2.700e-06, 2.671e-03, 0.000e+00 }, // PM + PM (non-exhaust)
+        { 3.679e-01, 6.243e-03, 8.448e-02, 3.129e-05, 0.000e+00, 1.759e-02, 0.000e+00 }, // HC
+        { 4.698e+02, 2.722e+02, 1.853e+02, 0.000e+00, 0.000e+00, 7.036e+02, 0.000e+00 }, // FC
+        { 2.207e+00, 0.000e+00, 2.240e-01, 0.000e+00, 1.828e-04, 0.000e+00, 0.000e+00 }, // NOx
+        { 1.449e+00, 2.494e-03, 1.690e-04, 0.000e+00, 1.260e-04, 9.617e-03, 0.000e+00 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RT_gt20-26t_Euro-VIs_D-E
-        { 1.462e+03, 2.352e+02, 5.765e+02, 0.000e+00, 0.000e+00, 6.082e+02, 0.000e+00 }, // CO2(total)
+        { 1.462e+03, 8.469e+02, 5.765e+02, 0.000e+00, 0.000e+00, 2.189e+03, 0.000e+00 }, // CO2(total)
         { 6.939e-01, 0.000e+00, 7.279e-01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 3.679e-01, 1.734e-03, 8.448e-02, 2.414e-06, 0.000e+00, 4.886e-03, 0.000e+00 }, // HC
-        { 4.698e+02, 7.560e+01, 1.853e+02, 0.000e+00, 0.000e+00, 1.955e+02, 0.000e+00 }, // FC
-        { 4.701e+01, 1.182e+00, 1.289e+02, 0.000e+00, 3.757e-05, 8.278e-01, 2.326e-02 }, // NOx
-        { 1.449e+00, 6.928e-04, 1.690e-04, 0.000e+00, 2.700e-06, 2.671e-03, 0.000e+00 }, // PM + PM (non-exhaust)
+        { 3.679e-01, 6.243e-03, 8.448e-02, 3.129e-05, 0.000e+00, 1.759e-02, 0.000e+00 }, // HC
+        { 4.698e+02, 2.722e+02, 1.853e+02, 0.000e+00, 0.000e+00, 7.036e+02, 0.000e+00 }, // FC
+        { 4.701e+01, 4.254e+00, 1.289e+02, 0.000e+00, 1.753e-03, 2.980e+00, 3.014e-01 }, // NOx
+        { 1.449e+00, 2.494e-03, 1.690e-04, 0.000e+00, 1.260e-04, 9.617e-03, 0.000e+00 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RT_gt26-28t_50ties
-        { 5.114e+03, 2.220e+02, 1.105e+04, 0.000e+00, 0.000e+00, 4.863e+02, 0.000e+00 }, // CO2(total)
-        { 3.620e+01, 6.315e-01, 4.907e+01, 0.000e+00, 0.000e+00, 1.537e+00, 0.000e+00 }, // CO
-        { 1.256e+01, 0.000e+00, 1.601e-02, 0.000e+00, 1.099e-05, 0.000e+00, 2.932e-03 }, // HC
-        { 1.643e+03, 7.136e+01, 3.552e+03, 0.000e+00, 0.000e+00, 1.563e+02, 0.000e+00 }, // FC
-        { 9.358e+01, 3.237e+00, 1.709e+02, 0.000e+00, 0.000e+00, 7.739e+00, 0.000e+00 }, // NOx
-        { 6.041e+00, 9.772e-02, 6.037e+00, 0.000e+00, 2.825e-06, 2.113e-01, 9.037e-06 }, // PM + PM (non-exhaust)
+        { 5.114e+03, 7.994e+02, 1.105e+04, 0.000e+00, 0.000e+00, 1.751e+03, 0.000e+00 }, // CO2(total)
+        { 3.620e+01, 2.273e+00, 4.907e+01, 0.000e+00, 0.000e+00, 5.532e+00, 0.000e+00 }, // CO
+        { 1.256e+01, 0.000e+00, 1.601e-02, 0.000e+00, 5.126e-04, 0.000e+00, 3.800e-02 }, // HC
+        { 1.643e+03, 2.569e+02, 3.552e+03, 0.000e+00, 0.000e+00, 5.626e+02, 0.000e+00 }, // FC
+        { 9.358e+01, 1.165e+01, 1.709e+02, 0.000e+00, 0.000e+00, 2.786e+01, 0.000e+00 }, // NOx
+        { 6.041e+00, 3.518e-01, 6.037e+00, 0.000e+00, 1.318e-04, 7.606e-01, 1.171e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RT_gt26-28t_60ties
-        { 5.114e+03, 2.220e+02, 1.105e+04, 0.000e+00, 0.000e+00, 4.863e+02, 0.000e+00 }, // CO2(total)
-        { 3.620e+01, 6.315e-01, 4.907e+01, 0.000e+00, 0.000e+00, 1.537e+00, 0.000e+00 }, // CO
-        { 1.256e+01, 0.000e+00, 1.601e-02, 0.000e+00, 1.099e-05, 0.000e+00, 2.932e-03 }, // HC
-        { 1.643e+03, 7.136e+01, 3.552e+03, 0.000e+00, 0.000e+00, 1.563e+02, 0.000e+00 }, // FC
-        { 9.358e+01, 3.237e+00, 1.709e+02, 0.000e+00, 0.000e+00, 7.739e+00, 0.000e+00 }, // NOx
-        { 6.041e+00, 9.772e-02, 6.037e+00, 0.000e+00, 2.825e-06, 2.113e-01, 9.037e-06 }, // PM + PM (non-exhaust)
+        { 5.114e+03, 7.994e+02, 1.105e+04, 0.000e+00, 0.000e+00, 1.751e+03, 0.000e+00 }, // CO2(total)
+        { 3.620e+01, 2.273e+00, 4.907e+01, 0.000e+00, 0.000e+00, 5.532e+00, 0.000e+00 }, // CO
+        { 1.256e+01, 0.000e+00, 1.601e-02, 0.000e+00, 5.126e-04, 0.000e+00, 3.800e-02 }, // HC
+        { 1.643e+03, 2.569e+02, 3.552e+03, 0.000e+00, 0.000e+00, 5.626e+02, 0.000e+00 }, // FC
+        { 9.358e+01, 1.165e+01, 1.709e+02, 0.000e+00, 0.000e+00, 2.786e+01, 0.000e+00 }, // NOx
+        { 6.041e+00, 3.518e-01, 6.037e+00, 0.000e+00, 1.318e-04, 7.606e-01, 1.171e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RT_gt26-28t_70ties
-        { 5.114e+03, 2.220e+02, 1.105e+04, 0.000e+00, 0.000e+00, 4.863e+02, 0.000e+00 }, // CO2(total)
-        { 3.620e+01, 6.315e-01, 4.907e+01, 0.000e+00, 0.000e+00, 1.537e+00, 0.000e+00 }, // CO
-        { 1.256e+01, 0.000e+00, 1.601e-02, 0.000e+00, 1.099e-05, 0.000e+00, 2.932e-03 }, // HC
-        { 1.643e+03, 7.136e+01, 3.552e+03, 0.000e+00, 0.000e+00, 1.563e+02, 0.000e+00 }, // FC
-        { 9.358e+01, 3.237e+00, 1.709e+02, 0.000e+00, 0.000e+00, 7.739e+00, 0.000e+00 }, // NOx
-        { 6.041e+00, 9.772e-02, 6.037e+00, 0.000e+00, 2.825e-06, 2.113e-01, 9.037e-06 }, // PM + PM (non-exhaust)
+        { 5.114e+03, 7.994e+02, 1.105e+04, 0.000e+00, 0.000e+00, 1.751e+03, 0.000e+00 }, // CO2(total)
+        { 3.620e+01, 2.273e+00, 4.907e+01, 0.000e+00, 0.000e+00, 5.532e+00, 0.000e+00 }, // CO
+        { 1.256e+01, 0.000e+00, 1.601e-02, 0.000e+00, 5.126e-04, 0.000e+00, 3.800e-02 }, // HC
+        { 1.643e+03, 2.569e+02, 3.552e+03, 0.000e+00, 0.000e+00, 5.626e+02, 0.000e+00 }, // FC
+        { 9.358e+01, 1.165e+01, 1.709e+02, 0.000e+00, 0.000e+00, 2.786e+01, 0.000e+00 }, // NOx
+        { 6.041e+00, 3.518e-01, 6.037e+00, 0.000e+00, 1.318e-04, 7.606e-01, 1.171e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RT_gt26-28t_80ties
-        { 5.114e+03, 2.220e+02, 1.105e+04, 0.000e+00, 0.000e+00, 4.863e+02, 0.000e+00 }, // CO2(total)
-        { 3.620e+01, 6.315e-01, 4.907e+01, 0.000e+00, 0.000e+00, 1.537e+00, 0.000e+00 }, // CO
-        { 1.256e+01, 0.000e+00, 1.601e-02, 0.000e+00, 1.099e-05, 0.000e+00, 2.932e-03 }, // HC
-        { 1.643e+03, 7.136e+01, 3.552e+03, 0.000e+00, 0.000e+00, 1.563e+02, 0.000e+00 }, // FC
-        { 9.358e+01, 3.237e+00, 1.709e+02, 0.000e+00, 0.000e+00, 7.739e+00, 0.000e+00 }, // NOx
-        { 6.041e+00, 9.772e-02, 6.037e+00, 0.000e+00, 2.825e-06, 2.113e-01, 9.037e-06 }, // PM + PM (non-exhaust)
+        { 5.114e+03, 7.994e+02, 1.105e+04, 0.000e+00, 0.000e+00, 1.751e+03, 0.000e+00 }, // CO2(total)
+        { 3.620e+01, 2.273e+00, 4.907e+01, 0.000e+00, 0.000e+00, 5.532e+00, 0.000e+00 }, // CO
+        { 1.256e+01, 0.000e+00, 1.601e-02, 0.000e+00, 5.126e-04, 0.000e+00, 3.800e-02 }, // HC
+        { 1.643e+03, 2.569e+02, 3.552e+03, 0.000e+00, 0.000e+00, 5.626e+02, 0.000e+00 }, // FC
+        { 9.358e+01, 1.165e+01, 1.709e+02, 0.000e+00, 0.000e+00, 2.786e+01, 0.000e+00 }, // NOx
+        { 6.041e+00, 3.518e-01, 6.037e+00, 0.000e+00, 1.318e-04, 7.606e-01, 1.171e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RT_gt26-28t_Euro-I
-        { 5.792e+03, 1.978e+02, 1.391e+04, 0.000e+00, 0.000e+00, 4.178e+02, 0.000e+00 }, // CO2(total)
-        { 1.642e+01, 2.696e-01, 1.349e+01, 0.000e+00, 0.000e+00, 6.749e-01, 0.000e+00 }, // CO
-        { 6.143e+00, 0.000e+00, 3.489e+00, 0.000e+00, 9.641e-06, 0.000e+00, 2.136e-03 }, // HC
-        { 1.861e+03, 6.357e+01, 4.471e+03, 0.000e+00, 0.000e+00, 1.343e+02, 0.000e+00 }, // FC
-        { 7.694e+01, 1.545e+00, 1.609e+02, 0.000e+00, 0.000e+00, 3.610e+00, 0.000e+00 }, // NOx
-        { 3.583e+00, 7.590e-02, 7.220e-02, 0.000e+00, 2.700e-06, 1.707e-01, 0.000e+00 }, // PM + PM (non-exhaust)
+        { 5.792e+03, 7.121e+02, 1.391e+04, 0.000e+00, 0.000e+00, 1.504e+03, 0.000e+00 }, // CO2(total)
+        { 1.642e+01, 9.706e-01, 1.349e+01, 0.000e+00, 0.000e+00, 2.430e+00, 0.000e+00 }, // CO
+        { 6.143e+00, 0.000e+00, 3.489e+00, 0.000e+00, 4.498e-04, 0.000e+00, 2.768e-02 }, // HC
+        { 1.861e+03, 2.289e+02, 4.471e+03, 0.000e+00, 0.000e+00, 4.834e+02, 0.000e+00 }, // FC
+        { 7.694e+01, 5.561e+00, 1.609e+02, 0.000e+00, 0.000e+00, 1.300e+01, 0.000e+00 }, // NOx
+        { 3.583e+00, 2.732e-01, 7.220e-02, 0.000e+00, 1.260e-04, 6.147e-01, 0.000e+00 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RT_gt26-28t_Euro-II
-        { 4.277e+03, 2.181e+02, 8.677e+03, 0.000e+00, 0.000e+00, 4.928e+02, 0.000e+00 }, // CO2(total)
-        { 2.094e+01, 6.449e-02, 4.370e+01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 4.172e+00, 0.000e+00, 1.746e+00, 0.000e+00, 5.447e-06, 0.000e+00, 1.277e-03 }, // HC
-        { 1.374e+03, 7.009e+01, 2.789e+03, 0.000e+00, 0.000e+00, 1.584e+02, 0.000e+00 }, // FC
-        { 6.937e+01, 1.755e+00, 1.172e+02, 0.000e+00, 0.000e+00, 4.426e+00, 0.000e+00 }, // NOx
-        { 2.841e+00, 2.592e-02, 2.374e+00, 6.726e-05, 2.790e-06, 3.803e-02, 1.869e-04 }, // PM + PM (non-exhaust)
+        { 4.277e+03, 7.851e+02, 8.677e+03, 0.000e+00, 0.000e+00, 1.774e+03, 0.000e+00 }, // CO2(total)
+        { 2.094e+01, 2.322e-01, 4.370e+01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
+        { 4.172e+00, 0.000e+00, 1.746e+00, 0.000e+00, 2.541e-04, 0.000e+00, 1.655e-02 }, // HC
+        { 1.374e+03, 2.523e+02, 2.789e+03, 0.000e+00, 0.000e+00, 5.701e+02, 0.000e+00 }, // FC
+        { 6.937e+01, 6.316e+00, 1.172e+02, 0.000e+00, 0.000e+00, 1.593e+01, 0.000e+00 }, // NOx
+        { 2.841e+00, 9.331e-02, 2.374e+00, 8.717e-04, 1.301e-04, 1.369e-01, 2.422e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RT_gt26-28t_Euro-III
-        { 3.778e+03, 2.410e+02, 7.057e+03, 0.000e+00, 0.000e+00, 5.687e+02, 0.000e+00 }, // CO2(total)
-        { 2.009e+01, 0.000e+00, 1.018e+01, 0.000e+00, 1.765e-05, 0.000e+00, 3.997e-03 }, // CO
-        { 4.156e+00, 0.000e+00, 2.029e+00, 0.000e+00, 4.025e-06, 0.000e+00, 9.777e-04 }, // HC
-        { 1.214e+03, 7.744e+01, 2.268e+03, 0.000e+00, 0.000e+00, 1.828e+02, 0.000e+00 }, // FC
-        { 5.217e+01, 1.489e+00, 7.844e+01, 0.000e+00, 0.000e+00, 4.046e+00, 0.000e+00 }, // NOx
-        { 2.834e+00, 2.502e-02, 0.000e+00, 5.080e-05, 2.709e-06, 5.111e-02, 1.056e-04 }, // PM + PM (non-exhaust)
+        { 3.778e+03, 8.675e+02, 7.057e+03, 0.000e+00, 0.000e+00, 2.047e+03, 0.000e+00 }, // CO2(total)
+        { 2.009e+01, 0.000e+00, 1.018e+01, 0.000e+00, 8.235e-04, 0.000e+00, 5.180e-02 }, // CO
+        { 4.156e+00, 0.000e+00, 2.029e+00, 0.000e+00, 1.878e-04, 0.000e+00, 1.267e-02 }, // HC
+        { 1.214e+03, 2.788e+02, 2.268e+03, 0.000e+00, 0.000e+00, 6.580e+02, 0.000e+00 }, // FC
+        { 5.217e+01, 5.362e+00, 7.844e+01, 0.000e+00, 0.000e+00, 1.456e+01, 0.000e+00 }, // NOx
+        { 2.834e+00, 9.009e-02, 0.000e+00, 6.583e-04, 1.264e-04, 1.840e-01, 1.369e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RT_gt26-28t_Euro-IV_EGR
-        { 3.241e+03, 2.482e+02, 6.932e+03, 0.000e+00, 0.000e+00, 5.870e+02, 0.000e+00 }, // CO2(total)
-        { 1.005e+01, 9.911e-02, 2.529e+01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 6.489e-01, 0.000e+00, 1.240e+00, 0.000e+00, 1.237e-06, 1.930e-03, 0.000e+00 }, // HC
-        { 1.041e+03, 7.976e+01, 2.228e+03, 0.000e+00, 0.000e+00, 1.887e+02, 0.000e+00 }, // FC
-        { 5.554e+01, 7.837e-01, 1.007e+02, 0.000e+00, 0.000e+00, 2.134e+00, 0.000e+00 }, // NOx
-        { 1.976e+00, 0.000e+00, 8.639e-01, 0.000e+00, 3.031e-06, 9.439e-04, 2.103e-07 }, // PM + PM (non-exhaust)
+        { 3.241e+03, 8.935e+02, 6.932e+03, 0.000e+00, 0.000e+00, 2.113e+03, 0.000e+00 }, // CO2(total)
+        { 1.005e+01, 3.568e-01, 2.529e+01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
+        { 6.489e-01, 0.000e+00, 1.240e+00, 0.000e+00, 5.769e-05, 6.948e-03, 0.000e+00 }, // HC
+        { 1.041e+03, 2.871e+02, 2.228e+03, 0.000e+00, 0.000e+00, 6.792e+02, 0.000e+00 }, // FC
+        { 5.554e+01, 2.821e+00, 1.007e+02, 0.000e+00, 0.000e+00, 7.684e+00, 0.000e+00 }, // NOx
+        { 1.976e+00, 0.000e+00, 8.639e-01, 0.000e+00, 1.414e-04, 3.398e-03, 2.726e-06 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RT_gt26-28t_Euro-IV_SCR
-        { 3.475e+03, 2.392e+02, 7.732e+03, 0.000e+00, 0.000e+00, 5.594e+02, 0.000e+00 }, // CO2(total)
+        { 3.475e+03, 8.610e+02, 7.732e+03, 0.000e+00, 0.000e+00, 2.014e+03, 0.000e+00 }, // CO2(total)
         { 2.810e+01, 0.000e+00, 4.629e+01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 1.974e-01, 2.240e-03, 1.678e-01, 0.000e+00, 6.764e-07, 1.102e-02, 0.000e+00 }, // HC
-        { 1.117e+03, 7.686e+01, 2.485e+03, 0.000e+00, 0.000e+00, 1.798e+02, 0.000e+00 }, // FC
-        { 2.767e+01, 7.363e-01, 3.013e+00, 0.000e+00, 0.000e+00, 2.050e+00, 0.000e+00 }, // NOx
-        { 1.980e+00, 0.000e+00, 8.624e-01, 0.000e+00, 3.123e-06, 8.541e-04, 4.387e-05 }, // PM + PM (non-exhaust)
+        { 1.974e-01, 8.066e-03, 1.678e-01, 0.000e+00, 3.156e-05, 3.966e-02, 0.000e+00 }, // HC
+        { 1.117e+03, 2.767e+02, 2.485e+03, 0.000e+00, 0.000e+00, 6.472e+02, 0.000e+00 }, // FC
+        { 2.767e+01, 2.651e+00, 3.013e+00, 0.000e+00, 0.000e+00, 7.380e+00, 0.000e+00 }, // NOx
+        { 1.980e+00, 0.000e+00, 8.624e-01, 0.000e+00, 1.457e-04, 3.075e-03, 5.686e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RT_gt26-28t_Euro-IV_SCRs
-        { 3.475e+03, 2.392e+02, 7.732e+03, 0.000e+00, 0.000e+00, 5.594e+02, 0.000e+00 }, // CO2(total)
+        { 3.475e+03, 8.610e+02, 7.732e+03, 0.000e+00, 0.000e+00, 2.014e+03, 0.000e+00 }, // CO2(total)
         { 2.810e+01, 0.000e+00, 4.629e+01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 1.974e-01, 2.240e-03, 1.678e-01, 0.000e+00, 6.764e-07, 1.102e-02, 0.000e+00 }, // HC
-        { 1.117e+03, 7.686e+01, 2.485e+03, 0.000e+00, 0.000e+00, 1.798e+02, 0.000e+00 }, // FC
-        { 5.618e+01, 2.107e+00, 1.067e+02, 0.000e+00, 0.000e+00, 5.091e+00, 0.000e+00 }, // NOx
-        { 1.980e+00, 0.000e+00, 8.624e-01, 0.000e+00, 3.123e-06, 8.541e-04, 4.387e-05 }, // PM + PM (non-exhaust)
+        { 1.974e-01, 8.066e-03, 1.678e-01, 0.000e+00, 3.156e-05, 3.966e-02, 0.000e+00 }, // HC
+        { 1.117e+03, 2.767e+02, 2.485e+03, 0.000e+00, 0.000e+00, 6.472e+02, 0.000e+00 }, // FC
+        { 5.618e+01, 7.584e+00, 1.067e+02, 0.000e+00, 0.000e+00, 1.833e+01, 0.000e+00 }, // NOx
+        { 1.980e+00, 0.000e+00, 8.624e-01, 0.000e+00, 1.457e-04, 3.075e-03, 5.686e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RT_gt26-28t_Euro-V_EGR
-        { 3.551e+03, 2.313e+02, 8.006e+03, 0.000e+00, 0.000e+00, 5.427e+02, 0.000e+00 }, // CO2(total)
-        { 7.360e+00, 0.000e+00, 9.630e+00, 0.000e+00, 1.050e-06, 0.000e+00, 0.000e+00 }, // CO
-        { 1.081e+00, 0.000e+00, 1.287e+00, 0.000e+00, 1.489e-06, 6.947e-03, 1.610e-04 }, // HC
-        { 1.141e+03, 7.433e+01, 2.573e+03, 0.000e+00, 0.000e+00, 1.744e+02, 0.000e+00 }, // FC
-        { 4.480e+01, 4.861e-01, 9.448e+01, 0.000e+00, 0.000e+00, 7.898e-01, 0.000e+00 }, // NOx
-        { 1.742e+00, 2.571e-03, 6.819e-02, 0.000e+00, 4.128e-06, 2.149e-02, 1.147e-04 }, // PM + PM (non-exhaust)
+        { 3.551e+03, 8.326e+02, 8.006e+03, 0.000e+00, 0.000e+00, 1.954e+03, 0.000e+00 }, // CO2(total)
+        { 7.360e+00, 0.000e+00, 9.630e+00, 0.000e+00, 4.898e-05, 0.000e+00, 0.000e+00 }, // CO
+        { 1.081e+00, 0.000e+00, 1.287e+00, 0.000e+00, 6.947e-05, 2.501e-02, 2.086e-03 }, // HC
+        { 1.141e+03, 2.676e+02, 2.573e+03, 0.000e+00, 0.000e+00, 6.278e+02, 0.000e+00 }, // FC
+        { 4.480e+01, 1.750e+00, 9.448e+01, 0.000e+00, 0.000e+00, 2.843e+00, 0.000e+00 }, // NOx
+        { 1.742e+00, 9.257e-03, 6.819e-02, 0.000e+00, 1.926e-04, 7.735e-02, 1.487e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RT_gt26-28t_Euro-V_SCR
-        { 3.618e+03, 2.226e+02, 8.274e+03, 0.000e+00, 0.000e+00, 5.184e+02, 0.000e+00 }, // CO2(total)
+        { 3.618e+03, 8.014e+02, 8.274e+03, 0.000e+00, 0.000e+00, 1.866e+03, 0.000e+00 }, // CO2(total)
         { 2.680e+01, 0.000e+00, 4.341e+01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 2.832e-01, 0.000e+00, 6.679e-02, 0.000e+00, 7.371e-07, 1.155e-02, 0.000e+00 }, // HC
-        { 1.163e+03, 7.155e+01, 2.659e+03, 0.000e+00, 0.000e+00, 1.666e+02, 0.000e+00 }, // FC
-        { 2.970e+01, 2.597e-01, 0.000e+00, 0.000e+00, 0.000e+00, 6.303e-01, 4.580e-03 }, // NOx
-        { 1.997e+00, 0.000e+00, 8.210e-01, 0.000e+00, 3.085e-06, 7.168e-05, 5.199e-05 }, // PM + PM (non-exhaust)
+        { 2.832e-01, 0.000e+00, 6.679e-02, 0.000e+00, 3.439e-05, 4.158e-02, 0.000e+00 }, // HC
+        { 1.163e+03, 2.576e+02, 2.659e+03, 0.000e+00, 0.000e+00, 5.998e+02, 0.000e+00 }, // FC
+        { 2.970e+01, 9.350e-01, 0.000e+00, 0.000e+00, 0.000e+00, 2.269e+00, 5.936e-02 }, // NOx
+        { 1.997e+00, 0.000e+00, 8.210e-01, 0.000e+00, 1.439e-04, 2.580e-04, 6.737e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RT_gt26-28t_Euro-V_SCRs
-        { 3.618e+03, 2.226e+02, 8.274e+03, 0.000e+00, 0.000e+00, 5.184e+02, 0.000e+00 }, // CO2(total)
+        { 3.618e+03, 8.014e+02, 8.274e+03, 0.000e+00, 0.000e+00, 1.866e+03, 0.000e+00 }, // CO2(total)
         { 2.680e+01, 0.000e+00, 4.341e+01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 2.832e-01, 0.000e+00, 6.679e-02, 0.000e+00, 7.371e-07, 1.155e-02, 0.000e+00 }, // HC
-        { 1.163e+03, 7.155e+01, 2.659e+03, 0.000e+00, 0.000e+00, 1.666e+02, 0.000e+00 }, // FC
-        { 6.404e+01, 2.043e+00, 9.550e+01, 0.000e+00, 0.000e+00, 5.269e+00, 0.000e+00 }, // NOx
-        { 1.997e+00, 0.000e+00, 8.210e-01, 0.000e+00, 3.085e-06, 7.168e-05, 5.199e-05 }, // PM + PM (non-exhaust)
+        { 2.832e-01, 0.000e+00, 6.679e-02, 0.000e+00, 3.439e-05, 4.158e-02, 0.000e+00 }, // HC
+        { 1.163e+03, 2.576e+02, 2.659e+03, 0.000e+00, 0.000e+00, 5.998e+02, 0.000e+00 }, // FC
+        { 6.404e+01, 7.355e+00, 9.550e+01, 0.000e+00, 0.000e+00, 1.897e+01, 0.000e+00 }, // NOx
+        { 1.997e+00, 0.000e+00, 8.210e-01, 0.000e+00, 1.439e-04, 2.580e-04, 6.737e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RT_gt26-28t_Euro-VI_A-C
-        { 2.835e+03, 2.361e+02, 6.085e+03, 0.000e+00, 0.000e+00, 5.624e+02, 0.000e+00 }, // CO2(total)
-        { 1.740e+00, 2.800e-02, 2.936e+00, 0.000e+00, 0.000e+00, 1.695e-02, 0.000e+00 }, // CO
-        { 1.106e-01, 5.045e-03, 1.546e-01, 0.000e+00, 0.000e+00, 6.814e-03, 0.000e+00 }, // HC
-        { 9.113e+02, 7.587e+01, 1.956e+03, 0.000e+00, 0.000e+00, 1.808e+02, 0.000e+00 }, // FC
-        { 4.510e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.237e-05, 0.000e+00, 8.237e-04 }, // NOx
-        { 1.532e+00, 0.000e+00, 7.256e-02, 0.000e+00, 3.119e-06, 6.852e-04, 5.149e-05 }, // PM + PM (non-exhaust)
+        { 2.835e+03, 8.498e+02, 6.085e+03, 0.000e+00, 0.000e+00, 2.025e+03, 0.000e+00 }, // CO2(total)
+        { 1.740e+00, 1.008e-01, 2.936e+00, 0.000e+00, 0.000e+00, 6.100e-02, 0.000e+00 }, // CO
+        { 1.106e-01, 1.816e-02, 1.546e-01, 0.000e+00, 0.000e+00, 2.453e-02, 0.000e+00 }, // HC
+        { 9.113e+02, 2.731e+02, 1.956e+03, 0.000e+00, 0.000e+00, 6.507e+02, 0.000e+00 }, // FC
+        { 4.510e+00, 0.000e+00, 0.000e+00, 0.000e+00, 5.771e-04, 0.000e+00, 1.068e-02 }, // NOx
+        { 1.532e+00, 0.000e+00, 7.256e-02, 0.000e+00, 1.455e-04, 2.467e-03, 6.673e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RT_gt26-28t_Euro-VIs_A-C
-        { 2.835e+03, 2.361e+02, 6.085e+03, 0.000e+00, 0.000e+00, 5.624e+02, 0.000e+00 }, // CO2(total)
-        { 1.740e+00, 2.800e-02, 2.936e+00, 0.000e+00, 0.000e+00, 1.695e-02, 0.000e+00 }, // CO
-        { 1.106e-01, 5.045e-03, 1.546e-01, 0.000e+00, 0.000e+00, 6.814e-03, 0.000e+00 }, // HC
-        { 9.113e+02, 7.587e+01, 1.956e+03, 0.000e+00, 0.000e+00, 1.808e+02, 0.000e+00 }, // FC
-        { 2.415e+01, 1.630e+00, 5.082e+01, 0.000e+00, 0.000e+00, 3.865e+00, 0.000e+00 }, // NOx
-        { 1.532e+00, 0.000e+00, 7.256e-02, 0.000e+00, 3.119e-06, 6.852e-04, 5.149e-05 }, // PM + PM (non-exhaust)
+        { 2.835e+03, 8.498e+02, 6.085e+03, 0.000e+00, 0.000e+00, 2.025e+03, 0.000e+00 }, // CO2(total)
+        { 1.740e+00, 1.008e-01, 2.936e+00, 0.000e+00, 0.000e+00, 6.100e-02, 0.000e+00 }, // CO
+        { 1.106e-01, 1.816e-02, 1.546e-01, 0.000e+00, 0.000e+00, 2.453e-02, 0.000e+00 }, // HC
+        { 9.113e+02, 2.731e+02, 1.956e+03, 0.000e+00, 0.000e+00, 6.507e+02, 0.000e+00 }, // FC
+        { 2.415e+01, 5.867e+00, 5.082e+01, 0.000e+00, 0.000e+00, 1.391e+01, 0.000e+00 }, // NOx
+        { 1.532e+00, 0.000e+00, 7.256e-02, 0.000e+00, 1.455e-04, 2.467e-03, 6.673e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RT_gt26-28t_Euro-VI_D-E
-        { 2.452e+03, 2.421e+02, 4.939e+03, 0.000e+00, 0.000e+00, 5.795e+02, 0.000e+00 }, // CO2(total)
+        { 2.452e+03, 8.716e+02, 4.939e+03, 0.000e+00, 0.000e+00, 2.086e+03, 0.000e+00 }, // CO2(total)
         { 5.513e-01, 0.000e+00, 8.734e-01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 4.014e-01, 0.000e+00, 2.850e-01, 0.000e+00, 5.627e-07, 8.942e-04, 0.000e+00 }, // HC
-        { 7.881e+02, 7.781e+01, 1.587e+03, 0.000e+00, 0.000e+00, 1.862e+02, 0.000e+00 }, // FC
-        { 2.046e+00, 0.000e+00, 1.407e-01, 0.000e+00, 5.976e-06, 0.000e+00, 0.000e+00 }, // NOx
-        { 1.444e+00, 9.383e-04, 7.373e-03, 0.000e+00, 2.692e-06, 2.504e-03, 0.000e+00 }, // PM + PM (non-exhaust)
+        { 4.014e-01, 0.000e+00, 2.850e-01, 0.000e+00, 2.625e-05, 3.219e-03, 0.000e+00 }, // HC
+        { 7.881e+02, 2.801e+02, 1.587e+03, 0.000e+00, 0.000e+00, 6.705e+02, 0.000e+00 }, // FC
+        { 2.046e+00, 0.000e+00, 1.407e-01, 0.000e+00, 2.788e-04, 0.000e+00, 0.000e+00 }, // NOx
+        { 1.444e+00, 3.378e-03, 7.373e-03, 0.000e+00, 1.256e-04, 9.015e-03, 0.000e+00 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RT_gt26-28t_Euro-VIs_D-E
-        { 2.452e+03, 2.421e+02, 4.939e+03, 0.000e+00, 0.000e+00, 5.795e+02, 0.000e+00 }, // CO2(total)
+        { 2.452e+03, 8.716e+02, 4.939e+03, 0.000e+00, 0.000e+00, 2.086e+03, 0.000e+00 }, // CO2(total)
         { 5.513e-01, 0.000e+00, 8.734e-01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 4.014e-01, 0.000e+00, 2.850e-01, 0.000e+00, 5.627e-07, 8.942e-04, 0.000e+00 }, // HC
-        { 7.881e+02, 7.781e+01, 1.587e+03, 0.000e+00, 0.000e+00, 1.862e+02, 0.000e+00 }, // FC
-        { 5.941e+01, 1.260e+00, 1.233e+02, 0.000e+00, 0.000e+00, 2.850e+00, 0.000e+00 }, // NOx
-        { 1.444e+00, 9.383e-04, 7.373e-03, 0.000e+00, 2.692e-06, 2.504e-03, 0.000e+00 }, // PM + PM (non-exhaust)
+        { 4.014e-01, 0.000e+00, 2.850e-01, 0.000e+00, 2.625e-05, 3.219e-03, 0.000e+00 }, // HC
+        { 7.881e+02, 2.801e+02, 1.587e+03, 0.000e+00, 0.000e+00, 6.705e+02, 0.000e+00 }, // FC
+        { 5.941e+01, 4.536e+00, 1.233e+02, 0.000e+00, 0.000e+00, 1.026e+01, 0.000e+00 }, // NOx
+        { 1.444e+00, 3.378e-03, 7.373e-03, 0.000e+00, 1.256e-04, 9.015e-03, 0.000e+00 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RT_gt28-32t_50ties
-        { 5.797e+03, 2.465e+02, 1.193e+04, 0.000e+00, 0.000e+00, 5.564e+02, 0.000e+00 }, // CO2(total)
-        { 3.041e+01, 1.485e-01, 5.220e+01, 0.000e+00, 0.000e+00, 7.649e-02, 0.000e+00 }, // CO
-        { 7.351e+00, 0.000e+00, 7.604e-01, 0.000e+00, 1.016e-05, 0.000e+00, 1.213e-03 }, // HC
-        { 1.863e+03, 7.923e+01, 3.835e+03, 0.000e+00, 0.000e+00, 1.788e+02, 0.000e+00 }, // FC
-        { 8.945e+01, 3.447e+00, 1.673e+02, 0.000e+00, 0.000e+00, 8.269e+00, 0.000e+00 }, // NOx
-        { 6.210e+00, 7.604e-02, 9.252e+00, 0.000e+00, 2.840e-06, 4.295e-02, 9.418e-06 }, // PM + PM (non-exhaust)
+        { 5.797e+03, 8.875e+02, 1.193e+04, 0.000e+00, 0.000e+00, 2.003e+03, 0.000e+00 }, // CO2(total)
+        { 3.041e+01, 5.347e-01, 5.220e+01, 0.000e+00, 0.000e+00, 2.754e-01, 0.000e+00 }, // CO
+        { 7.351e+00, 0.000e+00, 7.604e-01, 0.000e+00, 4.739e-04, 0.000e+00, 1.572e-02 }, // HC
+        { 1.863e+03, 2.852e+02, 3.835e+03, 0.000e+00, 0.000e+00, 6.438e+02, 0.000e+00 }, // FC
+        { 8.945e+01, 1.241e+01, 1.673e+02, 0.000e+00, 0.000e+00, 2.977e+01, 0.000e+00 }, // NOx
+        { 6.210e+00, 2.737e-01, 9.252e+00, 0.000e+00, 1.325e-04, 1.546e-01, 1.221e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RT_gt28-32t_60ties
-        { 5.797e+03, 2.465e+02, 1.193e+04, 0.000e+00, 0.000e+00, 5.564e+02, 0.000e+00 }, // CO2(total)
-        { 3.041e+01, 1.485e-01, 5.220e+01, 0.000e+00, 0.000e+00, 7.649e-02, 0.000e+00 }, // CO
-        { 7.351e+00, 0.000e+00, 7.604e-01, 0.000e+00, 1.016e-05, 0.000e+00, 1.213e-03 }, // HC
-        { 1.863e+03, 7.923e+01, 3.835e+03, 0.000e+00, 0.000e+00, 1.788e+02, 0.000e+00 }, // FC
-        { 8.945e+01, 3.447e+00, 1.673e+02, 0.000e+00, 0.000e+00, 8.269e+00, 0.000e+00 }, // NOx
-        { 6.210e+00, 7.604e-02, 9.252e+00, 0.000e+00, 2.840e-06, 4.295e-02, 9.418e-06 }, // PM + PM (non-exhaust)
+        { 5.797e+03, 8.875e+02, 1.193e+04, 0.000e+00, 0.000e+00, 2.003e+03, 0.000e+00 }, // CO2(total)
+        { 3.041e+01, 5.347e-01, 5.220e+01, 0.000e+00, 0.000e+00, 2.754e-01, 0.000e+00 }, // CO
+        { 7.351e+00, 0.000e+00, 7.604e-01, 0.000e+00, 4.739e-04, 0.000e+00, 1.572e-02 }, // HC
+        { 1.863e+03, 2.852e+02, 3.835e+03, 0.000e+00, 0.000e+00, 6.438e+02, 0.000e+00 }, // FC
+        { 8.945e+01, 1.241e+01, 1.673e+02, 0.000e+00, 0.000e+00, 2.977e+01, 0.000e+00 }, // NOx
+        { 6.210e+00, 2.737e-01, 9.252e+00, 0.000e+00, 1.325e-04, 1.546e-01, 1.221e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RT_gt28-32t_70ties
-        { 5.797e+03, 2.465e+02, 1.193e+04, 0.000e+00, 0.000e+00, 5.564e+02, 0.000e+00 }, // CO2(total)
-        { 3.041e+01, 1.485e-01, 5.220e+01, 0.000e+00, 0.000e+00, 7.649e-02, 0.000e+00 }, // CO
-        { 7.351e+00, 0.000e+00, 7.604e-01, 0.000e+00, 1.016e-05, 0.000e+00, 1.213e-03 }, // HC
-        { 1.863e+03, 7.923e+01, 3.835e+03, 0.000e+00, 0.000e+00, 1.788e+02, 0.000e+00 }, // FC
-        { 8.945e+01, 3.447e+00, 1.673e+02, 0.000e+00, 0.000e+00, 8.269e+00, 0.000e+00 }, // NOx
-        { 6.210e+00, 7.604e-02, 9.252e+00, 0.000e+00, 2.840e-06, 4.295e-02, 9.418e-06 }, // PM + PM (non-exhaust)
+        { 5.797e+03, 8.875e+02, 1.193e+04, 0.000e+00, 0.000e+00, 2.003e+03, 0.000e+00 }, // CO2(total)
+        { 3.041e+01, 5.347e-01, 5.220e+01, 0.000e+00, 0.000e+00, 2.754e-01, 0.000e+00 }, // CO
+        { 7.351e+00, 0.000e+00, 7.604e-01, 0.000e+00, 4.739e-04, 0.000e+00, 1.572e-02 }, // HC
+        { 1.863e+03, 2.852e+02, 3.835e+03, 0.000e+00, 0.000e+00, 6.438e+02, 0.000e+00 }, // FC
+        { 8.945e+01, 1.241e+01, 1.673e+02, 0.000e+00, 0.000e+00, 2.977e+01, 0.000e+00 }, // NOx
+        { 6.210e+00, 2.737e-01, 9.252e+00, 0.000e+00, 1.325e-04, 1.546e-01, 1.221e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RT_gt28-32t_80ties
-        { 5.797e+03, 2.465e+02, 1.193e+04, 0.000e+00, 0.000e+00, 5.564e+02, 0.000e+00 }, // CO2(total)
-        { 3.041e+01, 1.485e-01, 5.220e+01, 0.000e+00, 0.000e+00, 7.649e-02, 0.000e+00 }, // CO
-        { 7.351e+00, 0.000e+00, 7.604e-01, 0.000e+00, 1.016e-05, 0.000e+00, 1.213e-03 }, // HC
-        { 1.863e+03, 7.923e+01, 3.835e+03, 0.000e+00, 0.000e+00, 1.788e+02, 0.000e+00 }, // FC
-        { 8.945e+01, 3.447e+00, 1.673e+02, 0.000e+00, 0.000e+00, 8.269e+00, 0.000e+00 }, // NOx
-        { 6.210e+00, 7.604e-02, 9.252e+00, 0.000e+00, 2.840e-06, 4.295e-02, 9.418e-06 }, // PM + PM (non-exhaust)
+        { 5.797e+03, 8.875e+02, 1.193e+04, 0.000e+00, 0.000e+00, 2.003e+03, 0.000e+00 }, // CO2(total)
+        { 3.041e+01, 5.347e-01, 5.220e+01, 0.000e+00, 0.000e+00, 2.754e-01, 0.000e+00 }, // CO
+        { 7.351e+00, 0.000e+00, 7.604e-01, 0.000e+00, 4.739e-04, 0.000e+00, 1.572e-02 }, // HC
+        { 1.863e+03, 2.852e+02, 3.835e+03, 0.000e+00, 0.000e+00, 6.438e+02, 0.000e+00 }, // FC
+        { 8.945e+01, 1.241e+01, 1.673e+02, 0.000e+00, 0.000e+00, 2.977e+01, 0.000e+00 }, // NOx
+        { 6.210e+00, 2.737e-01, 9.252e+00, 0.000e+00, 1.325e-04, 1.546e-01, 1.221e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RT_gt28-32t_Euro-I
-        { 6.127e+03, 2.309e+02, 1.322e+04, 0.000e+00, 0.000e+00, 5.188e+02, 0.000e+00 }, // CO2(total)
-        { 1.958e+01, 2.863e-01, 2.605e+01, 0.000e+00, 0.000e+00, 6.296e-01, 0.000e+00 }, // CO
-        { 7.250e+00, 0.000e+00, 3.765e+00, 0.000e+00, 1.021e-05, 0.000e+00, 2.367e-03 }, // HC
-        { 1.969e+03, 7.420e+01, 4.249e+03, 0.000e+00, 0.000e+00, 1.667e+02, 0.000e+00 }, // FC
-        { 8.321e+01, 1.878e+00, 1.579e+02, 0.000e+00, 0.000e+00, 4.701e+00, 0.000e+00 }, // NOx
-        { 4.192e+00, 8.198e-02, 2.260e-01, 0.000e+00, 2.781e-06, 1.930e-01, 7.143e-06 }, // PM + PM (non-exhaust)
+        { 6.127e+03, 8.312e+02, 1.322e+04, 0.000e+00, 0.000e+00, 1.868e+03, 0.000e+00 }, // CO2(total)
+        { 1.958e+01, 1.031e+00, 2.605e+01, 0.000e+00, 0.000e+00, 2.267e+00, 0.000e+00 }, // CO
+        { 7.250e+00, 0.000e+00, 3.765e+00, 0.000e+00, 4.764e-04, 0.000e+00, 3.067e-02 }, // HC
+        { 1.969e+03, 2.671e+02, 4.249e+03, 0.000e+00, 0.000e+00, 6.002e+02, 0.000e+00 }, // FC
+        { 8.321e+01, 6.762e+00, 1.579e+02, 0.000e+00, 0.000e+00, 1.692e+01, 0.000e+00 }, // NOx
+        { 4.192e+00, 2.951e-01, 2.260e-01, 0.000e+00, 1.298e-04, 6.948e-01, 9.257e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RT_gt28-32t_Euro-II
-        { 5.117e+03, 2.385e+02, 1.020e+04, 0.000e+00, 0.000e+00, 5.504e+02, 0.000e+00 }, // CO2(total)
-        { 2.382e+01, 7.553e-02, 5.098e+01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 4.849e+00, 0.000e+00, 1.927e+00, 0.000e+00, 6.098e-06, 0.000e+00, 1.492e-03 }, // HC
-        { 1.645e+03, 7.666e+01, 3.277e+03, 0.000e+00, 0.000e+00, 1.769e+02, 0.000e+00 }, // FC
-        { 8.345e+01, 1.904e+00, 1.408e+02, 0.000e+00, 0.000e+00, 4.942e+00, 0.000e+00 }, // NOx
-        { 2.824e+00, 3.837e-02, 2.145e+00, 0.000e+00, 2.789e-06, 6.788e-02, 5.810e-06 }, // PM + PM (non-exhaust)
+        { 5.117e+03, 8.587e+02, 1.020e+04, 0.000e+00, 0.000e+00, 1.981e+03, 0.000e+00 }, // CO2(total)
+        { 2.382e+01, 2.719e-01, 5.098e+01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
+        { 4.849e+00, 0.000e+00, 1.927e+00, 0.000e+00, 2.845e-04, 0.000e+00, 1.934e-02 }, // HC
+        { 1.645e+03, 2.760e+02, 3.277e+03, 0.000e+00, 0.000e+00, 6.368e+02, 0.000e+00 }, // FC
+        { 8.345e+01, 6.856e+00, 1.408e+02, 0.000e+00, 0.000e+00, 1.779e+01, 0.000e+00 }, // NOx
+        { 2.824e+00, 1.381e-01, 2.145e+00, 0.000e+00, 1.301e-04, 2.444e-01, 7.529e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RT_gt28-32t_Euro-III
-        { 5.713e+03, 2.326e+02, 1.201e+04, 0.000e+00, 0.000e+00, 5.360e+02, 0.000e+00 }, // CO2(total)
-        { 1.996e+01, 8.523e-02, 2.052e+01, 8.755e-04, 0.000e+00, 0.000e+00, 3.561e-03 }, // CO
-        { 4.313e+00, 0.000e+00, 1.825e+00, 0.000e+00, 4.275e-06, 0.000e+00, 1.120e-03 }, // HC
-        { 1.836e+03, 7.475e+01, 3.858e+03, 0.000e+00, 0.000e+00, 1.722e+02, 0.000e+00 }, // FC
-        { 7.156e+01, 1.404e+00, 1.299e+02, 0.000e+00, 0.000e+00, 3.746e+00, 0.000e+00 }, // NOx
-        { 3.534e+00, 1.702e-03, 0.000e+00, 2.580e-04, 2.744e-06, 4.848e-02, 1.809e-04 }, // PM + PM (non-exhaust)
+        { 5.713e+03, 8.373e+02, 1.201e+04, 0.000e+00, 0.000e+00, 1.929e+03, 0.000e+00 }, // CO2(total)
+        { 1.996e+01, 3.068e-01, 2.052e+01, 1.135e-02, 0.000e+00, 0.000e+00, 4.615e-02 }, // CO
+        { 4.313e+00, 0.000e+00, 1.825e+00, 0.000e+00, 1.994e-04, 0.000e+00, 1.451e-02 }, // HC
+        { 1.836e+03, 2.691e+02, 3.858e+03, 0.000e+00, 0.000e+00, 6.201e+02, 0.000e+00 }, // FC
+        { 7.156e+01, 5.053e+00, 1.299e+02, 0.000e+00, 0.000e+00, 1.349e+01, 0.000e+00 }, // NOx
+        { 3.534e+00, 6.129e-03, 0.000e+00, 3.344e-03, 1.280e-04, 1.745e-01, 2.344e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RT_gt28-32t_Euro-IV_EGR
-        { 5.218e+03, 2.369e+02, 1.190e+04, 0.000e+00, 0.000e+00, 5.459e+02, 0.000e+00 }, // CO2(total)
-        { 1.182e+01, 1.123e-01, 3.163e+01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 8.330e-01, 1.695e-03, 1.919e+00, 0.000e+00, 9.224e-07, 0.000e+00, 0.000e+00 }, // HC
-        { 1.677e+03, 7.614e+01, 3.824e+03, 0.000e+00, 0.000e+00, 1.754e+02, 0.000e+00 }, // FC
-        { 9.176e+01, 4.252e-01, 2.180e+02, 0.000e+00, 0.000e+00, 8.908e-01, 0.000e+00 }, // NOx
-        { 2.089e+00, 0.000e+00, 1.196e+00, 0.000e+00, 2.986e-06, 0.000e+00, 6.272e-06 }, // PM + PM (non-exhaust)
+        { 5.218e+03, 8.529e+02, 1.190e+04, 0.000e+00, 0.000e+00, 1.965e+03, 0.000e+00 }, // CO2(total)
+        { 1.182e+01, 4.042e-01, 3.163e+01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
+        { 8.330e-01, 6.102e-03, 1.919e+00, 0.000e+00, 4.303e-05, 0.000e+00, 0.000e+00 }, // HC
+        { 1.677e+03, 2.741e+02, 3.824e+03, 0.000e+00, 0.000e+00, 6.316e+02, 0.000e+00 }, // FC
+        { 9.176e+01, 1.531e+00, 2.180e+02, 0.000e+00, 0.000e+00, 3.207e+00, 0.000e+00 }, // NOx
+        { 2.089e+00, 0.000e+00, 1.196e+00, 0.000e+00, 1.393e-04, 0.000e+00, 8.129e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RT_gt28-32t_Euro-IV_SCR
-        { 5.592e+03, 2.226e+02, 1.288e+04, 0.000e+00, 0.000e+00, 5.062e+02, 0.000e+00 }, // CO2(total)
+        { 5.592e+03, 8.014e+02, 1.288e+04, 0.000e+00, 0.000e+00, 1.822e+03, 0.000e+00 }, // CO2(total)
         { 3.720e+01, 0.000e+00, 7.678e+01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 3.162e-01, 0.000e+00, 3.576e-01, 0.000e+00, 8.402e-07, 8.989e-03, 0.000e+00 }, // HC
-        { 1.797e+03, 7.154e+01, 4.139e+03, 0.000e+00, 0.000e+00, 1.627e+02, 0.000e+00 }, // FC
-        { 3.415e+01, 7.117e-01, 1.297e+01, 0.000e+00, 0.000e+00, 2.047e+00, 0.000e+00 }, // NOx
-        { 2.103e+00, 0.000e+00, 1.400e+00, 0.000e+00, 3.061e-06, 4.930e-04, 5.151e-06 }, // PM + PM (non-exhaust)
+        { 3.162e-01, 0.000e+00, 3.576e-01, 0.000e+00, 3.920e-05, 3.236e-02, 0.000e+00 }, // HC
+        { 1.797e+03, 2.576e+02, 4.139e+03, 0.000e+00, 0.000e+00, 5.857e+02, 0.000e+00 }, // FC
+        { 3.415e+01, 2.562e+00, 1.297e+01, 0.000e+00, 0.000e+00, 7.369e+00, 0.000e+00 }, // NOx
+        { 2.103e+00, 0.000e+00, 1.400e+00, 0.000e+00, 1.428e-04, 1.775e-03, 6.676e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RT_gt28-32t_Euro-IV_SCRs
-        { 5.592e+03, 2.226e+02, 1.288e+04, 0.000e+00, 0.000e+00, 5.062e+02, 0.000e+00 }, // CO2(total)
+        { 5.592e+03, 8.014e+02, 1.288e+04, 0.000e+00, 0.000e+00, 1.822e+03, 0.000e+00 }, // CO2(total)
         { 3.720e+01, 0.000e+00, 7.678e+01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 3.162e-01, 0.000e+00, 3.576e-01, 0.000e+00, 8.402e-07, 8.989e-03, 0.000e+00 }, // HC
-        { 1.797e+03, 7.154e+01, 4.139e+03, 0.000e+00, 0.000e+00, 1.627e+02, 0.000e+00 }, // FC
-        { 7.245e+01, 2.061e+00, 1.362e+02, 0.000e+00, 0.000e+00, 5.007e+00, 0.000e+00 }, // NOx
-        { 2.103e+00, 0.000e+00, 1.400e+00, 0.000e+00, 3.061e-06, 4.930e-04, 5.151e-06 }, // PM + PM (non-exhaust)
+        { 3.162e-01, 0.000e+00, 3.576e-01, 0.000e+00, 3.920e-05, 3.236e-02, 0.000e+00 }, // HC
+        { 1.797e+03, 2.576e+02, 4.139e+03, 0.000e+00, 0.000e+00, 5.857e+02, 0.000e+00 }, // FC
+        { 7.245e+01, 7.421e+00, 1.362e+02, 0.000e+00, 0.000e+00, 1.803e+01, 0.000e+00 }, // NOx
+        { 2.103e+00, 0.000e+00, 1.400e+00, 0.000e+00, 1.428e-04, 1.775e-03, 6.676e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RT_gt28-32t_Euro-V_EGR
-        { 4.439e+03, 2.508e+02, 9.833e+03, 0.000e+00, 0.000e+00, 5.998e+02, 0.000e+00 }, // CO2(total)
-        { 8.456e+00, 0.000e+00, 1.120e+01, 0.000e+00, 9.544e-07, 0.000e+00, 0.000e+00 }, // CO
-        { 1.246e+00, 0.000e+00, 1.400e+00, 0.000e+00, 1.622e-06, 1.195e-02, 1.456e-04 }, // HC
-        { 1.427e+03, 8.061e+01, 3.160e+03, 0.000e+00, 0.000e+00, 1.928e+02, 0.000e+00 }, // FC
-        { 5.278e+01, 5.187e-01, 1.110e+02, 0.000e+00, 0.000e+00, 8.536e-01, 0.000e+00 }, // NOx
-        { 1.789e+00, 3.043e-03, 3.878e-02, 0.000e+00, 4.263e-06, 2.683e-02, 1.043e-04 }, // PM + PM (non-exhaust)
+        { 4.439e+03, 9.030e+02, 9.833e+03, 0.000e+00, 0.000e+00, 2.159e+03, 0.000e+00 }, // CO2(total)
+        { 8.456e+00, 0.000e+00, 1.120e+01, 0.000e+00, 4.453e-05, 0.000e+00, 0.000e+00 }, // CO
+        { 1.246e+00, 0.000e+00, 1.400e+00, 0.000e+00, 7.569e-05, 4.301e-02, 1.887e-03 }, // HC
+        { 1.427e+03, 2.902e+02, 3.160e+03, 0.000e+00, 0.000e+00, 6.940e+02, 0.000e+00 }, // FC
+        { 5.278e+01, 1.867e+00, 1.110e+02, 0.000e+00, 0.000e+00, 3.073e+00, 0.000e+00 }, // NOx
+        { 1.789e+00, 1.095e-02, 3.878e-02, 0.000e+00, 1.989e-04, 9.659e-02, 1.352e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RT_gt28-32t_Euro-V_SCR
-        { 4.513e+03, 2.413e+02, 1.017e+04, 0.000e+00, 0.000e+00, 5.724e+02, 0.000e+00 }, // CO2(total)
+        { 4.513e+03, 8.685e+02, 1.017e+04, 0.000e+00, 0.000e+00, 2.061e+03, 0.000e+00 }, // CO2(total)
         { 3.040e+01, 0.000e+00, 4.983e+01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 3.248e-01, 1.303e-04, 8.697e-02, 0.000e+00, 8.068e-07, 1.316e-02, 0.000e+00 }, // HC
-        { 1.450e+03, 7.754e+01, 3.267e+03, 0.000e+00, 0.000e+00, 1.840e+02, 0.000e+00 }, // FC
-        { 3.573e+01, 2.569e-01, 0.000e+00, 0.000e+00, 0.000e+00, 7.543e-01, 4.807e-03 }, // NOx
-        { 2.082e+00, 0.000e+00, 9.584e-01, 0.000e+00, 3.113e-06, 2.021e-04, 5.169e-05 }, // PM + PM (non-exhaust)
+        { 3.248e-01, 4.692e-04, 8.697e-02, 0.000e+00, 3.764e-05, 4.736e-02, 0.000e+00 }, // HC
+        { 1.450e+03, 2.791e+02, 3.267e+03, 0.000e+00, 0.000e+00, 6.622e+02, 0.000e+00 }, // FC
+        { 3.573e+01, 9.250e-01, 0.000e+00, 0.000e+00, 0.000e+00, 2.715e+00, 6.230e-02 }, // NOx
+        { 2.082e+00, 0.000e+00, 9.584e-01, 0.000e+00, 1.453e-04, 7.276e-04, 6.700e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RT_gt28-32t_Euro-V_SCRs
-        { 4.513e+03, 2.413e+02, 1.017e+04, 0.000e+00, 0.000e+00, 5.724e+02, 0.000e+00 }, // CO2(total)
+        { 4.513e+03, 8.685e+02, 1.017e+04, 0.000e+00, 0.000e+00, 2.061e+03, 0.000e+00 }, // CO2(total)
         { 3.040e+01, 0.000e+00, 4.983e+01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 3.248e-01, 1.303e-04, 8.697e-02, 0.000e+00, 8.068e-07, 1.316e-02, 0.000e+00 }, // HC
-        { 1.450e+03, 7.754e+01, 3.267e+03, 0.000e+00, 0.000e+00, 1.840e+02, 0.000e+00 }, // FC
-        { 7.836e+01, 2.220e+00, 1.194e+02, 0.000e+00, 0.000e+00, 5.855e+00, 0.000e+00 }, // NOx
-        { 2.082e+00, 0.000e+00, 9.584e-01, 0.000e+00, 3.113e-06, 2.021e-04, 5.169e-05 }, // PM + PM (non-exhaust)
+        { 3.248e-01, 4.692e-04, 8.697e-02, 0.000e+00, 3.764e-05, 4.736e-02, 0.000e+00 }, // HC
+        { 1.450e+03, 2.791e+02, 3.267e+03, 0.000e+00, 0.000e+00, 6.622e+02, 0.000e+00 }, // FC
+        { 7.836e+01, 7.992e+00, 1.194e+02, 0.000e+00, 0.000e+00, 2.108e+01, 0.000e+00 }, // NOx
+        { 2.082e+00, 0.000e+00, 9.584e-01, 0.000e+00, 1.453e-04, 7.276e-04, 6.700e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RT_gt28-32t_Euro-VI_A-C
-        { 4.464e+03, 2.356e+02, 1.013e+04, 0.000e+00, 0.000e+00, 5.580e+02, 0.000e+00 }, // CO2(total)
-        { 2.461e+00, 0.000e+00, 2.239e+00, 0.000e+00, 2.747e-06, 0.000e+00, 1.986e-04 }, // CO
-        { 1.462e-01, 3.874e-03, 1.664e-01, 5.666e-06, 0.000e+00, 4.920e-03, 0.000e+00 }, // HC
-        { 1.435e+03, 7.571e+01, 3.256e+03, 0.000e+00, 0.000e+00, 1.793e+02, 0.000e+00 }, // FC
-        { 4.901e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.196e-05, 0.000e+00, 1.098e-03 }, // NOx
-        { 1.507e+00, 0.000e+00, 0.000e+00, 0.000e+00, 3.193e-06, 0.000e+00, 7.561e-05 }, // PM + PM (non-exhaust)
+        { 4.464e+03, 8.480e+02, 1.013e+04, 0.000e+00, 0.000e+00, 2.009e+03, 0.000e+00 }, // CO2(total)
+        { 2.461e+00, 0.000e+00, 2.239e+00, 0.000e+00, 1.281e-04, 0.000e+00, 2.574e-03 }, // CO
+        { 1.462e-01, 1.395e-02, 1.664e-01, 7.343e-05, 0.000e+00, 1.771e-02, 0.000e+00 }, // HC
+        { 1.435e+03, 2.725e+02, 3.256e+03, 0.000e+00, 0.000e+00, 6.455e+02, 0.000e+00 }, // FC
+        { 4.901e+00, 0.000e+00, 0.000e+00, 0.000e+00, 5.579e-04, 0.000e+00, 1.423e-02 }, // NOx
+        { 1.507e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.490e-04, 0.000e+00, 9.799e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RT_gt28-32t_Euro-VIs_A-C
-        { 4.464e+03, 2.356e+02, 1.013e+04, 0.000e+00, 0.000e+00, 5.580e+02, 0.000e+00 }, // CO2(total)
-        { 2.461e+00, 0.000e+00, 2.239e+00, 0.000e+00, 2.747e-06, 0.000e+00, 1.986e-04 }, // CO
-        { 1.462e-01, 3.874e-03, 1.664e-01, 5.666e-06, 0.000e+00, 4.920e-03, 0.000e+00 }, // HC
-        { 1.435e+03, 7.571e+01, 3.256e+03, 0.000e+00, 0.000e+00, 1.793e+02, 0.000e+00 }, // FC
-        { 4.690e+01, 1.629e+00, 1.243e+02, 0.000e+00, 0.000e+00, 3.754e+00, 0.000e+00 }, // NOx
-        { 1.507e+00, 0.000e+00, 0.000e+00, 0.000e+00, 3.193e-06, 0.000e+00, 7.561e-05 }, // PM + PM (non-exhaust)
+        { 4.464e+03, 8.480e+02, 1.013e+04, 0.000e+00, 0.000e+00, 2.009e+03, 0.000e+00 }, // CO2(total)
+        { 2.461e+00, 0.000e+00, 2.239e+00, 0.000e+00, 1.281e-04, 0.000e+00, 2.574e-03 }, // CO
+        { 1.462e-01, 1.395e-02, 1.664e-01, 7.343e-05, 0.000e+00, 1.771e-02, 0.000e+00 }, // HC
+        { 1.435e+03, 2.725e+02, 3.256e+03, 0.000e+00, 0.000e+00, 6.455e+02, 0.000e+00 }, // FC
+        { 4.690e+01, 5.864e+00, 1.243e+02, 0.000e+00, 0.000e+00, 1.352e+01, 0.000e+00 }, // NOx
+        { 1.507e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.490e-04, 0.000e+00, 9.799e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RT_gt28-32t_Euro-VI_D-E
-        { 3.849e+03, 2.505e+02, 8.359e+03, 0.000e+00, 0.000e+00, 6.041e+02, 0.000e+00 }, // CO2(total)
+        { 3.849e+03, 9.019e+02, 8.359e+03, 0.000e+00, 0.000e+00, 2.175e+03, 0.000e+00 }, // CO2(total)
         { 4.584e-01, 0.000e+00, 4.680e-01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 4.445e-01, 0.000e+00, 2.969e-01, 0.000e+00, 6.353e-07, 2.897e-03, 0.000e+00 }, // HC
-        { 1.237e+03, 8.052e+01, 2.686e+03, 0.000e+00, 0.000e+00, 1.942e+02, 0.000e+00 }, // FC
-        { 2.243e+00, 0.000e+00, 5.690e-01, 0.000e+00, 5.510e-06, 0.000e+00, 0.000e+00 }, // NOx
-        { 1.446e+00, 1.017e-03, 1.576e-02, 0.000e+00, 2.711e-06, 2.963e-03, 0.000e+00 }, // PM + PM (non-exhaust)
+        { 4.445e-01, 0.000e+00, 2.969e-01, 0.000e+00, 2.964e-05, 1.043e-02, 0.000e+00 }, // HC
+        { 1.237e+03, 2.899e+02, 2.686e+03, 0.000e+00, 0.000e+00, 6.990e+02, 0.000e+00 }, // FC
+        { 2.243e+00, 0.000e+00, 5.690e-01, 0.000e+00, 2.571e-04, 0.000e+00, 0.000e+00 }, // NOx
+        { 1.446e+00, 3.661e-03, 1.576e-02, 0.000e+00, 1.265e-04, 1.067e-02, 0.000e+00 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RT_gt28-32t_Euro-VIs_D-E
-        { 3.849e+03, 2.505e+02, 8.359e+03, 0.000e+00, 0.000e+00, 6.041e+02, 0.000e+00 }, // CO2(total)
+        { 3.849e+03, 9.019e+02, 8.359e+03, 0.000e+00, 0.000e+00, 2.175e+03, 0.000e+00 }, // CO2(total)
         { 4.584e-01, 0.000e+00, 4.680e-01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 4.445e-01, 0.000e+00, 2.969e-01, 0.000e+00, 6.353e-07, 2.897e-03, 0.000e+00 }, // HC
-        { 1.237e+03, 8.052e+01, 2.686e+03, 0.000e+00, 0.000e+00, 1.942e+02, 0.000e+00 }, // FC
-        { 7.174e+01, 1.339e+00, 1.482e+02, 0.000e+00, 0.000e+00, 3.164e+00, 0.000e+00 }, // NOx
-        { 1.446e+00, 1.017e-03, 1.576e-02, 0.000e+00, 2.711e-06, 2.963e-03, 0.000e+00 }, // PM + PM (non-exhaust)
+        { 4.445e-01, 0.000e+00, 2.969e-01, 0.000e+00, 2.964e-05, 1.043e-02, 0.000e+00 }, // HC
+        { 1.237e+03, 2.899e+02, 2.686e+03, 0.000e+00, 0.000e+00, 6.990e+02, 0.000e+00 }, // FC
+        { 7.174e+01, 4.822e+00, 1.482e+02, 0.000e+00, 0.000e+00, 1.139e+01, 0.000e+00 }, // NOx
+        { 1.446e+00, 3.661e-03, 1.576e-02, 0.000e+00, 1.265e-04, 1.067e-02, 0.000e+00 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RT_gt32t_50ties
-        { 6.919e+03, 2.493e+02, 1.453e+04, 0.000e+00, 0.000e+00, 5.650e+02, 0.000e+00 }, // CO2(total)
-        { 3.116e+01, 1.734e-01, 5.159e+01, 0.000e+00, 0.000e+00, 1.433e-01, 0.000e+00 }, // CO
-        { 7.871e+00, 0.000e+00, 1.263e+00, 0.000e+00, 1.062e-05, 0.000e+00, 1.232e-03 }, // HC
-        { 2.224e+03, 8.011e+01, 4.669e+03, 0.000e+00, 0.000e+00, 1.816e+02, 0.000e+00 }, // FC
-        { 1.074e+02, 3.490e+00, 2.088e+02, 0.000e+00, 0.000e+00, 8.397e+00, 0.000e+00 }, // NOx
-        { 6.486e+00, 8.127e-02, 9.734e+00, 0.000e+00, 2.833e-06, 4.704e-02, 9.110e-06 }, // PM + PM (non-exhaust)
+        { 6.919e+03, 8.973e+02, 1.453e+04, 0.000e+00, 0.000e+00, 2.034e+03, 0.000e+00 }, // CO2(total)
+        { 3.116e+01, 6.242e-01, 5.159e+01, 0.000e+00, 0.000e+00, 5.160e-01, 0.000e+00 }, // CO
+        { 7.871e+00, 0.000e+00, 1.263e+00, 0.000e+00, 4.954e-04, 0.000e+00, 1.597e-02 }, // HC
+        { 2.224e+03, 2.884e+02, 4.669e+03, 0.000e+00, 0.000e+00, 6.536e+02, 0.000e+00 }, // FC
+        { 1.074e+02, 1.256e+01, 2.088e+02, 0.000e+00, 0.000e+00, 3.023e+01, 0.000e+00 }, // NOx
+        { 6.486e+00, 2.926e-01, 9.734e+00, 0.000e+00, 1.322e-04, 1.693e-01, 1.181e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RT_gt32t_60ties
-        { 6.919e+03, 2.493e+02, 1.453e+04, 0.000e+00, 0.000e+00, 5.650e+02, 0.000e+00 }, // CO2(total)
-        { 3.116e+01, 1.734e-01, 5.159e+01, 0.000e+00, 0.000e+00, 1.433e-01, 0.000e+00 }, // CO
-        { 7.871e+00, 0.000e+00, 1.263e+00, 0.000e+00, 1.062e-05, 0.000e+00, 1.232e-03 }, // HC
-        { 2.224e+03, 8.011e+01, 4.669e+03, 0.000e+00, 0.000e+00, 1.816e+02, 0.000e+00 }, // FC
-        { 1.074e+02, 3.490e+00, 2.088e+02, 0.000e+00, 0.000e+00, 8.397e+00, 0.000e+00 }, // NOx
-        { 6.486e+00, 8.127e-02, 9.734e+00, 0.000e+00, 2.833e-06, 4.704e-02, 9.110e-06 }, // PM + PM (non-exhaust)
+        { 6.919e+03, 8.973e+02, 1.453e+04, 0.000e+00, 0.000e+00, 2.034e+03, 0.000e+00 }, // CO2(total)
+        { 3.116e+01, 6.242e-01, 5.159e+01, 0.000e+00, 0.000e+00, 5.160e-01, 0.000e+00 }, // CO
+        { 7.871e+00, 0.000e+00, 1.263e+00, 0.000e+00, 4.954e-04, 0.000e+00, 1.597e-02 }, // HC
+        { 2.224e+03, 2.884e+02, 4.669e+03, 0.000e+00, 0.000e+00, 6.536e+02, 0.000e+00 }, // FC
+        { 1.074e+02, 1.256e+01, 2.088e+02, 0.000e+00, 0.000e+00, 3.023e+01, 0.000e+00 }, // NOx
+        { 6.486e+00, 2.926e-01, 9.734e+00, 0.000e+00, 1.322e-04, 1.693e-01, 1.181e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RT_gt32t_70ties
-        { 6.919e+03, 2.493e+02, 1.453e+04, 0.000e+00, 0.000e+00, 5.650e+02, 0.000e+00 }, // CO2(total)
-        { 3.116e+01, 1.734e-01, 5.159e+01, 0.000e+00, 0.000e+00, 1.433e-01, 0.000e+00 }, // CO
-        { 7.871e+00, 0.000e+00, 1.263e+00, 0.000e+00, 1.062e-05, 0.000e+00, 1.232e-03 }, // HC
-        { 2.224e+03, 8.011e+01, 4.669e+03, 0.000e+00, 0.000e+00, 1.816e+02, 0.000e+00 }, // FC
-        { 1.074e+02, 3.490e+00, 2.088e+02, 0.000e+00, 0.000e+00, 8.397e+00, 0.000e+00 }, // NOx
-        { 6.486e+00, 8.127e-02, 9.734e+00, 0.000e+00, 2.833e-06, 4.704e-02, 9.110e-06 }, // PM + PM (non-exhaust)
+        { 6.919e+03, 8.973e+02, 1.453e+04, 0.000e+00, 0.000e+00, 2.034e+03, 0.000e+00 }, // CO2(total)
+        { 3.116e+01, 6.242e-01, 5.159e+01, 0.000e+00, 0.000e+00, 5.160e-01, 0.000e+00 }, // CO
+        { 7.871e+00, 0.000e+00, 1.263e+00, 0.000e+00, 4.954e-04, 0.000e+00, 1.597e-02 }, // HC
+        { 2.224e+03, 2.884e+02, 4.669e+03, 0.000e+00, 0.000e+00, 6.536e+02, 0.000e+00 }, // FC
+        { 1.074e+02, 1.256e+01, 2.088e+02, 0.000e+00, 0.000e+00, 3.023e+01, 0.000e+00 }, // NOx
+        { 6.486e+00, 2.926e-01, 9.734e+00, 0.000e+00, 1.322e-04, 1.693e-01, 1.181e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RT_gt32t_80ties
-        { 6.919e+03, 2.493e+02, 1.453e+04, 0.000e+00, 0.000e+00, 5.650e+02, 0.000e+00 }, // CO2(total)
-        { 3.116e+01, 1.734e-01, 5.159e+01, 0.000e+00, 0.000e+00, 1.433e-01, 0.000e+00 }, // CO
-        { 7.871e+00, 0.000e+00, 1.263e+00, 0.000e+00, 1.062e-05, 0.000e+00, 1.232e-03 }, // HC
-        { 2.224e+03, 8.011e+01, 4.669e+03, 0.000e+00, 0.000e+00, 1.816e+02, 0.000e+00 }, // FC
-        { 1.074e+02, 3.490e+00, 2.088e+02, 0.000e+00, 0.000e+00, 8.397e+00, 0.000e+00 }, // NOx
-        { 6.486e+00, 8.127e-02, 9.734e+00, 0.000e+00, 2.833e-06, 4.704e-02, 9.110e-06 }, // PM + PM (non-exhaust)
+        { 6.919e+03, 8.973e+02, 1.453e+04, 0.000e+00, 0.000e+00, 2.034e+03, 0.000e+00 }, // CO2(total)
+        { 3.116e+01, 6.242e-01, 5.159e+01, 0.000e+00, 0.000e+00, 5.160e-01, 0.000e+00 }, // CO
+        { 7.871e+00, 0.000e+00, 1.263e+00, 0.000e+00, 4.954e-04, 0.000e+00, 1.597e-02 }, // HC
+        { 2.224e+03, 2.884e+02, 4.669e+03, 0.000e+00, 0.000e+00, 6.536e+02, 0.000e+00 }, // FC
+        { 1.074e+02, 1.256e+01, 2.088e+02, 0.000e+00, 0.000e+00, 3.023e+01, 0.000e+00 }, // NOx
+        { 6.486e+00, 2.926e-01, 9.734e+00, 0.000e+00, 1.322e-04, 1.693e-01, 1.181e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RT_gt32t_Euro-I
-        { 7.809e+03, 2.252e+02, 1.804e+04, 0.000e+00, 0.000e+00, 4.992e+02, 0.000e+00 }, // CO2(total)
-        { 1.648e+01, 3.882e-01, 7.333e+00, 0.000e+00, 0.000e+00, 1.012e+00, 0.000e+00 }, // CO
-        { 7.907e+00, 0.000e+00, 5.102e+00, 0.000e+00, 1.043e-05, 0.000e+00, 2.415e-03 }, // HC
-        { 2.510e+03, 7.238e+01, 5.799e+03, 0.000e+00, 0.000e+00, 1.604e+02, 0.000e+00 }, // FC
-        { 1.021e+02, 1.795e+00, 2.075e+02, 0.000e+00, 0.000e+00, 4.480e+00, 0.000e+00 }, // NOx
-        { 4.643e+00, 8.320e-02, 1.070e+00, 0.000e+00, 2.713e-06, 1.965e-01, 6.332e-06 }, // PM + PM (non-exhaust)
+        { 7.809e+03, 8.108e+02, 1.804e+04, 0.000e+00, 0.000e+00, 1.797e+03, 0.000e+00 }, // CO2(total)
+        { 1.648e+01, 1.398e+00, 7.333e+00, 0.000e+00, 0.000e+00, 3.644e+00, 0.000e+00 }, // CO
+        { 7.907e+00, 0.000e+00, 5.102e+00, 0.000e+00, 4.868e-04, 0.000e+00, 3.130e-02 }, // HC
+        { 2.510e+03, 2.606e+02, 5.799e+03, 0.000e+00, 0.000e+00, 5.776e+02, 0.000e+00 }, // FC
+        { 1.021e+02, 6.462e+00, 2.075e+02, 0.000e+00, 0.000e+00, 1.613e+01, 0.000e+00 }, // NOx
+        { 4.643e+00, 2.995e-01, 1.070e+00, 0.000e+00, 1.266e-04, 7.073e-01, 8.206e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RT_gt32t_Euro-II
-        { 6.119e+03, 2.424e+02, 1.248e+04, 0.000e+00, 0.000e+00, 5.619e+02, 0.000e+00 }, // CO2(total)
-        { 2.525e+01, 7.887e-02, 5.410e+01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 5.185e+00, 0.000e+00, 2.410e+00, 3.074e-05, 5.836e-06, 0.000e+00, 1.525e-03 }, // HC
-        { 1.966e+03, 7.791e+01, 4.011e+03, 0.000e+00, 0.000e+00, 1.806e+02, 0.000e+00 }, // FC
-        { 9.479e+01, 1.937e+00, 1.624e+02, 0.000e+00, 0.000e+00, 5.109e+00, 0.000e+00 }, // NOx
-        { 2.975e+00, 3.985e-02, 2.489e+00, 0.000e+00, 2.788e-06, 6.945e-02, 6.423e-06 }, // PM + PM (non-exhaust)
+        { 6.119e+03, 8.727e+02, 1.248e+04, 0.000e+00, 0.000e+00, 2.023e+03, 0.000e+00 }, // CO2(total)
+        { 2.525e+01, 2.839e-01, 5.410e+01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
+        { 5.185e+00, 0.000e+00, 2.410e+00, 3.984e-04, 2.723e-04, 0.000e+00, 1.977e-02 }, // HC
+        { 1.966e+03, 2.805e+02, 4.011e+03, 0.000e+00, 0.000e+00, 6.501e+02, 0.000e+00 }, // FC
+        { 9.479e+01, 6.974e+00, 1.624e+02, 0.000e+00, 0.000e+00, 1.839e+01, 0.000e+00 }, // NOx
+        { 2.975e+00, 1.435e-01, 2.489e+00, 0.000e+00, 1.301e-04, 2.500e-01, 8.324e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RT_gt32t_Euro-III
-        { 6.609e+03, 2.328e+02, 1.368e+04, 0.000e+00, 0.000e+00, 5.386e+02, 0.000e+00 }, // CO2(total)
-        { 2.516e+01, 8.584e-02, 3.605e+01, 0.000e+00, 4.281e-06, 0.000e+00, 1.718e-03 }, // CO
-        { 4.556e+00, 0.000e+00, 1.911e+00, 0.000e+00, 4.431e-06, 0.000e+00, 1.212e-03 }, // HC
-        { 2.124e+03, 7.483e+01, 4.396e+03, 0.000e+00, 0.000e+00, 1.731e+02, 0.000e+00 }, // FC
-        { 8.252e+01, 1.375e+00, 1.532e+02, 0.000e+00, 0.000e+00, 3.702e+00, 0.000e+00 }, // NOx
-        { 3.712e+00, 2.151e-03, 5.387e-01, 2.497e-04, 2.791e-06, 4.321e-02, 2.044e-04 }, // PM + PM (non-exhaust)
+        { 6.609e+03, 8.382e+02, 1.368e+04, 0.000e+00, 0.000e+00, 1.939e+03, 0.000e+00 }, // CO2(total)
+        { 2.516e+01, 3.090e-01, 3.605e+01, 0.000e+00, 1.997e-04, 0.000e+00, 2.226e-02 }, // CO
+        { 4.556e+00, 0.000e+00, 1.911e+00, 0.000e+00, 2.067e-04, 0.000e+00, 1.570e-02 }, // HC
+        { 2.124e+03, 2.694e+02, 4.396e+03, 0.000e+00, 0.000e+00, 6.231e+02, 0.000e+00 }, // FC
+        { 8.252e+01, 4.951e+00, 1.532e+02, 0.000e+00, 0.000e+00, 1.333e+01, 0.000e+00 }, // NOx
+        { 3.712e+00, 7.743e-03, 5.387e-01, 3.236e-03, 1.302e-04, 1.556e-01, 2.649e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RT_gt32t_Euro-IV_EGR
-        { 6.236e+03, 2.386e+02, 1.421e+04, 0.000e+00, 0.000e+00, 5.515e+02, 0.000e+00 }, // CO2(total)
-        { 1.330e+01, 1.139e-01, 3.510e+01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 6.461e-01, 8.649e-03, 1.986e+00, 0.000e+00, 4.072e-07, 1.262e-03, 0.000e+00 }, // HC
-        { 2.004e+03, 7.669e+01, 4.567e+03, 0.000e+00, 0.000e+00, 1.773e+02, 0.000e+00 }, // FC
-        { 9.845e+01, 4.239e-01, 2.290e+02, 0.000e+00, 0.000e+00, 9.435e-01, 0.000e+00 }, // NOx
-        { 2.129e+00, 0.000e+00, 1.286e+00, 0.000e+00, 3.010e-06, 0.000e+00, 5.986e-06 }, // PM + PM (non-exhaust)
+        { 6.236e+03, 8.590e+02, 1.421e+04, 0.000e+00, 0.000e+00, 1.986e+03, 0.000e+00 }, // CO2(total)
+        { 1.330e+01, 4.101e-01, 3.510e+01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
+        { 6.461e-01, 3.114e-02, 1.986e+00, 0.000e+00, 1.900e-05, 4.545e-03, 0.000e+00 }, // HC
+        { 2.004e+03, 2.761e+02, 4.567e+03, 0.000e+00, 0.000e+00, 6.381e+02, 0.000e+00 }, // FC
+        { 9.845e+01, 1.526e+00, 2.290e+02, 0.000e+00, 0.000e+00, 3.397e+00, 0.000e+00 }, // NOx
+        { 2.129e+00, 0.000e+00, 1.286e+00, 0.000e+00, 1.405e-04, 0.000e+00, 7.758e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RT_gt32t_Euro-IV_SCR
-        { 7.462e+03, 2.023e+02, 1.788e+04, 0.000e+00, 0.000e+00, 4.441e+02, 0.000e+00 }, // CO2(total)
+        { 7.462e+03, 7.284e+02, 1.788e+04, 0.000e+00, 0.000e+00, 1.599e+03, 0.000e+00 }, // CO2(total)
         { 4.237e+01, 0.000e+00, 8.850e+01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 2.983e-01, 1.434e-03, 3.806e-01, 0.000e+00, 7.543e-07, 1.006e-02, 0.000e+00 }, // HC
-        { 2.398e+03, 6.503e+01, 5.747e+03, 0.000e+00, 0.000e+00, 1.427e+02, 0.000e+00 }, // FC
-        { 4.162e+01, 6.300e-01, 2.836e+01, 0.000e+00, 0.000e+00, 1.855e+00, 0.000e+00 }, // NOx
-        { 2.015e+00, 4.704e-03, 1.241e+00, 0.000e+00, 2.737e-06, 7.077e-03, 0.000e+00 }, // PM + PM (non-exhaust)
+        { 2.983e-01, 5.161e-03, 3.806e-01, 0.000e+00, 3.519e-05, 3.623e-02, 0.000e+00 }, // HC
+        { 2.398e+03, 2.341e+02, 5.747e+03, 0.000e+00, 0.000e+00, 5.138e+02, 0.000e+00 }, // FC
+        { 4.162e+01, 2.268e+00, 2.836e+01, 0.000e+00, 0.000e+00, 6.677e+00, 0.000e+00 }, // NOx
+        { 2.015e+00, 1.693e-02, 1.241e+00, 0.000e+00, 1.277e-04, 2.548e-02, 0.000e+00 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RT_gt32t_Euro-IV_SCRs
-        { 7.462e+03, 2.023e+02, 1.788e+04, 0.000e+00, 0.000e+00, 4.441e+02, 0.000e+00 }, // CO2(total)
+        { 7.462e+03, 7.284e+02, 1.788e+04, 0.000e+00, 0.000e+00, 1.599e+03, 0.000e+00 }, // CO2(total)
         { 4.237e+01, 0.000e+00, 8.850e+01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 2.983e-01, 1.434e-03, 3.806e-01, 0.000e+00, 7.543e-07, 1.006e-02, 0.000e+00 }, // HC
-        { 2.398e+03, 6.503e+01, 5.747e+03, 0.000e+00, 0.000e+00, 1.427e+02, 0.000e+00 }, // FC
-        { 9.484e+01, 1.776e+00, 1.962e+02, 0.000e+00, 0.000e+00, 4.139e+00, 0.000e+00 }, // NOx
-        { 2.015e+00, 4.704e-03, 1.241e+00, 0.000e+00, 2.737e-06, 7.077e-03, 0.000e+00 }, // PM + PM (non-exhaust)
+        { 2.983e-01, 5.161e-03, 3.806e-01, 0.000e+00, 3.519e-05, 3.623e-02, 0.000e+00 }, // HC
+        { 2.398e+03, 2.341e+02, 5.747e+03, 0.000e+00, 0.000e+00, 5.138e+02, 0.000e+00 }, // FC
+        { 9.484e+01, 6.395e+00, 1.962e+02, 0.000e+00, 0.000e+00, 1.490e+01, 0.000e+00 }, // NOx
+        { 2.015e+00, 1.693e-02, 1.241e+00, 0.000e+00, 1.277e-04, 2.548e-02, 0.000e+00 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RT_gt32t_Euro-V_EGR
-        { 5.729e+03, 2.428e+02, 1.314e+04, 0.000e+00, 0.000e+00, 5.697e+02, 0.000e+00 }, // CO2(total)
+        { 5.729e+03, 8.740e+02, 1.314e+04, 0.000e+00, 0.000e+00, 2.051e+03, 0.000e+00 }, // CO2(total)
         { 1.009e+01, 0.000e+00, 1.535e+01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 1.330e+00, 1.663e-03, 1.340e+00, 0.000e+00, 1.431e-06, 2.817e-02, 0.000e+00 }, // HC
-        { 1.841e+03, 7.802e+01, 4.223e+03, 0.000e+00, 0.000e+00, 1.831e+02, 0.000e+00 }, // FC
-        { 6.925e+01, 4.028e-01, 1.649e+02, 0.000e+00, 0.000e+00, 4.153e-01, 0.000e+00 }, // NOx
-        { 1.822e+00, 0.000e+00, 4.046e-01, 0.000e+00, 4.810e-06, 0.000e+00, 4.043e-04 }, // PM + PM (non-exhaust)
+        { 1.330e+00, 5.986e-03, 1.340e+00, 0.000e+00, 6.678e-05, 1.014e-01, 0.000e+00 }, // HC
+        { 1.841e+03, 2.809e+02, 4.223e+03, 0.000e+00, 0.000e+00, 6.592e+02, 0.000e+00 }, // FC
+        { 6.925e+01, 1.450e+00, 1.649e+02, 0.000e+00, 0.000e+00, 1.495e+00, 0.000e+00 }, // NOx
+        { 1.822e+00, 0.000e+00, 4.046e-01, 0.000e+00, 2.244e-04, 0.000e+00, 5.240e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RT_gt32t_Euro-V_SCR
-        { 5.631e+03, 2.344e+02, 1.277e+04, 0.000e+00, 0.000e+00, 5.481e+02, 0.000e+00 }, // CO2(total)
+        { 5.631e+03, 8.437e+02, 1.277e+04, 0.000e+00, 0.000e+00, 1.973e+03, 0.000e+00 }, // CO2(total)
         { 3.933e+01, 0.000e+00, 8.039e+01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 3.462e-01, 1.005e-03, 2.829e-01, 0.000e+00, 6.911e-07, 1.136e-02, 0.000e+00 }, // HC
-        { 1.810e+03, 7.532e+01, 4.105e+03, 0.000e+00, 0.000e+00, 1.761e+02, 0.000e+00 }, // FC
-        { 3.873e+01, 2.373e-01, 0.000e+00, 0.000e+00, 0.000e+00, 6.500e-01, 6.383e-03 }, // NOx
-        { 2.243e+00, 0.000e+00, 1.537e+00, 0.000e+00, 2.964e-06, 0.000e+00, 6.097e-06 }, // PM + PM (non-exhaust)
+        { 3.462e-01, 3.618e-03, 2.829e-01, 0.000e+00, 3.225e-05, 4.088e-02, 0.000e+00 }, // HC
+        { 1.810e+03, 2.711e+02, 4.105e+03, 0.000e+00, 0.000e+00, 6.341e+02, 0.000e+00 }, // FC
+        { 3.873e+01, 8.544e-01, 0.000e+00, 0.000e+00, 0.000e+00, 2.340e+00, 8.272e-02 }, // NOx
+        { 2.243e+00, 0.000e+00, 1.537e+00, 0.000e+00, 1.383e-04, 0.000e+00, 7.902e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RT_gt32t_Euro-V_SCRs
-        { 5.631e+03, 2.344e+02, 1.277e+04, 0.000e+00, 0.000e+00, 5.481e+02, 0.000e+00 }, // CO2(total)
+        { 5.631e+03, 8.437e+02, 1.277e+04, 0.000e+00, 0.000e+00, 1.973e+03, 0.000e+00 }, // CO2(total)
         { 3.933e+01, 0.000e+00, 8.039e+01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 3.462e-01, 1.005e-03, 2.829e-01, 0.000e+00, 6.911e-07, 1.136e-02, 0.000e+00 }, // HC
-        { 1.810e+03, 7.532e+01, 4.105e+03, 0.000e+00, 0.000e+00, 1.761e+02, 0.000e+00 }, // FC
-        { 8.364e+01, 2.247e+00, 1.158e+02, 0.000e+00, 0.000e+00, 6.004e+00, 0.000e+00 }, // NOx
-        { 2.243e+00, 0.000e+00, 1.537e+00, 0.000e+00, 2.964e-06, 0.000e+00, 6.097e-06 }, // PM + PM (non-exhaust)
+        { 3.462e-01, 3.618e-03, 2.829e-01, 0.000e+00, 3.225e-05, 4.088e-02, 0.000e+00 }, // HC
+        { 1.810e+03, 2.711e+02, 4.105e+03, 0.000e+00, 0.000e+00, 6.341e+02, 0.000e+00 }, // FC
+        { 8.364e+01, 8.088e+00, 1.158e+02, 0.000e+00, 0.000e+00, 2.162e+01, 0.000e+00 }, // NOx
+        { 2.243e+00, 0.000e+00, 1.537e+00, 0.000e+00, 1.383e-04, 0.000e+00, 7.902e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RT_gt32t_Euro-VI_A-C
-        { 5.770e+03, 2.285e+02, 1.356e+04, 0.000e+00, 0.000e+00, 5.319e+02, 0.000e+00 }, // CO2(total)
-        { 2.945e+00, 5.664e-03, 4.259e+00, 0.000e+00, 1.489e-06, 0.000e+00, 0.000e+00 }, // CO
-        { 1.711e-01, 4.289e-03, 2.925e-01, 0.000e+00, 0.000e+00, 3.591e-03, 0.000e+00 }, // HC
-        { 1.854e+03, 7.343e+01, 4.357e+03, 0.000e+00, 0.000e+00, 1.710e+02, 0.000e+00 }, // FC
-        { 5.473e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.178e-05, 0.000e+00, 1.410e-03 }, // NOx
-        { 1.513e+00, 0.000e+00, 1.171e-01, 0.000e+00, 3.223e-06, 0.000e+00, 6.358e-05 }, // PM + PM (non-exhaust)
+        { 5.770e+03, 8.226e+02, 1.356e+04, 0.000e+00, 0.000e+00, 1.915e+03, 0.000e+00 }, // CO2(total)
+        { 2.945e+00, 2.039e-02, 4.259e+00, 0.000e+00, 6.947e-05, 0.000e+00, 0.000e+00 }, // CO
+        { 1.711e-01, 1.544e-02, 2.925e-01, 0.000e+00, 0.000e+00, 1.293e-02, 0.000e+00 }, // HC
+        { 1.854e+03, 2.644e+02, 4.357e+03, 0.000e+00, 0.000e+00, 6.154e+02, 0.000e+00 }, // FC
+        { 5.473e+00, 0.000e+00, 0.000e+00, 0.000e+00, 5.497e-04, 0.000e+00, 1.827e-02 }, // NOx
+        { 1.513e+00, 0.000e+00, 1.171e-01, 0.000e+00, 1.504e-04, 0.000e+00, 8.240e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RT_gt32t_Euro-VIs_A-C
-        { 5.770e+03, 2.285e+02, 1.356e+04, 0.000e+00, 0.000e+00, 5.319e+02, 0.000e+00 }, // CO2(total)
-        { 2.945e+00, 5.664e-03, 4.259e+00, 0.000e+00, 1.489e-06, 0.000e+00, 0.000e+00 }, // CO
-        { 1.711e-01, 4.289e-03, 2.925e-01, 0.000e+00, 0.000e+00, 3.591e-03, 0.000e+00 }, // HC
-        { 1.854e+03, 7.343e+01, 4.357e+03, 0.000e+00, 0.000e+00, 1.710e+02, 0.000e+00 }, // FC
-        { 5.167e+01, 1.609e+00, 1.288e+02, 0.000e+00, 0.000e+00, 3.682e+00, 0.000e+00 }, // NOx
-        { 1.513e+00, 0.000e+00, 1.171e-01, 0.000e+00, 3.223e-06, 0.000e+00, 6.358e-05 }, // PM + PM (non-exhaust)
+        { 5.770e+03, 8.226e+02, 1.356e+04, 0.000e+00, 0.000e+00, 1.915e+03, 0.000e+00 }, // CO2(total)
+        { 2.945e+00, 2.039e-02, 4.259e+00, 0.000e+00, 6.947e-05, 0.000e+00, 0.000e+00 }, // CO
+        { 1.711e-01, 1.544e-02, 2.925e-01, 0.000e+00, 0.000e+00, 1.293e-02, 0.000e+00 }, // HC
+        { 1.854e+03, 2.644e+02, 4.357e+03, 0.000e+00, 0.000e+00, 6.154e+02, 0.000e+00 }, // FC
+        { 5.167e+01, 5.793e+00, 1.288e+02, 0.000e+00, 0.000e+00, 1.326e+01, 0.000e+00 }, // NOx
+        { 1.513e+00, 0.000e+00, 1.171e-01, 0.000e+00, 1.504e-04, 0.000e+00, 8.240e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RT_gt32t_Euro-VI_D-E
-        { 5.136e+03, 2.432e+02, 1.176e+04, 0.000e+00, 0.000e+00, 5.757e+02, 0.000e+00 }, // CO2(total)
+        { 5.136e+03, 8.755e+02, 1.176e+04, 0.000e+00, 0.000e+00, 2.072e+03, 0.000e+00 }, // CO2(total)
         { 4.678e-01, 0.000e+00, 4.408e-01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 4.649e-01, 0.000e+00, 3.099e-01, 0.000e+00, 6.584e-07, 2.805e-03, 0.000e+00 }, // HC
-        { 1.651e+03, 7.815e+01, 3.780e+03, 0.000e+00, 0.000e+00, 1.850e+02, 0.000e+00 }, // FC
-        { 2.616e+00, 0.000e+00, 1.100e+00, 0.000e+00, 5.154e-06, 1.501e-03, 0.000e+00 }, // NOx
-        { 1.435e+00, 1.016e-03, 1.211e-02, 0.000e+00, 2.724e-06, 1.940e-03, 8.861e-06 }, // PM + PM (non-exhaust)
+        { 4.649e-01, 0.000e+00, 3.099e-01, 0.000e+00, 3.072e-05, 1.010e-02, 0.000e+00 }, // HC
+        { 1.651e+03, 2.814e+02, 3.780e+03, 0.000e+00, 0.000e+00, 6.661e+02, 0.000e+00 }, // FC
+        { 2.616e+00, 0.000e+00, 1.100e+00, 0.000e+00, 2.405e-04, 5.405e-03, 0.000e+00 }, // NOx
+        { 1.435e+00, 3.656e-03, 1.211e-02, 0.000e+00, 1.271e-04, 6.986e-03, 1.148e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RT_gt32t_Euro-VIs_D-E
-        { 5.136e+03, 2.432e+02, 1.176e+04, 0.000e+00, 0.000e+00, 5.757e+02, 0.000e+00 }, // CO2(total)
+        { 5.136e+03, 8.755e+02, 1.176e+04, 0.000e+00, 0.000e+00, 2.072e+03, 0.000e+00 }, // CO2(total)
         { 4.678e-01, 0.000e+00, 4.408e-01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 4.649e-01, 0.000e+00, 3.099e-01, 0.000e+00, 6.584e-07, 2.805e-03, 0.000e+00 }, // HC
-        { 1.651e+03, 7.815e+01, 3.780e+03, 0.000e+00, 0.000e+00, 1.850e+02, 0.000e+00 }, // FC
-        { 8.960e+01, 1.384e+00, 2.038e+02, 0.000e+00, 0.000e+00, 3.245e+00, 0.000e+00 }, // NOx
-        { 1.435e+00, 1.016e-03, 1.211e-02, 0.000e+00, 2.724e-06, 1.940e-03, 8.861e-06 }, // PM + PM (non-exhaust)
+        { 4.649e-01, 0.000e+00, 3.099e-01, 0.000e+00, 3.072e-05, 1.010e-02, 0.000e+00 }, // HC
+        { 1.651e+03, 2.814e+02, 3.780e+03, 0.000e+00, 0.000e+00, 6.661e+02, 0.000e+00 }, // FC
+        { 8.960e+01, 4.984e+00, 2.038e+02, 0.000e+00, 0.000e+00, 1.168e+01, 0.000e+00 }, // NOx
+        { 1.435e+00, 3.656e-03, 1.211e-02, 0.000e+00, 1.271e-04, 6.986e-03, 1.148e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_le7_5t_50ties
-        { 2.842e+03, 1.705e+01, 0.000e+00, 4.347e-01, 9.126e-03, 1.456e+02, 1.223e+00 }, // CO2(total)
-        { 3.064e+01, 0.000e+00, 0.000e+00, 0.000e+00, 4.301e-05, 7.486e-01, 5.280e-04 }, // CO
-        { 1.873e+01, 0.000e+00, 3.433e+00, 0.000e+00, 3.608e-06, 0.000e+00, 0.000e+00 }, // HC
-        { 9.134e+02, 5.480e+00, 0.000e+00, 1.397e-01, 2.933e-03, 4.678e+01, 3.931e-01 }, // FC
-        { 3.743e+01, 4.194e-01, 0.000e+00, 0.000e+00, 1.541e-04, 2.203e+00, 9.778e-03 }, // NOx
-        { 5.952e+00, 0.000e+00, 0.000e+00, 2.921e-04, 6.327e-06, 9.752e-02, 3.138e-04 }, // PM + PM (non-exhaust)
+        { 2.842e+03, 6.138e+01, 0.000e+00, 5.634e+00, 4.258e-01, 5.240e+02, 1.585e+01 }, // CO2(total)
+        { 3.064e+01, 0.000e+00, 0.000e+00, 0.000e+00, 2.007e-03, 2.695e+00, 6.843e-03 }, // CO
+        { 1.873e+01, 0.000e+00, 3.433e+00, 0.000e+00, 1.683e-04, 0.000e+00, 0.000e+00 }, // HC
+        { 9.134e+02, 1.973e+01, 0.000e+00, 1.811e+00, 1.368e-01, 1.684e+02, 5.095e+00 }, // FC
+        { 3.743e+01, 1.510e+00, 0.000e+00, 0.000e+00, 7.189e-03, 7.929e+00, 1.267e-01 }, // NOx
+        { 5.952e+00, 0.000e+00, 0.000e+00, 3.785e-03, 2.952e-04, 3.511e-01, 4.067e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_le7_5t_60ties
-        { 2.842e+03, 1.705e+01, 0.000e+00, 4.347e-01, 9.126e-03, 1.456e+02, 1.223e+00 }, // CO2(total)
-        { 3.064e+01, 0.000e+00, 0.000e+00, 0.000e+00, 4.301e-05, 7.486e-01, 5.280e-04 }, // CO
-        { 1.873e+01, 0.000e+00, 3.433e+00, 0.000e+00, 3.608e-06, 0.000e+00, 0.000e+00 }, // HC
-        { 9.134e+02, 5.480e+00, 0.000e+00, 1.397e-01, 2.933e-03, 4.678e+01, 3.931e-01 }, // FC
-        { 3.743e+01, 4.194e-01, 0.000e+00, 0.000e+00, 1.541e-04, 2.203e+00, 9.778e-03 }, // NOx
-        { 5.952e+00, 0.000e+00, 0.000e+00, 2.921e-04, 6.327e-06, 9.752e-02, 3.138e-04 }, // PM + PM (non-exhaust)
+        { 2.842e+03, 6.138e+01, 0.000e+00, 5.634e+00, 4.258e-01, 5.240e+02, 1.585e+01 }, // CO2(total)
+        { 3.064e+01, 0.000e+00, 0.000e+00, 0.000e+00, 2.007e-03, 2.695e+00, 6.843e-03 }, // CO
+        { 1.873e+01, 0.000e+00, 3.433e+00, 0.000e+00, 1.683e-04, 0.000e+00, 0.000e+00 }, // HC
+        { 9.134e+02, 1.973e+01, 0.000e+00, 1.811e+00, 1.368e-01, 1.684e+02, 5.095e+00 }, // FC
+        { 3.743e+01, 1.510e+00, 0.000e+00, 0.000e+00, 7.189e-03, 7.929e+00, 1.267e-01 }, // NOx
+        { 5.952e+00, 0.000e+00, 0.000e+00, 3.785e-03, 2.952e-04, 3.511e-01, 4.067e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_le7_5t_70ties
-        { 2.842e+03, 1.705e+01, 0.000e+00, 4.347e-01, 9.126e-03, 1.456e+02, 1.223e+00 }, // CO2(total)
-        { 3.064e+01, 0.000e+00, 0.000e+00, 0.000e+00, 4.301e-05, 7.486e-01, 5.280e-04 }, // CO
-        { 1.873e+01, 0.000e+00, 3.433e+00, 0.000e+00, 3.608e-06, 0.000e+00, 0.000e+00 }, // HC
-        { 9.134e+02, 5.480e+00, 0.000e+00, 1.397e-01, 2.933e-03, 4.678e+01, 3.931e-01 }, // FC
-        { 3.743e+01, 4.194e-01, 0.000e+00, 0.000e+00, 1.541e-04, 2.203e+00, 9.778e-03 }, // NOx
-        { 5.952e+00, 0.000e+00, 0.000e+00, 2.921e-04, 6.327e-06, 9.752e-02, 3.138e-04 }, // PM + PM (non-exhaust)
+        { 2.842e+03, 6.138e+01, 0.000e+00, 5.634e+00, 4.258e-01, 5.240e+02, 1.585e+01 }, // CO2(total)
+        { 3.064e+01, 0.000e+00, 0.000e+00, 0.000e+00, 2.007e-03, 2.695e+00, 6.843e-03 }, // CO
+        { 1.873e+01, 0.000e+00, 3.433e+00, 0.000e+00, 1.683e-04, 0.000e+00, 0.000e+00 }, // HC
+        { 9.134e+02, 1.973e+01, 0.000e+00, 1.811e+00, 1.368e-01, 1.684e+02, 5.095e+00 }, // FC
+        { 3.743e+01, 1.510e+00, 0.000e+00, 0.000e+00, 7.189e-03, 7.929e+00, 1.267e-01 }, // NOx
+        { 5.952e+00, 0.000e+00, 0.000e+00, 3.785e-03, 2.952e-04, 3.511e-01, 4.067e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_le7_5t_80ties
-        { 2.842e+03, 1.705e+01, 0.000e+00, 4.347e-01, 9.126e-03, 1.456e+02, 1.223e+00 }, // CO2(total)
-        { 3.064e+01, 0.000e+00, 0.000e+00, 0.000e+00, 4.301e-05, 7.486e-01, 5.280e-04 }, // CO
-        { 1.873e+01, 0.000e+00, 3.433e+00, 0.000e+00, 3.608e-06, 0.000e+00, 0.000e+00 }, // HC
-        { 9.134e+02, 5.480e+00, 0.000e+00, 1.397e-01, 2.933e-03, 4.678e+01, 3.931e-01 }, // FC
-        { 3.743e+01, 4.194e-01, 0.000e+00, 0.000e+00, 1.541e-04, 2.203e+00, 9.778e-03 }, // NOx
-        { 5.952e+00, 0.000e+00, 0.000e+00, 2.921e-04, 6.327e-06, 9.752e-02, 3.138e-04 }, // PM + PM (non-exhaust)
+        { 2.842e+03, 6.138e+01, 0.000e+00, 5.634e+00, 4.258e-01, 5.240e+02, 1.585e+01 }, // CO2(total)
+        { 3.064e+01, 0.000e+00, 0.000e+00, 0.000e+00, 2.007e-03, 2.695e+00, 6.843e-03 }, // CO
+        { 1.873e+01, 0.000e+00, 3.433e+00, 0.000e+00, 1.683e-04, 0.000e+00, 0.000e+00 }, // HC
+        { 9.134e+02, 1.973e+01, 0.000e+00, 1.811e+00, 1.368e-01, 1.684e+02, 5.095e+00 }, // FC
+        { 3.743e+01, 1.510e+00, 0.000e+00, 0.000e+00, 7.189e-03, 7.929e+00, 1.267e-01 }, // NOx
+        { 5.952e+00, 0.000e+00, 0.000e+00, 3.785e-03, 2.952e-04, 3.511e-01, 4.067e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_le7_5t_Euro-I
-        { 2.829e+03, 9.035e+00, 0.000e+00, 4.455e-01, 8.320e-03, 1.317e+02, 1.287e+00 }, // CO2(total)
-        { 1.140e+01, 0.000e+00, 0.000e+00, 5.147e-04, 8.695e-06, 2.681e-01, 6.495e-04 }, // CO
-        { 3.440e+00, 0.000e+00, 1.738e+00, 0.000e+00, 2.496e-06, 0.000e+00, 2.710e-04 }, // HC
-        { 9.091e+02, 2.904e+00, 0.000e+00, 1.432e-01, 2.674e-03, 4.232e+01, 4.136e-01 }, // FC
-        { 1.983e+01, 4.589e-01, 0.000e+00, 0.000e+00, 9.755e-05, 1.401e+00, 1.099e-02 }, // NOx
-        { 3.697e+00, 0.000e+00, 4.790e-01, 0.000e+00, 4.844e-06, 3.532e-04, 5.235e-04 }, // PM + PM (non-exhaust)
+        { 2.829e+03, 3.253e+01, 0.000e+00, 5.774e+00, 3.882e-01, 4.741e+02, 1.668e+01 }, // CO2(total)
+        { 1.140e+01, 0.000e+00, 0.000e+00, 6.671e-03, 4.057e-04, 9.650e-01, 8.418e-03 }, // CO
+        { 3.440e+00, 0.000e+00, 1.738e+00, 0.000e+00, 1.165e-04, 0.000e+00, 3.512e-03 }, // HC
+        { 9.091e+02, 1.045e+01, 0.000e+00, 1.856e+00, 1.248e-01, 1.524e+02, 5.360e+00 }, // FC
+        { 1.983e+01, 1.652e+00, 0.000e+00, 0.000e+00, 4.551e-03, 5.045e+00, 1.425e-01 }, // NOx
+        { 3.697e+00, 0.000e+00, 4.790e-01, 0.000e+00, 2.260e-04, 1.272e-03, 6.785e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_le7_5t_Euro-II
-        { 2.368e+03, 2.809e+01, 0.000e+00, 3.628e-02, 1.001e-02, 1.224e+02, 1.262e+00 }, // CO2(total)
-        { 8.994e+00, 1.471e-02, 7.244e+00, 4.578e-04, 0.000e+00, 8.470e-02, 0.000e+00 }, // CO
-        { 2.113e+00, 0.000e+00, 9.123e-01, 0.000e+00, 1.628e-06, 0.000e+00, 2.248e-04 }, // HC
-        { 7.611e+02, 9.027e+00, 0.000e+00, 1.166e-02, 3.218e-03, 3.935e+01, 4.056e-01 }, // FC
-        { 2.168e+01, 4.894e-01, 0.000e+00, 0.000e+00, 8.555e-05, 1.653e+00, 6.476e-03 }, // NOx
-        { 2.546e+00, 0.000e+00, 4.633e-01, 0.000e+00, 3.675e-06, 2.057e-02, 3.646e-06 }, // PM + PM (non-exhaust)
+        { 2.368e+03, 1.011e+02, 0.000e+00, 4.702e-01, 4.672e-01, 4.408e+02, 1.636e+01 }, // CO2(total)
+        { 8.994e+00, 5.296e-02, 7.244e+00, 5.933e-03, 0.000e+00, 3.049e-01, 0.000e+00 }, // CO
+        { 2.113e+00, 0.000e+00, 9.123e-01, 0.000e+00, 7.595e-05, 0.000e+00, 2.913e-03 }, // HC
+        { 7.611e+02, 3.250e+01, 0.000e+00, 1.511e-01, 1.501e-01, 1.417e+02, 5.256e+00 }, // FC
+        { 2.168e+01, 1.762e+00, 0.000e+00, 0.000e+00, 3.992e-03, 5.950e+00, 8.394e-02 }, // NOx
+        { 2.546e+00, 0.000e+00, 4.633e-01, 0.000e+00, 1.715e-04, 7.406e-02, 4.725e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_le7_5t_Euro-III
-        { 2.726e+03, 5.297e+00, 0.000e+00, 6.394e-01, 5.691e-03, 1.313e+02, 1.244e+00 }, // CO2(total)
-        { 1.177e+01, 0.000e+00, 5.048e+00, 2.767e-04, 0.000e+00, 6.156e-02, 0.000e+00 }, // CO
-        { 2.028e+00, 0.000e+00, 7.814e-01, 0.000e+00, 9.706e-07, 0.000e+00, 1.219e-04 }, // HC
-        { 8.762e+02, 1.702e+00, 0.000e+00, 2.055e-01, 1.829e-03, 4.220e+01, 3.998e-01 }, // FC
-        { 2.194e+01, 0.000e+00, 0.000e+00, 8.281e-03, 1.238e-05, 1.155e+00, 7.005e-03 }, // NOx
-        { 2.546e+00, 0.000e+00, 2.817e-01, 0.000e+00, 3.203e-06, 3.209e-04, 1.405e-04 }, // PM + PM (non-exhaust)
+        { 2.726e+03, 1.907e+01, 0.000e+00, 8.286e+00, 2.655e-01, 4.727e+02, 1.612e+01 }, // CO2(total)
+        { 1.177e+01, 0.000e+00, 5.048e+00, 3.587e-03, 0.000e+00, 2.216e-01, 0.000e+00 }, // CO
+        { 2.028e+00, 0.000e+00, 7.814e-01, 0.000e+00, 4.529e-05, 0.000e+00, 1.580e-03 }, // HC
+        { 8.762e+02, 6.129e+00, 0.000e+00, 2.663e+00, 8.533e-02, 1.519e+02, 5.181e+00 }, // FC
+        { 2.194e+01, 0.000e+00, 0.000e+00, 1.073e-01, 5.775e-04, 4.157e+00, 9.078e-02 }, // NOx
+        { 2.546e+00, 0.000e+00, 2.817e-01, 0.000e+00, 1.495e-04, 1.155e-03, 1.821e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_le7_5t_Euro-IV_EGR
-        { 2.050e+03, 0.000e+00, 0.000e+00, 1.333e+00, 5.046e-04, 1.564e+02, 1.029e+00 }, // CO2(total)
-        { 2.256e+00, 9.445e-02, 3.917e+00, 0.000e+00, 0.000e+00, 1.103e-01, 0.000e+00 }, // CO
-        { 1.757e-01, 1.848e-03, 2.423e-01, 0.000e+00, 6.105e-07, 0.000e+00, 1.071e-04 }, // HC
-        { 6.590e+02, 0.000e+00, 0.000e+00, 4.285e-01, 1.622e-04, 5.028e+01, 3.307e-01 }, // FC
-        { 1.178e+00, 7.639e-01, 0.000e+00, 1.493e-03, 0.000e+00, 1.440e+00, 8.690e-04 }, // NOx
-        { 1.527e+00, 4.219e-03, 2.806e-01, 0.000e+00, 2.724e-06, 1.335e-03, 3.868e-05 }, // PM + PM (non-exhaust)
+        { 2.050e+03, 0.000e+00, 0.000e+00, 1.728e+01, 2.354e-02, 5.632e+02, 1.334e+01 }, // CO2(total)
+        { 2.256e+00, 3.400e-01, 3.917e+00, 0.000e+00, 0.000e+00, 3.972e-01, 0.000e+00 }, // CO
+        { 1.757e-01, 6.652e-03, 2.423e-01, 0.000e+00, 2.848e-05, 0.000e+00, 1.389e-03 }, // HC
+        { 6.590e+02, 0.000e+00, 0.000e+00, 5.553e+00, 7.566e-03, 1.810e+02, 4.286e+00 }, // FC
+        { 1.178e+00, 2.750e+00, 0.000e+00, 1.935e-02, 0.000e+00, 5.186e+00, 1.126e-02 }, // NOx
+        { 1.527e+00, 1.519e-02, 2.806e-01, 0.000e+00, 1.271e-04, 4.807e-03, 5.013e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_le7_5t_Euro-IV_SCR
-        { 2.073e+03, 0.000e+00, 0.000e+00, 1.267e+00, 1.009e-03, 1.535e+02, 1.021e+00 }, // CO2(total)
-        { 1.038e+01, 1.395e-01, 2.514e+01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 5.168e-02, 1.457e-03, 0.000e+00, 0.000e+00, 1.594e-07, 4.366e-03, 5.087e-07 }, // HC
-        { 6.662e+02, 0.000e+00, 0.000e+00, 4.071e-01, 3.244e-04, 4.934e+01, 3.281e-01 }, // FC
-        { 2.024e+01, 0.000e+00, 0.000e+00, 1.170e-04, 3.772e-05, 2.803e-01, 3.824e-03 }, // NOx
-        { 1.598e+00, 3.436e-03, 4.685e-01, 0.000e+00, 2.718e-06, 0.000e+00, 1.026e-05 }, // PM + PM (non-exhaust)
+        { 2.073e+03, 0.000e+00, 0.000e+00, 1.642e+01, 4.710e-02, 5.527e+02, 1.323e+01 }, // CO2(total)
+        { 1.038e+01, 5.021e-01, 2.514e+01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
+        { 5.168e-02, 5.245e-03, 0.000e+00, 0.000e+00, 7.439e-06, 1.572e-02, 6.593e-06 }, // HC
+        { 6.662e+02, 0.000e+00, 0.000e+00, 5.277e+00, 1.514e-02, 1.776e+02, 4.252e+00 }, // FC
+        { 2.024e+01, 0.000e+00, 0.000e+00, 1.517e-03, 1.760e-03, 1.009e+00, 4.956e-02 }, // NOx
+        { 1.598e+00, 1.237e-02, 4.685e-01, 0.000e+00, 1.268e-04, 0.000e+00, 1.330e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_le7_5t_Euro-IV_SCRs
-        { 2.073e+03, 0.000e+00, 0.000e+00, 1.267e+00, 1.009e-03, 1.535e+02, 1.021e+00 }, // CO2(total)
-        { 1.038e+01, 1.395e-01, 2.514e+01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 5.168e-02, 1.457e-03, 0.000e+00, 0.000e+00, 1.594e-07, 4.366e-03, 5.087e-07 }, // HC
-        { 6.662e+02, 0.000e+00, 0.000e+00, 4.071e-01, 3.244e-04, 4.934e+01, 3.281e-01 }, // FC
-        { 1.797e+01, 5.657e-01, 2.668e+00, 0.000e+00, 8.638e-05, 1.711e+00, 5.773e-03 }, // NOx
-        { 1.598e+00, 3.436e-03, 4.685e-01, 0.000e+00, 2.718e-06, 0.000e+00, 1.026e-05 }, // PM + PM (non-exhaust)
+        { 2.073e+03, 0.000e+00, 0.000e+00, 1.642e+01, 4.710e-02, 5.527e+02, 1.323e+01 }, // CO2(total)
+        { 1.038e+01, 5.021e-01, 2.514e+01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
+        { 5.168e-02, 5.245e-03, 0.000e+00, 0.000e+00, 7.439e-06, 1.572e-02, 6.593e-06 }, // HC
+        { 6.662e+02, 0.000e+00, 0.000e+00, 5.277e+00, 1.514e-02, 1.776e+02, 4.252e+00 }, // FC
+        { 1.797e+01, 2.036e+00, 2.668e+00, 0.000e+00, 4.030e-03, 6.159e+00, 7.481e-02 }, // NOx
+        { 1.598e+00, 1.237e-02, 4.685e-01, 0.000e+00, 1.268e-04, 0.000e+00, 1.330e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_le7_5t_Euro-V_EGR
-        { 2.018e+03, 0.000e+00, 0.000e+00, 1.250e+00, 7.821e-04, 1.494e+02, 1.053e+00 }, // CO2(total)
-        { 4.304e+00, 8.346e-03, 4.893e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 4.411e-01, 9.420e-04, 4.309e-01, 0.000e+00, 7.356e-07, 1.510e-03, 5.961e-05 }, // HC
-        { 6.485e+02, 0.000e+00, 0.000e+00, 4.019e-01, 2.514e-04, 4.802e+01, 3.385e-01 }, // FC
-        { 1.729e+00, 4.068e-01, 0.000e+00, 6.260e-03, 0.000e+00, 9.077e-01, 1.056e-02 }, // NOx
-        { 1.531e+00, 8.320e-04, 2.102e-02, 0.000e+00, 3.081e-06, 6.518e-03, 9.302e-06 }, // PM + PM (non-exhaust)
+        { 2.018e+03, 0.000e+00, 0.000e+00, 1.621e+01, 3.649e-02, 5.379e+02, 1.365e+01 }, // CO2(total)
+        { 4.304e+00, 3.005e-02, 4.893e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
+        { 4.411e-01, 3.391e-03, 4.309e-01, 0.000e+00, 3.432e-05, 5.437e-03, 7.725e-04 }, // HC
+        { 6.485e+02, 0.000e+00, 0.000e+00, 5.208e+00, 1.173e-02, 1.729e+02, 4.387e+00 }, // FC
+        { 1.729e+00, 1.464e+00, 0.000e+00, 8.112e-02, 0.000e+00, 3.268e+00, 1.368e-01 }, // NOx
+        { 1.531e+00, 2.995e-03, 2.102e-02, 0.000e+00, 1.437e-04, 2.346e-02, 1.205e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_le7_5t_Euro-V_SCR
-        { 1.943e+03, 0.000e+00, 0.000e+00, 1.275e+00, 1.888e-04, 1.485e+02, 9.978e-01 }, // CO2(total)
-        { 7.617e+00, 1.766e-01, 1.810e+01, 0.000e+00, 0.000e+00, 1.050e-01, 0.000e+00 }, // CO
-        { 7.667e-02, 2.529e-04, 0.000e+00, 2.387e-05, 0.000e+00, 3.481e-03, 1.015e-05 }, // HC
-        { 6.244e+02, 0.000e+00, 0.000e+00, 4.098e-01, 6.068e-05, 4.772e+01, 3.207e-01 }, // FC
-        { 1.710e+01, 0.000e+00, 0.000e+00, 0.000e+00, 1.383e-05, 0.000e+00, 2.692e-03 }, // NOx
-        { 1.578e+00, 4.012e-03, 3.675e-01, 0.000e+00, 2.720e-06, 1.859e-03, 1.103e-05 }, // PM + PM (non-exhaust)
+        { 1.943e+03, 0.000e+00, 0.000e+00, 1.653e+01, 8.809e-03, 5.346e+02, 1.293e+01 }, // CO2(total)
+        { 7.617e+00, 6.359e-01, 1.810e+01, 0.000e+00, 0.000e+00, 3.779e-01, 0.000e+00 }, // CO
+        { 7.667e-02, 9.104e-04, 0.000e+00, 3.093e-04, 0.000e+00, 1.253e-02, 1.315e-04 }, // HC
+        { 6.244e+02, 0.000e+00, 0.000e+00, 5.311e+00, 2.831e-03, 1.718e+02, 4.156e+00 }, // FC
+        { 1.710e+01, 0.000e+00, 0.000e+00, 0.000e+00, 6.453e-04, 0.000e+00, 3.489e-02 }, // NOx
+        { 1.578e+00, 1.444e-02, 3.675e-01, 0.000e+00, 1.269e-04, 6.693e-03, 1.429e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_le7_5t_Euro-V_SCRs
-        { 1.943e+03, 0.000e+00, 0.000e+00, 1.275e+00, 1.888e-04, 1.485e+02, 9.978e-01 }, // CO2(total)
-        { 7.617e+00, 1.766e-01, 1.810e+01, 0.000e+00, 0.000e+00, 1.050e-01, 0.000e+00 }, // CO
-        { 7.667e-02, 2.529e-04, 0.000e+00, 2.387e-05, 0.000e+00, 3.481e-03, 1.015e-05 }, // HC
-        { 6.244e+02, 0.000e+00, 0.000e+00, 4.098e-01, 6.068e-05, 4.772e+01, 3.207e-01 }, // FC
-        { 1.994e+01, 5.587e-01, 0.000e+00, 0.000e+00, 8.081e-05, 1.690e+00, 5.986e-03 }, // NOx
-        { 1.578e+00, 4.012e-03, 3.675e-01, 0.000e+00, 2.720e-06, 1.859e-03, 1.103e-05 }, // PM + PM (non-exhaust)
+        { 1.943e+03, 0.000e+00, 0.000e+00, 1.653e+01, 8.809e-03, 5.346e+02, 1.293e+01 }, // CO2(total)
+        { 7.617e+00, 6.359e-01, 1.810e+01, 0.000e+00, 0.000e+00, 3.779e-01, 0.000e+00 }, // CO
+        { 7.667e-02, 9.104e-04, 0.000e+00, 3.093e-04, 0.000e+00, 1.253e-02, 1.315e-04 }, // HC
+        { 6.244e+02, 0.000e+00, 0.000e+00, 5.311e+00, 2.831e-03, 1.718e+02, 4.156e+00 }, // FC
+        { 1.994e+01, 2.011e+00, 0.000e+00, 0.000e+00, 3.770e-03, 6.083e+00, 7.758e-02 }, // NOx
+        { 1.578e+00, 1.444e-02, 3.675e-01, 0.000e+00, 1.269e-04, 6.693e-03, 1.429e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_le7_5t_Euro-VI_A-C
-        { 1.936e+03, 0.000e+00, 0.000e+00, 1.251e+00, 1.372e-04, 1.531e+02, 9.282e-01 }, // CO2(total)
-        { 1.053e+00, 1.003e-03, 1.179e+00, 6.279e-05, 0.000e+00, 0.000e+00, 2.462e-05 }, // CO
-        { 8.609e-02, 0.000e+00, 1.124e-02, 1.401e-05, 1.868e-08, 1.272e-03, 2.040e-05 }, // HC
-        { 6.221e+02, 0.000e+00, 0.000e+00, 4.021e-01, 4.410e-05, 4.920e+01, 2.983e-01 }, // FC
-        { 1.158e-01, 6.448e-02, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 7.758e-04 }, // NOx
-        { 1.483e+00, 0.000e+00, 4.753e-02, 0.000e+00, 2.742e-06, 0.000e+00, 9.802e-06 }, // PM + PM (non-exhaust)
+        { 1.936e+03, 0.000e+00, 0.000e+00, 1.621e+01, 6.403e-03, 5.511e+02, 1.203e+01 }, // CO2(total)
+        { 1.053e+00, 3.609e-03, 1.179e+00, 8.138e-04, 0.000e+00, 0.000e+00, 3.190e-04 }, // CO
+        { 8.609e-02, 0.000e+00, 1.124e-02, 1.815e-04, 8.715e-07, 4.578e-03, 2.644e-04 }, // HC
+        { 6.221e+02, 0.000e+00, 0.000e+00, 5.211e+00, 2.058e-03, 1.771e+02, 3.866e+00 }, // FC
+        { 1.158e-01, 2.321e-01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.005e-02 }, // NOx
+        { 1.483e+00, 0.000e+00, 4.753e-02, 0.000e+00, 1.279e-04, 0.000e+00, 1.270e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_le7_5t_Euro-VIs_A-C
-        { 1.936e+03, 0.000e+00, 0.000e+00, 1.251e+00, 1.372e-04, 1.531e+02, 9.282e-01 }, // CO2(total)
-        { 1.053e+00, 1.003e-03, 1.179e+00, 6.279e-05, 0.000e+00, 0.000e+00, 2.462e-05 }, // CO
-        { 8.609e-02, 0.000e+00, 1.124e-02, 1.401e-05, 1.868e-08, 1.272e-03, 2.040e-05 }, // HC
-        { 6.221e+02, 0.000e+00, 0.000e+00, 4.021e-01, 4.410e-05, 4.920e+01, 2.983e-01 }, // FC
-        { 6.537e+00, 5.234e-02, 0.000e+00, 1.191e-02, 0.000e+00, 7.274e-01, 1.836e-02 }, // NOx
-        { 1.483e+00, 0.000e+00, 4.753e-02, 0.000e+00, 2.742e-06, 0.000e+00, 9.802e-06 }, // PM + PM (non-exhaust)
+        { 1.936e+03, 0.000e+00, 0.000e+00, 1.621e+01, 6.403e-03, 5.511e+02, 1.203e+01 }, // CO2(total)
+        { 1.053e+00, 3.609e-03, 1.179e+00, 8.138e-04, 0.000e+00, 0.000e+00, 3.190e-04 }, // CO
+        { 8.609e-02, 0.000e+00, 1.124e-02, 1.815e-04, 8.715e-07, 4.578e-03, 2.644e-04 }, // HC
+        { 6.221e+02, 0.000e+00, 0.000e+00, 5.211e+00, 2.058e-03, 1.771e+02, 3.866e+00 }, // FC
+        { 6.537e+00, 1.884e-01, 0.000e+00, 1.544e-01, 0.000e+00, 2.619e+00, 2.379e-01 }, // NOx
+        { 1.483e+00, 0.000e+00, 4.753e-02, 0.000e+00, 1.279e-04, 0.000e+00, 1.270e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_le7_5t_Euro-VI_D-E
-        { 1.632e+03, 9.171e+00, 0.000e+00, 1.152e+00, 0.000e+00, 1.452e+02, 1.001e+00 }, // CO2(total)
+        { 1.632e+03, 3.302e+01, 0.000e+00, 1.493e+01, 0.000e+00, 5.226e+02, 1.297e+01 }, // CO2(total)
         { 4.487e-01, 0.000e+00, 3.677e-01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 1.666e-01, 2.530e-04, 6.593e-02, 0.000e+00, 1.026e-07, 0.000e+00, 1.309e-05 }, // HC
-        { 5.246e+02, 2.947e+00, 0.000e+00, 3.703e-01, 0.000e+00, 4.666e+01, 3.216e-01 }, // FC
-        { 7.422e-01, 0.000e+00, 5.967e-01, 7.898e-05, 1.809e-07, 0.000e+00, 0.000e+00 }, // NOx
-        { 1.435e+00, 1.345e-04, 0.000e+00, 1.830e-06, 2.712e-06, 4.681e-04, 1.072e-05 }, // PM + PM (non-exhaust)
+        { 1.666e-01, 9.109e-04, 6.593e-02, 0.000e+00, 4.788e-06, 0.000e+00, 1.697e-04 }, // HC
+        { 5.246e+02, 1.061e+01, 0.000e+00, 4.799e+00, 0.000e+00, 1.680e+02, 4.168e+00 }, // FC
+        { 7.422e-01, 0.000e+00, 5.967e-01, 1.024e-03, 8.439e-06, 0.000e+00, 0.000e+00 }, // NOx
+        { 1.435e+00, 4.843e-04, 0.000e+00, 2.371e-05, 1.265e-04, 1.685e-03, 1.389e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_le7_5t_Euro-VIs_D-E
-        { 1.632e+03, 9.171e+00, 0.000e+00, 1.152e+00, 0.000e+00, 1.452e+02, 1.001e+00 }, // CO2(total)
+        { 1.632e+03, 3.302e+01, 0.000e+00, 1.493e+01, 0.000e+00, 5.226e+02, 1.297e+01 }, // CO2(total)
         { 4.487e-01, 0.000e+00, 3.677e-01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 1.666e-01, 2.530e-04, 6.593e-02, 0.000e+00, 1.026e-07, 0.000e+00, 1.309e-05 }, // HC
-        { 5.246e+02, 2.947e+00, 0.000e+00, 3.703e-01, 0.000e+00, 4.666e+01, 3.216e-01 }, // FC
-        { 1.693e+01, 3.098e-01, 2.838e+01, 0.000e+00, 8.663e-05, 2.323e-01, 1.572e-02 }, // NOx
-        { 1.435e+00, 1.345e-04, 0.000e+00, 1.830e-06, 2.712e-06, 4.681e-04, 1.072e-05 }, // PM + PM (non-exhaust)
+        { 1.666e-01, 9.109e-04, 6.593e-02, 0.000e+00, 4.788e-06, 0.000e+00, 1.697e-04 }, // HC
+        { 5.246e+02, 1.061e+01, 0.000e+00, 4.799e+00, 0.000e+00, 1.680e+02, 4.168e+00 }, // FC
+        { 1.693e+01, 1.115e+00, 2.838e+01, 0.000e+00, 4.042e-03, 8.362e-01, 2.038e-01 }, // NOx
+        { 1.435e+00, 4.843e-04, 0.000e+00, 2.371e-05, 1.265e-04, 1.685e-03, 1.389e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_gt20-28t_50ties
-        { 6.366e+02, 2.329e+02, 0.000e+00, 0.000e+00, 0.000e+00, 5.259e+02, 1.864e-01 }, // CO2(total)
-        { 1.654e+01, 7.496e-01, 0.000e+00, 0.000e+00, 0.000e+00, 1.431e+00, 5.249e-03 }, // CO
-        { 1.470e+01, 0.000e+00, 6.758e+00, 0.000e+00, 0.000e+00, 0.000e+00, 4.158e-04 }, // HC
-        { 2.046e+02, 7.485e+01, 0.000e+00, 0.000e+00, 0.000e+00, 1.690e+02, 5.991e-02 }, // FC
-        { 1.628e+01, 3.697e+00, 0.000e+00, 0.000e+00, 0.000e+00, 8.600e+00, 0.000e+00 }, // NOx
-        { 4.139e+00, 9.733e-02, 0.000e+00, 0.000e+00, 2.701e-06, 2.101e-01, 4.337e-04 }, // PM + PM (non-exhaust)
+        { 6.366e+02, 8.384e+02, 0.000e+00, 0.000e+00, 0.000e+00, 1.893e+03, 2.416e+00 }, // CO2(total)
+        { 1.654e+01, 2.698e+00, 0.000e+00, 0.000e+00, 0.000e+00, 5.151e+00, 6.802e-02 }, // CO
+        { 1.470e+01, 0.000e+00, 6.758e+00, 0.000e+00, 0.000e+00, 0.000e+00, 5.389e-03 }, // HC
+        { 2.046e+02, 2.695e+02, 0.000e+00, 0.000e+00, 0.000e+00, 6.085e+02, 7.765e-01 }, // FC
+        { 1.628e+01, 1.331e+01, 0.000e+00, 0.000e+00, 0.000e+00, 3.096e+01, 0.000e+00 }, // NOx
+        { 4.139e+00, 3.504e-01, 0.000e+00, 0.000e+00, 1.260e-04, 7.563e-01, 5.621e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_gt20-28t_60ties
-        { 6.366e+02, 2.329e+02, 0.000e+00, 0.000e+00, 0.000e+00, 5.259e+02, 1.864e-01 }, // CO2(total)
-        { 1.654e+01, 7.496e-01, 0.000e+00, 0.000e+00, 0.000e+00, 1.431e+00, 5.249e-03 }, // CO
-        { 1.470e+01, 0.000e+00, 6.758e+00, 0.000e+00, 0.000e+00, 0.000e+00, 4.158e-04 }, // HC
-        { 2.046e+02, 7.485e+01, 0.000e+00, 0.000e+00, 0.000e+00, 1.690e+02, 5.991e-02 }, // FC
-        { 1.628e+01, 3.697e+00, 0.000e+00, 0.000e+00, 0.000e+00, 8.600e+00, 0.000e+00 }, // NOx
-        { 4.139e+00, 9.733e-02, 0.000e+00, 0.000e+00, 2.701e-06, 2.101e-01, 4.337e-04 }, // PM + PM (non-exhaust)
+        { 6.366e+02, 8.384e+02, 0.000e+00, 0.000e+00, 0.000e+00, 1.893e+03, 2.416e+00 }, // CO2(total)
+        { 1.654e+01, 2.698e+00, 0.000e+00, 0.000e+00, 0.000e+00, 5.151e+00, 6.802e-02 }, // CO
+        { 1.470e+01, 0.000e+00, 6.758e+00, 0.000e+00, 0.000e+00, 0.000e+00, 5.389e-03 }, // HC
+        { 2.046e+02, 2.695e+02, 0.000e+00, 0.000e+00, 0.000e+00, 6.085e+02, 7.765e-01 }, // FC
+        { 1.628e+01, 1.331e+01, 0.000e+00, 0.000e+00, 0.000e+00, 3.096e+01, 0.000e+00 }, // NOx
+        { 4.139e+00, 3.504e-01, 0.000e+00, 0.000e+00, 1.260e-04, 7.563e-01, 5.621e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_gt20-28t_70ties
-        { 6.366e+02, 2.329e+02, 0.000e+00, 0.000e+00, 0.000e+00, 5.259e+02, 1.864e-01 }, // CO2(total)
-        { 1.654e+01, 7.496e-01, 0.000e+00, 0.000e+00, 0.000e+00, 1.431e+00, 5.249e-03 }, // CO
-        { 1.470e+01, 0.000e+00, 6.758e+00, 0.000e+00, 0.000e+00, 0.000e+00, 4.158e-04 }, // HC
-        { 2.046e+02, 7.485e+01, 0.000e+00, 0.000e+00, 0.000e+00, 1.690e+02, 5.991e-02 }, // FC
-        { 1.628e+01, 3.697e+00, 0.000e+00, 0.000e+00, 0.000e+00, 8.600e+00, 0.000e+00 }, // NOx
-        { 4.139e+00, 9.733e-02, 0.000e+00, 0.000e+00, 2.701e-06, 2.101e-01, 4.337e-04 }, // PM + PM (non-exhaust)
+        { 6.366e+02, 8.384e+02, 0.000e+00, 0.000e+00, 0.000e+00, 1.893e+03, 2.416e+00 }, // CO2(total)
+        { 1.654e+01, 2.698e+00, 0.000e+00, 0.000e+00, 0.000e+00, 5.151e+00, 6.802e-02 }, // CO
+        { 1.470e+01, 0.000e+00, 6.758e+00, 0.000e+00, 0.000e+00, 0.000e+00, 5.389e-03 }, // HC
+        { 2.046e+02, 2.695e+02, 0.000e+00, 0.000e+00, 0.000e+00, 6.085e+02, 7.765e-01 }, // FC
+        { 1.628e+01, 1.331e+01, 0.000e+00, 0.000e+00, 0.000e+00, 3.096e+01, 0.000e+00 }, // NOx
+        { 4.139e+00, 3.504e-01, 0.000e+00, 0.000e+00, 1.260e-04, 7.563e-01, 5.621e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_gt20-28t_80ties
-        { 6.366e+02, 2.329e+02, 0.000e+00, 0.000e+00, 0.000e+00, 5.259e+02, 1.864e-01 }, // CO2(total)
-        { 1.654e+01, 7.496e-01, 0.000e+00, 0.000e+00, 0.000e+00, 1.431e+00, 5.249e-03 }, // CO
-        { 1.470e+01, 0.000e+00, 6.758e+00, 0.000e+00, 0.000e+00, 0.000e+00, 4.158e-04 }, // HC
-        { 2.046e+02, 7.485e+01, 0.000e+00, 0.000e+00, 0.000e+00, 1.690e+02, 5.991e-02 }, // FC
-        { 1.628e+01, 3.697e+00, 0.000e+00, 0.000e+00, 0.000e+00, 8.600e+00, 0.000e+00 }, // NOx
-        { 4.139e+00, 9.733e-02, 0.000e+00, 0.000e+00, 2.701e-06, 2.101e-01, 4.337e-04 }, // PM + PM (non-exhaust)
+        { 6.366e+02, 8.384e+02, 0.000e+00, 0.000e+00, 0.000e+00, 1.893e+03, 2.416e+00 }, // CO2(total)
+        { 1.654e+01, 2.698e+00, 0.000e+00, 0.000e+00, 0.000e+00, 5.151e+00, 6.802e-02 }, // CO
+        { 1.470e+01, 0.000e+00, 6.758e+00, 0.000e+00, 0.000e+00, 0.000e+00, 5.389e-03 }, // HC
+        { 2.046e+02, 2.695e+02, 0.000e+00, 0.000e+00, 0.000e+00, 6.085e+02, 7.765e-01 }, // FC
+        { 1.628e+01, 1.331e+01, 0.000e+00, 0.000e+00, 0.000e+00, 3.096e+01, 0.000e+00 }, // NOx
+        { 4.139e+00, 3.504e-01, 0.000e+00, 0.000e+00, 1.260e-04, 7.563e-01, 5.621e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_lt28t_EE
-        { 6.366e+02, 2.329e+02, 0.000e+00, 0.000e+00, 0.000e+00, 5.259e+02, 1.864e-01 }, // CO2(total)
-        { 1.985e+01, 8.995e-01, 0.000e+00, 0.000e+00, 0.000e+00, 1.717e+00, 6.298e-03 }, // CO
-        { 1.763e+01, 0.000e+00, 8.110e+00, 0.000e+00, 0.000e+00, 0.000e+00, 4.989e-04 }, // HC
-        { 2.046e+02, 7.485e+01, 0.000e+00, 0.000e+00, 0.000e+00, 1.690e+02, 5.991e-02 }, // FC
-        { 1.628e+01, 3.697e+00, 0.000e+00, 0.000e+00, 0.000e+00, 8.600e+00, 0.000e+00 }, // NOx
-        { 4.139e+00, 9.733e-02, 0.000e+00, 0.000e+00, 2.701e-06, 2.101e-01, 4.337e-04 }, // PM + PM (non-exhaust)
+        { 6.366e+02, 8.384e+02, 0.000e+00, 0.000e+00, 0.000e+00, 1.893e+03, 2.416e+00 }, // CO2(total)
+        { 1.985e+01, 3.238e+00, 0.000e+00, 0.000e+00, 0.000e+00, 6.181e+00, 8.163e-02 }, // CO
+        { 1.763e+01, 0.000e+00, 8.110e+00, 0.000e+00, 0.000e+00, 0.000e+00, 6.466e-03 }, // HC
+        { 2.046e+02, 2.695e+02, 0.000e+00, 0.000e+00, 0.000e+00, 6.085e+02, 7.765e-01 }, // FC
+        { 1.628e+01, 1.331e+01, 0.000e+00, 0.000e+00, 0.000e+00, 3.096e+01, 0.000e+00 }, // NOx
+        { 4.139e+00, 3.504e-01, 0.000e+00, 0.000e+00, 1.260e-04, 7.563e-01, 5.621e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_gt20-28t_Euro-I
-        { 7.743e+02, 2.221e+02, 0.000e+00, 0.000e+00, 0.000e+00, 5.172e+02, 6.313e-02 }, // CO2(total)
-        { 1.587e+01, 4.286e-02, 1.426e+01, 2.115e-03, 0.000e+00, 0.000e+00, 6.530e-03 }, // CO
-        { 6.244e+00, 0.000e+00, 8.774e-01, 2.172e-04, 4.530e-07, 1.237e-01, 0.000e+00 }, // HC
-        { 2.488e+02, 7.139e+01, 0.000e+00, 0.000e+00, 0.000e+00, 1.662e+02, 2.029e-02 }, // FC
-        { 9.870e+00, 2.250e+00, 0.000e+00, 0.000e+00, 0.000e+00, 5.212e+00, 0.000e+00 }, // NOx
-        { 3.974e+00, 4.672e-02, 0.000e+00, 0.000e+00, 2.702e-06, 9.543e-02, 4.419e-04 }, // PM + PM (non-exhaust)
+        { 7.743e+02, 7.997e+02, 0.000e+00, 0.000e+00, 0.000e+00, 1.862e+03, 8.181e-01 }, // CO2(total)
+        { 1.587e+01, 1.543e-01, 1.426e+01, 2.741e-02, 0.000e+00, 0.000e+00, 8.463e-02 }, // CO
+        { 6.244e+00, 0.000e+00, 8.774e-01, 2.815e-03, 2.113e-05, 4.454e-01, 0.000e+00 }, // HC
+        { 2.488e+02, 2.570e+02, 0.000e+00, 0.000e+00, 0.000e+00, 5.984e+02, 2.629e-01 }, // FC
+        { 9.870e+00, 8.100e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.876e+01, 0.000e+00 }, // NOx
+        { 3.974e+00, 1.682e-01, 0.000e+00, 0.000e+00, 1.261e-04, 3.436e-01, 5.727e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_gt20-28t_Euro-II
-        { 5.528e+02, 2.168e+02, 0.000e+00, 0.000e+00, 0.000e+00, 4.504e+02, 7.372e-01 }, // CO2(total)
-        { 1.442e+01, 0.000e+00, 1.645e+01, 1.637e-03, 0.000e+00, 0.000e+00, 3.314e-03 }, // CO
-        { 4.159e+00, 2.759e-03, 5.253e-03, 1.538e-04, 0.000e+00, 8.828e-02, 0.000e+00 }, // HC
-        { 1.777e+02, 6.969e+01, 0.000e+00, 0.000e+00, 0.000e+00, 1.448e+02, 2.369e-01 }, // FC
-        { 1.966e+01, 2.092e+00, 0.000e+00, 6.032e-04, 0.000e+00, 5.126e+00, 0.000e+00 }, // NOx
-        { 2.426e+00, 2.689e-02, 1.397e-01, 0.000e+00, 2.705e-06, 6.368e-02, 8.423e-06 }, // PM + PM (non-exhaust)
+        { 5.528e+02, 7.806e+02, 0.000e+00, 0.000e+00, 0.000e+00, 1.622e+03, 9.554e+00 }, // CO2(total)
+        { 1.442e+01, 0.000e+00, 1.645e+01, 2.122e-02, 0.000e+00, 0.000e+00, 4.295e-02 }, // CO
+        { 4.159e+00, 9.931e-03, 5.253e-03, 1.993e-03, 0.000e+00, 3.178e-01, 0.000e+00 }, // HC
+        { 1.777e+02, 2.509e+02, 0.000e+00, 0.000e+00, 0.000e+00, 5.212e+02, 3.071e+00 }, // FC
+        { 1.966e+01, 7.533e+00, 0.000e+00, 7.817e-03, 0.000e+00, 1.846e+01, 0.000e+00 }, // NOx
+        { 2.426e+00, 9.680e-02, 1.397e-01, 0.000e+00, 1.262e-04, 2.293e-01, 1.092e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_gt20-28t_Euro-III
-        { 6.080e+02, 2.183e+02, 0.000e+00, 0.000e+00, 0.000e+00, 4.314e+02, 1.044e+00 }, // CO2(total)
-        { 2.027e+01, 0.000e+00, 1.071e+01, 5.402e-04, 6.403e-06, 0.000e+00, 3.052e-03 }, // CO
-        { 4.275e+00, 6.142e-03, 1.882e+00, 0.000e+00, 3.178e-07, 1.795e-02, 2.567e-04 }, // HC
-        { 1.954e+02, 7.015e+01, 0.000e+00, 0.000e+00, 0.000e+00, 1.386e+02, 3.357e-01 }, // FC
-        { 3.300e+01, 9.077e-01, 0.000e+00, 7.805e-03, 0.000e+00, 3.936e+00, 2.124e-03 }, // NOx
-        { 3.262e+00, 1.222e-02, 0.000e+00, 0.000e+00, 2.696e-06, 2.541e-02, 1.542e-04 }, // PM + PM (non-exhaust)
+        { 6.080e+02, 7.858e+02, 0.000e+00, 0.000e+00, 0.000e+00, 1.553e+03, 1.354e+01 }, // CO2(total)
+        { 2.027e+01, 0.000e+00, 1.071e+01, 7.001e-03, 2.988e-04, 0.000e+00, 3.956e-02 }, // CO
+        { 4.275e+00, 2.211e-02, 1.882e+00, 0.000e+00, 1.483e-05, 6.461e-02, 3.326e-03 }, // HC
+        { 1.954e+02, 2.525e+02, 0.000e+00, 0.000e+00, 0.000e+00, 4.991e+02, 4.350e+00 }, // FC
+        { 3.300e+01, 3.268e+00, 0.000e+00, 1.012e-01, 0.000e+00, 1.417e+01, 2.752e-02 }, // NOx
+        { 3.262e+00, 4.401e-02, 0.000e+00, 0.000e+00, 1.258e-04, 9.148e-02, 1.999e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_gt20-28t_Euro-IV_EGR
-        { 2.907e+01, 2.244e+02, 0.000e+00, 0.000e+00, 0.000e+00, 4.537e+02, 8.678e-01 }, // CO2(total)
-        { 5.224e+00, 1.770e-01, 4.762e+00, 0.000e+00, 0.000e+00, 4.073e-01, 1.252e-05 }, // CO
-        { 3.185e-01, 7.572e-03, 4.477e-02, 0.000e+00, 3.833e-07, 2.693e-02, 0.000e+00 }, // HC
-        { 9.341e+00, 7.211e+01, 0.000e+00, 0.000e+00, 0.000e+00, 1.458e+02, 2.789e-01 }, // FC
-        { 2.232e+01, 1.092e+00, 5.315e+01, 0.000e+00, 3.551e-05, 1.510e+00, 1.501e-02 }, // NOx
-        { 1.730e+00, 6.335e-03, 7.432e-01, 0.000e+00, 2.720e-06, 0.000e+00, 9.164e-05 }, // PM + PM (non-exhaust)
+        { 2.907e+01, 8.077e+02, 0.000e+00, 0.000e+00, 0.000e+00, 1.633e+03, 1.125e+01 }, // CO2(total)
+        { 5.224e+00, 6.373e-01, 4.762e+00, 0.000e+00, 0.000e+00, 1.466e+00, 1.623e-04 }, // CO
+        { 3.185e-01, 2.726e-02, 4.477e-02, 0.000e+00, 1.788e-05, 9.696e-02, 0.000e+00 }, // HC
+        { 9.341e+00, 2.596e+02, 0.000e+00, 0.000e+00, 0.000e+00, 5.249e+02, 3.614e+00 }, // FC
+        { 2.232e+01, 3.930e+00, 5.315e+01, 0.000e+00, 1.657e-03, 5.435e+00, 1.946e-01 }, // NOx
+        { 1.730e+00, 2.280e-02, 7.432e-01, 0.000e+00, 1.269e-04, 0.000e+00, 1.188e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_gt20-28t_Euro-IV_SCR
-        { 5.970e+02, 2.106e+02, 0.000e+00, 0.000e+00, 0.000e+00, 5.022e+02, 0.000e+00 }, // CO2(total)
-        { 2.624e+01, 0.000e+00, 4.395e+01, 0.000e+00, 4.326e-05, 0.000e+00, 6.697e-03 }, // CO
-        { 1.711e-01, 1.293e-03, 3.506e-02, 2.499e-05, 0.000e+00, 9.843e-03, 0.000e+00 }, // HC
-        { 1.919e+02, 6.769e+01, 0.000e+00, 0.000e+00, 0.000e+00, 1.614e+02, 0.000e+00 }, // FC
-        { 2.856e+01, 4.912e-01, 0.000e+00, 0.000e+00, 0.000e+00, 1.303e+00, 3.527e-03 }, // NOx
-        { 1.962e+00, 0.000e+00, 8.289e-01, 0.000e+00, 3.480e-06, 1.540e-04, 1.330e-04 }, // PM + PM (non-exhaust)
+        { 5.970e+02, 7.583e+02, 0.000e+00, 0.000e+00, 0.000e+00, 1.808e+03, 0.000e+00 }, // CO2(total)
+        { 2.624e+01, 0.000e+00, 4.395e+01, 0.000e+00, 2.019e-03, 0.000e+00, 8.679e-02 }, // CO
+        { 1.711e-01, 4.654e-03, 3.506e-02, 3.239e-04, 0.000e+00, 3.544e-02, 0.000e+00 }, // HC
+        { 1.919e+02, 2.437e+02, 0.000e+00, 0.000e+00, 0.000e+00, 5.811e+02, 0.000e+00 }, // FC
+        { 2.856e+01, 1.768e+00, 0.000e+00, 0.000e+00, 0.000e+00, 4.691e+00, 4.571e-02 }, // NOx
+        { 1.962e+00, 0.000e+00, 8.289e-01, 0.000e+00, 1.624e-04, 5.543e-04, 1.723e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_gt20-28t_Euro-IV_SCRs
-        { 5.970e+02, 2.106e+02, 0.000e+00, 0.000e+00, 0.000e+00, 5.022e+02, 0.000e+00 }, // CO2(total)
-        { 2.624e+01, 0.000e+00, 4.395e+01, 0.000e+00, 4.326e-05, 0.000e+00, 6.697e-03 }, // CO
-        { 1.711e-01, 1.293e-03, 3.506e-02, 2.499e-05, 0.000e+00, 9.843e-03, 0.000e+00 }, // HC
-        { 1.919e+02, 6.769e+01, 0.000e+00, 0.000e+00, 0.000e+00, 1.614e+02, 0.000e+00 }, // FC
-        { 1.769e+01, 2.120e+00, 5.879e+00, 0.000e+00, 0.000e+00, 5.132e+00, 0.000e+00 }, // NOx
-        { 1.962e+00, 0.000e+00, 8.289e-01, 0.000e+00, 3.480e-06, 1.540e-04, 1.330e-04 }, // PM + PM (non-exhaust)
+        { 5.970e+02, 7.583e+02, 0.000e+00, 0.000e+00, 0.000e+00, 1.808e+03, 0.000e+00 }, // CO2(total)
+        { 2.624e+01, 0.000e+00, 4.395e+01, 0.000e+00, 2.019e-03, 0.000e+00, 8.679e-02 }, // CO
+        { 1.711e-01, 4.654e-03, 3.506e-02, 3.239e-04, 0.000e+00, 3.544e-02, 0.000e+00 }, // HC
+        { 1.919e+02, 2.437e+02, 0.000e+00, 0.000e+00, 0.000e+00, 5.811e+02, 0.000e+00 }, // FC
+        { 1.769e+01, 7.632e+00, 5.879e+00, 0.000e+00, 0.000e+00, 1.847e+01, 0.000e+00 }, // NOx
+        { 1.962e+00, 0.000e+00, 8.289e-01, 0.000e+00, 1.624e-04, 5.543e-04, 1.723e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_gt20-28t_Euro-V_EGR
-        { 5.268e+02, 2.059e+02, 0.000e+00, 0.000e+00, 0.000e+00, 4.930e+02, 0.000e+00 }, // CO2(total)
-        { 7.925e+00, 0.000e+00, 1.080e+01, 0.000e+00, 8.703e-06, 0.000e+00, 1.206e-03 }, // CO
-        { 8.963e-01, 4.227e-03, 6.238e-01, 0.000e+00, 6.664e-07, 2.162e-02, 5.917e-05 }, // HC
-        { 1.693e+02, 6.616e+01, 0.000e+00, 0.000e+00, 0.000e+00, 1.584e+02, 0.000e+00 }, // FC
-        { 2.364e+01, 6.958e-01, 5.204e+01, 0.000e+00, 3.836e-05, 5.079e-01, 1.723e-02 }, // NOx
-        { 1.583e+00, 5.513e-03, 1.652e-01, 0.000e+00, 2.709e-06, 1.400e-02, 5.427e-06 }, // PM + PM (non-exhaust)
+        { 5.268e+02, 7.411e+02, 0.000e+00, 0.000e+00, 0.000e+00, 1.775e+03, 0.000e+00 }, // CO2(total)
+        { 7.925e+00, 0.000e+00, 1.080e+01, 0.000e+00, 4.060e-04, 0.000e+00, 1.563e-02 }, // CO
+        { 8.963e-01, 1.522e-02, 6.238e-01, 0.000e+00, 3.109e-05, 7.782e-02, 7.668e-04 }, // HC
+        { 1.693e+02, 2.382e+02, 0.000e+00, 0.000e+00, 0.000e+00, 5.704e+02, 0.000e+00 }, // FC
+        { 2.364e+01, 2.505e+00, 5.204e+01, 0.000e+00, 1.790e-03, 1.829e+00, 2.233e-01 }, // NOx
+        { 1.583e+00, 1.985e-02, 1.652e-01, 0.000e+00, 1.264e-04, 5.040e-02, 7.033e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_gt20-28t_Euro-V_SCR
-        { 7.488e+02, 1.974e+02, 0.000e+00, 0.000e+00, 0.000e+00, 4.794e+02, 0.000e+00 }, // CO2(total)
-        { 2.112e+01, 1.275e-01, 3.500e+01, 0.000e+00, 4.221e-05, 0.000e+00, 1.004e-02 }, // CO
-        { 1.130e-01, 4.349e-03, 0.000e+00, 0.000e+00, 0.000e+00, 1.013e-02, 0.000e+00 }, // HC
-        { 2.407e+02, 6.343e+01, 0.000e+00, 0.000e+00, 0.000e+00, 1.541e+02, 0.000e+00 }, // FC
-        { 3.310e+01, 1.157e-01, 0.000e+00, 0.000e+00, 0.000e+00, 2.767e-01, 3.621e-03 }, // NOx
-        { 1.983e+00, 0.000e+00, 7.461e-01, 0.000e+00, 3.652e-06, 6.175e-04, 1.787e-04 }, // PM + PM (non-exhaust)
+        { 7.488e+02, 7.105e+02, 0.000e+00, 0.000e+00, 0.000e+00, 1.726e+03, 0.000e+00 }, // CO2(total)
+        { 2.112e+01, 4.591e-01, 3.500e+01, 0.000e+00, 1.969e-03, 0.000e+00, 1.301e-01 }, // CO
+        { 1.130e-01, 1.566e-02, 0.000e+00, 0.000e+00, 0.000e+00, 3.648e-02, 0.000e+00 }, // HC
+        { 2.407e+02, 2.284e+02, 0.000e+00, 0.000e+00, 0.000e+00, 5.547e+02, 0.000e+00 }, // FC
+        { 3.310e+01, 4.166e-01, 0.000e+00, 0.000e+00, 0.000e+00, 9.962e-01, 4.693e-02 }, // NOx
+        { 1.983e+00, 0.000e+00, 7.461e-01, 0.000e+00, 1.704e-04, 2.223e-03, 2.316e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_gt20-28t_Euro-V_SCRs
-        { 7.488e+02, 1.974e+02, 0.000e+00, 0.000e+00, 0.000e+00, 4.794e+02, 0.000e+00 }, // CO2(total)
-        { 2.112e+01, 1.275e-01, 3.500e+01, 0.000e+00, 4.221e-05, 0.000e+00, 1.004e-02 }, // CO
-        { 1.130e-01, 4.349e-03, 0.000e+00, 0.000e+00, 0.000e+00, 1.013e-02, 0.000e+00 }, // HC
-        { 2.407e+02, 6.343e+01, 0.000e+00, 0.000e+00, 0.000e+00, 1.541e+02, 0.000e+00 }, // FC
-        { 2.567e+01, 2.001e+00, 8.411e+00, 0.000e+00, 0.000e+00, 4.778e+00, 0.000e+00 }, // NOx
-        { 1.983e+00, 0.000e+00, 7.461e-01, 0.000e+00, 3.652e-06, 6.175e-04, 1.787e-04 }, // PM + PM (non-exhaust)
+        { 7.488e+02, 7.105e+02, 0.000e+00, 0.000e+00, 0.000e+00, 1.726e+03, 0.000e+00 }, // CO2(total)
+        { 2.112e+01, 4.591e-01, 3.500e+01, 0.000e+00, 1.969e-03, 0.000e+00, 1.301e-01 }, // CO
+        { 1.130e-01, 1.566e-02, 0.000e+00, 0.000e+00, 0.000e+00, 3.648e-02, 0.000e+00 }, // HC
+        { 2.407e+02, 2.284e+02, 0.000e+00, 0.000e+00, 0.000e+00, 5.547e+02, 0.000e+00 }, // FC
+        { 2.567e+01, 7.204e+00, 8.411e+00, 0.000e+00, 0.000e+00, 1.720e+01, 0.000e+00 }, // NOx
+        { 1.983e+00, 0.000e+00, 7.461e-01, 0.000e+00, 1.704e-04, 2.223e-03, 2.316e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_gt20-28t_Euro-VI_A-C
-        { 6.088e+02, 1.991e+02, 0.000e+00, 0.000e+00, 0.000e+00, 4.817e+02, 0.000e+00 }, // CO2(total)
-        { 2.253e+00, 0.000e+00, 2.131e+00, 0.000e+00, 1.937e-06, 0.000e+00, 3.169e-04 }, // CO
-        { 1.416e-01, 2.512e-03, 1.024e-02, 0.000e+00, 0.000e+00, 6.056e-03, 0.000e+00 }, // HC
-        { 1.956e+02, 6.398e+01, 0.000e+00, 0.000e+00, 0.000e+00, 1.548e+02, 0.000e+00 }, // FC
-        { 4.965e+00, 0.000e+00, 0.000e+00, 0.000e+00, 3.503e-06, 0.000e+00, 0.000e+00 }, // NOx
-        { 1.563e+00, 0.000e+00, 1.548e-01, 0.000e+00, 2.721e-06, 8.478e-04, 2.263e-06 }, // PM + PM (non-exhaust)
+        { 6.088e+02, 7.167e+02, 0.000e+00, 0.000e+00, 0.000e+00, 1.734e+03, 0.000e+00 }, // CO2(total)
+        { 2.253e+00, 0.000e+00, 2.131e+00, 0.000e+00, 9.036e-05, 0.000e+00, 4.107e-03 }, // CO
+        { 1.416e-01, 9.043e-03, 1.024e-02, 0.000e+00, 0.000e+00, 2.180e-02, 0.000e+00 }, // HC
+        { 1.956e+02, 2.303e+02, 0.000e+00, 0.000e+00, 0.000e+00, 5.573e+02, 0.000e+00 }, // FC
+        { 4.965e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.635e-04, 0.000e+00, 0.000e+00 }, // NOx
+        { 1.563e+00, 0.000e+00, 1.548e-01, 0.000e+00, 1.270e-04, 3.052e-03, 2.933e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_gt20-28t_Euro-VIs_A-C
-        { 6.088e+02, 1.991e+02, 0.000e+00, 0.000e+00, 0.000e+00, 4.817e+02, 0.000e+00 }, // CO2(total)
-        { 2.253e+00, 0.000e+00, 2.131e+00, 0.000e+00, 1.937e-06, 0.000e+00, 3.169e-04 }, // CO
-        { 1.416e-01, 2.512e-03, 1.024e-02, 0.000e+00, 0.000e+00, 6.056e-03, 0.000e+00 }, // HC
-        { 1.956e+02, 6.398e+01, 0.000e+00, 0.000e+00, 0.000e+00, 1.548e+02, 0.000e+00 }, // FC
-        { 9.150e-02, 1.544e+00, 0.000e+00, 0.000e+00, 0.000e+00, 3.464e+00, 1.642e-03 }, // NOx
-        { 1.563e+00, 0.000e+00, 1.548e-01, 0.000e+00, 2.721e-06, 8.478e-04, 2.263e-06 }, // PM + PM (non-exhaust)
+        { 6.088e+02, 7.167e+02, 0.000e+00, 0.000e+00, 0.000e+00, 1.734e+03, 0.000e+00 }, // CO2(total)
+        { 2.253e+00, 0.000e+00, 2.131e+00, 0.000e+00, 9.036e-05, 0.000e+00, 4.107e-03 }, // CO
+        { 1.416e-01, 9.043e-03, 1.024e-02, 0.000e+00, 0.000e+00, 2.180e-02, 0.000e+00 }, // HC
+        { 1.956e+02, 2.303e+02, 0.000e+00, 0.000e+00, 0.000e+00, 5.573e+02, 0.000e+00 }, // FC
+        { 9.150e-02, 5.557e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.247e+01, 2.129e-02 }, // NOx
+        { 1.563e+00, 0.000e+00, 1.548e-01, 0.000e+00, 1.270e-04, 3.052e-03, 2.933e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_gt20-28t_Euro-VI_D-E
-        { 2.702e+02, 2.022e+02, 0.000e+00, 0.000e+00, 0.000e+00, 4.659e+02, 1.396e-01 }, // CO2(total)
+        { 2.702e+02, 7.278e+02, 0.000e+00, 0.000e+00, 0.000e+00, 1.677e+03, 1.809e+00 }, // CO2(total)
         { 1.140e+00, 0.000e+00, 1.053e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 3.417e-01, 1.716e-03, 7.915e-02, 0.000e+00, 0.000e+00, 4.038e-03, 0.000e+00 }, // HC
-        { 8.684e+01, 6.497e+01, 0.000e+00, 0.000e+00, 0.000e+00, 1.497e+02, 4.485e-02 }, // FC
-        { 2.218e+00, 0.000e+00, 1.686e-01, 0.000e+00, 3.401e-06, 0.000e+00, 1.645e-04 }, // NOx
-        { 1.445e+00, 5.006e-04, 2.638e-03, 0.000e+00, 2.708e-06, 1.492e-03, 6.978e-06 }, // PM + PM (non-exhaust)
+        { 3.417e-01, 6.179e-03, 7.915e-02, 0.000e+00, 0.000e+00, 1.454e-02, 0.000e+00 }, // HC
+        { 8.684e+01, 2.339e+02, 0.000e+00, 0.000e+00, 0.000e+00, 5.391e+02, 5.813e-01 }, // FC
+        { 2.218e+00, 0.000e+00, 1.686e-01, 0.000e+00, 1.587e-04, 0.000e+00, 2.132e-03 }, // NOx
+        { 1.445e+00, 1.802e-03, 2.638e-03, 0.000e+00, 1.264e-04, 5.372e-03, 9.043e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_gt20-28t_Euro-VIs_D-E
-        { 2.702e+02, 2.022e+02, 0.000e+00, 0.000e+00, 0.000e+00, 4.659e+02, 1.396e-01 }, // CO2(total)
+        { 2.702e+02, 7.278e+02, 0.000e+00, 0.000e+00, 0.000e+00, 1.677e+03, 1.809e+00 }, // CO2(total)
         { 1.140e+00, 0.000e+00, 1.053e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 3.417e-01, 1.716e-03, 7.915e-02, 0.000e+00, 0.000e+00, 4.038e-03, 0.000e+00 }, // HC
-        { 8.684e+01, 6.497e+01, 0.000e+00, 0.000e+00, 0.000e+00, 1.497e+02, 4.485e-02 }, // FC
-        { 3.843e+00, 1.946e+00, 0.000e+00, 0.000e+00, 0.000e+00, 4.390e+00, 1.769e-03 }, // NOx
-        { 1.445e+00, 5.006e-04, 2.638e-03, 0.000e+00, 2.708e-06, 1.492e-03, 6.978e-06 }, // PM + PM (non-exhaust)
+        { 3.417e-01, 6.179e-03, 7.915e-02, 0.000e+00, 0.000e+00, 1.454e-02, 0.000e+00 }, // HC
+        { 8.684e+01, 2.339e+02, 0.000e+00, 0.000e+00, 0.000e+00, 5.391e+02, 5.813e-01 }, // FC
+        { 3.843e+00, 7.005e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.580e+01, 2.293e-02 }, // NOx
+        { 1.445e+00, 1.802e-03, 2.638e-03, 0.000e+00, 1.264e-04, 5.372e-03, 9.043e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_gt28-34t_50ties
-        { 7.988e+03, 1.769e+02, 1.799e+04, 0.000e+00, 0.000e+00, 4.019e+02, 0.000e+00 }, // CO2(total)
-        { 3.820e+01, 6.607e-01, 4.875e+01, 0.000e+00, 0.000e+00, 1.708e+00, 0.000e+00 }, // CO
-        { 1.316e+01, 0.000e+00, 4.028e+00, 0.000e+00, 2.566e-06, 0.000e+00, 1.640e-03 }, // HC
-        { 2.567e+03, 5.687e+01, 5.781e+03, 0.000e+00, 0.000e+00, 1.292e+02, 0.000e+00 }, // FC
-        { 1.297e+02, 2.785e+00, 2.821e+02, 0.000e+00, 0.000e+00, 6.366e+00, 0.000e+00 }, // NOx
-        { 7.125e+00, 8.038e-02, 7.518e+00, 0.000e+00, 2.735e-06, 2.000e-01, 2.105e-06 }, // PM + PM (non-exhaust)
+        { 7.988e+03, 6.370e+02, 1.799e+04, 0.000e+00, 0.000e+00, 1.447e+03, 0.000e+00 }, // CO2(total)
+        { 3.820e+01, 2.379e+00, 4.875e+01, 0.000e+00, 0.000e+00, 6.148e+00, 0.000e+00 }, // CO
+        { 1.316e+01, 0.000e+00, 4.028e+00, 0.000e+00, 1.197e-04, 0.000e+00, 2.125e-02 }, // HC
+        { 2.567e+03, 2.047e+02, 5.781e+03, 0.000e+00, 0.000e+00, 4.649e+02, 0.000e+00 }, // FC
+        { 1.297e+02, 1.003e+01, 2.821e+02, 0.000e+00, 0.000e+00, 2.292e+01, 0.000e+00 }, // NOx
+        { 7.125e+00, 2.894e-01, 7.518e+00, 0.000e+00, 1.276e-04, 7.198e-01, 2.728e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_gt28-34t_60ties
-        { 7.988e+03, 1.769e+02, 1.799e+04, 0.000e+00, 0.000e+00, 4.019e+02, 0.000e+00 }, // CO2(total)
-        { 3.820e+01, 6.607e-01, 4.875e+01, 0.000e+00, 0.000e+00, 1.708e+00, 0.000e+00 }, // CO
-        { 1.316e+01, 0.000e+00, 4.028e+00, 0.000e+00, 2.566e-06, 0.000e+00, 1.640e-03 }, // HC
-        { 2.567e+03, 5.687e+01, 5.781e+03, 0.000e+00, 0.000e+00, 1.292e+02, 0.000e+00 }, // FC
-        { 1.297e+02, 2.785e+00, 2.821e+02, 0.000e+00, 0.000e+00, 6.366e+00, 0.000e+00 }, // NOx
-        { 7.125e+00, 8.038e-02, 7.518e+00, 0.000e+00, 2.735e-06, 2.000e-01, 2.105e-06 }, // PM + PM (non-exhaust)
+        { 7.988e+03, 6.370e+02, 1.799e+04, 0.000e+00, 0.000e+00, 1.447e+03, 0.000e+00 }, // CO2(total)
+        { 3.820e+01, 2.379e+00, 4.875e+01, 0.000e+00, 0.000e+00, 6.148e+00, 0.000e+00 }, // CO
+        { 1.316e+01, 0.000e+00, 4.028e+00, 0.000e+00, 1.197e-04, 0.000e+00, 2.125e-02 }, // HC
+        { 2.567e+03, 2.047e+02, 5.781e+03, 0.000e+00, 0.000e+00, 4.649e+02, 0.000e+00 }, // FC
+        { 1.297e+02, 1.003e+01, 2.821e+02, 0.000e+00, 0.000e+00, 2.292e+01, 0.000e+00 }, // NOx
+        { 7.125e+00, 2.894e-01, 7.518e+00, 0.000e+00, 1.276e-04, 7.198e-01, 2.728e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_gt28-34t_70ties
-        { 7.988e+03, 1.769e+02, 1.799e+04, 0.000e+00, 0.000e+00, 4.019e+02, 0.000e+00 }, // CO2(total)
-        { 3.820e+01, 6.607e-01, 4.875e+01, 0.000e+00, 0.000e+00, 1.708e+00, 0.000e+00 }, // CO
-        { 1.316e+01, 0.000e+00, 4.028e+00, 0.000e+00, 2.566e-06, 0.000e+00, 1.640e-03 }, // HC
-        { 2.567e+03, 5.687e+01, 5.781e+03, 0.000e+00, 0.000e+00, 1.292e+02, 0.000e+00 }, // FC
-        { 1.297e+02, 2.785e+00, 2.821e+02, 0.000e+00, 0.000e+00, 6.366e+00, 0.000e+00 }, // NOx
-        { 7.125e+00, 8.038e-02, 7.518e+00, 0.000e+00, 2.735e-06, 2.000e-01, 2.105e-06 }, // PM + PM (non-exhaust)
+        { 7.988e+03, 6.370e+02, 1.799e+04, 0.000e+00, 0.000e+00, 1.447e+03, 0.000e+00 }, // CO2(total)
+        { 3.820e+01, 2.379e+00, 4.875e+01, 0.000e+00, 0.000e+00, 6.148e+00, 0.000e+00 }, // CO
+        { 1.316e+01, 0.000e+00, 4.028e+00, 0.000e+00, 1.197e-04, 0.000e+00, 2.125e-02 }, // HC
+        { 2.567e+03, 2.047e+02, 5.781e+03, 0.000e+00, 0.000e+00, 4.649e+02, 0.000e+00 }, // FC
+        { 1.297e+02, 1.003e+01, 2.821e+02, 0.000e+00, 0.000e+00, 2.292e+01, 0.000e+00 }, // NOx
+        { 7.125e+00, 2.894e-01, 7.518e+00, 0.000e+00, 1.276e-04, 7.198e-01, 2.728e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_gt28-34t_80ties
-        { 7.988e+03, 1.769e+02, 1.799e+04, 0.000e+00, 0.000e+00, 4.019e+02, 0.000e+00 }, // CO2(total)
-        { 3.820e+01, 6.607e-01, 4.875e+01, 0.000e+00, 0.000e+00, 1.708e+00, 0.000e+00 }, // CO
-        { 1.316e+01, 0.000e+00, 4.028e+00, 0.000e+00, 2.566e-06, 0.000e+00, 1.640e-03 }, // HC
-        { 2.567e+03, 5.687e+01, 5.781e+03, 0.000e+00, 0.000e+00, 1.292e+02, 0.000e+00 }, // FC
-        { 1.297e+02, 2.785e+00, 2.821e+02, 0.000e+00, 0.000e+00, 6.366e+00, 0.000e+00 }, // NOx
-        { 7.125e+00, 8.038e-02, 7.518e+00, 0.000e+00, 2.735e-06, 2.000e-01, 2.105e-06 }, // PM + PM (non-exhaust)
+        { 7.988e+03, 6.370e+02, 1.799e+04, 0.000e+00, 0.000e+00, 1.447e+03, 0.000e+00 }, // CO2(total)
+        { 3.820e+01, 2.379e+00, 4.875e+01, 0.000e+00, 0.000e+00, 6.148e+00, 0.000e+00 }, // CO
+        { 1.316e+01, 0.000e+00, 4.028e+00, 0.000e+00, 1.197e-04, 0.000e+00, 2.125e-02 }, // HC
+        { 2.567e+03, 2.047e+02, 5.781e+03, 0.000e+00, 0.000e+00, 4.649e+02, 0.000e+00 }, // FC
+        { 1.297e+02, 1.003e+01, 2.821e+02, 0.000e+00, 0.000e+00, 2.292e+01, 0.000e+00 }, // NOx
+        { 7.125e+00, 2.894e-01, 7.518e+00, 0.000e+00, 1.276e-04, 7.198e-01, 2.728e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_28-34t_EE
-        { 7.988e+03, 1.769e+02, 1.799e+04, 0.000e+00, 0.000e+00, 4.019e+02, 0.000e+00 }, // CO2(total)
-        { 5.348e+01, 9.250e-01, 6.825e+01, 0.000e+00, 0.000e+00, 2.391e+00, 0.000e+00 }, // CO
-        { 3.947e+01, 0.000e+00, 1.208e+01, 0.000e+00, 7.699e-06, 0.000e+00, 4.919e-03 }, // HC
-        { 2.567e+03, 5.687e+01, 5.781e+03, 0.000e+00, 0.000e+00, 1.292e+02, 0.000e+00 }, // FC
-        { 1.557e+02, 3.342e+00, 3.385e+02, 0.000e+00, 0.000e+00, 7.639e+00, 0.000e+00 }, // NOx
-        { 1.113e+01, 1.366e-01, 1.278e+01, 0.000e+00, 2.735e-06, 3.399e-01, 2.105e-06 }, // PM + PM (non-exhaust)
+        { 7.988e+03, 6.370e+02, 1.799e+04, 0.000e+00, 0.000e+00, 1.447e+03, 0.000e+00 }, // CO2(total)
+        { 5.348e+01, 3.330e+00, 6.825e+01, 0.000e+00, 0.000e+00, 8.607e+00, 0.000e+00 }, // CO
+        { 3.947e+01, 0.000e+00, 1.208e+01, 0.000e+00, 3.592e-04, 0.000e+00, 6.375e-02 }, // HC
+        { 2.567e+03, 2.047e+02, 5.781e+03, 0.000e+00, 0.000e+00, 4.649e+02, 0.000e+00 }, // FC
+        { 1.557e+02, 1.203e+01, 3.385e+02, 0.000e+00, 0.000e+00, 2.750e+01, 0.000e+00 }, // NOx
+        { 1.113e+01, 4.919e-01, 1.278e+01, 0.000e+00, 1.276e-04, 1.224e+00, 2.728e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_gt28-34t_Euro-I
-        { 7.431e+03, 1.767e+02, 1.677e+04, 0.000e+00, 0.000e+00, 4.016e+02, 0.000e+00 }, // CO2(total)
-        { 1.552e+01, 3.208e-01, 6.915e+00, 0.000e+00, 0.000e+00, 8.899e-01, 0.000e+00 }, // CO
-        { 6.200e+00, 2.107e-02, 3.277e+00, 0.000e+00, 5.266e-07, 1.202e-01, 0.000e+00 }, // HC
-        { 2.388e+03, 5.677e+01, 5.390e+03, 0.000e+00, 0.000e+00, 1.291e+02, 0.000e+00 }, // FC
-        { 7.510e+01, 1.787e+00, 1.639e+02, 0.000e+00, 0.000e+00, 4.043e+00, 0.000e+00 }, // NOx
-        { 5.171e+00, 4.384e-02, 3.096e+00, 0.000e+00, 2.721e-06, 1.198e-01, 0.000e+00 }, // PM + PM (non-exhaust)
+        { 7.431e+03, 6.360e+02, 1.677e+04, 0.000e+00, 0.000e+00, 1.446e+03, 0.000e+00 }, // CO2(total)
+        { 1.552e+01, 1.155e+00, 6.915e+00, 0.000e+00, 0.000e+00, 3.204e+00, 0.000e+00 }, // CO
+        { 6.200e+00, 7.586e-02, 3.277e+00, 0.000e+00, 2.457e-05, 4.327e-01, 0.000e+00 }, // HC
+        { 2.388e+03, 2.044e+02, 5.390e+03, 0.000e+00, 0.000e+00, 4.646e+02, 0.000e+00 }, // FC
+        { 7.510e+01, 6.432e+00, 1.639e+02, 0.000e+00, 0.000e+00, 1.456e+01, 0.000e+00 }, // NOx
+        { 5.171e+00, 1.578e-01, 3.096e+00, 0.000e+00, 1.270e-04, 4.313e-01, 0.000e+00 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_gt28-34t_Euro-II
-        { 6.187e+03, 2.021e+02, 1.257e+04, 0.000e+00, 0.000e+00, 4.964e+02, 0.000e+00 }, // CO2(total)
-        { 1.716e+01, 0.000e+00, 1.443e+01, 0.000e+00, 2.555e-05, 0.000e+00, 6.019e-03 }, // CO
-        { 4.364e+00, 1.701e-02, 2.417e+00, 0.000e+00, 0.000e+00, 8.150e-02, 0.000e+00 }, // HC
-        { 1.988e+03, 6.495e+01, 4.040e+03, 0.000e+00, 0.000e+00, 1.595e+02, 0.000e+00 }, // FC
-        { 6.544e+01, 2.087e+00, 1.150e+02, 0.000e+00, 0.000e+00, 5.126e+00, 0.000e+00 }, // NOx
-        { 2.849e+00, 2.988e-02, 1.116e+00, 0.000e+00, 2.739e-06, 6.857e-02, 1.376e-05 }, // PM + PM (non-exhaust)
+        { 6.187e+03, 7.275e+02, 1.257e+04, 0.000e+00, 0.000e+00, 1.787e+03, 0.000e+00 }, // CO2(total)
+        { 1.716e+01, 0.000e+00, 1.443e+01, 0.000e+00, 1.192e-03, 0.000e+00, 7.801e-02 }, // CO
+        { 4.364e+00, 6.124e-02, 2.417e+00, 0.000e+00, 0.000e+00, 2.934e-01, 0.000e+00 }, // HC
+        { 1.988e+03, 2.338e+02, 4.040e+03, 0.000e+00, 0.000e+00, 5.743e+02, 0.000e+00 }, // FC
+        { 6.544e+01, 7.514e+00, 1.150e+02, 0.000e+00, 0.000e+00, 1.845e+01, 0.000e+00 }, // NOx
+        { 2.849e+00, 1.076e-01, 1.116e+00, 0.000e+00, 1.278e-04, 2.468e-01, 1.783e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_gt28-34t_Euro-III
-        { 5.255e+03, 2.285e+02, 9.562e+03, 0.000e+00, 0.000e+00, 5.779e+02, 0.000e+00 }, // CO2(total)
-        { 2.058e+01, 0.000e+00, 9.245e+00, 0.000e+00, 2.154e-05, 0.000e+00, 5.561e-03 }, // CO
-        { 3.995e+00, 1.756e-02, 1.465e+00, 0.000e+00, 0.000e+00, 7.790e-02, 0.000e+00 }, // HC
-        { 1.689e+03, 7.343e+01, 3.073e+03, 0.000e+00, 0.000e+00, 1.857e+02, 0.000e+00 }, // FC
-        { 4.427e+01, 1.845e+00, 8.114e+01, 0.000e+00, 0.000e+00, 4.332e+00, 0.000e+00 }, // NOx
-        { 3.284e+00, 2.109e-02, 3.491e-01, 0.000e+00, 2.708e-06, 6.119e-02, 0.000e+00 }, // PM + PM (non-exhaust)
+        { 5.255e+03, 8.226e+02, 9.562e+03, 0.000e+00, 0.000e+00, 2.080e+03, 0.000e+00 }, // CO2(total)
+        { 2.058e+01, 0.000e+00, 9.245e+00, 0.000e+00, 1.005e-03, 0.000e+00, 7.207e-02 }, // CO
+        { 3.995e+00, 6.321e-02, 1.465e+00, 0.000e+00, 0.000e+00, 2.804e-01, 0.000e+00 }, // HC
+        { 1.689e+03, 2.644e+02, 3.073e+03, 0.000e+00, 0.000e+00, 6.686e+02, 0.000e+00 }, // FC
+        { 4.427e+01, 6.643e+00, 8.114e+01, 0.000e+00, 0.000e+00, 1.560e+01, 0.000e+00 }, // NOx
+        { 3.284e+00, 7.593e-02, 3.491e-01, 0.000e+00, 1.263e-04, 2.203e-01, 0.000e+00 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_gt28-34t_Euro-IV_EGR
-        { 5.794e+03, 2.122e+02, 1.300e+04, 0.000e+00, 0.000e+00, 5.168e+02, 0.000e+00 }, // CO2(total)
-        { 9.446e+00, 7.953e-02, 1.666e+01, 7.685e-04, 0.000e+00, 0.000e+00, 3.971e-03 }, // CO
-        { 6.621e-01, 0.000e+00, 8.695e-01, 4.315e-05, 6.643e-07, 0.000e+00, 2.694e-04 }, // HC
-        { 1.862e+03, 6.820e+01, 4.178e+03, 0.000e+00, 0.000e+00, 1.661e+02, 0.000e+00 }, // FC
-        { 3.513e+01, 1.520e+00, 5.747e+01, 0.000e+00, 0.000e+00, 3.659e+00, 0.000e+00 }, // NOx
-        { 2.008e+00, 0.000e+00, 5.720e-01, 0.000e+00, 3.349e-06, 8.614e-04, 1.587e-04 }, // PM + PM (non-exhaust)
+        { 5.794e+03, 7.639e+02, 1.300e+04, 0.000e+00, 0.000e+00, 1.860e+03, 0.000e+00 }, // CO2(total)
+        { 9.446e+00, 2.863e-01, 1.666e+01, 9.960e-03, 0.000e+00, 0.000e+00, 5.147e-02 }, // CO
+        { 6.621e-01, 0.000e+00, 8.695e-01, 5.592e-04, 3.099e-05, 0.000e+00, 3.492e-03 }, // HC
+        { 1.862e+03, 2.455e+02, 4.178e+03, 0.000e+00, 0.000e+00, 5.979e+02, 0.000e+00 }, // FC
+        { 3.513e+01, 5.472e+00, 5.747e+01, 0.000e+00, 0.000e+00, 1.317e+01, 0.000e+00 }, // NOx
+        { 2.008e+00, 0.000e+00, 5.720e-01, 0.000e+00, 1.563e-04, 3.101e-03, 2.057e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_gt28-34t_Euro-IV_SCR
-        { 5.328e+03, 2.191e+02, 1.161e+04, 0.000e+00, 0.000e+00, 5.388e+02, 0.000e+00 }, // CO2(total)
-        { 2.753e+01, 0.000e+00, 3.325e+01, 0.000e+00, 3.078e-05, 0.000e+00, 7.055e-03 }, // CO
-        { 1.947e-01, 4.661e-03, 2.798e-01, 0.000e+00, 0.000e+00, 1.202e-02, 0.000e+00 }, // HC
-        { 1.712e+03, 7.040e+01, 3.730e+03, 0.000e+00, 0.000e+00, 1.732e+02, 0.000e+00 }, // FC
-        { 3.844e+01, 5.351e-01, 1.209e+01, 0.000e+00, 0.000e+00, 2.002e+00, 0.000e+00 }, // NOx
-        { 2.002e+00, 0.000e+00, 6.901e-01, 0.000e+00, 3.311e-06, 1.002e-03, 1.437e-04 }, // PM + PM (non-exhaust)
+        { 5.328e+03, 7.886e+02, 1.161e+04, 0.000e+00, 0.000e+00, 1.940e+03, 0.000e+00 }, // CO2(total)
+        { 2.753e+01, 0.000e+00, 3.325e+01, 0.000e+00, 1.436e-03, 0.000e+00, 9.143e-02 }, // CO
+        { 1.947e-01, 1.678e-02, 2.798e-01, 0.000e+00, 0.000e+00, 4.326e-02, 0.000e+00 }, // HC
+        { 1.712e+03, 2.534e+02, 3.730e+03, 0.000e+00, 0.000e+00, 6.234e+02, 0.000e+00 }, // FC
+        { 3.844e+01, 1.926e+00, 1.209e+01, 0.000e+00, 0.000e+00, 7.209e+00, 0.000e+00 }, // NOx
+        { 2.002e+00, 0.000e+00, 6.901e-01, 0.000e+00, 1.545e-04, 3.607e-03, 1.862e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_gt28-34t_Euro-IV_SCRs
-        { 5.328e+03, 2.191e+02, 1.161e+04, 0.000e+00, 0.000e+00, 5.388e+02, 0.000e+00 }, // CO2(total)
-        { 2.753e+01, 0.000e+00, 3.325e+01, 0.000e+00, 3.078e-05, 0.000e+00, 7.055e-03 }, // CO
-        { 1.947e-01, 4.661e-03, 2.798e-01, 0.000e+00, 0.000e+00, 1.202e-02, 0.000e+00 }, // HC
-        { 1.712e+03, 7.040e+01, 3.730e+03, 0.000e+00, 0.000e+00, 1.732e+02, 0.000e+00 }, // FC
-        { 6.288e+01, 2.125e+00, 1.187e+02, 0.000e+00, 0.000e+00, 5.254e+00, 0.000e+00 }, // NOx
-        { 2.002e+00, 0.000e+00, 6.901e-01, 0.000e+00, 3.311e-06, 1.002e-03, 1.437e-04 }, // PM + PM (non-exhaust)
+        { 5.328e+03, 7.886e+02, 1.161e+04, 0.000e+00, 0.000e+00, 1.940e+03, 0.000e+00 }, // CO2(total)
+        { 2.753e+01, 0.000e+00, 3.325e+01, 0.000e+00, 1.436e-03, 0.000e+00, 9.143e-02 }, // CO
+        { 1.947e-01, 1.678e-02, 2.798e-01, 0.000e+00, 0.000e+00, 4.326e-02, 0.000e+00 }, // HC
+        { 1.712e+03, 2.534e+02, 3.730e+03, 0.000e+00, 0.000e+00, 6.234e+02, 0.000e+00 }, // FC
+        { 6.288e+01, 7.650e+00, 1.187e+02, 0.000e+00, 0.000e+00, 1.891e+01, 0.000e+00 }, // NOx
+        { 2.002e+00, 0.000e+00, 6.901e-01, 0.000e+00, 1.545e-04, 3.607e-03, 1.862e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_gt28-34t_Euro-V_EGR
-        { 4.602e+03, 2.277e+02, 9.720e+03, 0.000e+00, 0.000e+00, 5.673e+02, 0.000e+00 }, // CO2(total)
-        { 7.690e+00, 0.000e+00, 8.313e+00, 0.000e+00, 3.868e-06, 0.000e+00, 8.106e-04 }, // CO
-        { 9.411e-01, 5.471e-03, 1.323e+00, 4.495e-05, 0.000e+00, 5.959e-03, 2.231e-04 }, // HC
-        { 1.479e+03, 7.317e+01, 3.124e+03, 0.000e+00, 0.000e+00, 1.823e+02, 0.000e+00 }, // FC
-        { 6.019e+01, 0.000e+00, 9.564e+01, 0.000e+00, 7.759e-05, 0.000e+00, 1.714e-02 }, // NOx
-        { 1.706e+00, 6.426e-03, 4.188e-01, 0.000e+00, 2.723e-06, 1.820e-02, 6.249e-06 }, // PM + PM (non-exhaust)
+        { 4.602e+03, 8.196e+02, 9.720e+03, 0.000e+00, 0.000e+00, 2.042e+03, 0.000e+00 }, // CO2(total)
+        { 7.690e+00, 0.000e+00, 8.313e+00, 0.000e+00, 1.804e-04, 0.000e+00, 1.051e-02 }, // CO
+        { 9.411e-01, 1.969e-02, 1.323e+00, 5.826e-04, 0.000e+00, 2.145e-02, 2.891e-03 }, // HC
+        { 1.479e+03, 2.634e+02, 3.124e+03, 0.000e+00, 0.000e+00, 6.563e+02, 0.000e+00 }, // FC
+        { 6.019e+01, 0.000e+00, 9.564e+01, 0.000e+00, 3.620e-03, 0.000e+00, 2.221e-01 }, // NOx
+        { 1.706e+00, 2.313e-02, 4.188e-01, 0.000e+00, 1.271e-04, 6.551e-02, 8.099e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_gt28-34t_Euro-V_SCR
-        { 4.739e+03, 2.177e+02, 1.014e+04, 0.000e+00, 0.000e+00, 5.411e+02, 0.000e+00 }, // CO2(total)
-        { 2.639e+01, 0.000e+00, 3.068e+01, 0.000e+00, 2.893e-05, 0.000e+00, 5.143e-03 }, // CO
-        { 1.960e-01, 4.831e-03, 1.941e-01, 0.000e+00, 0.000e+00, 1.203e-02, 0.000e+00 }, // HC
-        { 1.523e+03, 6.996e+01, 3.258e+03, 0.000e+00, 0.000e+00, 1.739e+02, 0.000e+00 }, // FC
-        { 3.428e+01, 1.943e-01, 0.000e+00, 0.000e+00, 0.000e+00, 8.789e-01, 1.384e-04 }, // NOx
-        { 2.007e+00, 0.000e+00, 6.669e-01, 0.000e+00, 3.330e-06, 0.000e+00, 1.345e-04 }, // PM + PM (non-exhaust)
+        { 4.739e+03, 7.837e+02, 1.014e+04, 0.000e+00, 0.000e+00, 1.948e+03, 0.000e+00 }, // CO2(total)
+        { 2.639e+01, 0.000e+00, 3.068e+01, 0.000e+00, 1.350e-03, 0.000e+00, 6.666e-02 }, // CO
+        { 1.960e-01, 1.739e-02, 1.941e-01, 0.000e+00, 0.000e+00, 4.332e-02, 0.000e+00 }, // HC
+        { 1.523e+03, 2.519e+02, 3.258e+03, 0.000e+00, 0.000e+00, 6.260e+02, 0.000e+00 }, // FC
+        { 3.428e+01, 6.994e-01, 0.000e+00, 0.000e+00, 0.000e+00, 3.164e+00, 1.794e-03 }, // NOx
+        { 2.007e+00, 0.000e+00, 6.669e-01, 0.000e+00, 1.554e-04, 0.000e+00, 1.743e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_gt28-34t_Euro-V_SCRs
-        { 4.739e+03, 2.177e+02, 1.014e+04, 0.000e+00, 0.000e+00, 5.411e+02, 0.000e+00 }, // CO2(total)
-        { 2.639e+01, 0.000e+00, 3.068e+01, 0.000e+00, 2.893e-05, 0.000e+00, 5.143e-03 }, // CO
-        { 1.960e-01, 4.831e-03, 1.941e-01, 0.000e+00, 0.000e+00, 1.203e-02, 0.000e+00 }, // HC
-        { 1.523e+03, 6.996e+01, 3.258e+03, 0.000e+00, 0.000e+00, 1.739e+02, 0.000e+00 }, // FC
-        { 6.683e+01, 2.133e+00, 1.090e+02, 0.000e+00, 0.000e+00, 5.246e+00, 0.000e+00 }, // NOx
-        { 2.007e+00, 0.000e+00, 6.669e-01, 0.000e+00, 3.330e-06, 0.000e+00, 1.345e-04 }, // PM + PM (non-exhaust)
+        { 4.739e+03, 7.837e+02, 1.014e+04, 0.000e+00, 0.000e+00, 1.948e+03, 0.000e+00 }, // CO2(total)
+        { 2.639e+01, 0.000e+00, 3.068e+01, 0.000e+00, 1.350e-03, 0.000e+00, 6.666e-02 }, // CO
+        { 1.960e-01, 1.739e-02, 1.941e-01, 0.000e+00, 0.000e+00, 4.332e-02, 0.000e+00 }, // HC
+        { 1.523e+03, 2.519e+02, 3.258e+03, 0.000e+00, 0.000e+00, 6.260e+02, 0.000e+00 }, // FC
+        { 6.683e+01, 7.679e+00, 1.090e+02, 0.000e+00, 0.000e+00, 1.889e+01, 0.000e+00 }, // NOx
+        { 2.007e+00, 0.000e+00, 6.669e-01, 0.000e+00, 1.554e-04, 0.000e+00, 1.743e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_gt28-34t_Euro-VI_A-C
-        { 4.776e+03, 2.137e+02, 1.037e+04, 0.000e+00, 0.000e+00, 5.281e+02, 0.000e+00 }, // CO2(total)
-        { 2.028e+00, 1.778e-02, 1.836e+00, 0.000e+00, 0.000e+00, 3.617e-02, 9.766e-05 }, // CO
-        { 1.835e-01, 3.612e-03, 1.235e-01, 0.000e+00, 0.000e+00, 9.569e-03, 0.000e+00 }, // HC
-        { 1.535e+03, 6.868e+01, 3.332e+03, 0.000e+00, 0.000e+00, 1.697e+02, 0.000e+00 }, // FC
-        { 5.601e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.586e-07, 0.000e+00, 1.315e-04 }, // NOx
-        { 1.564e+00, 0.000e+00, 1.191e-01, 0.000e+00, 2.728e-06, 2.978e-04, 2.233e-05 }, // PM + PM (non-exhaust)
+        { 4.776e+03, 7.694e+02, 1.037e+04, 0.000e+00, 0.000e+00, 1.901e+03, 0.000e+00 }, // CO2(total)
+        { 2.028e+00, 6.400e-02, 1.836e+00, 0.000e+00, 0.000e+00, 1.302e-01, 1.266e-03 }, // CO
+        { 1.835e-01, 1.300e-02, 1.235e-01, 0.000e+00, 0.000e+00, 3.445e-02, 0.000e+00 }, // HC
+        { 1.535e+03, 2.473e+02, 3.332e+03, 0.000e+00, 0.000e+00, 6.110e+02, 0.000e+00 }, // FC
+        { 5.601e+00, 0.000e+00, 0.000e+00, 0.000e+00, 7.402e-06, 0.000e+00, 1.704e-03 }, // NOx
+        { 1.564e+00, 0.000e+00, 1.191e-01, 0.000e+00, 1.273e-04, 1.072e-03, 2.894e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_gt28-34t_Euro-VIs_A-C
-        { 4.776e+03, 2.137e+02, 1.037e+04, 0.000e+00, 0.000e+00, 5.281e+02, 0.000e+00 }, // CO2(total)
-        { 2.028e+00, 1.778e-02, 1.836e+00, 0.000e+00, 0.000e+00, 3.617e-02, 9.766e-05 }, // CO
-        { 1.835e-01, 3.612e-03, 1.235e-01, 0.000e+00, 0.000e+00, 9.569e-03, 0.000e+00 }, // HC
-        { 1.535e+03, 6.868e+01, 3.332e+03, 0.000e+00, 0.000e+00, 1.697e+02, 0.000e+00 }, // FC
-        { 3.405e+01, 1.528e+00, 7.219e+01, 0.000e+00, 0.000e+00, 3.678e+00, 0.000e+00 }, // NOx
-        { 1.564e+00, 0.000e+00, 1.191e-01, 0.000e+00, 2.728e-06, 2.978e-04, 2.233e-05 }, // PM + PM (non-exhaust)
+        { 4.776e+03, 7.694e+02, 1.037e+04, 0.000e+00, 0.000e+00, 1.901e+03, 0.000e+00 }, // CO2(total)
+        { 2.028e+00, 6.400e-02, 1.836e+00, 0.000e+00, 0.000e+00, 1.302e-01, 1.266e-03 }, // CO
+        { 1.835e-01, 1.300e-02, 1.235e-01, 0.000e+00, 0.000e+00, 3.445e-02, 0.000e+00 }, // HC
+        { 1.535e+03, 2.473e+02, 3.332e+03, 0.000e+00, 0.000e+00, 6.110e+02, 0.000e+00 }, // FC
+        { 3.405e+01, 5.500e+00, 7.219e+01, 0.000e+00, 0.000e+00, 1.324e+01, 0.000e+00 }, // NOx
+        { 1.564e+00, 0.000e+00, 1.191e-01, 0.000e+00, 1.273e-04, 1.072e-03, 2.894e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_gt28-34t_Euro-VI_D-E
-        { 4.197e+03, 2.228e+02, 8.853e+03, 0.000e+00, 0.000e+00, 5.545e+02, 0.000e+00 }, // CO2(total)
+        { 4.197e+03, 8.021e+02, 8.853e+03, 0.000e+00, 0.000e+00, 1.996e+03, 0.000e+00 }, // CO2(total)
         { 8.083e-01, 0.000e+00, 4.942e-01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 3.550e-01, 2.020e-03, 1.099e-01, 0.000e+00, 0.000e+00, 5.367e-03, 0.000e+00 }, // HC
-        { 1.349e+03, 7.160e+01, 2.845e+03, 0.000e+00, 0.000e+00, 1.782e+02, 0.000e+00 }, // FC
-        { 2.037e+00, 0.000e+00, 1.384e-01, 0.000e+00, 2.641e-06, 0.000e+00, 2.205e-04 }, // NOx
-        { 1.455e+00, 6.568e-04, 2.520e-02, 0.000e+00, 2.719e-06, 2.526e-03, 2.427e-06 }, // PM + PM (non-exhaust)
+        { 3.550e-01, 7.271e-03, 1.099e-01, 0.000e+00, 0.000e+00, 1.932e-02, 0.000e+00 }, // HC
+        { 1.349e+03, 2.578e+02, 2.845e+03, 0.000e+00, 0.000e+00, 6.416e+02, 0.000e+00 }, // FC
+        { 2.037e+00, 0.000e+00, 1.384e-01, 0.000e+00, 1.232e-04, 0.000e+00, 2.857e-03 }, // NOx
+        { 1.455e+00, 2.364e-03, 2.520e-02, 0.000e+00, 1.269e-04, 9.094e-03, 3.145e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_gt28-34t_Euro-VIs_D-E
-        { 4.197e+03, 2.228e+02, 8.853e+03, 0.000e+00, 0.000e+00, 5.545e+02, 0.000e+00 }, // CO2(total)
+        { 4.197e+03, 8.021e+02, 8.853e+03, 0.000e+00, 0.000e+00, 1.996e+03, 0.000e+00 }, // CO2(total)
         { 8.083e-01, 0.000e+00, 4.942e-01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 3.550e-01, 2.020e-03, 1.099e-01, 0.000e+00, 0.000e+00, 5.367e-03, 0.000e+00 }, // HC
-        { 1.349e+03, 7.160e+01, 2.845e+03, 0.000e+00, 0.000e+00, 1.782e+02, 0.000e+00 }, // FC
-        { 5.708e+01, 1.156e+00, 1.408e+02, 0.000e+00, 3.942e-05, 1.116e+00, 2.177e-02 }, // NOx
-        { 1.455e+00, 6.568e-04, 2.520e-02, 0.000e+00, 2.719e-06, 2.526e-03, 2.427e-06 }, // PM + PM (non-exhaust)
+        { 3.550e-01, 7.271e-03, 1.099e-01, 0.000e+00, 0.000e+00, 1.932e-02, 0.000e+00 }, // HC
+        { 1.349e+03, 2.578e+02, 2.845e+03, 0.000e+00, 0.000e+00, 6.416e+02, 0.000e+00 }, // FC
+        { 5.708e+01, 4.163e+00, 1.408e+02, 0.000e+00, 1.839e-03, 4.017e+00, 2.821e-01 }, // NOx
+        { 1.455e+00, 2.364e-03, 2.520e-02, 0.000e+00, 1.269e-04, 9.094e-03, 3.145e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_gt34-40t_50ties
-        { 7.811e+03, 2.310e+02, 1.553e+04, 0.000e+00, 0.000e+00, 5.591e+02, 0.000e+00 }, // CO2(total)
-        { 3.171e+01, 1.413e-01, 4.991e+01, 0.000e+00, 0.000e+00, 2.313e-01, 0.000e+00 }, // CO
-        { 7.674e+00, 0.000e+00, 0.000e+00, 0.000e+00, 4.128e-06, 9.061e-02, 3.846e-04 }, // HC
-        { 2.510e+03, 7.425e+01, 4.991e+03, 0.000e+00, 0.000e+00, 1.797e+02, 0.000e+00 }, // FC
-        { 1.117e+02, 3.455e+00, 2.185e+02, 0.000e+00, 0.000e+00, 8.435e+00, 0.000e+00 }, // NOx
-        { 7.237e+00, 5.923e-02, 8.608e+00, 0.000e+00, 2.826e-06, 9.599e-02, 5.013e-06 }, // PM + PM (non-exhaust)
+        { 7.811e+03, 8.318e+02, 1.553e+04, 0.000e+00, 0.000e+00, 2.013e+03, 0.000e+00 }, // CO2(total)
+        { 3.171e+01, 5.087e-01, 4.991e+01, 0.000e+00, 0.000e+00, 8.328e-01, 0.000e+00 }, // CO
+        { 7.674e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.926e-04, 3.262e-01, 4.985e-03 }, // HC
+        { 2.510e+03, 2.673e+02, 4.991e+03, 0.000e+00, 0.000e+00, 6.469e+02, 0.000e+00 }, // FC
+        { 1.117e+02, 1.244e+01, 2.185e+02, 0.000e+00, 0.000e+00, 3.037e+01, 0.000e+00 }, // NOx
+        { 7.237e+00, 2.132e-01, 8.608e+00, 0.000e+00, 1.319e-04, 3.455e-01, 6.496e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_gt34-40t_60ties
-        { 7.811e+03, 2.310e+02, 1.553e+04, 0.000e+00, 0.000e+00, 5.591e+02, 0.000e+00 }, // CO2(total)
-        { 3.171e+01, 1.413e-01, 4.991e+01, 0.000e+00, 0.000e+00, 2.313e-01, 0.000e+00 }, // CO
-        { 7.674e+00, 0.000e+00, 0.000e+00, 0.000e+00, 4.128e-06, 9.061e-02, 3.846e-04 }, // HC
-        { 2.510e+03, 7.425e+01, 4.991e+03, 0.000e+00, 0.000e+00, 1.797e+02, 0.000e+00 }, // FC
-        { 1.117e+02, 3.455e+00, 2.185e+02, 0.000e+00, 0.000e+00, 8.435e+00, 0.000e+00 }, // NOx
-        { 7.237e+00, 5.923e-02, 8.608e+00, 0.000e+00, 2.826e-06, 9.599e-02, 5.013e-06 }, // PM + PM (non-exhaust)
+        { 7.811e+03, 8.318e+02, 1.553e+04, 0.000e+00, 0.000e+00, 2.013e+03, 0.000e+00 }, // CO2(total)
+        { 3.171e+01, 5.087e-01, 4.991e+01, 0.000e+00, 0.000e+00, 8.328e-01, 0.000e+00 }, // CO
+        { 7.674e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.926e-04, 3.262e-01, 4.985e-03 }, // HC
+        { 2.510e+03, 2.673e+02, 4.991e+03, 0.000e+00, 0.000e+00, 6.469e+02, 0.000e+00 }, // FC
+        { 1.117e+02, 1.244e+01, 2.185e+02, 0.000e+00, 0.000e+00, 3.037e+01, 0.000e+00 }, // NOx
+        { 7.237e+00, 2.132e-01, 8.608e+00, 0.000e+00, 1.319e-04, 3.455e-01, 6.496e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_gt34-40t_70ties
-        { 7.811e+03, 2.310e+02, 1.553e+04, 0.000e+00, 0.000e+00, 5.591e+02, 0.000e+00 }, // CO2(total)
-        { 3.171e+01, 1.413e-01, 4.991e+01, 0.000e+00, 0.000e+00, 2.313e-01, 0.000e+00 }, // CO
-        { 7.674e+00, 0.000e+00, 0.000e+00, 0.000e+00, 4.128e-06, 9.061e-02, 3.846e-04 }, // HC
-        { 2.510e+03, 7.425e+01, 4.991e+03, 0.000e+00, 0.000e+00, 1.797e+02, 0.000e+00 }, // FC
-        { 1.117e+02, 3.455e+00, 2.185e+02, 0.000e+00, 0.000e+00, 8.435e+00, 0.000e+00 }, // NOx
-        { 7.237e+00, 5.923e-02, 8.608e+00, 0.000e+00, 2.826e-06, 9.599e-02, 5.013e-06 }, // PM + PM (non-exhaust)
+        { 7.811e+03, 8.318e+02, 1.553e+04, 0.000e+00, 0.000e+00, 2.013e+03, 0.000e+00 }, // CO2(total)
+        { 3.171e+01, 5.087e-01, 4.991e+01, 0.000e+00, 0.000e+00, 8.328e-01, 0.000e+00 }, // CO
+        { 7.674e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.926e-04, 3.262e-01, 4.985e-03 }, // HC
+        { 2.510e+03, 2.673e+02, 4.991e+03, 0.000e+00, 0.000e+00, 6.469e+02, 0.000e+00 }, // FC
+        { 1.117e+02, 1.244e+01, 2.185e+02, 0.000e+00, 0.000e+00, 3.037e+01, 0.000e+00 }, // NOx
+        { 7.237e+00, 2.132e-01, 8.608e+00, 0.000e+00, 1.319e-04, 3.455e-01, 6.496e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_gt34-40t_80ties
-        { 7.811e+03, 2.310e+02, 1.553e+04, 0.000e+00, 0.000e+00, 5.591e+02, 0.000e+00 }, // CO2(total)
-        { 3.171e+01, 1.413e-01, 4.991e+01, 0.000e+00, 0.000e+00, 2.313e-01, 0.000e+00 }, // CO
-        { 7.674e+00, 0.000e+00, 0.000e+00, 0.000e+00, 4.128e-06, 9.061e-02, 3.846e-04 }, // HC
-        { 2.510e+03, 7.425e+01, 4.991e+03, 0.000e+00, 0.000e+00, 1.797e+02, 0.000e+00 }, // FC
-        { 1.117e+02, 3.455e+00, 2.185e+02, 0.000e+00, 0.000e+00, 8.435e+00, 0.000e+00 }, // NOx
-        { 7.237e+00, 5.923e-02, 8.608e+00, 0.000e+00, 2.826e-06, 9.599e-02, 5.013e-06 }, // PM + PM (non-exhaust)
+        { 7.811e+03, 8.318e+02, 1.553e+04, 0.000e+00, 0.000e+00, 2.013e+03, 0.000e+00 }, // CO2(total)
+        { 3.171e+01, 5.087e-01, 4.991e+01, 0.000e+00, 0.000e+00, 8.328e-01, 0.000e+00 }, // CO
+        { 7.674e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.926e-04, 3.262e-01, 4.985e-03 }, // HC
+        { 2.510e+03, 2.673e+02, 4.991e+03, 0.000e+00, 0.000e+00, 6.469e+02, 0.000e+00 }, // FC
+        { 1.117e+02, 1.244e+01, 2.185e+02, 0.000e+00, 0.000e+00, 3.037e+01, 0.000e+00 }, // NOx
+        { 7.237e+00, 2.132e-01, 8.608e+00, 0.000e+00, 1.319e-04, 3.455e-01, 6.496e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_gt34-40t_Euro-I
-        { 7.843e+03, 2.176e+02, 1.550e+04, 0.000e+00, 0.000e+00, 5.335e+02, 0.000e+00 }, // CO2(total)
-        { 2.115e+01, 3.145e-01, 4.610e+01, 0.000e+00, 0.000e+00, 1.517e-01, 4.597e-03 }, // CO
-        { 6.522e+00, 4.465e-02, 1.051e+00, 0.000e+00, 0.000e+00, 1.917e-01, 0.000e+00 }, // HC
-        { 2.521e+03, 6.994e+01, 4.980e+03, 0.000e+00, 0.000e+00, 1.715e+02, 0.000e+00 }, // FC
-        { 8.575e+01, 2.153e+00, 1.680e+02, 0.000e+00, 0.000e+00, 5.248e+00, 0.000e+00 }, // NOx
-        { 5.410e+00, 5.886e-02, 2.031e+00, 0.000e+00, 2.829e-06, 1.719e-01, 5.743e-06 }, // PM + PM (non-exhaust)
+        { 7.843e+03, 7.835e+02, 1.550e+04, 0.000e+00, 0.000e+00, 1.921e+03, 0.000e+00 }, // CO2(total)
+        { 2.115e+01, 1.132e+00, 4.610e+01, 0.000e+00, 0.000e+00, 5.462e-01, 5.957e-02 }, // CO
+        { 6.522e+00, 1.607e-01, 1.051e+00, 0.000e+00, 0.000e+00, 6.903e-01, 0.000e+00 }, // HC
+        { 2.521e+03, 2.518e+02, 4.980e+03, 0.000e+00, 0.000e+00, 6.173e+02, 0.000e+00 }, // FC
+        { 8.575e+01, 7.750e+00, 1.680e+02, 0.000e+00, 0.000e+00, 1.889e+01, 0.000e+00 }, // NOx
+        { 5.410e+00, 2.119e-01, 2.031e+00, 0.000e+00, 1.320e-04, 6.187e-01, 7.442e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_gt34-40t_Euro-II
-        { 7.441e+03, 2.198e+02, 1.482e+04, 0.000e+00, 0.000e+00, 5.453e+02, 0.000e+00 }, // CO2(total)
-        { 1.827e+01, 1.802e-01, 2.831e+01, 0.000e+00, 0.000e+00, 3.670e-01, 0.000e+00 }, // CO
-        { 4.377e+00, 3.144e-02, 3.007e-01, 0.000e+00, 0.000e+00, 1.290e-01, 0.000e+00 }, // HC
-        { 2.391e+03, 7.063e+01, 4.762e+03, 0.000e+00, 0.000e+00, 1.753e+02, 0.000e+00 }, // FC
-        { 9.070e+01, 2.140e+00, 1.693e+02, 0.000e+00, 0.000e+00, 5.316e+00, 0.000e+00 }, // NOx
-        { 3.053e+00, 3.489e-02, 1.646e+00, 0.000e+00, 2.769e-06, 7.759e-02, 6.515e-06 }, // PM + PM (non-exhaust)
+        { 7.441e+03, 7.912e+02, 1.482e+04, 0.000e+00, 0.000e+00, 1.963e+03, 0.000e+00 }, // CO2(total)
+        { 1.827e+01, 6.488e-01, 2.831e+01, 0.000e+00, 0.000e+00, 1.321e+00, 0.000e+00 }, // CO
+        { 4.377e+00, 1.132e-01, 3.007e-01, 0.000e+00, 0.000e+00, 4.645e-01, 0.000e+00 }, // HC
+        { 2.391e+03, 2.543e+02, 4.762e+03, 0.000e+00, 0.000e+00, 6.309e+02, 0.000e+00 }, // FC
+        { 9.070e+01, 7.704e+00, 1.693e+02, 0.000e+00, 0.000e+00, 1.914e+01, 0.000e+00 }, // NOx
+        { 3.053e+00, 1.256e-01, 1.646e+00, 0.000e+00, 1.292e-04, 2.793e-01, 8.443e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_gt34-40t_Euro-III
-        { 7.738e+03, 2.174e+02, 1.543e+04, 0.000e+00, 0.000e+00, 5.430e+02, 0.000e+00 }, // CO2(total)
-        { 2.139e+01, 1.846e-01, 1.912e+01, 0.000e+00, 0.000e+00, 4.345e-01, 0.000e+00 }, // CO
-        { 4.932e+00, 5.071e-03, 1.452e+00, 8.335e-05, 0.000e+00, 7.724e-02, 0.000e+00 }, // HC
-        { 2.487e+03, 6.988e+01, 4.959e+03, 0.000e+00, 0.000e+00, 1.745e+02, 0.000e+00 }, // FC
-        { 7.137e+01, 1.787e+00, 1.454e+02, 0.000e+00, 0.000e+00, 4.232e+00, 0.000e+00 }, // NOx
-        { 3.762e+00, 1.639e-02, 1.108e+00, 0.000e+00, 2.745e-06, 4.344e-02, 6.380e-06 }, // PM + PM (non-exhaust)
+        { 7.738e+03, 7.828e+02, 1.543e+04, 0.000e+00, 0.000e+00, 1.955e+03, 0.000e+00 }, // CO2(total)
+        { 2.139e+01, 6.645e-01, 1.912e+01, 0.000e+00, 0.000e+00, 1.564e+00, 0.000e+00 }, // CO
+        { 4.932e+00, 1.826e-02, 1.452e+00, 1.080e-03, 0.000e+00, 2.780e-01, 0.000e+00 }, // HC
+        { 2.487e+03, 2.516e+02, 4.959e+03, 0.000e+00, 0.000e+00, 6.282e+02, 0.000e+00 }, // FC
+        { 7.137e+01, 6.433e+00, 1.454e+02, 0.000e+00, 0.000e+00, 1.524e+01, 0.000e+00 }, // NOx
+        { 3.762e+00, 5.900e-02, 1.108e+00, 0.000e+00, 1.281e-04, 1.564e-01, 8.269e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_gt34-40t_Euro-IV_EGR
-        { 7.213e+03, 2.262e+02, 1.594e+04, 0.000e+00, 0.000e+00, 5.536e+02, 0.000e+00 }, // CO2(total)
-        { 1.215e+01, 1.506e-01, 1.769e+01, 0.000e+00, 0.000e+00, 4.505e-01, 0.000e+00 }, // CO
-        { 5.506e-01, 1.236e-02, 8.867e-01, 0.000e+00, 0.000e+00, 2.943e-02, 0.000e+00 }, // HC
-        { 2.318e+03, 7.269e+01, 5.122e+03, 0.000e+00, 0.000e+00, 1.779e+02, 0.000e+00 }, // FC
-        { 7.535e+01, 1.076e+00, 1.666e+02, 0.000e+00, 0.000e+00, 2.550e+00, 0.000e+00 }, // NOx
-        { 2.051e+00, 3.770e-03, 8.681e-01, 0.000e+00, 2.749e-06, 1.141e-02, 7.069e-06 }, // PM + PM (non-exhaust)
+        { 7.213e+03, 8.143e+02, 1.594e+04, 0.000e+00, 0.000e+00, 1.993e+03, 0.000e+00 }, // CO2(total)
+        { 1.215e+01, 5.423e-01, 1.769e+01, 0.000e+00, 0.000e+00, 1.622e+00, 0.000e+00 }, // CO
+        { 5.506e-01, 4.448e-02, 8.867e-01, 0.000e+00, 0.000e+00, 1.060e-01, 0.000e+00 }, // HC
+        { 2.318e+03, 2.617e+02, 5.122e+03, 0.000e+00, 0.000e+00, 6.405e+02, 0.000e+00 }, // FC
+        { 7.535e+01, 3.873e+00, 1.666e+02, 0.000e+00, 0.000e+00, 9.180e+00, 0.000e+00 }, // NOx
+        { 2.051e+00, 1.357e-02, 8.681e-01, 0.000e+00, 1.282e-04, 4.107e-02, 9.162e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_gt34-40t_Euro-IV_SCR
-        { 8.664e+03, 1.889e+02, 2.048e+04, 0.000e+00, 0.000e+00, 4.416e+02, 0.000e+00 }, // CO2(total)
-        { 3.435e+01, 2.102e-01, 5.047e+01, 0.000e+00, 0.000e+00, 7.659e-01, 0.000e+00 }, // CO
-        { 2.923e-01, 3.657e-03, 5.624e-01, 0.000e+00, 0.000e+00, 7.816e-03, 0.000e+00 }, // HC
-        { 2.784e+03, 6.070e+01, 6.582e+03, 0.000e+00, 0.000e+00, 1.419e+02, 0.000e+00 }, // FC
-        { 5.240e+01, 4.308e-01, 3.602e+01, 0.000e+00, 0.000e+00, 1.849e+00, 0.000e+00 }, // NOx
-        { 2.029e+00, 5.236e-03, 7.741e-01, 0.000e+00, 2.688e-06, 1.662e-02, 8.056e-07 }, // PM + PM (non-exhaust)
+        { 8.664e+03, 6.799e+02, 2.048e+04, 0.000e+00, 0.000e+00, 1.590e+03, 0.000e+00 }, // CO2(total)
+        { 3.435e+01, 7.568e-01, 5.047e+01, 0.000e+00, 0.000e+00, 2.757e+00, 0.000e+00 }, // CO
+        { 2.923e-01, 1.317e-02, 5.624e-01, 0.000e+00, 0.000e+00, 2.814e-02, 0.000e+00 }, // HC
+        { 2.784e+03, 2.185e+02, 6.582e+03, 0.000e+00, 0.000e+00, 5.109e+02, 0.000e+00 }, // FC
+        { 5.240e+01, 1.551e+00, 3.602e+01, 0.000e+00, 0.000e+00, 6.658e+00, 0.000e+00 }, // NOx
+        { 2.029e+00, 1.885e-02, 7.741e-01, 0.000e+00, 1.254e-04, 5.984e-02, 1.044e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_gt34-40t_Euro-IV_SCRs
-        { 8.664e+03, 1.889e+02, 2.048e+04, 0.000e+00, 0.000e+00, 4.416e+02, 0.000e+00 }, // CO2(total)
-        { 3.435e+01, 2.102e-01, 5.047e+01, 0.000e+00, 0.000e+00, 7.659e-01, 0.000e+00 }, // CO
-        { 2.923e-01, 3.657e-03, 5.624e-01, 0.000e+00, 0.000e+00, 7.816e-03, 0.000e+00 }, // HC
-        { 2.784e+03, 6.070e+01, 6.582e+03, 0.000e+00, 0.000e+00, 1.419e+02, 0.000e+00 }, // FC
-        { 9.320e+01, 2.020e+00, 1.920e+02, 0.000e+00, 0.000e+00, 4.891e+00, 0.000e+00 }, // NOx
-        { 2.029e+00, 5.236e-03, 7.741e-01, 0.000e+00, 2.688e-06, 1.662e-02, 8.056e-07 }, // PM + PM (non-exhaust)
+        { 8.664e+03, 6.799e+02, 2.048e+04, 0.000e+00, 0.000e+00, 1.590e+03, 0.000e+00 }, // CO2(total)
+        { 3.435e+01, 7.568e-01, 5.047e+01, 0.000e+00, 0.000e+00, 2.757e+00, 0.000e+00 }, // CO
+        { 2.923e-01, 1.317e-02, 5.624e-01, 0.000e+00, 0.000e+00, 2.814e-02, 0.000e+00 }, // HC
+        { 2.784e+03, 2.185e+02, 6.582e+03, 0.000e+00, 0.000e+00, 5.109e+02, 0.000e+00 }, // FC
+        { 9.320e+01, 7.271e+00, 1.920e+02, 0.000e+00, 0.000e+00, 1.761e+01, 0.000e+00 }, // NOx
+        { 2.029e+00, 1.885e-02, 7.741e-01, 0.000e+00, 1.254e-04, 5.984e-02, 1.044e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_gt34-40t_Euro-V_EGR
-        { 8.432e+03, 1.900e+02, 2.005e+04, 0.000e+00, 0.000e+00, 4.481e+02, 0.000e+00 }, // CO2(total)
-        { 1.096e+01, 2.004e-02, 1.442e+01, 0.000e+00, 0.000e+00, 1.405e-01, 0.000e+00 }, // CO
-        { 9.444e-01, 1.347e-02, 8.346e-01, 0.000e+00, 0.000e+00, 3.894e-02, 8.731e-06 }, // HC
-        { 2.710e+03, 6.105e+01, 6.442e+03, 0.000e+00, 0.000e+00, 1.440e+02, 0.000e+00 }, // FC
-        { 4.962e+01, 8.874e-01, 7.442e+01, 0.000e+00, 0.000e+00, 2.425e+00, 0.000e+00 }, // NOx
-        { 1.790e+00, 5.855e-03, 6.463e-01, 0.000e+00, 2.684e-06, 1.449e-02, 2.263e-06 }, // PM + PM (non-exhaust)
+        { 8.432e+03, 6.838e+02, 2.005e+04, 0.000e+00, 0.000e+00, 1.613e+03, 0.000e+00 }, // CO2(total)
+        { 1.096e+01, 7.216e-02, 1.442e+01, 0.000e+00, 0.000e+00, 5.060e-01, 0.000e+00 }, // CO
+        { 9.444e-01, 4.848e-02, 8.346e-01, 0.000e+00, 0.000e+00, 1.402e-01, 1.132e-04 }, // HC
+        { 2.710e+03, 2.198e+02, 6.442e+03, 0.000e+00, 0.000e+00, 5.185e+02, 0.000e+00 }, // FC
+        { 4.962e+01, 3.195e+00, 7.442e+01, 0.000e+00, 0.000e+00, 8.732e+00, 0.000e+00 }, // NOx
+        { 1.790e+00, 2.108e-02, 6.463e-01, 0.000e+00, 1.252e-04, 5.218e-02, 2.933e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_gt34-40t_Euro-V_SCR
-        { 7.726e+03, 2.035e+02, 1.817e+04, 0.000e+00, 0.000e+00, 4.958e+02, 0.000e+00 }, // CO2(total)
-        { 2.582e+01, 2.570e-01, 3.728e+01, 0.000e+00, 0.000e+00, 0.000e+00, 7.542e-03 }, // CO
-        { 3.079e-01, 4.235e-03, 5.235e-01, 0.000e+00, 0.000e+00, 9.087e-03, 0.000e+00 }, // HC
-        { 2.483e+03, 6.540e+01, 5.839e+03, 0.000e+00, 0.000e+00, 1.593e+02, 0.000e+00 }, // FC
-        { 4.279e+01, 1.522e-01, 0.000e+00, 0.000e+00, 0.000e+00, 9.966e-01, 0.000e+00 }, // NOx
-        { 1.986e+00, 5.928e-03, 8.645e-01, 0.000e+00, 2.679e-06, 6.799e-04, 1.557e-04 }, // PM + PM (non-exhaust)
+        { 7.726e+03, 7.326e+02, 1.817e+04, 0.000e+00, 0.000e+00, 1.785e+03, 0.000e+00 }, // CO2(total)
+        { 2.582e+01, 9.254e-01, 3.728e+01, 0.000e+00, 0.000e+00, 0.000e+00, 9.774e-02 }, // CO
+        { 3.079e-01, 1.524e-02, 5.235e-01, 0.000e+00, 0.000e+00, 3.271e-02, 0.000e+00 }, // HC
+        { 2.483e+03, 2.355e+02, 5.839e+03, 0.000e+00, 0.000e+00, 5.736e+02, 0.000e+00 }, // FC
+        { 4.279e+01, 5.477e-01, 0.000e+00, 0.000e+00, 0.000e+00, 3.588e+00, 0.000e+00 }, // NOx
+        { 1.986e+00, 2.134e-02, 8.645e-01, 0.000e+00, 1.250e-04, 2.448e-03, 2.018e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_gt34-40t_Euro-V_SCRs
-        { 7.726e+03, 2.035e+02, 1.817e+04, 0.000e+00, 0.000e+00, 4.958e+02, 0.000e+00 }, // CO2(total)
-        { 2.582e+01, 2.570e-01, 3.728e+01, 0.000e+00, 0.000e+00, 0.000e+00, 7.542e-03 }, // CO
-        { 3.079e-01, 4.235e-03, 5.235e-01, 0.000e+00, 0.000e+00, 9.087e-03, 0.000e+00 }, // HC
-        { 2.483e+03, 6.540e+01, 5.839e+03, 0.000e+00, 0.000e+00, 1.593e+02, 0.000e+00 }, // FC
-        { 9.697e+01, 2.092e+00, 1.763e+02, 0.000e+00, 0.000e+00, 5.131e+00, 0.000e+00 }, // NOx
-        { 1.986e+00, 5.928e-03, 8.645e-01, 0.000e+00, 2.679e-06, 6.799e-04, 1.557e-04 }, // PM + PM (non-exhaust)
+        { 7.726e+03, 7.326e+02, 1.817e+04, 0.000e+00, 0.000e+00, 1.785e+03, 0.000e+00 }, // CO2(total)
+        { 2.582e+01, 9.254e-01, 3.728e+01, 0.000e+00, 0.000e+00, 0.000e+00, 9.774e-02 }, // CO
+        { 3.079e-01, 1.524e-02, 5.235e-01, 0.000e+00, 0.000e+00, 3.271e-02, 0.000e+00 }, // HC
+        { 2.483e+03, 2.355e+02, 5.839e+03, 0.000e+00, 0.000e+00, 5.736e+02, 0.000e+00 }, // FC
+        { 9.697e+01, 7.530e+00, 1.763e+02, 0.000e+00, 0.000e+00, 1.847e+01, 0.000e+00 }, // NOx
+        { 1.986e+00, 2.134e-02, 8.645e-01, 0.000e+00, 1.250e-04, 2.448e-03, 2.018e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_gt34-40t_Euro-VI_A-C
-        { 7.734e+03, 1.998e+02, 1.833e+04, 0.000e+00, 0.000e+00, 4.864e+02, 0.000e+00 }, // CO2(total)
-        { 2.762e+00, 1.541e-02, 3.229e+00, 0.000e+00, 0.000e+00, 4.081e-02, 0.000e+00 }, // CO
-        { 3.050e-01, 2.563e-03, 4.805e-01, 0.000e+00, 0.000e+00, 5.845e-03, 0.000e+00 }, // HC
-        { 2.486e+03, 6.423e+01, 5.891e+03, 0.000e+00, 0.000e+00, 1.563e+02, 0.000e+00 }, // FC
-        { 6.535e+00, 0.000e+00, 1.363e-01, 0.000e+00, 0.000e+00, 0.000e+00, 2.818e-04 }, // NOx
-        { 1.599e+00, 0.000e+00, 1.509e-01, 0.000e+00, 2.681e-06, 6.726e-04, 1.725e-05 }, // PM + PM (non-exhaust)
+        { 7.734e+03, 7.194e+02, 1.833e+04, 0.000e+00, 0.000e+00, 1.751e+03, 0.000e+00 }, // CO2(total)
+        { 2.762e+00, 5.547e-02, 3.229e+00, 0.000e+00, 0.000e+00, 1.469e-01, 0.000e+00 }, // CO
+        { 3.050e-01, 9.227e-03, 4.805e-01, 0.000e+00, 0.000e+00, 2.104e-02, 0.000e+00 }, // HC
+        { 2.486e+03, 2.312e+02, 5.891e+03, 0.000e+00, 0.000e+00, 5.628e+02, 0.000e+00 }, // FC
+        { 6.535e+00, 0.000e+00, 1.363e-01, 0.000e+00, 0.000e+00, 0.000e+00, 3.652e-03 }, // NOx
+        { 1.599e+00, 0.000e+00, 1.509e-01, 0.000e+00, 1.251e-04, 2.421e-03, 2.235e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_gt34-40t_Euro-VIs_A-C
-        { 7.734e+03, 1.998e+02, 1.833e+04, 0.000e+00, 0.000e+00, 4.864e+02, 0.000e+00 }, // CO2(total)
-        { 2.762e+00, 1.541e-02, 3.229e+00, 0.000e+00, 0.000e+00, 4.081e-02, 0.000e+00 }, // CO
-        { 3.050e-01, 2.563e-03, 4.805e-01, 0.000e+00, 0.000e+00, 5.845e-03, 0.000e+00 }, // HC
-        { 2.486e+03, 6.423e+01, 5.891e+03, 0.000e+00, 0.000e+00, 1.563e+02, 0.000e+00 }, // FC
-        { 5.189e+01, 1.557e+00, 1.104e+02, 0.000e+00, 0.000e+00, 3.813e+00, 0.000e+00 }, // NOx
-        { 1.599e+00, 0.000e+00, 1.509e-01, 0.000e+00, 2.681e-06, 6.726e-04, 1.725e-05 }, // PM + PM (non-exhaust)
+        { 7.734e+03, 7.194e+02, 1.833e+04, 0.000e+00, 0.000e+00, 1.751e+03, 0.000e+00 }, // CO2(total)
+        { 2.762e+00, 5.547e-02, 3.229e+00, 0.000e+00, 0.000e+00, 1.469e-01, 0.000e+00 }, // CO
+        { 3.050e-01, 9.227e-03, 4.805e-01, 0.000e+00, 0.000e+00, 2.104e-02, 0.000e+00 }, // HC
+        { 2.486e+03, 2.312e+02, 5.891e+03, 0.000e+00, 0.000e+00, 5.628e+02, 0.000e+00 }, // FC
+        { 5.189e+01, 5.604e+00, 1.104e+02, 0.000e+00, 0.000e+00, 1.373e+01, 0.000e+00 }, // NOx
+        { 1.599e+00, 0.000e+00, 1.509e-01, 0.000e+00, 1.251e-04, 2.421e-03, 2.235e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_gt34-40t_Euro-VI_D-E
-        { 6.788e+03, 2.167e+02, 1.573e+04, 0.000e+00, 0.000e+00, 5.347e+02, 0.000e+00 }, // CO2(total)
+        { 6.788e+03, 7.801e+02, 1.573e+04, 0.000e+00, 0.000e+00, 1.925e+03, 0.000e+00 }, // CO2(total)
         { 6.148e-01, 0.000e+00, 5.132e-01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 4.131e-01, 2.329e-03, 1.216e-01, 0.000e+00, 0.000e+00, 6.067e-03, 0.000e+00 }, // HC
-        { 2.181e+03, 6.964e+01, 5.054e+03, 0.000e+00, 0.000e+00, 1.719e+02, 0.000e+00 }, // FC
-        { 2.469e+00, 0.000e+00, 0.000e+00, 5.334e-05, 2.901e-06, 0.000e+00, 3.703e-04 }, // NOx
-        { 1.479e+00, 5.489e-04, 5.975e-02, 0.000e+00, 2.686e-06, 2.170e-03, 0.000e+00 }, // PM + PM (non-exhaust)
+        { 4.131e-01, 8.386e-03, 1.216e-01, 0.000e+00, 0.000e+00, 2.184e-02, 0.000e+00 }, // HC
+        { 2.181e+03, 2.507e+02, 5.054e+03, 0.000e+00, 0.000e+00, 6.187e+02, 0.000e+00 }, // FC
+        { 2.469e+00, 0.000e+00, 0.000e+00, 6.912e-04, 1.354e-04, 0.000e+00, 4.799e-03 }, // NOx
+        { 1.479e+00, 1.976e-03, 5.975e-02, 0.000e+00, 1.253e-04, 7.811e-03, 0.000e+00 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_gt34-40t_Euro-VIs_D-E
-        { 6.788e+03, 2.167e+02, 1.573e+04, 0.000e+00, 0.000e+00, 5.347e+02, 0.000e+00 }, // CO2(total)
+        { 6.788e+03, 7.801e+02, 1.573e+04, 0.000e+00, 0.000e+00, 1.925e+03, 0.000e+00 }, // CO2(total)
         { 6.148e-01, 0.000e+00, 5.132e-01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 4.131e-01, 2.329e-03, 1.216e-01, 0.000e+00, 0.000e+00, 6.067e-03, 0.000e+00 }, // HC
-        { 2.181e+03, 6.964e+01, 5.054e+03, 0.000e+00, 0.000e+00, 1.719e+02, 0.000e+00 }, // FC
-        { 4.364e+01, 2.111e+00, 6.750e+01, 0.000e+00, 0.000e+00, 4.596e+00, 6.067e-03 }, // NOx
-        { 1.479e+00, 5.489e-04, 5.975e-02, 0.000e+00, 2.686e-06, 2.170e-03, 0.000e+00 }, // PM + PM (non-exhaust)
+        { 4.131e-01, 8.386e-03, 1.216e-01, 0.000e+00, 0.000e+00, 2.184e-02, 0.000e+00 }, // HC
+        { 2.181e+03, 2.507e+02, 5.054e+03, 0.000e+00, 0.000e+00, 6.187e+02, 0.000e+00 }, // FC
+        { 4.364e+01, 7.598e+00, 6.750e+01, 0.000e+00, 0.000e+00, 1.654e+01, 7.863e-02 }, // NOx
+        { 1.479e+00, 1.976e-03, 5.975e-02, 0.000e+00, 1.253e-04, 7.811e-03, 0.000e+00 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_gt40-50t_50ties
-        { 9.112e+03, 2.609e+02, 1.893e+04, 0.000e+00, 0.000e+00, 6.263e+02, 0.000e+00 }, // CO2(total)
-        { 2.891e+01, 2.773e-01, 2.849e+01, 0.000e+00, 0.000e+00, 6.767e-01, 0.000e+00 }, // CO
-        { 9.139e+00, 0.000e+00, 0.000e+00, 0.000e+00, 4.491e-06, 1.225e-01, 2.199e-04 }, // HC
-        { 2.928e+03, 8.385e+01, 6.084e+03, 0.000e+00, 0.000e+00, 2.013e+02, 0.000e+00 }, // FC
-        { 1.356e+02, 3.935e+00, 2.820e+02, 0.000e+00, 0.000e+00, 9.490e+00, 0.000e+00 }, // NOx
-        { 7.462e+00, 8.008e-02, 7.234e+00, 0.000e+00, 2.776e-06, 1.515e-01, 4.916e-06 }, // PM + PM (non-exhaust)
+        { 9.112e+03, 9.392e+02, 1.893e+04, 0.000e+00, 0.000e+00, 2.255e+03, 0.000e+00 }, // CO2(total)
+        { 2.891e+01, 9.981e-01, 2.849e+01, 0.000e+00, 0.000e+00, 2.436e+00, 0.000e+00 }, // CO
+        { 9.139e+00, 0.000e+00, 0.000e+00, 0.000e+00, 2.095e-04, 4.410e-01, 2.849e-03 }, // HC
+        { 2.928e+03, 3.019e+02, 6.084e+03, 0.000e+00, 0.000e+00, 7.246e+02, 0.000e+00 }, // FC
+        { 1.356e+02, 1.417e+01, 2.820e+02, 0.000e+00, 0.000e+00, 3.416e+01, 0.000e+00 }, // NOx
+        { 7.462e+00, 2.883e-01, 7.234e+00, 0.000e+00, 1.295e-04, 5.455e-01, 6.371e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_gt40-50t_60ties
-        { 9.112e+03, 2.609e+02, 1.893e+04, 0.000e+00, 0.000e+00, 6.263e+02, 0.000e+00 }, // CO2(total)
-        { 2.891e+01, 2.773e-01, 2.849e+01, 0.000e+00, 0.000e+00, 6.767e-01, 0.000e+00 }, // CO
-        { 9.139e+00, 0.000e+00, 0.000e+00, 0.000e+00, 4.491e-06, 1.225e-01, 2.199e-04 }, // HC
-        { 2.928e+03, 8.385e+01, 6.084e+03, 0.000e+00, 0.000e+00, 2.013e+02, 0.000e+00 }, // FC
-        { 1.356e+02, 3.935e+00, 2.820e+02, 0.000e+00, 0.000e+00, 9.490e+00, 0.000e+00 }, // NOx
-        { 7.462e+00, 8.008e-02, 7.234e+00, 0.000e+00, 2.776e-06, 1.515e-01, 4.916e-06 }, // PM + PM (non-exhaust)
+        { 9.112e+03, 9.392e+02, 1.893e+04, 0.000e+00, 0.000e+00, 2.255e+03, 0.000e+00 }, // CO2(total)
+        { 2.891e+01, 9.981e-01, 2.849e+01, 0.000e+00, 0.000e+00, 2.436e+00, 0.000e+00 }, // CO
+        { 9.139e+00, 0.000e+00, 0.000e+00, 0.000e+00, 2.095e-04, 4.410e-01, 2.849e-03 }, // HC
+        { 2.928e+03, 3.019e+02, 6.084e+03, 0.000e+00, 0.000e+00, 7.246e+02, 0.000e+00 }, // FC
+        { 1.356e+02, 1.417e+01, 2.820e+02, 0.000e+00, 0.000e+00, 3.416e+01, 0.000e+00 }, // NOx
+        { 7.462e+00, 2.883e-01, 7.234e+00, 0.000e+00, 1.295e-04, 5.455e-01, 6.371e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_gt40-50t_70ties
-        { 9.112e+03, 2.609e+02, 1.893e+04, 0.000e+00, 0.000e+00, 6.263e+02, 0.000e+00 }, // CO2(total)
-        { 2.891e+01, 2.773e-01, 2.849e+01, 0.000e+00, 0.000e+00, 6.767e-01, 0.000e+00 }, // CO
-        { 9.139e+00, 0.000e+00, 0.000e+00, 0.000e+00, 4.491e-06, 1.225e-01, 2.199e-04 }, // HC
-        { 2.928e+03, 8.385e+01, 6.084e+03, 0.000e+00, 0.000e+00, 2.013e+02, 0.000e+00 }, // FC
-        { 1.356e+02, 3.935e+00, 2.820e+02, 0.000e+00, 0.000e+00, 9.490e+00, 0.000e+00 }, // NOx
-        { 7.462e+00, 8.008e-02, 7.234e+00, 0.000e+00, 2.776e-06, 1.515e-01, 4.916e-06 }, // PM + PM (non-exhaust)
+        { 9.112e+03, 9.392e+02, 1.893e+04, 0.000e+00, 0.000e+00, 2.255e+03, 0.000e+00 }, // CO2(total)
+        { 2.891e+01, 9.981e-01, 2.849e+01, 0.000e+00, 0.000e+00, 2.436e+00, 0.000e+00 }, // CO
+        { 9.139e+00, 0.000e+00, 0.000e+00, 0.000e+00, 2.095e-04, 4.410e-01, 2.849e-03 }, // HC
+        { 2.928e+03, 3.019e+02, 6.084e+03, 0.000e+00, 0.000e+00, 7.246e+02, 0.000e+00 }, // FC
+        { 1.356e+02, 1.417e+01, 2.820e+02, 0.000e+00, 0.000e+00, 3.416e+01, 0.000e+00 }, // NOx
+        { 7.462e+00, 2.883e-01, 7.234e+00, 0.000e+00, 1.295e-04, 5.455e-01, 6.371e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_gt40-50t_80ties
-        { 9.112e+03, 2.609e+02, 1.893e+04, 0.000e+00, 0.000e+00, 6.263e+02, 0.000e+00 }, // CO2(total)
-        { 2.891e+01, 2.773e-01, 2.849e+01, 0.000e+00, 0.000e+00, 6.767e-01, 0.000e+00 }, // CO
-        { 9.139e+00, 0.000e+00, 0.000e+00, 0.000e+00, 4.491e-06, 1.225e-01, 2.199e-04 }, // HC
-        { 2.928e+03, 8.385e+01, 6.084e+03, 0.000e+00, 0.000e+00, 2.013e+02, 0.000e+00 }, // FC
-        { 1.356e+02, 3.935e+00, 2.820e+02, 0.000e+00, 0.000e+00, 9.490e+00, 0.000e+00 }, // NOx
-        { 7.462e+00, 8.008e-02, 7.234e+00, 0.000e+00, 2.776e-06, 1.515e-01, 4.916e-06 }, // PM + PM (non-exhaust)
+        { 9.112e+03, 9.392e+02, 1.893e+04, 0.000e+00, 0.000e+00, 2.255e+03, 0.000e+00 }, // CO2(total)
+        { 2.891e+01, 9.981e-01, 2.849e+01, 0.000e+00, 0.000e+00, 2.436e+00, 0.000e+00 }, // CO
+        { 9.139e+00, 0.000e+00, 0.000e+00, 0.000e+00, 2.095e-04, 4.410e-01, 2.849e-03 }, // HC
+        { 2.928e+03, 3.019e+02, 6.084e+03, 0.000e+00, 0.000e+00, 7.246e+02, 0.000e+00 }, // FC
+        { 1.356e+02, 1.417e+01, 2.820e+02, 0.000e+00, 0.000e+00, 3.416e+01, 0.000e+00 }, // NOx
+        { 7.462e+00, 2.883e-01, 7.234e+00, 0.000e+00, 1.295e-04, 5.455e-01, 6.371e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_gt40-50t_Euro-I
-        { 8.629e+03, 2.510e+02, 1.684e+04, 0.000e+00, 0.000e+00, 6.183e+02, 0.000e+00 }, // CO2(total)
-        { 2.678e+01, 2.998e-01, 6.171e+01, 3.783e-04, 0.000e+00, 0.000e+00, 6.013e-03 }, // CO
-        { 7.480e+00, 5.456e-02, 4.548e-01, 0.000e+00, 0.000e+00, 2.357e-01, 0.000e+00 }, // HC
-        { 2.773e+03, 8.066e+01, 5.412e+03, 0.000e+00, 0.000e+00, 1.987e+02, 0.000e+00 }, // FC
-        { 9.764e+01, 2.512e+00, 1.901e+02, 0.000e+00, 0.000e+00, 6.143e+00, 0.000e+00 }, // NOx
-        { 5.899e+00, 7.060e-02, 1.782e+00, 0.000e+00, 2.826e-06, 2.076e-01, 5.998e-06 }, // PM + PM (non-exhaust)
+        { 8.629e+03, 9.035e+02, 1.684e+04, 0.000e+00, 0.000e+00, 2.226e+03, 0.000e+00 }, // CO2(total)
+        { 2.678e+01, 1.079e+00, 6.171e+01, 4.903e-03, 0.000e+00, 0.000e+00, 7.793e-02 }, // CO
+        { 7.480e+00, 1.964e-01, 4.548e-01, 0.000e+00, 0.000e+00, 8.486e-01, 0.000e+00 }, // HC
+        { 2.773e+03, 2.904e+02, 5.412e+03, 0.000e+00, 0.000e+00, 7.154e+02, 0.000e+00 }, // FC
+        { 9.764e+01, 9.043e+00, 1.901e+02, 0.000e+00, 0.000e+00, 2.212e+01, 0.000e+00 }, // NOx
+        { 5.899e+00, 2.541e-01, 1.782e+00, 0.000e+00, 1.319e-04, 7.472e-01, 7.773e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_gt40-50t_Euro-II
-        { 8.396e+03, 2.587e+02, 1.714e+04, 0.000e+00, 0.000e+00, 6.465e+02, 0.000e+00 }, // CO2(total)
-        { 2.124e+01, 0.000e+00, 2.381e+01, 2.512e-03, 0.000e+00, 0.000e+00, 6.422e-03 }, // CO
-        { 5.347e+00, 3.440e-02, 1.475e+00, 0.000e+00, 0.000e+00, 1.401e-01, 0.000e+00 }, // HC
-        { 2.698e+03, 8.315e+01, 5.509e+03, 0.000e+00, 0.000e+00, 2.078e+02, 0.000e+00 }, // FC
-        { 1.042e+02, 2.528e+00, 1.963e+02, 0.000e+00, 0.000e+00, 6.346e+00, 0.000e+00 }, // NOx
-        { 3.019e+00, 4.429e-02, 9.889e-01, 0.000e+00, 2.728e-06, 9.796e-02, 4.317e-05 }, // PM + PM (non-exhaust)
+        { 8.396e+03, 9.314e+02, 1.714e+04, 0.000e+00, 0.000e+00, 2.327e+03, 0.000e+00 }, // CO2(total)
+        { 2.124e+01, 0.000e+00, 2.381e+01, 3.255e-02, 0.000e+00, 0.000e+00, 8.323e-02 }, // CO
+        { 5.347e+00, 1.239e-01, 1.475e+00, 0.000e+00, 0.000e+00, 5.043e-01, 0.000e+00 }, // HC
+        { 2.698e+03, 2.993e+02, 5.509e+03, 0.000e+00, 0.000e+00, 7.480e+02, 0.000e+00 }, // FC
+        { 1.042e+02, 9.102e+00, 1.963e+02, 0.000e+00, 0.000e+00, 2.285e+01, 0.000e+00 }, // NOx
+        { 3.019e+00, 1.594e-01, 9.889e-01, 0.000e+00, 1.273e-04, 3.527e-01, 5.595e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_gt40-50t_Euro-III
-        { 8.727e+03, 2.444e+02, 1.748e+04, 0.000e+00, 0.000e+00, 6.098e+02, 0.000e+00 }, // CO2(total)
-        { 2.393e+01, 2.188e-01, 2.142e+01, 0.000e+00, 0.000e+00, 5.049e-01, 0.000e+00 }, // CO
-        { 5.742e+00, 2.830e-03, 1.647e+00, 1.221e-04, 0.000e+00, 8.944e-02, 0.000e+00 }, // HC
-        { 2.805e+03, 7.853e+01, 5.619e+03, 0.000e+00, 0.000e+00, 1.960e+02, 0.000e+00 }, // FC
-        { 8.219e+01, 2.041e+00, 1.677e+02, 0.000e+00, 0.000e+00, 4.836e+00, 0.000e+00 }, // NOx
-        { 4.087e+00, 1.922e-02, 1.263e+00, 0.000e+00, 2.742e-06, 5.036e-02, 6.376e-06 }, // PM + PM (non-exhaust)
+        { 8.727e+03, 8.797e+02, 1.748e+04, 0.000e+00, 0.000e+00, 2.195e+03, 0.000e+00 }, // CO2(total)
+        { 2.393e+01, 7.876e-01, 2.142e+01, 0.000e+00, 0.000e+00, 1.818e+00, 0.000e+00 }, // CO
+        { 5.742e+00, 1.019e-02, 1.647e+00, 1.582e-03, 0.000e+00, 3.220e-01, 0.000e+00 }, // HC
+        { 2.805e+03, 2.827e+02, 5.619e+03, 0.000e+00, 0.000e+00, 7.055e+02, 0.000e+00 }, // FC
+        { 8.219e+01, 7.348e+00, 1.677e+02, 0.000e+00, 0.000e+00, 1.741e+01, 0.000e+00 }, // NOx
+        { 4.087e+00, 6.920e-02, 1.263e+00, 0.000e+00, 1.279e-04, 1.813e-01, 8.264e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_gt40-50t_Euro-IV_EGR
-        { 8.160e+03, 2.545e+02, 1.804e+04, 0.000e+00, 0.000e+00, 6.232e+02, 0.000e+00 }, // CO2(total)
-        { 1.395e+01, 1.725e-01, 2.023e+01, 0.000e+00, 0.000e+00, 5.172e-01, 0.000e+00 }, // CO
-        { 6.353e-01, 1.408e-02, 1.026e+00, 0.000e+00, 0.000e+00, 3.354e-02, 0.000e+00 }, // HC
-        { 2.623e+03, 8.180e+01, 5.797e+03, 0.000e+00, 0.000e+00, 2.003e+02, 0.000e+00 }, // FC
-        { 8.654e+01, 1.230e+00, 1.911e+02, 0.000e+00, 0.000e+00, 2.920e+00, 0.000e+00 }, // NOx
-        { 2.148e+00, 4.285e-03, 9.977e-01, 0.000e+00, 2.747e-06, 1.301e-02, 7.016e-06 }, // PM + PM (non-exhaust)
+        { 8.160e+03, 9.163e+02, 1.804e+04, 0.000e+00, 0.000e+00, 2.244e+03, 0.000e+00 }, // CO2(total)
+        { 1.395e+01, 6.209e-01, 2.023e+01, 0.000e+00, 0.000e+00, 1.862e+00, 0.000e+00 }, // CO
+        { 6.353e-01, 5.067e-02, 1.026e+00, 0.000e+00, 0.000e+00, 1.207e-01, 0.000e+00 }, // HC
+        { 2.623e+03, 2.945e+02, 5.797e+03, 0.000e+00, 0.000e+00, 7.211e+02, 0.000e+00 }, // FC
+        { 8.654e+01, 4.428e+00, 1.911e+02, 0.000e+00, 0.000e+00, 1.051e+01, 0.000e+00 }, // NOx
+        { 2.148e+00, 1.542e-02, 9.977e-01, 0.000e+00, 1.282e-04, 4.683e-02, 9.092e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_gt40-50t_Euro-IV_SCR
-        { 9.834e+03, 2.113e+02, 2.329e+04, 0.000e+00, 0.000e+00, 4.933e+02, 0.000e+00 }, // CO2(total)
-        { 3.941e+01, 2.451e-01, 5.764e+01, 0.000e+00, 0.000e+00, 8.949e-01, 0.000e+00 }, // CO
-        { 3.372e-01, 4.154e-03, 6.499e-01, 0.000e+00, 0.000e+00, 8.870e-03, 0.000e+00 }, // HC
-        { 3.160e+03, 6.791e+01, 7.484e+03, 0.000e+00, 0.000e+00, 1.585e+02, 0.000e+00 }, // FC
-        { 6.034e+01, 4.844e-01, 4.191e+01, 0.000e+00, 0.000e+00, 2.101e+00, 0.000e+00 }, // NOx
-        { 2.118e+00, 6.035e-03, 8.856e-01, 0.000e+00, 2.688e-06, 1.923e-02, 5.759e-07 }, // PM + PM (non-exhaust)
+        { 9.834e+03, 7.607e+02, 2.329e+04, 0.000e+00, 0.000e+00, 1.776e+03, 0.000e+00 }, // CO2(total)
+        { 3.941e+01, 8.825e-01, 5.764e+01, 0.000e+00, 0.000e+00, 3.222e+00, 0.000e+00 }, // CO
+        { 3.372e-01, 1.496e-02, 6.499e-01, 0.000e+00, 0.000e+00, 3.193e-02, 0.000e+00 }, // HC
+        { 3.160e+03, 2.445e+02, 7.484e+03, 0.000e+00, 0.000e+00, 5.707e+02, 0.000e+00 }, // FC
+        { 6.034e+01, 1.744e+00, 4.191e+01, 0.000e+00, 0.000e+00, 7.564e+00, 0.000e+00 }, // NOx
+        { 2.118e+00, 2.173e-02, 8.856e-01, 0.000e+00, 1.254e-04, 6.924e-02, 7.463e-06 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_gt40-50t_Euro-IV_SCRs
-        { 9.834e+03, 2.113e+02, 2.329e+04, 0.000e+00, 0.000e+00, 4.933e+02, 0.000e+00 }, // CO2(total)
-        { 3.941e+01, 2.451e-01, 5.764e+01, 0.000e+00, 0.000e+00, 8.949e-01, 0.000e+00 }, // CO
-        { 3.372e-01, 4.154e-03, 6.499e-01, 0.000e+00, 0.000e+00, 8.870e-03, 0.000e+00 }, // HC
-        { 3.160e+03, 6.791e+01, 7.484e+03, 0.000e+00, 0.000e+00, 1.585e+02, 0.000e+00 }, // FC
-        { 1.075e+02, 2.300e+00, 2.219e+02, 0.000e+00, 0.000e+00, 5.566e+00, 0.000e+00 }, // NOx
-        { 2.118e+00, 6.035e-03, 8.856e-01, 0.000e+00, 2.688e-06, 1.923e-02, 5.759e-07 }, // PM + PM (non-exhaust)
+        { 9.834e+03, 7.607e+02, 2.329e+04, 0.000e+00, 0.000e+00, 1.776e+03, 0.000e+00 }, // CO2(total)
+        { 3.941e+01, 8.825e-01, 5.764e+01, 0.000e+00, 0.000e+00, 3.222e+00, 0.000e+00 }, // CO
+        { 3.372e-01, 1.496e-02, 6.499e-01, 0.000e+00, 0.000e+00, 3.193e-02, 0.000e+00 }, // HC
+        { 3.160e+03, 2.445e+02, 7.484e+03, 0.000e+00, 0.000e+00, 5.707e+02, 0.000e+00 }, // FC
+        { 1.075e+02, 8.281e+00, 2.219e+02, 0.000e+00, 0.000e+00, 2.004e+01, 0.000e+00 }, // NOx
+        { 2.118e+00, 2.173e-02, 8.856e-01, 0.000e+00, 1.254e-04, 6.924e-02, 7.463e-06 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_gt40-50t_Euro-V_EGR
-        { 9.541e+03, 2.133e+02, 2.269e+04, 0.000e+00, 0.000e+00, 5.034e+02, 0.000e+00 }, // CO2(total)
-        { 1.261e+01, 2.265e-02, 1.657e+01, 0.000e+00, 0.000e+00, 1.613e-01, 0.000e+00 }, // CO
-        { 1.085e+00, 1.540e-02, 9.567e-01, 0.000e+00, 0.000e+00, 4.471e-02, 9.115e-06 }, // HC
-        { 3.066e+03, 6.857e+01, 7.291e+03, 0.000e+00, 0.000e+00, 1.618e+02, 0.000e+00 }, // FC
-        { 5.716e+01, 1.013e+00, 8.585e+01, 0.000e+00, 0.000e+00, 2.774e+00, 0.000e+00 }, // NOx
-        { 1.844e+00, 6.693e-03, 7.418e-01, 0.000e+00, 2.682e-06, 1.657e-02, 2.047e-06 }, // PM + PM (non-exhaust)
+        { 9.541e+03, 7.680e+02, 2.269e+04, 0.000e+00, 0.000e+00, 1.812e+03, 0.000e+00 }, // CO2(total)
+        { 1.261e+01, 8.155e-02, 1.657e+01, 0.000e+00, 0.000e+00, 5.805e-01, 0.000e+00 }, // CO
+        { 1.085e+00, 5.545e-02, 9.567e-01, 0.000e+00, 0.000e+00, 1.610e-01, 1.181e-04 }, // HC
+        { 3.066e+03, 2.468e+02, 7.291e+03, 0.000e+00, 0.000e+00, 5.824e+02, 0.000e+00 }, // FC
+        { 5.716e+01, 3.648e+00, 8.585e+01, 0.000e+00, 0.000e+00, 9.986e+00, 0.000e+00 }, // NOx
+        { 1.844e+00, 2.410e-02, 7.418e-01, 0.000e+00, 1.251e-04, 5.967e-02, 2.653e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_gt40-50t_Euro-V_SCR
-        { 8.749e+03, 2.289e+02, 2.062e+04, 0.000e+00, 0.000e+00, 5.574e+02, 0.000e+00 }, // CO2(total)
-        { 2.971e+01, 2.912e-01, 4.283e+01, 0.000e+00, 0.000e+00, 0.000e+00, 8.566e-03 }, // CO
-        { 3.529e-01, 4.864e-03, 6.015e-01, 0.000e+00, 0.000e+00, 1.042e-02, 0.000e+00 }, // HC
-        { 2.812e+03, 7.356e+01, 6.626e+03, 0.000e+00, 0.000e+00, 1.791e+02, 0.000e+00 }, // FC
-        { 4.931e+01, 1.677e-01, 0.000e+00, 0.000e+00, 0.000e+00, 1.137e+00, 0.000e+00 }, // NOx
-        { 2.071e+00, 6.715e-03, 9.953e-01, 0.000e+00, 2.675e-06, 6.741e-04, 1.767e-04 }, // PM + PM (non-exhaust)
+        { 8.749e+03, 8.240e+02, 2.062e+04, 0.000e+00, 0.000e+00, 2.007e+03, 0.000e+00 }, // CO2(total)
+        { 2.971e+01, 1.048e+00, 4.283e+01, 0.000e+00, 0.000e+00, 0.000e+00, 1.110e-01 }, // CO
+        { 3.529e-01, 1.751e-02, 6.015e-01, 0.000e+00, 0.000e+00, 3.752e-02, 0.000e+00 }, // HC
+        { 2.812e+03, 2.648e+02, 6.626e+03, 0.000e+00, 0.000e+00, 6.449e+02, 0.000e+00 }, // FC
+        { 4.931e+01, 6.035e-01, 0.000e+00, 0.000e+00, 0.000e+00, 4.095e+00, 0.000e+00 }, // NOx
+        { 2.071e+00, 2.418e-02, 9.953e-01, 0.000e+00, 1.248e-04, 2.427e-03, 2.290e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_gt40-50t_Euro-V_SCRs
-        { 8.749e+03, 2.289e+02, 2.062e+04, 0.000e+00, 0.000e+00, 5.574e+02, 0.000e+00 }, // CO2(total)
-        { 2.971e+01, 2.912e-01, 4.283e+01, 0.000e+00, 0.000e+00, 0.000e+00, 8.566e-03 }, // CO
-        { 3.529e-01, 4.864e-03, 6.015e-01, 0.000e+00, 0.000e+00, 1.042e-02, 0.000e+00 }, // HC
-        { 2.812e+03, 7.356e+01, 6.626e+03, 0.000e+00, 0.000e+00, 1.791e+02, 0.000e+00 }, // FC
-        { 1.117e+02, 2.390e+00, 2.040e+02, 0.000e+00, 0.000e+00, 5.860e+00, 0.000e+00 }, // NOx
-        { 2.071e+00, 6.715e-03, 9.953e-01, 0.000e+00, 2.675e-06, 6.741e-04, 1.767e-04 }, // PM + PM (non-exhaust)
+        { 8.749e+03, 8.240e+02, 2.062e+04, 0.000e+00, 0.000e+00, 2.007e+03, 0.000e+00 }, // CO2(total)
+        { 2.971e+01, 1.048e+00, 4.283e+01, 0.000e+00, 0.000e+00, 0.000e+00, 1.110e-01 }, // CO
+        { 3.529e-01, 1.751e-02, 6.015e-01, 0.000e+00, 0.000e+00, 3.752e-02, 0.000e+00 }, // HC
+        { 2.812e+03, 2.648e+02, 6.626e+03, 0.000e+00, 0.000e+00, 6.449e+02, 0.000e+00 }, // FC
+        { 1.117e+02, 8.606e+00, 2.040e+02, 0.000e+00, 0.000e+00, 2.110e+01, 0.000e+00 }, // NOx
+        { 2.071e+00, 2.418e-02, 9.953e-01, 0.000e+00, 1.248e-04, 2.427e-03, 2.290e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_gt40-50t_Euro-VI_A-C
-        { 8.734e+03, 2.249e+02, 2.072e+04, 0.000e+00, 0.000e+00, 5.473e+02, 0.000e+00 }, // CO2(total)
-        { 3.165e+00, 1.780e-02, 3.694e+00, 0.000e+00, 0.000e+00, 4.714e-02, 0.000e+00 }, // CO
-        { 3.477e-01, 2.978e-03, 5.464e-01, 0.000e+00, 0.000e+00, 6.795e-03, 0.000e+00 }, // HC
-        { 2.807e+03, 7.227e+01, 6.660e+03, 0.000e+00, 0.000e+00, 1.759e+02, 0.000e+00 }, // FC
-        { 7.421e+00, 0.000e+00, 1.211e-01, 0.000e+00, 0.000e+00, 0.000e+00, 3.301e-04 }, // NOx
-        { 1.624e+00, 0.000e+00, 1.773e-01, 0.000e+00, 2.679e-06, 6.682e-04, 1.929e-05 }, // PM + PM (non-exhaust)
+        { 8.734e+03, 8.096e+02, 2.072e+04, 0.000e+00, 0.000e+00, 1.970e+03, 0.000e+00 }, // CO2(total)
+        { 3.165e+00, 6.407e-02, 3.694e+00, 0.000e+00, 0.000e+00, 1.697e-01, 0.000e+00 }, // CO
+        { 3.477e-01, 1.072e-02, 5.464e-01, 0.000e+00, 0.000e+00, 2.446e-02, 0.000e+00 }, // HC
+        { 2.807e+03, 2.602e+02, 6.660e+03, 0.000e+00, 0.000e+00, 6.332e+02, 0.000e+00 }, // FC
+        { 7.421e+00, 0.000e+00, 1.211e-01, 0.000e+00, 0.000e+00, 0.000e+00, 4.278e-03 }, // NOx
+        { 1.624e+00, 0.000e+00, 1.773e-01, 0.000e+00, 1.250e-04, 2.406e-03, 2.499e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_gt40-50t_Euro-VIs_A-C
-        { 8.734e+03, 2.249e+02, 2.072e+04, 0.000e+00, 0.000e+00, 5.473e+02, 0.000e+00 }, // CO2(total)
-        { 3.165e+00, 1.780e-02, 3.694e+00, 0.000e+00, 0.000e+00, 4.714e-02, 0.000e+00 }, // CO
-        { 3.477e-01, 2.978e-03, 5.464e-01, 0.000e+00, 0.000e+00, 6.795e-03, 0.000e+00 }, // HC
-        { 2.807e+03, 7.227e+01, 6.660e+03, 0.000e+00, 0.000e+00, 1.759e+02, 0.000e+00 }, // FC
-        { 6.007e+01, 1.772e+00, 1.281e+02, 0.000e+00, 0.000e+00, 4.342e+00, 0.000e+00 }, // NOx
-        { 1.624e+00, 0.000e+00, 1.773e-01, 0.000e+00, 2.679e-06, 6.682e-04, 1.929e-05 }, // PM + PM (non-exhaust)
+        { 8.734e+03, 8.096e+02, 2.072e+04, 0.000e+00, 0.000e+00, 1.970e+03, 0.000e+00 }, // CO2(total)
+        { 3.165e+00, 6.407e-02, 3.694e+00, 0.000e+00, 0.000e+00, 1.697e-01, 0.000e+00 }, // CO
+        { 3.477e-01, 1.072e-02, 5.464e-01, 0.000e+00, 0.000e+00, 2.446e-02, 0.000e+00 }, // HC
+        { 2.807e+03, 2.602e+02, 6.660e+03, 0.000e+00, 0.000e+00, 6.332e+02, 0.000e+00 }, // FC
+        { 6.007e+01, 6.379e+00, 1.281e+02, 0.000e+00, 0.000e+00, 1.563e+01, 0.000e+00 }, // NOx
+        { 1.624e+00, 0.000e+00, 1.773e-01, 0.000e+00, 1.250e-04, 2.406e-03, 2.499e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_gt40-50t_Euro-VI_D-E
-        { 7.647e+03, 2.445e+02, 1.770e+04, 0.000e+00, 0.000e+00, 6.038e+02, 0.000e+00 }, // CO2(total)
+        { 7.647e+03, 8.802e+02, 1.770e+04, 0.000e+00, 0.000e+00, 2.174e+03, 0.000e+00 }, // CO2(total)
         { 7.062e-01, 0.000e+00, 5.907e-01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 4.741e-01, 2.666e-03, 1.395e-01, 0.000e+00, 0.000e+00, 6.959e-03, 0.000e+00 }, // HC
-        { 2.458e+03, 7.857e+01, 5.689e+03, 0.000e+00, 0.000e+00, 1.941e+02, 0.000e+00 }, // FC
-        { 2.830e+00, 0.000e+00, 0.000e+00, 1.312e-04, 2.575e-06, 0.000e+00, 3.942e-04 }, // NOx
-        { 1.483e+00, 6.344e-04, 6.792e-02, 0.000e+00, 2.686e-06, 2.377e-03, 0.000e+00 }, // PM + PM (non-exhaust)
+        { 4.741e-01, 9.597e-03, 1.395e-01, 0.000e+00, 0.000e+00, 2.505e-02, 0.000e+00 }, // HC
+        { 2.458e+03, 2.829e+02, 5.689e+03, 0.000e+00, 0.000e+00, 6.986e+02, 0.000e+00 }, // FC
+        { 2.830e+00, 0.000e+00, 0.000e+00, 1.701e-03, 1.201e-04, 0.000e+00, 5.108e-03 }, // NOx
+        { 1.483e+00, 2.284e-03, 6.792e-02, 0.000e+00, 1.253e-04, 8.557e-03, 0.000e+00 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_gt40-50t_Euro-VIs_D-E
-        { 7.647e+03, 2.445e+02, 1.770e+04, 0.000e+00, 0.000e+00, 6.038e+02, 0.000e+00 }, // CO2(total)
+        { 7.647e+03, 8.802e+02, 1.770e+04, 0.000e+00, 0.000e+00, 2.174e+03, 0.000e+00 }, // CO2(total)
         { 7.062e-01, 0.000e+00, 5.907e-01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 4.741e-01, 2.666e-03, 1.395e-01, 0.000e+00, 0.000e+00, 6.959e-03, 0.000e+00 }, // HC
-        { 2.458e+03, 7.857e+01, 5.689e+03, 0.000e+00, 0.000e+00, 1.941e+02, 0.000e+00 }, // FC
-        { 5.056e+01, 2.404e+00, 8.355e+01, 0.000e+00, 0.000e+00, 5.045e+00, 8.510e-03 }, // NOx
-        { 1.483e+00, 6.344e-04, 6.792e-02, 0.000e+00, 2.686e-06, 2.377e-03, 0.000e+00 }, // PM + PM (non-exhaust)
+        { 4.741e-01, 9.597e-03, 1.395e-01, 0.000e+00, 0.000e+00, 2.505e-02, 0.000e+00 }, // HC
+        { 2.458e+03, 2.829e+02, 5.689e+03, 0.000e+00, 0.000e+00, 6.986e+02, 0.000e+00 }, // FC
+        { 5.056e+01, 8.656e+00, 8.355e+01, 0.000e+00, 0.000e+00, 1.816e+01, 1.103e-01 }, // NOx
+        { 1.483e+00, 2.284e-03, 6.792e-02, 0.000e+00, 1.253e-04, 8.557e-03, 0.000e+00 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_gt50-60t_50ties
-        { 1.221e+04, 3.012e+02, 2.430e+04, 0.000e+00, 0.000e+00, 7.378e+02, 0.000e+00 }, // CO2(total)
-        { 5.115e+01, 5.636e-02, 8.664e+01, 8.421e-04, 0.000e+00, 0.000e+00, 1.516e-03 }, // CO
-        { 1.117e+01, 0.000e+00, 0.000e+00, 0.000e+00, 5.533e-06, 1.560e-01, 2.260e-04 }, // HC
-        { 3.925e+03, 9.680e+01, 7.808e+03, 0.000e+00, 0.000e+00, 2.371e+02, 0.000e+00 }, // FC
-        { 1.835e+02, 4.739e+00, 3.578e+02, 0.000e+00, 0.000e+00, 1.173e+01, 0.000e+00 }, // NOx
-        { 1.041e+01, 7.617e-02, 1.411e+01, 0.000e+00, 2.854e-06, 1.111e-01, 4.616e-06 }, // PM + PM (non-exhaust)
+        { 1.221e+04, 1.084e+03, 2.430e+04, 0.000e+00, 0.000e+00, 2.656e+03, 0.000e+00 }, // CO2(total)
+        { 5.115e+01, 2.029e-01, 8.664e+01, 1.091e-02, 0.000e+00, 0.000e+00, 1.965e-02 }, // CO
+        { 1.117e+01, 0.000e+00, 0.000e+00, 0.000e+00, 2.582e-04, 5.618e-01, 2.929e-03 }, // HC
+        { 3.925e+03, 3.485e+02, 7.808e+03, 0.000e+00, 0.000e+00, 8.537e+02, 0.000e+00 }, // FC
+        { 1.835e+02, 1.706e+01, 3.578e+02, 0.000e+00, 0.000e+00, 4.223e+01, 0.000e+00 }, // NOx
+        { 1.041e+01, 2.742e-01, 1.411e+01, 0.000e+00, 1.332e-04, 3.999e-01, 5.982e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_gt50-60t_60ties
-        { 1.221e+04, 3.012e+02, 2.430e+04, 0.000e+00, 0.000e+00, 7.378e+02, 0.000e+00 }, // CO2(total)
-        { 5.115e+01, 5.636e-02, 8.664e+01, 8.421e-04, 0.000e+00, 0.000e+00, 1.516e-03 }, // CO
-        { 1.117e+01, 0.000e+00, 0.000e+00, 0.000e+00, 5.533e-06, 1.560e-01, 2.260e-04 }, // HC
-        { 3.925e+03, 9.680e+01, 7.808e+03, 0.000e+00, 0.000e+00, 2.371e+02, 0.000e+00 }, // FC
-        { 1.835e+02, 4.739e+00, 3.578e+02, 0.000e+00, 0.000e+00, 1.173e+01, 0.000e+00 }, // NOx
-        { 1.041e+01, 7.617e-02, 1.411e+01, 0.000e+00, 2.854e-06, 1.111e-01, 4.616e-06 }, // PM + PM (non-exhaust)
+        { 1.221e+04, 1.084e+03, 2.430e+04, 0.000e+00, 0.000e+00, 2.656e+03, 0.000e+00 }, // CO2(total)
+        { 5.115e+01, 2.029e-01, 8.664e+01, 1.091e-02, 0.000e+00, 0.000e+00, 1.965e-02 }, // CO
+        { 1.117e+01, 0.000e+00, 0.000e+00, 0.000e+00, 2.582e-04, 5.618e-01, 2.929e-03 }, // HC
+        { 3.925e+03, 3.485e+02, 7.808e+03, 0.000e+00, 0.000e+00, 8.537e+02, 0.000e+00 }, // FC
+        { 1.835e+02, 1.706e+01, 3.578e+02, 0.000e+00, 0.000e+00, 4.223e+01, 0.000e+00 }, // NOx
+        { 1.041e+01, 2.742e-01, 1.411e+01, 0.000e+00, 1.332e-04, 3.999e-01, 5.982e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_gt50-60t_70ties
-        { 1.221e+04, 3.012e+02, 2.430e+04, 0.000e+00, 0.000e+00, 7.378e+02, 0.000e+00 }, // CO2(total)
-        { 5.115e+01, 5.636e-02, 8.664e+01, 8.421e-04, 0.000e+00, 0.000e+00, 1.516e-03 }, // CO
-        { 1.117e+01, 0.000e+00, 0.000e+00, 0.000e+00, 5.533e-06, 1.560e-01, 2.260e-04 }, // HC
-        { 3.925e+03, 9.680e+01, 7.808e+03, 0.000e+00, 0.000e+00, 2.371e+02, 0.000e+00 }, // FC
-        { 1.835e+02, 4.739e+00, 3.578e+02, 0.000e+00, 0.000e+00, 1.173e+01, 0.000e+00 }, // NOx
-        { 1.041e+01, 7.617e-02, 1.411e+01, 0.000e+00, 2.854e-06, 1.111e-01, 4.616e-06 }, // PM + PM (non-exhaust)
+        { 1.221e+04, 1.084e+03, 2.430e+04, 0.000e+00, 0.000e+00, 2.656e+03, 0.000e+00 }, // CO2(total)
+        { 5.115e+01, 2.029e-01, 8.664e+01, 1.091e-02, 0.000e+00, 0.000e+00, 1.965e-02 }, // CO
+        { 1.117e+01, 0.000e+00, 0.000e+00, 0.000e+00, 2.582e-04, 5.618e-01, 2.929e-03 }, // HC
+        { 3.925e+03, 3.485e+02, 7.808e+03, 0.000e+00, 0.000e+00, 8.537e+02, 0.000e+00 }, // FC
+        { 1.835e+02, 1.706e+01, 3.578e+02, 0.000e+00, 0.000e+00, 4.223e+01, 0.000e+00 }, // NOx
+        { 1.041e+01, 2.742e-01, 1.411e+01, 0.000e+00, 1.332e-04, 3.999e-01, 5.982e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_gt50-60t_80ties
-        { 1.221e+04, 3.012e+02, 2.430e+04, 0.000e+00, 0.000e+00, 7.378e+02, 0.000e+00 }, // CO2(total)
-        { 5.115e+01, 5.636e-02, 8.664e+01, 8.421e-04, 0.000e+00, 0.000e+00, 1.516e-03 }, // CO
-        { 1.117e+01, 0.000e+00, 0.000e+00, 0.000e+00, 5.533e-06, 1.560e-01, 2.260e-04 }, // HC
-        { 3.925e+03, 9.680e+01, 7.808e+03, 0.000e+00, 0.000e+00, 2.371e+02, 0.000e+00 }, // FC
-        { 1.835e+02, 4.739e+00, 3.578e+02, 0.000e+00, 0.000e+00, 1.173e+01, 0.000e+00 }, // NOx
-        { 1.041e+01, 7.617e-02, 1.411e+01, 0.000e+00, 2.854e-06, 1.111e-01, 4.616e-06 }, // PM + PM (non-exhaust)
+        { 1.221e+04, 1.084e+03, 2.430e+04, 0.000e+00, 0.000e+00, 2.656e+03, 0.000e+00 }, // CO2(total)
+        { 5.115e+01, 2.029e-01, 8.664e+01, 1.091e-02, 0.000e+00, 0.000e+00, 1.965e-02 }, // CO
+        { 1.117e+01, 0.000e+00, 0.000e+00, 0.000e+00, 2.582e-04, 5.618e-01, 2.929e-03 }, // HC
+        { 3.925e+03, 3.485e+02, 7.808e+03, 0.000e+00, 0.000e+00, 8.537e+02, 0.000e+00 }, // FC
+        { 1.835e+02, 1.706e+01, 3.578e+02, 0.000e+00, 0.000e+00, 4.223e+01, 0.000e+00 }, // NOx
+        { 1.041e+01, 2.742e-01, 1.411e+01, 0.000e+00, 1.332e-04, 3.999e-01, 5.982e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_gt50-60t_Euro-I
-        { 1.380e+04, 2.686e+02, 3.076e+04, 0.000e+00, 0.000e+00, 6.428e+02, 0.000e+00 }, // CO2(total)
-        { 1.821e+01, 6.782e-01, 3.316e+01, 0.000e+00, 0.000e+00, 4.345e-01, 1.144e-02 }, // CO
-        { 1.139e+01, 3.448e-02, 8.466e+00, 0.000e+00, 0.000e+00, 1.808e-01, 0.000e+00 }, // HC
-        { 4.436e+03, 8.632e+01, 9.886e+03, 0.000e+00, 0.000e+00, 2.066e+02, 0.000e+00 }, // FC
-        { 1.486e+02, 2.887e+00, 3.132e+02, 0.000e+00, 0.000e+00, 7.010e+00, 0.000e+00 }, // NOx
-        { 8.485e+00, 6.953e-02, 7.167e+00, 0.000e+00, 2.753e-06, 1.989e-01, 6.416e-06 }, // PM + PM (non-exhaust)
+        { 1.380e+04, 9.670e+02, 3.076e+04, 0.000e+00, 0.000e+00, 2.314e+03, 0.000e+00 }, // CO2(total)
+        { 1.821e+01, 2.441e+00, 3.316e+01, 0.000e+00, 0.000e+00, 1.564e+00, 1.483e-01 }, // CO
+        { 1.139e+01, 1.241e-01, 8.466e+00, 0.000e+00, 0.000e+00, 6.507e-01, 0.000e+00 }, // HC
+        { 4.436e+03, 3.108e+02, 9.886e+03, 0.000e+00, 0.000e+00, 7.437e+02, 0.000e+00 }, // FC
+        { 1.486e+02, 1.039e+01, 3.132e+02, 0.000e+00, 0.000e+00, 2.524e+01, 0.000e+00 }, // NOx
+        { 8.485e+00, 2.503e-01, 7.167e+00, 0.000e+00, 1.284e-04, 7.160e-01, 8.315e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_gt50-60t_Euro-II
-        { 1.163e+04, 2.862e+02, 2.287e+04, 0.000e+00, 0.000e+00, 7.174e+02, 0.000e+00 }, // CO2(total)
-        { 3.743e+01, 7.360e-02, 7.833e+01, 0.000e+00, 4.282e-06, 0.000e+00, 1.746e-04 }, // CO
-        { 6.411e+00, 4.051e-02, 1.017e+00, 0.000e+00, 0.000e+00, 1.737e-01, 0.000e+00 }, // HC
-        { 3.737e+03, 9.198e+01, 7.349e+03, 0.000e+00, 0.000e+00, 2.305e+02, 0.000e+00 }, // FC
-        { 1.394e+02, 2.981e+00, 2.517e+02, 0.000e+00, 0.000e+00, 7.583e+00, 0.000e+00 }, // NOx
-        { 4.417e+00, 3.937e-02, 4.983e+00, 0.000e+00, 2.834e-06, 7.207e-02, 6.391e-06 }, // PM + PM (non-exhaust)
+        { 1.163e+04, 1.030e+03, 2.287e+04, 0.000e+00, 0.000e+00, 2.583e+03, 0.000e+00 }, // CO2(total)
+        { 3.743e+01, 2.650e-01, 7.833e+01, 0.000e+00, 1.998e-04, 0.000e+00, 2.262e-03 }, // CO
+        { 6.411e+00, 1.458e-01, 1.017e+00, 0.000e+00, 0.000e+00, 6.253e-01, 0.000e+00 }, // HC
+        { 3.737e+03, 3.311e+02, 7.349e+03, 0.000e+00, 0.000e+00, 8.300e+02, 0.000e+00 }, // FC
+        { 1.394e+02, 1.073e+01, 2.517e+02, 0.000e+00, 0.000e+00, 2.730e+01, 0.000e+00 }, // NOx
+        { 4.417e+00, 1.417e-01, 4.983e+00, 0.000e+00, 1.322e-04, 2.595e-01, 8.283e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_gt50-60t_Euro-III
-        { 1.268e+04, 2.774e+02, 2.763e+04, 0.000e+00, 0.000e+00, 6.850e+02, 0.000e+00 }, // CO2(total)
-        { 2.690e+01, 1.636e-01, 1.870e+01, 1.991e-03, 0.000e+00, 0.000e+00, 9.684e-03 }, // CO
-        { 6.809e+00, 2.122e-02, 3.459e+00, 0.000e+00, 0.000e+00, 1.068e-01, 0.000e+00 }, // HC
-        { 4.076e+03, 8.914e+01, 8.880e+03, 0.000e+00, 0.000e+00, 2.202e+02, 0.000e+00 }, // FC
-        { 1.121e+02, 2.414e+00, 2.298e+02, 0.000e+00, 0.000e+00, 5.734e+00, 0.000e+00 }, // NOx
-        { 4.764e+00, 2.796e-02, 1.990e+00, 0.000e+00, 2.703e-06, 7.359e-02, 5.653e-06 }, // PM + PM (non-exhaust)
+        { 1.268e+04, 9.985e+02, 2.763e+04, 0.000e+00, 0.000e+00, 2.466e+03, 0.000e+00 }, // CO2(total)
+        { 2.690e+01, 5.888e-01, 1.870e+01, 2.580e-02, 0.000e+00, 0.000e+00, 1.255e-01 }, // CO
+        { 6.809e+00, 7.638e-02, 3.459e+00, 0.000e+00, 0.000e+00, 3.846e-01, 0.000e+00 }, // HC
+        { 4.076e+03, 3.209e+02, 8.880e+03, 0.000e+00, 0.000e+00, 7.926e+02, 0.000e+00 }, // FC
+        { 1.121e+02, 8.692e+00, 2.298e+02, 0.000e+00, 0.000e+00, 2.064e+01, 0.000e+00 }, // NOx
+        { 4.764e+00, 1.007e-01, 1.990e+00, 0.000e+00, 1.261e-04, 2.649e-01, 7.326e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_gt50-60t_Euro-IV_EGR
-        { 1.392e+04, 2.329e+02, 3.335e+04, 0.000e+00, 0.000e+00, 5.314e+02, 0.000e+00 }, // CO2(total)
-        { 1.986e+01, 1.774e-01, 3.100e+01, 0.000e+00, 0.000e+00, 5.538e-01, 0.000e+00 }, // CO
-        { 7.838e-01, 1.769e-02, 1.068e+00, 0.000e+00, 0.000e+00, 4.430e-02, 0.000e+00 }, // HC
-        { 4.474e+03, 7.485e+01, 1.072e+04, 0.000e+00, 0.000e+00, 1.708e+02, 0.000e+00 }, // FC
-        { 1.108e+02, 1.630e+00, 2.149e+02, 0.000e+00, 0.000e+00, 4.286e+00, 0.000e+00 }, // NOx
-        { 2.228e+00, 7.918e-03, 7.338e-01, 0.000e+00, 2.720e-06, 2.697e-02, 0.000e+00 }, // PM + PM (non-exhaust)
+        { 1.392e+04, 8.385e+02, 3.335e+04, 0.000e+00, 0.000e+00, 1.913e+03, 0.000e+00 }, // CO2(total)
+        { 1.986e+01, 6.386e-01, 3.100e+01, 0.000e+00, 0.000e+00, 1.994e+00, 0.000e+00 }, // CO
+        { 7.838e-01, 6.369e-02, 1.068e+00, 0.000e+00, 0.000e+00, 1.595e-01, 0.000e+00 }, // HC
+        { 4.474e+03, 2.695e+02, 1.072e+04, 0.000e+00, 0.000e+00, 6.148e+02, 0.000e+00 }, // FC
+        { 1.108e+02, 5.869e+00, 2.149e+02, 0.000e+00, 0.000e+00, 1.543e+01, 0.000e+00 }, // NOx
+        { 2.228e+00, 2.850e-02, 7.338e-01, 0.000e+00, 1.269e-04, 9.708e-02, 0.000e+00 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_gt50-60t_Euro-IV_SCR
-        { 1.356e+04, 2.471e+02, 3.283e+04, 0.000e+00, 0.000e+00, 5.767e+02, 0.000e+00 }, // CO2(total)
-        { 4.283e+01, 2.879e-01, 6.340e+01, 0.000e+00, 0.000e+00, 0.000e+00, 1.133e-02 }, // CO
-        { 4.493e-01, 4.949e-03, 8.626e-01, 0.000e+00, 0.000e+00, 1.119e-02, 0.000e+00 }, // HC
-        { 4.357e+03, 7.941e+01, 1.055e+04, 0.000e+00, 0.000e+00, 1.853e+02, 0.000e+00 }, // FC
-        { 8.031e+01, 5.412e-01, 7.087e+01, 0.000e+00, 0.000e+00, 2.456e+00, 0.000e+00 }, // NOx
-        { 2.203e+00, 7.160e-03, 1.227e+00, 0.000e+00, 2.688e-06, 0.000e+00, 2.269e-04 }, // PM + PM (non-exhaust)
+        { 1.356e+04, 8.895e+02, 3.283e+04, 0.000e+00, 0.000e+00, 2.076e+03, 0.000e+00 }, // CO2(total)
+        { 4.283e+01, 1.036e+00, 6.340e+01, 0.000e+00, 0.000e+00, 0.000e+00, 1.469e-01 }, // CO
+        { 4.493e-01, 1.782e-02, 8.626e-01, 0.000e+00, 0.000e+00, 4.029e-02, 0.000e+00 }, // HC
+        { 4.357e+03, 2.859e+02, 1.055e+04, 0.000e+00, 0.000e+00, 6.673e+02, 0.000e+00 }, // FC
+        { 8.031e+01, 1.948e+00, 7.087e+01, 0.000e+00, 0.000e+00, 8.843e+00, 0.000e+00 }, // NOx
+        { 2.203e+00, 2.578e-02, 1.227e+00, 0.000e+00, 1.254e-04, 0.000e+00, 2.941e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_gt50-60t_Euro-IV_SCRs
-        { 1.356e+04, 2.471e+02, 3.283e+04, 0.000e+00, 0.000e+00, 5.767e+02, 0.000e+00 }, // CO2(total)
-        { 4.283e+01, 2.879e-01, 6.340e+01, 0.000e+00, 0.000e+00, 0.000e+00, 1.133e-02 }, // CO
-        { 4.493e-01, 4.949e-03, 8.626e-01, 0.000e+00, 0.000e+00, 1.119e-02, 0.000e+00 }, // HC
-        { 4.357e+03, 7.941e+01, 1.055e+04, 0.000e+00, 0.000e+00, 1.853e+02, 0.000e+00 }, // FC
-        { 1.512e+02, 2.719e+00, 3.246e+02, 0.000e+00, 0.000e+00, 6.582e+00, 0.000e+00 }, // NOx
-        { 2.203e+00, 7.160e-03, 1.227e+00, 0.000e+00, 2.688e-06, 0.000e+00, 2.269e-04 }, // PM + PM (non-exhaust)
+        { 1.356e+04, 8.895e+02, 3.283e+04, 0.000e+00, 0.000e+00, 2.076e+03, 0.000e+00 }, // CO2(total)
+        { 4.283e+01, 1.036e+00, 6.340e+01, 0.000e+00, 0.000e+00, 0.000e+00, 1.469e-01 }, // CO
+        { 4.493e-01, 1.782e-02, 8.626e-01, 0.000e+00, 0.000e+00, 4.029e-02, 0.000e+00 }, // HC
+        { 4.357e+03, 2.859e+02, 1.055e+04, 0.000e+00, 0.000e+00, 6.673e+02, 0.000e+00 }, // FC
+        { 1.512e+02, 9.787e+00, 3.246e+02, 0.000e+00, 0.000e+00, 2.370e+01, 0.000e+00 }, // NOx
+        { 2.203e+00, 2.578e-02, 1.227e+00, 0.000e+00, 1.254e-04, 0.000e+00, 2.941e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_gt50-60t_Euro-V_EGR
-        { 1.314e+04, 2.490e+02, 3.178e+04, 0.000e+00, 0.000e+00, 5.866e+02, 0.000e+00 }, // CO2(total)
-        { 1.274e+01, 4.798e-02, 1.317e+01, 0.000e+00, 0.000e+00, 1.642e-02, 2.694e-03 }, // CO
-        { 1.352e+00, 1.786e-02, 2.062e+00, 0.000e+00, 0.000e+00, 1.695e-02, 3.227e-04 }, // HC
-        { 4.222e+03, 8.003e+01, 1.021e+04, 0.000e+00, 0.000e+00, 1.885e+02, 0.000e+00 }, // FC
-        { 6.855e+01, 1.209e+00, 8.695e+01, 0.000e+00, 0.000e+00, 3.398e+00, 0.000e+00 }, // NOx
-        { 2.082e+00, 7.278e-03, 1.387e+00, 0.000e+00, 2.691e-06, 1.788e-02, 7.662e-07 }, // PM + PM (non-exhaust)
+        { 1.314e+04, 8.965e+02, 3.178e+04, 0.000e+00, 0.000e+00, 2.112e+03, 0.000e+00 }, // CO2(total)
+        { 1.274e+01, 1.727e-01, 1.317e+01, 0.000e+00, 0.000e+00, 5.911e-02, 3.491e-02 }, // CO
+        { 1.352e+00, 6.429e-02, 2.062e+00, 0.000e+00, 0.000e+00, 6.103e-02, 4.182e-03 }, // HC
+        { 4.222e+03, 2.881e+02, 1.021e+04, 0.000e+00, 0.000e+00, 6.787e+02, 0.000e+00 }, // FC
+        { 6.855e+01, 4.353e+00, 8.695e+01, 0.000e+00, 0.000e+00, 1.223e+01, 0.000e+00 }, // NOx
+        { 2.082e+00, 2.620e-02, 1.387e+00, 0.000e+00, 1.256e-04, 6.436e-02, 9.930e-06 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_gt50-60t_Euro-V_SCR
-        { 1.266e+04, 2.473e+02, 3.040e+04, 0.000e+00, 0.000e+00, 5.850e+02, 0.000e+00 }, // CO2(total)
-        { 3.992e+01, 2.914e-01, 5.594e+01, 0.000e+00, 0.000e+00, 0.000e+00, 9.557e-03 }, // CO
-        { 4.579e-01, 5.160e-03, 7.404e-01, 0.000e+00, 0.000e+00, 1.096e-02, 0.000e+00 }, // HC
-        { 4.070e+03, 7.947e+01, 9.771e+03, 0.000e+00, 0.000e+00, 1.880e+02, 0.000e+00 }, // FC
-        { 6.310e+01, 1.815e-01, 5.853e+00, 0.000e+00, 0.000e+00, 1.383e+00, 0.000e+00 }, // NOx
-        { 2.395e+00, 0.000e+00, 1.137e+00, 6.409e-05, 2.700e-06, 0.000e+00, 2.199e-04 }, // PM + PM (non-exhaust)
+        { 1.266e+04, 8.902e+02, 3.040e+04, 0.000e+00, 0.000e+00, 2.106e+03, 0.000e+00 }, // CO2(total)
+        { 3.992e+01, 1.049e+00, 5.594e+01, 0.000e+00, 0.000e+00, 0.000e+00, 1.239e-01 }, // CO
+        { 4.579e-01, 1.858e-02, 7.404e-01, 0.000e+00, 0.000e+00, 3.946e-02, 0.000e+00 }, // HC
+        { 4.070e+03, 2.861e+02, 9.771e+03, 0.000e+00, 0.000e+00, 6.768e+02, 0.000e+00 }, // FC
+        { 6.310e+01, 6.533e-01, 5.853e+00, 0.000e+00, 0.000e+00, 4.979e+00, 0.000e+00 }, // NOx
+        { 2.395e+00, 0.000e+00, 1.137e+00, 8.306e-04, 1.260e-04, 0.000e+00, 2.849e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_gt50-60t_Euro-V_SCRs
-        { 1.266e+04, 2.473e+02, 3.040e+04, 0.000e+00, 0.000e+00, 5.850e+02, 0.000e+00 }, // CO2(total)
-        { 3.992e+01, 2.914e-01, 5.594e+01, 0.000e+00, 0.000e+00, 0.000e+00, 9.557e-03 }, // CO
-        { 4.579e-01, 5.160e-03, 7.404e-01, 0.000e+00, 0.000e+00, 1.096e-02, 0.000e+00 }, // HC
-        { 4.070e+03, 7.947e+01, 9.771e+03, 0.000e+00, 0.000e+00, 1.880e+02, 0.000e+00 }, // FC
-        { 1.620e+02, 2.671e+00, 3.198e+02, 0.000e+00, 0.000e+00, 6.400e+00, 0.000e+00 }, // NOx
-        { 2.395e+00, 0.000e+00, 1.137e+00, 6.409e-05, 2.700e-06, 0.000e+00, 2.199e-04 }, // PM + PM (non-exhaust)
+        { 1.266e+04, 8.902e+02, 3.040e+04, 0.000e+00, 0.000e+00, 2.106e+03, 0.000e+00 }, // CO2(total)
+        { 3.992e+01, 1.049e+00, 5.594e+01, 0.000e+00, 0.000e+00, 0.000e+00, 1.239e-01 }, // CO
+        { 4.579e-01, 1.858e-02, 7.404e-01, 0.000e+00, 0.000e+00, 3.946e-02, 0.000e+00 }, // HC
+        { 4.070e+03, 2.861e+02, 9.771e+03, 0.000e+00, 0.000e+00, 6.768e+02, 0.000e+00 }, // FC
+        { 1.620e+02, 9.615e+00, 3.198e+02, 0.000e+00, 0.000e+00, 2.304e+01, 0.000e+00 }, // NOx
+        { 2.395e+00, 0.000e+00, 1.137e+00, 8.306e-04, 1.260e-04, 0.000e+00, 2.849e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_gt50-60t_Euro-VI_A-C
-        { 1.258e+04, 2.431e+02, 3.025e+04, 0.000e+00, 0.000e+00, 5.758e+02, 0.000e+00 }, // CO2(total)
-        { 3.662e+00, 2.107e-02, 3.027e+00, 0.000e+00, 0.000e+00, 6.610e-02, 0.000e+00 }, // CO
-        { 4.135e-01, 3.106e-03, 5.320e-01, 0.000e+00, 0.000e+00, 7.457e-03, 0.000e+00 }, // HC
-        { 4.044e+03, 7.812e+01, 9.720e+03, 0.000e+00, 0.000e+00, 1.850e+02, 0.000e+00 }, // FC
-        { 8.744e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 3.737e-04 }, // NOx
-        { 1.642e+00, 2.457e-04, 8.281e-02, 0.000e+00, 2.695e-06, 4.158e-03, 3.428e-06 }, // PM + PM (non-exhaust)
+        { 1.258e+04, 8.750e+02, 3.025e+04, 0.000e+00, 0.000e+00, 2.073e+03, 0.000e+00 }, // CO2(total)
+        { 3.662e+00, 7.584e-02, 3.027e+00, 0.000e+00, 0.000e+00, 2.380e-01, 0.000e+00 }, // CO
+        { 4.135e-01, 1.118e-02, 5.320e-01, 0.000e+00, 0.000e+00, 2.684e-02, 0.000e+00 }, // HC
+        { 4.044e+03, 2.812e+02, 9.720e+03, 0.000e+00, 0.000e+00, 6.662e+02, 0.000e+00 }, // FC
+        { 8.744e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 4.843e-03 }, // NOx
+        { 1.642e+00, 8.846e-04, 8.281e-02, 0.000e+00, 1.257e-04, 1.497e-02, 4.443e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_gt50-60t_Euro-VIs_A-C
-        { 1.258e+04, 2.431e+02, 3.025e+04, 0.000e+00, 0.000e+00, 5.758e+02, 0.000e+00 }, // CO2(total)
-        { 3.662e+00, 2.107e-02, 3.027e+00, 0.000e+00, 0.000e+00, 6.610e-02, 0.000e+00 }, // CO
-        { 4.135e-01, 3.106e-03, 5.320e-01, 0.000e+00, 0.000e+00, 7.457e-03, 0.000e+00 }, // HC
-        { 4.044e+03, 7.812e+01, 9.720e+03, 0.000e+00, 0.000e+00, 1.850e+02, 0.000e+00 }, // FC
-        { 9.533e+01, 1.991e+00, 2.294e+02, 0.000e+00, 0.000e+00, 4.593e+00, 0.000e+00 }, // NOx
-        { 1.642e+00, 2.457e-04, 8.281e-02, 0.000e+00, 2.695e-06, 4.158e-03, 3.428e-06 }, // PM + PM (non-exhaust)
+        { 1.258e+04, 8.750e+02, 3.025e+04, 0.000e+00, 0.000e+00, 2.073e+03, 0.000e+00 }, // CO2(total)
+        { 3.662e+00, 7.584e-02, 3.027e+00, 0.000e+00, 0.000e+00, 2.380e-01, 0.000e+00 }, // CO
+        { 4.135e-01, 1.118e-02, 5.320e-01, 0.000e+00, 0.000e+00, 2.684e-02, 0.000e+00 }, // HC
+        { 4.044e+03, 2.812e+02, 9.720e+03, 0.000e+00, 0.000e+00, 6.662e+02, 0.000e+00 }, // FC
+        { 9.533e+01, 7.166e+00, 2.294e+02, 0.000e+00, 0.000e+00, 1.654e+01, 0.000e+00 }, // NOx
+        { 1.642e+00, 8.846e-04, 8.281e-02, 0.000e+00, 1.257e-04, 1.497e-02, 4.443e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_gt50-60t_Euro-VI_D-E
-        { 1.186e+04, 2.554e+02, 2.886e+04, 0.000e+00, 0.000e+00, 6.042e+02, 0.000e+00 }, // CO2(total)
-        { 1.068e+00, 0.000e+00, 6.013e-01, 0.000e+00, 0.000e+00, 0.000e+00, 1.538e-04 }, // CO
-        { 6.035e-01, 3.063e-03, 3.005e-01, 0.000e+00, 0.000e+00, 7.608e-03, 0.000e+00 }, // HC
-        { 3.812e+03, 8.209e+01, 9.276e+03, 0.000e+00, 0.000e+00, 1.942e+02, 0.000e+00 }, // FC
-        { 3.316e+00, 1.376e-03, 0.000e+00, 4.179e-04, 0.000e+00, 0.000e+00, 5.309e-04 }, // NOx
-        { 1.488e+00, 6.953e-04, 1.092e-01, 0.000e+00, 2.688e-06, 1.837e-03, 0.000e+00 }, // PM + PM (non-exhaust)
+        { 1.186e+04, 9.195e+02, 2.886e+04, 0.000e+00, 0.000e+00, 2.175e+03, 0.000e+00 }, // CO2(total)
+        { 1.068e+00, 0.000e+00, 6.013e-01, 0.000e+00, 0.000e+00, 0.000e+00, 1.993e-03 }, // CO
+        { 6.035e-01, 1.103e-02, 3.005e-01, 0.000e+00, 0.000e+00, 2.739e-02, 0.000e+00 }, // HC
+        { 3.812e+03, 2.955e+02, 9.276e+03, 0.000e+00, 0.000e+00, 6.991e+02, 0.000e+00 }, // FC
+        { 3.316e+00, 4.955e-03, 0.000e+00, 5.416e-03, 0.000e+00, 0.000e+00, 6.880e-03 }, // NOx
+        { 1.488e+00, 2.503e-03, 1.092e-01, 0.000e+00, 1.254e-04, 6.612e-03, 0.000e+00 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_gt50-60t_Euro-VIs_D-E
-        { 1.186e+04, 2.554e+02, 2.886e+04, 0.000e+00, 0.000e+00, 6.042e+02, 0.000e+00 }, // CO2(total)
-        { 1.068e+00, 0.000e+00, 6.013e-01, 0.000e+00, 0.000e+00, 0.000e+00, 1.538e-04 }, // CO
-        { 6.035e-01, 3.063e-03, 3.005e-01, 0.000e+00, 0.000e+00, 7.608e-03, 0.000e+00 }, // HC
-        { 3.812e+03, 8.209e+01, 9.276e+03, 0.000e+00, 0.000e+00, 1.942e+02, 0.000e+00 }, // FC
-        { 8.758e+01, 2.639e+00, 1.507e+02, 0.000e+00, 0.000e+00, 6.467e+00, 0.000e+00 }, // NOx
-        { 1.488e+00, 6.953e-04, 1.092e-01, 0.000e+00, 2.688e-06, 1.837e-03, 0.000e+00 }, // PM + PM (non-exhaust)
+        { 1.186e+04, 9.195e+02, 2.886e+04, 0.000e+00, 0.000e+00, 2.175e+03, 0.000e+00 }, // CO2(total)
+        { 1.068e+00, 0.000e+00, 6.013e-01, 0.000e+00, 0.000e+00, 0.000e+00, 1.993e-03 }, // CO
+        { 6.035e-01, 1.103e-02, 3.005e-01, 0.000e+00, 0.000e+00, 2.739e-02, 0.000e+00 }, // HC
+        { 3.812e+03, 2.955e+02, 9.276e+03, 0.000e+00, 0.000e+00, 6.991e+02, 0.000e+00 }, // FC
+        { 8.758e+01, 9.500e+00, 1.507e+02, 0.000e+00, 0.000e+00, 2.328e+01, 0.000e+00 }, // NOx
+        { 1.488e+00, 2.503e-03, 1.092e-01, 0.000e+00, 1.254e-04, 6.612e-03, 0.000e+00 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_gt60t_50ties
-        { 2.132e+04, 2.622e+02, 4.948e+04, 0.000e+00, 0.000e+00, 5.415e+02, 0.000e+00 }, // CO2(total)
-        { 4.975e+01, 3.934e-01, 5.016e+01, 0.000e+00, 0.000e+00, 9.433e-01, 0.000e+00 }, // CO
-        { 1.284e+01, 0.000e+00, 4.804e+00, 0.000e+00, 1.097e-05, 1.234e-01, 0.000e+00 }, // HC
-        { 6.851e+03, 8.425e+01, 1.590e+04, 0.000e+00, 0.000e+00, 1.740e+02, 0.000e+00 }, // FC
-        { 3.343e+02, 4.183e+00, 7.750e+02, 0.000e+00, 0.000e+00, 8.694e+00, 0.000e+00 }, // NOx
-        { 1.255e+01, 9.756e-02, 1.820e+01, 0.000e+00, 2.914e-06, 9.372e-02, 0.000e+00 }, // PM + PM (non-exhaust)
+        { 2.132e+04, 9.438e+02, 4.948e+04, 0.000e+00, 0.000e+00, 1.949e+03, 0.000e+00 }, // CO2(total)
+        { 4.975e+01, 1.416e+00, 5.016e+01, 0.000e+00, 0.000e+00, 3.396e+00, 0.000e+00 }, // CO
+        { 1.284e+01, 0.000e+00, 4.804e+00, 0.000e+00, 5.118e-04, 4.444e-01, 0.000e+00 }, // HC
+        { 6.851e+03, 3.033e+02, 1.590e+04, 0.000e+00, 0.000e+00, 6.265e+02, 0.000e+00 }, // FC
+        { 3.343e+02, 1.506e+01, 7.750e+02, 0.000e+00, 0.000e+00, 3.130e+01, 0.000e+00 }, // NOx
+        { 1.255e+01, 3.512e-01, 1.820e+01, 0.000e+00, 1.360e-04, 3.374e-01, 0.000e+00 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_gt60t_60ties
-        { 2.132e+04, 2.622e+02, 4.948e+04, 0.000e+00, 0.000e+00, 5.415e+02, 0.000e+00 }, // CO2(total)
-        { 4.975e+01, 3.934e-01, 5.016e+01, 0.000e+00, 0.000e+00, 9.433e-01, 0.000e+00 }, // CO
-        { 1.284e+01, 0.000e+00, 4.804e+00, 0.000e+00, 1.097e-05, 1.234e-01, 0.000e+00 }, // HC
-        { 6.851e+03, 8.425e+01, 1.590e+04, 0.000e+00, 0.000e+00, 1.740e+02, 0.000e+00 }, // FC
-        { 3.343e+02, 4.183e+00, 7.750e+02, 0.000e+00, 0.000e+00, 8.694e+00, 0.000e+00 }, // NOx
-        { 1.255e+01, 9.756e-02, 1.820e+01, 0.000e+00, 2.914e-06, 9.372e-02, 0.000e+00 }, // PM + PM (non-exhaust)
+        { 2.132e+04, 9.438e+02, 4.948e+04, 0.000e+00, 0.000e+00, 1.949e+03, 0.000e+00 }, // CO2(total)
+        { 4.975e+01, 1.416e+00, 5.016e+01, 0.000e+00, 0.000e+00, 3.396e+00, 0.000e+00 }, // CO
+        { 1.284e+01, 0.000e+00, 4.804e+00, 0.000e+00, 5.118e-04, 4.444e-01, 0.000e+00 }, // HC
+        { 6.851e+03, 3.033e+02, 1.590e+04, 0.000e+00, 0.000e+00, 6.265e+02, 0.000e+00 }, // FC
+        { 3.343e+02, 1.506e+01, 7.750e+02, 0.000e+00, 0.000e+00, 3.130e+01, 0.000e+00 }, // NOx
+        { 1.255e+01, 3.512e-01, 1.820e+01, 0.000e+00, 1.360e-04, 3.374e-01, 0.000e+00 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_gt60t_70ties
-        { 2.132e+04, 2.622e+02, 4.948e+04, 0.000e+00, 0.000e+00, 5.415e+02, 0.000e+00 }, // CO2(total)
-        { 4.975e+01, 3.934e-01, 5.016e+01, 0.000e+00, 0.000e+00, 9.433e-01, 0.000e+00 }, // CO
-        { 1.284e+01, 0.000e+00, 4.804e+00, 0.000e+00, 1.097e-05, 1.234e-01, 0.000e+00 }, // HC
-        { 6.851e+03, 8.425e+01, 1.590e+04, 0.000e+00, 0.000e+00, 1.740e+02, 0.000e+00 }, // FC
-        { 3.343e+02, 4.183e+00, 7.750e+02, 0.000e+00, 0.000e+00, 8.694e+00, 0.000e+00 }, // NOx
-        { 1.255e+01, 9.756e-02, 1.820e+01, 0.000e+00, 2.914e-06, 9.372e-02, 0.000e+00 }, // PM + PM (non-exhaust)
+        { 2.132e+04, 9.438e+02, 4.948e+04, 0.000e+00, 0.000e+00, 1.949e+03, 0.000e+00 }, // CO2(total)
+        { 4.975e+01, 1.416e+00, 5.016e+01, 0.000e+00, 0.000e+00, 3.396e+00, 0.000e+00 }, // CO
+        { 1.284e+01, 0.000e+00, 4.804e+00, 0.000e+00, 5.118e-04, 4.444e-01, 0.000e+00 }, // HC
+        { 6.851e+03, 3.033e+02, 1.590e+04, 0.000e+00, 0.000e+00, 6.265e+02, 0.000e+00 }, // FC
+        { 3.343e+02, 1.506e+01, 7.750e+02, 0.000e+00, 0.000e+00, 3.130e+01, 0.000e+00 }, // NOx
+        { 1.255e+01, 3.512e-01, 1.820e+01, 0.000e+00, 1.360e-04, 3.374e-01, 0.000e+00 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_gt60t_80ties
-        { 2.132e+04, 2.622e+02, 4.948e+04, 0.000e+00, 0.000e+00, 5.415e+02, 0.000e+00 }, // CO2(total)
-        { 4.975e+01, 3.934e-01, 5.016e+01, 0.000e+00, 0.000e+00, 9.433e-01, 0.000e+00 }, // CO
-        { 1.284e+01, 0.000e+00, 4.804e+00, 0.000e+00, 1.097e-05, 1.234e-01, 0.000e+00 }, // HC
-        { 6.851e+03, 8.425e+01, 1.590e+04, 0.000e+00, 0.000e+00, 1.740e+02, 0.000e+00 }, // FC
-        { 3.343e+02, 4.183e+00, 7.750e+02, 0.000e+00, 0.000e+00, 8.694e+00, 0.000e+00 }, // NOx
-        { 1.255e+01, 9.756e-02, 1.820e+01, 0.000e+00, 2.914e-06, 9.372e-02, 0.000e+00 }, // PM + PM (non-exhaust)
+        { 2.132e+04, 9.438e+02, 4.948e+04, 0.000e+00, 0.000e+00, 1.949e+03, 0.000e+00 }, // CO2(total)
+        { 4.975e+01, 1.416e+00, 5.016e+01, 0.000e+00, 0.000e+00, 3.396e+00, 0.000e+00 }, // CO
+        { 1.284e+01, 0.000e+00, 4.804e+00, 0.000e+00, 5.118e-04, 4.444e-01, 0.000e+00 }, // HC
+        { 6.851e+03, 3.033e+02, 1.590e+04, 0.000e+00, 0.000e+00, 6.265e+02, 0.000e+00 }, // FC
+        { 3.343e+02, 1.506e+01, 7.750e+02, 0.000e+00, 0.000e+00, 3.130e+01, 0.000e+00 }, // NOx
+        { 1.255e+01, 3.512e-01, 1.820e+01, 0.000e+00, 1.360e-04, 3.374e-01, 0.000e+00 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_gt60t_Euro-I
-        { 2.393e+04, 1.681e+02, 5.427e+04, 0.000e+00, 0.000e+00, 3.360e+02, 0.000e+00 }, // CO2(total)
-        { 3.222e+01, 8.991e-01, 2.638e+01, 0.000e+00, 0.000e+00, 2.217e+00, 0.000e+00 }, // CO
-        { 1.394e+01, 0.000e+00, 9.476e+00, 0.000e+00, 6.644e-06, 1.823e-01, 0.000e+00 }, // HC
-        { 7.692e+03, 5.403e+01, 1.744e+04, 0.000e+00, 0.000e+00, 1.080e+02, 0.000e+00 }, // FC
-        { 2.703e+02, 1.731e+00, 5.867e+02, 0.000e+00, 0.000e+00, 3.682e+00, 0.000e+00 }, // NOx
-        { 1.059e+01, 6.850e-02, 1.363e+01, 0.000e+00, 2.893e-06, 1.064e-01, 0.000e+00 }, // PM + PM (non-exhaust)
+        { 2.393e+04, 6.052e+02, 5.427e+04, 0.000e+00, 0.000e+00, 1.210e+03, 0.000e+00 }, // CO2(total)
+        { 3.222e+01, 3.237e+00, 2.638e+01, 0.000e+00, 0.000e+00, 7.983e+00, 0.000e+00 }, // CO
+        { 1.394e+01, 0.000e+00, 9.476e+00, 0.000e+00, 3.100e-04, 6.564e-01, 0.000e+00 }, // HC
+        { 7.692e+03, 1.945e+02, 1.744e+04, 0.000e+00, 0.000e+00, 3.888e+02, 0.000e+00 }, // FC
+        { 2.703e+02, 6.232e+00, 5.867e+02, 0.000e+00, 0.000e+00, 1.325e+01, 0.000e+00 }, // NOx
+        { 1.059e+01, 2.466e-01, 1.363e+01, 0.000e+00, 1.350e-04, 3.829e-01, 0.000e+00 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_gt60t_Euro-II
-        { 2.148e+04, 2.279e+02, 4.995e+04, 0.000e+00, 0.000e+00, 4.730e+02, 0.000e+00 }, // CO2(total)
-        { 3.165e+01, 3.970e-01, 2.240e+01, 0.000e+00, 0.000e+00, 1.190e+00, 0.000e+00 }, // CO
-        { 8.352e+00, 3.628e-02, 6.602e+00, 0.000e+00, 0.000e+00, 1.220e-01, 0.000e+00 }, // HC
-        { 6.904e+03, 7.325e+01, 1.605e+04, 0.000e+00, 0.000e+00, 1.520e+02, 0.000e+00 }, // FC
-        { 2.433e+02, 2.460e+00, 5.125e+02, 0.000e+00, 0.000e+00, 5.671e+00, 0.000e+00 }, // NOx
-        { 4.903e+00, 5.497e-02, 3.872e+00, 0.000e+00, 2.879e-06, 1.268e-01, 0.000e+00 }, // PM + PM (non-exhaust)
+        { 2.148e+04, 8.205e+02, 4.995e+04, 0.000e+00, 0.000e+00, 1.703e+03, 0.000e+00 }, // CO2(total)
+        { 3.165e+01, 1.429e+00, 2.240e+01, 0.000e+00, 0.000e+00, 4.283e+00, 0.000e+00 }, // CO
+        { 8.352e+00, 1.306e-01, 6.602e+00, 0.000e+00, 0.000e+00, 4.390e-01, 0.000e+00 }, // HC
+        { 6.904e+03, 2.637e+02, 1.605e+04, 0.000e+00, 0.000e+00, 5.472e+02, 0.000e+00 }, // FC
+        { 2.433e+02, 8.857e+00, 5.125e+02, 0.000e+00, 0.000e+00, 2.042e+01, 0.000e+00 }, // NOx
+        { 4.903e+00, 1.979e-01, 3.872e+00, 0.000e+00, 1.343e-04, 4.565e-01, 0.000e+00 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_gt60t_Euro-III
-        { 1.753e+04, 3.191e+02, 3.573e+04, 0.000e+00, 0.000e+00, 7.759e+02, 0.000e+00 }, // CO2(total)
-        { 4.420e+01, 0.000e+00, 4.925e+01, 0.000e+00, 2.924e-05, 0.000e+00, 6.073e-03 }, // CO
-        { 6.984e+00, 4.154e-02, 1.485e+00, 0.000e+00, 0.000e+00, 1.723e-01, 0.000e+00 }, // HC
-        { 5.635e+03, 1.026e+02, 1.148e+04, 0.000e+00, 0.000e+00, 2.493e+02, 0.000e+00 }, // FC
-        { 1.771e+02, 2.493e+00, 3.522e+02, 0.000e+00, 0.000e+00, 6.159e+00, 0.000e+00 }, // NOx
-        { 5.031e+00, 3.641e-02, 1.711e+00, 0.000e+00, 2.922e-06, 9.203e-02, 8.146e-06 }, // PM + PM (non-exhaust)
+        { 1.753e+04, 1.149e+03, 3.573e+04, 0.000e+00, 0.000e+00, 2.793e+03, 0.000e+00 }, // CO2(total)
+        { 4.420e+01, 0.000e+00, 4.925e+01, 0.000e+00, 1.364e-03, 0.000e+00, 7.870e-02 }, // CO
+        { 6.984e+00, 1.495e-01, 1.485e+00, 0.000e+00, 0.000e+00, 6.202e-01, 0.000e+00 }, // HC
+        { 5.635e+03, 3.692e+02, 1.148e+04, 0.000e+00, 0.000e+00, 8.976e+02, 0.000e+00 }, // FC
+        { 1.771e+02, 8.976e+00, 3.522e+02, 0.000e+00, 0.000e+00, 2.217e+01, 0.000e+00 }, // NOx
+        { 5.031e+00, 1.311e-01, 1.711e+00, 0.000e+00, 1.363e-04, 3.313e-01, 1.056e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_gt60t_Euro-IV_EGR
-        { 1.822e+04, 2.945e+02, 3.918e+04, 0.000e+00, 0.000e+00, 7.032e+02, 0.000e+00 }, // CO2(total)
-        { 2.600e+01, 1.887e-01, 4.495e+01, 0.000e+00, 0.000e+00, 5.249e-01, 0.000e+00 }, // CO
-        { 1.380e+00, 1.521e-02, 3.050e+00, 0.000e+00, 0.000e+00, 2.529e-02, 0.000e+00 }, // HC
-        { 5.856e+03, 9.465e+01, 1.259e+04, 0.000e+00, 0.000e+00, 2.260e+02, 0.000e+00 }, // FC
-        { 1.941e+02, 8.207e-01, 4.236e+02, 0.000e+00, 0.000e+00, 2.028e+00, 0.000e+00 }, // NOx
-        { 2.618e+00, 2.218e-03, 1.893e+00, 0.000e+00, 2.918e-06, 1.168e-02, 1.473e-06 }, // PM + PM (non-exhaust)
+        { 1.822e+04, 1.060e+03, 3.918e+04, 0.000e+00, 0.000e+00, 2.531e+03, 0.000e+00 }, // CO2(total)
+        { 2.600e+01, 6.794e-01, 4.495e+01, 0.000e+00, 0.000e+00, 1.890e+00, 0.000e+00 }, // CO
+        { 1.380e+00, 5.476e-02, 3.050e+00, 0.000e+00, 0.000e+00, 9.104e-02, 0.000e+00 }, // HC
+        { 5.856e+03, 3.407e+02, 1.259e+04, 0.000e+00, 0.000e+00, 8.136e+02, 0.000e+00 }, // FC
+        { 1.941e+02, 2.955e+00, 4.236e+02, 0.000e+00, 0.000e+00, 7.301e+00, 0.000e+00 }, // NOx
+        { 2.618e+00, 7.985e-03, 1.893e+00, 0.000e+00, 1.361e-04, 4.203e-02, 1.909e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_gt60t_Euro-IV_SCR
-        { 1.874e+04, 2.755e+02, 3.828e+04, 0.000e+00, 0.000e+00, 6.938e+02, 0.000e+00 }, // CO2(total)
+        { 1.874e+04, 9.918e+02, 3.828e+04, 0.000e+00, 0.000e+00, 2.498e+03, 0.000e+00 }, // CO2(total)
         { 6.750e+01, 0.000e+00, 1.385e+02, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 5.441e-01, 6.266e-03, 1.123e+00, 0.000e+00, 0.000e+00, 1.021e-02, 0.000e+00 }, // HC
-        { 6.023e+03, 8.854e+01, 1.230e+04, 0.000e+00, 0.000e+00, 2.230e+02, 0.000e+00 }, // FC
-        { 9.727e+01, 7.646e-01, 8.738e+01, 0.000e+00, 0.000e+00, 3.046e+00, 0.000e+00 }, // NOx
-        { 2.654e+00, 0.000e+00, 2.359e+00, 0.000e+00, 3.057e-06, 0.000e+00, 5.847e-05 }, // PM + PM (non-exhaust)
+        { 5.441e-01, 2.256e-02, 1.123e+00, 0.000e+00, 0.000e+00, 3.676e-02, 0.000e+00 }, // HC
+        { 6.023e+03, 3.187e+02, 1.230e+04, 0.000e+00, 0.000e+00, 8.027e+02, 0.000e+00 }, // FC
+        { 9.727e+01, 2.753e+00, 8.738e+01, 0.000e+00, 0.000e+00, 1.097e+01, 0.000e+00 }, // NOx
+        { 2.654e+00, 0.000e+00, 2.359e+00, 0.000e+00, 1.427e-04, 0.000e+00, 7.577e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_gt60t_Euro-IV_SCRs
-        { 1.874e+04, 2.755e+02, 3.828e+04, 0.000e+00, 0.000e+00, 6.938e+02, 0.000e+00 }, // CO2(total)
+        { 1.874e+04, 9.918e+02, 3.828e+04, 0.000e+00, 0.000e+00, 2.498e+03, 0.000e+00 }, // CO2(total)
         { 6.750e+01, 0.000e+00, 1.385e+02, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 5.441e-01, 6.266e-03, 1.123e+00, 0.000e+00, 0.000e+00, 1.021e-02, 0.000e+00 }, // HC
-        { 6.023e+03, 8.854e+01, 1.230e+04, 0.000e+00, 0.000e+00, 2.230e+02, 0.000e+00 }, // FC
-        { 2.082e+02, 3.174e+00, 3.845e+02, 0.000e+00, 0.000e+00, 8.273e+00, 0.000e+00 }, // NOx
-        { 2.654e+00, 0.000e+00, 2.359e+00, 0.000e+00, 3.057e-06, 0.000e+00, 5.847e-05 }, // PM + PM (non-exhaust)
+        { 5.441e-01, 2.256e-02, 1.123e+00, 0.000e+00, 0.000e+00, 3.676e-02, 0.000e+00 }, // HC
+        { 6.023e+03, 3.187e+02, 1.230e+04, 0.000e+00, 0.000e+00, 8.027e+02, 0.000e+00 }, // FC
+        { 2.082e+02, 1.143e+01, 3.845e+02, 0.000e+00, 0.000e+00, 2.978e+01, 0.000e+00 }, // NOx
+        { 2.654e+00, 0.000e+00, 2.359e+00, 0.000e+00, 1.427e-04, 0.000e+00, 7.577e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_gt60t_Euro-V_EGR
-        { 1.848e+04, 2.727e+02, 3.870e+04, 0.000e+00, 0.000e+00, 6.766e+02, 0.000e+00 }, // CO2(total)
+        { 1.848e+04, 9.819e+02, 3.870e+04, 0.000e+00, 0.000e+00, 2.436e+03, 0.000e+00 }, // CO2(total)
         { 1.796e+01, 0.000e+00, 3.628e+01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 1.789e+00, 1.991e-02, 2.004e+00, 0.000e+00, 0.000e+00, 5.919e-02, 0.000e+00 }, // HC
-        { 5.939e+03, 8.766e+01, 1.244e+04, 0.000e+00, 0.000e+00, 2.174e+02, 0.000e+00 }, // FC
-        { 1.335e+02, 6.252e-01, 2.565e+02, 0.000e+00, 0.000e+00, 1.725e+00, 0.000e+00 }, // NOx
-        { 1.884e+00, 1.484e-02, 7.462e-01, 0.000e+00, 2.950e-06, 3.851e-02, 1.131e-05 }, // PM + PM (non-exhaust)
+        { 1.789e+00, 7.166e-02, 2.004e+00, 0.000e+00, 0.000e+00, 2.131e-01, 0.000e+00 }, // HC
+        { 5.939e+03, 3.156e+02, 1.244e+04, 0.000e+00, 0.000e+00, 7.828e+02, 0.000e+00 }, // FC
+        { 1.335e+02, 2.251e+00, 2.565e+02, 0.000e+00, 0.000e+00, 6.212e+00, 0.000e+00 }, // NOx
+        { 1.884e+00, 5.342e-02, 7.462e-01, 0.000e+00, 1.376e-04, 1.386e-01, 1.465e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_gt60t_Euro-V_SCR
-        { 1.785e+04, 2.713e+02, 3.762e+04, 0.000e+00, 0.000e+00, 6.658e+02, 0.000e+00 }, // CO2(total)
+        { 1.785e+04, 9.768e+02, 3.762e+04, 0.000e+00, 0.000e+00, 2.397e+03, 0.000e+00 }, // CO2(total)
         { 6.703e+01, 0.000e+00, 1.274e+02, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 5.786e-01, 6.222e-03, 9.750e-01, 0.000e+00, 0.000e+00, 1.172e-02, 0.000e+00 }, // HC
-        { 5.736e+03, 8.720e+01, 1.209e+04, 0.000e+00, 0.000e+00, 2.140e+02, 0.000e+00 }, // FC
-        { 7.673e+01, 1.977e-01, 1.052e+01, 0.000e+00, 0.000e+00, 1.652e+00, 0.000e+00 }, // NOx
-        { 2.699e+00, 0.000e+00, 2.245e+00, 1.534e-05, 2.946e-06, 0.000e+00, 8.176e-05 }, // PM + PM (non-exhaust)
+        { 5.786e-01, 2.240e-02, 9.750e-01, 0.000e+00, 0.000e+00, 4.218e-02, 0.000e+00 }, // HC
+        { 5.736e+03, 3.139e+02, 1.209e+04, 0.000e+00, 0.000e+00, 7.703e+02, 0.000e+00 }, // FC
+        { 7.673e+01, 7.118e-01, 1.052e+01, 0.000e+00, 0.000e+00, 5.949e+00, 0.000e+00 }, // NOx
+        { 2.699e+00, 0.000e+00, 2.245e+00, 1.988e-04, 1.375e-04, 0.000e+00, 1.060e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_gt60t_Euro-V_SCRs
-        { 1.785e+04, 2.713e+02, 3.762e+04, 0.000e+00, 0.000e+00, 6.658e+02, 0.000e+00 }, // CO2(total)
+        { 1.785e+04, 9.768e+02, 3.762e+04, 0.000e+00, 0.000e+00, 2.397e+03, 0.000e+00 }, // CO2(total)
         { 6.703e+01, 0.000e+00, 1.274e+02, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 5.786e-01, 6.222e-03, 9.750e-01, 0.000e+00, 0.000e+00, 1.172e-02, 0.000e+00 }, // HC
-        { 5.736e+03, 8.720e+01, 1.209e+04, 0.000e+00, 0.000e+00, 2.140e+02, 0.000e+00 }, // FC
-        { 2.214e+02, 3.051e+00, 3.748e+02, 0.000e+00, 0.000e+00, 8.053e+00, 0.000e+00 }, // NOx
-        { 2.699e+00, 0.000e+00, 2.245e+00, 1.534e-05, 2.946e-06, 0.000e+00, 8.176e-05 }, // PM + PM (non-exhaust)
+        { 5.786e-01, 2.240e-02, 9.750e-01, 0.000e+00, 0.000e+00, 4.218e-02, 0.000e+00 }, // HC
+        { 5.736e+03, 3.139e+02, 1.209e+04, 0.000e+00, 0.000e+00, 7.703e+02, 0.000e+00 }, // FC
+        { 2.214e+02, 1.098e+01, 3.748e+02, 0.000e+00, 0.000e+00, 2.899e+01, 0.000e+00 }, // NOx
+        { 2.699e+00, 0.000e+00, 2.245e+00, 1.988e-04, 1.375e-04, 0.000e+00, 1.060e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_gt60t_Euro-VI_A-C
-        { 1.863e+04, 2.404e+02, 3.990e+04, 0.000e+00, 0.000e+00, 5.853e+02, 0.000e+00 }, // CO2(total)
-        { 5.501e+00, 0.000e+00, 8.167e+00, 0.000e+00, 7.330e-07, 0.000e+00, 0.000e+00 }, // CO
-        { 5.044e-01, 3.002e-03, 7.164e-01, 0.000e+00, 0.000e+00, 4.832e-03, 0.000e+00 }, // HC
-        { 5.987e+03, 7.726e+01, 1.282e+04, 0.000e+00, 0.000e+00, 1.881e+02, 0.000e+00 }, // FC
-        { 1.018e+01, 0.000e+00, 0.000e+00, 0.000e+00, 2.805e-06, 0.000e+00, 1.395e-03 }, // NOx
-        { 1.583e+00, 0.000e+00, 4.702e-01, 0.000e+00, 2.951e-06, 0.000e+00, 9.453e-06 }, // PM + PM (non-exhaust)
+        { 1.863e+04, 8.655e+02, 3.990e+04, 0.000e+00, 0.000e+00, 2.107e+03, 0.000e+00 }, // CO2(total)
+        { 5.501e+00, 0.000e+00, 8.167e+00, 0.000e+00, 3.420e-05, 0.000e+00, 0.000e+00 }, // CO
+        { 5.044e-01, 1.081e-02, 7.164e-01, 0.000e+00, 0.000e+00, 1.739e-02, 0.000e+00 }, // HC
+        { 5.987e+03, 2.781e+02, 1.282e+04, 0.000e+00, 0.000e+00, 6.771e+02, 0.000e+00 }, // FC
+        { 1.018e+01, 0.000e+00, 0.000e+00, 0.000e+00, 1.309e-04, 0.000e+00, 1.808e-02 }, // NOx
+        { 1.583e+00, 0.000e+00, 4.702e-01, 0.000e+00, 1.377e-04, 0.000e+00, 1.225e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_gt60t_Euro-VIs_A-C
-        { 1.863e+04, 2.404e+02, 3.990e+04, 0.000e+00, 0.000e+00, 5.853e+02, 0.000e+00 }, // CO2(total)
-        { 5.501e+00, 0.000e+00, 8.167e+00, 0.000e+00, 7.330e-07, 0.000e+00, 0.000e+00 }, // CO
-        { 5.044e-01, 3.002e-03, 7.164e-01, 0.000e+00, 0.000e+00, 4.832e-03, 0.000e+00 }, // HC
-        { 5.987e+03, 7.726e+01, 1.282e+04, 0.000e+00, 0.000e+00, 1.881e+02, 0.000e+00 }, // FC
-        { 1.606e+02, 1.948e+00, 3.393e+02, 0.000e+00, 0.000e+00, 4.874e+00, 0.000e+00 }, // NOx
-        { 1.583e+00, 0.000e+00, 4.702e-01, 0.000e+00, 2.951e-06, 0.000e+00, 9.453e-06 }, // PM + PM (non-exhaust)
+        { 1.863e+04, 8.655e+02, 3.990e+04, 0.000e+00, 0.000e+00, 2.107e+03, 0.000e+00 }, // CO2(total)
+        { 5.501e+00, 0.000e+00, 8.167e+00, 0.000e+00, 3.420e-05, 0.000e+00, 0.000e+00 }, // CO
+        { 5.044e-01, 1.081e-02, 7.164e-01, 0.000e+00, 0.000e+00, 1.739e-02, 0.000e+00 }, // HC
+        { 5.987e+03, 2.781e+02, 1.282e+04, 0.000e+00, 0.000e+00, 6.771e+02, 0.000e+00 }, // FC
+        { 1.606e+02, 7.013e+00, 3.393e+02, 0.000e+00, 0.000e+00, 1.754e+01, 0.000e+00 }, // NOx
+        { 1.583e+00, 0.000e+00, 4.702e-01, 0.000e+00, 1.377e-04, 0.000e+00, 1.225e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_gt60t_Euro-VI_D-E
-        { 1.670e+04, 2.914e+02, 3.533e+04, 0.000e+00, 0.000e+00, 7.181e+02, 0.000e+00 }, // CO2(total)
+        { 1.670e+04, 1.049e+03, 3.533e+04, 0.000e+00, 0.000e+00, 2.585e+03, 0.000e+00 }, // CO2(total)
         { 1.093e+00, 0.000e+00, 1.918e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 6.939e-01, 4.235e-03, 1.889e-01, 0.000e+00, 0.000e+00, 1.342e-02, 0.000e+00 }, // HC
-        { 5.366e+03, 9.365e+01, 1.135e+04, 0.000e+00, 0.000e+00, 2.308e+02, 0.000e+00 }, // FC
-        { 4.936e+00, 0.000e+00, 1.286e+00, 0.000e+00, 3.160e-06, 0.000e+00, 5.290e-04 }, // NOx
-        { 1.389e+00, 1.086e-03, 9.051e-02, 0.000e+00, 2.946e-06, 2.530e-03, 1.284e-05 }, // PM + PM (non-exhaust)
+        { 6.939e-01, 1.524e-02, 1.889e-01, 0.000e+00, 0.000e+00, 4.831e-02, 0.000e+00 }, // HC
+        { 5.366e+03, 3.371e+02, 1.135e+04, 0.000e+00, 0.000e+00, 8.308e+02, 0.000e+00 }, // FC
+        { 4.936e+00, 0.000e+00, 1.286e+00, 0.000e+00, 1.474e-04, 0.000e+00, 6.856e-03 }, // NOx
+        { 1.389e+00, 3.909e-03, 9.051e-02, 0.000e+00, 1.374e-04, 9.108e-03, 1.664e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_gt60t_Euro-VIs_D-E
-        { 1.670e+04, 2.914e+02, 3.533e+04, 0.000e+00, 0.000e+00, 7.181e+02, 0.000e+00 }, // CO2(total)
+        { 1.670e+04, 1.049e+03, 3.533e+04, 0.000e+00, 0.000e+00, 2.585e+03, 0.000e+00 }, // CO2(total)
         { 1.093e+00, 0.000e+00, 1.918e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 6.939e-01, 4.235e-03, 1.889e-01, 0.000e+00, 0.000e+00, 1.342e-02, 0.000e+00 }, // HC
-        { 5.366e+03, 9.365e+01, 1.135e+04, 0.000e+00, 0.000e+00, 2.308e+02, 0.000e+00 }, // FC
-        { 1.768e+02, 2.322e+00, 3.849e+02, 0.000e+00, 0.000e+00, 5.228e+00, 0.000e+00 }, // NOx
-        { 1.389e+00, 1.086e-03, 9.051e-02, 0.000e+00, 2.946e-06, 2.530e-03, 1.284e-05 }, // PM + PM (non-exhaust)
+        { 6.939e-01, 1.524e-02, 1.889e-01, 0.000e+00, 0.000e+00, 4.831e-02, 0.000e+00 }, // HC
+        { 5.366e+03, 3.371e+02, 1.135e+04, 0.000e+00, 0.000e+00, 8.308e+02, 0.000e+00 }, // FC
+        { 1.768e+02, 8.361e+00, 3.849e+02, 0.000e+00, 0.000e+00, 1.882e+01, 0.000e+00 }, // NOx
+        { 1.389e+00, 3.909e-03, 9.051e-02, 0.000e+00, 1.374e-04, 9.108e-03, 1.664e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_gt14-20t_50ties
-        { 3.422e+03, 1.474e+02, 7.599e+03, 0.000e+00, 0.000e+00, 3.081e+02, 0.000e+00 }, // CO2(total)
-        { 2.687e+01, 5.877e-01, 3.482e+01, 0.000e+00, 0.000e+00, 1.371e+00, 0.000e+00 }, // CO
-        { 1.481e+01, 0.000e+00, 2.384e+00, 0.000e+00, 5.633e-06, 0.000e+00, 2.453e-03 }, // HC
-        { 1.100e+03, 4.738e+01, 2.442e+03, 0.000e+00, 0.000e+00, 9.902e+01, 0.000e+00 }, // FC
-        { 4.351e+01, 1.786e+00, 8.645e+01, 0.000e+00, 0.000e+00, 3.779e+00, 0.000e+00 }, // NOx
-        { 5.934e+00, 8.124e-02, 5.034e+00, 0.000e+00, 2.837e-06, 1.929e-01, 1.094e-06 }, // PM + PM (non-exhaust)
+        { 3.422e+03, 5.308e+02, 7.599e+03, 0.000e+00, 0.000e+00, 1.109e+03, 0.000e+00 }, // CO2(total)
+        { 2.687e+01, 2.116e+00, 3.482e+01, 0.000e+00, 0.000e+00, 4.934e+00, 0.000e+00 }, // CO
+        { 1.481e+01, 0.000e+00, 2.384e+00, 0.000e+00, 2.628e-04, 0.000e+00, 3.179e-02 }, // HC
+        { 1.100e+03, 1.706e+02, 2.442e+03, 0.000e+00, 0.000e+00, 3.565e+02, 0.000e+00 }, // FC
+        { 4.351e+01, 6.429e+00, 8.645e+01, 0.000e+00, 0.000e+00, 1.360e+01, 0.000e+00 }, // NOx
+        { 5.934e+00, 2.925e-01, 5.034e+00, 0.000e+00, 1.323e-04, 6.946e-01, 1.417e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_gt14-20t_60ties
-        { 3.422e+03, 1.474e+02, 7.599e+03, 0.000e+00, 0.000e+00, 3.081e+02, 0.000e+00 }, // CO2(total)
-        { 2.687e+01, 5.877e-01, 3.482e+01, 0.000e+00, 0.000e+00, 1.371e+00, 0.000e+00 }, // CO
-        { 1.481e+01, 0.000e+00, 2.384e+00, 0.000e+00, 5.633e-06, 0.000e+00, 2.453e-03 }, // HC
-        { 1.100e+03, 4.738e+01, 2.442e+03, 0.000e+00, 0.000e+00, 9.902e+01, 0.000e+00 }, // FC
-        { 4.351e+01, 1.786e+00, 8.645e+01, 0.000e+00, 0.000e+00, 3.779e+00, 0.000e+00 }, // NOx
-        { 5.934e+00, 8.124e-02, 5.034e+00, 0.000e+00, 2.837e-06, 1.929e-01, 1.094e-06 }, // PM + PM (non-exhaust)
+        { 3.422e+03, 5.308e+02, 7.599e+03, 0.000e+00, 0.000e+00, 1.109e+03, 0.000e+00 }, // CO2(total)
+        { 2.687e+01, 2.116e+00, 3.482e+01, 0.000e+00, 0.000e+00, 4.934e+00, 0.000e+00 }, // CO
+        { 1.481e+01, 0.000e+00, 2.384e+00, 0.000e+00, 2.628e-04, 0.000e+00, 3.179e-02 }, // HC
+        { 1.100e+03, 1.706e+02, 2.442e+03, 0.000e+00, 0.000e+00, 3.565e+02, 0.000e+00 }, // FC
+        { 4.351e+01, 6.429e+00, 8.645e+01, 0.000e+00, 0.000e+00, 1.360e+01, 0.000e+00 }, // NOx
+        { 5.934e+00, 2.925e-01, 5.034e+00, 0.000e+00, 1.323e-04, 6.946e-01, 1.417e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_gt14-20t_70ties
-        { 3.422e+03, 1.474e+02, 7.599e+03, 0.000e+00, 0.000e+00, 3.081e+02, 0.000e+00 }, // CO2(total)
-        { 2.687e+01, 5.877e-01, 3.482e+01, 0.000e+00, 0.000e+00, 1.371e+00, 0.000e+00 }, // CO
-        { 1.481e+01, 0.000e+00, 2.384e+00, 0.000e+00, 5.633e-06, 0.000e+00, 2.453e-03 }, // HC
-        { 1.100e+03, 4.738e+01, 2.442e+03, 0.000e+00, 0.000e+00, 9.902e+01, 0.000e+00 }, // FC
-        { 4.351e+01, 1.786e+00, 8.645e+01, 0.000e+00, 0.000e+00, 3.779e+00, 0.000e+00 }, // NOx
-        { 5.934e+00, 8.124e-02, 5.034e+00, 0.000e+00, 2.837e-06, 1.929e-01, 1.094e-06 }, // PM + PM (non-exhaust)
+        { 3.422e+03, 5.308e+02, 7.599e+03, 0.000e+00, 0.000e+00, 1.109e+03, 0.000e+00 }, // CO2(total)
+        { 2.687e+01, 2.116e+00, 3.482e+01, 0.000e+00, 0.000e+00, 4.934e+00, 0.000e+00 }, // CO
+        { 1.481e+01, 0.000e+00, 2.384e+00, 0.000e+00, 2.628e-04, 0.000e+00, 3.179e-02 }, // HC
+        { 1.100e+03, 1.706e+02, 2.442e+03, 0.000e+00, 0.000e+00, 3.565e+02, 0.000e+00 }, // FC
+        { 4.351e+01, 6.429e+00, 8.645e+01, 0.000e+00, 0.000e+00, 1.360e+01, 0.000e+00 }, // NOx
+        { 5.934e+00, 2.925e-01, 5.034e+00, 0.000e+00, 1.323e-04, 6.946e-01, 1.417e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_gt14-20t_80ties
-        { 3.422e+03, 1.474e+02, 7.599e+03, 0.000e+00, 0.000e+00, 3.081e+02, 0.000e+00 }, // CO2(total)
-        { 2.687e+01, 5.877e-01, 3.482e+01, 0.000e+00, 0.000e+00, 1.371e+00, 0.000e+00 }, // CO
-        { 1.481e+01, 0.000e+00, 2.384e+00, 0.000e+00, 5.633e-06, 0.000e+00, 2.453e-03 }, // HC
-        { 1.100e+03, 4.738e+01, 2.442e+03, 0.000e+00, 0.000e+00, 9.902e+01, 0.000e+00 }, // FC
-        { 4.351e+01, 1.786e+00, 8.645e+01, 0.000e+00, 0.000e+00, 3.779e+00, 0.000e+00 }, // NOx
-        { 5.934e+00, 8.124e-02, 5.034e+00, 0.000e+00, 2.837e-06, 1.929e-01, 1.094e-06 }, // PM + PM (non-exhaust)
+        { 3.422e+03, 5.308e+02, 7.599e+03, 0.000e+00, 0.000e+00, 1.109e+03, 0.000e+00 }, // CO2(total)
+        { 2.687e+01, 2.116e+00, 3.482e+01, 0.000e+00, 0.000e+00, 4.934e+00, 0.000e+00 }, // CO
+        { 1.481e+01, 0.000e+00, 2.384e+00, 0.000e+00, 2.628e-04, 0.000e+00, 3.179e-02 }, // HC
+        { 1.100e+03, 1.706e+02, 2.442e+03, 0.000e+00, 0.000e+00, 3.565e+02, 0.000e+00 }, // FC
+        { 4.351e+01, 6.429e+00, 8.645e+01, 0.000e+00, 0.000e+00, 1.360e+01, 0.000e+00 }, // NOx
+        { 5.934e+00, 2.925e-01, 5.034e+00, 0.000e+00, 1.323e-04, 6.946e-01, 1.417e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_gt14-20t_Euro-I
-        { 3.438e+03, 1.380e+02, 6.897e+03, 0.000e+00, 0.000e+00, 2.956e+02, 0.000e+00 }, // CO2(total)
-        { 1.096e+01, 1.915e-01, 1.656e+01, 8.151e-06, 0.000e+00, 3.692e-01, 0.000e+00 }, // CO
-        { 2.896e+00, 2.103e-02, 1.854e-01, 6.295e-05, 0.000e+00, 9.078e-02, 0.000e+00 }, // HC
-        { 1.105e+03, 4.436e+01, 2.217e+03, 0.000e+00, 0.000e+00, 9.500e+01, 0.000e+00 }, // FC
-        { 3.416e+01, 1.332e+00, 6.891e+01, 0.000e+00, 0.000e+00, 2.807e+00, 0.000e+00 }, // NOx
-        { 3.198e+00, 3.286e-02, 7.290e-01, 0.000e+00, 2.877e-06, 8.349e-02, 1.037e-06 }, // PM + PM (non-exhaust)
+        { 3.438e+03, 4.969e+02, 6.897e+03, 0.000e+00, 0.000e+00, 1.064e+03, 0.000e+00 }, // CO2(total)
+        { 1.096e+01, 6.894e-01, 1.656e+01, 1.056e-04, 0.000e+00, 1.329e+00, 0.000e+00 }, // CO
+        { 2.896e+00, 7.570e-02, 1.854e-01, 8.159e-04, 0.000e+00, 3.268e-01, 0.000e+00 }, // HC
+        { 1.105e+03, 1.597e+02, 2.217e+03, 0.000e+00, 0.000e+00, 3.420e+02, 0.000e+00 }, // FC
+        { 3.416e+01, 4.795e+00, 6.891e+01, 0.000e+00, 0.000e+00, 1.011e+01, 0.000e+00 }, // NOx
+        { 3.198e+00, 1.183e-01, 7.290e-01, 0.000e+00, 1.342e-04, 3.006e-01, 1.344e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_gt14-20t_Euro-II
-        { 2.401e+03, 1.594e+02, 4.316e+03, 0.000e+00, 0.000e+00, 3.575e+02, 0.000e+00 }, // CO2(total)
-        { 1.427e+01, 0.000e+00, 2.284e+01, 0.000e+00, 7.194e-06, 0.000e+00, 7.820e-04 }, // CO
-        { 2.346e+00, 2.825e-03, 0.000e+00, 1.921e-04, 0.000e+00, 5.800e-02, 1.486e-04 }, // HC
-        { 7.715e+02, 5.124e+01, 1.387e+03, 0.000e+00, 0.000e+00, 1.149e+02, 0.000e+00 }, // FC
-        { 2.947e+01, 1.543e+00, 4.958e+01, 0.000e+00, 0.000e+00, 3.427e+00, 0.000e+00 }, // NOx
-        { 2.546e+00, 9.464e-03, 1.756e+00, 7.815e-05, 2.824e-06, 4.008e-03, 3.010e-04 }, // PM + PM (non-exhaust)
+        { 2.401e+03, 5.740e+02, 4.316e+03, 0.000e+00, 0.000e+00, 1.287e+03, 0.000e+00 }, // CO2(total)
+        { 1.427e+01, 0.000e+00, 2.284e+01, 0.000e+00, 3.357e-04, 0.000e+00, 1.013e-02 }, // CO
+        { 2.346e+00, 1.017e-02, 0.000e+00, 2.490e-03, 0.000e+00, 2.088e-01, 1.926e-03 }, // HC
+        { 7.715e+02, 1.845e+02, 1.387e+03, 0.000e+00, 0.000e+00, 4.136e+02, 0.000e+00 }, // FC
+        { 2.947e+01, 5.554e+00, 4.958e+01, 0.000e+00, 0.000e+00, 1.234e+01, 0.000e+00 }, // NOx
+        { 2.546e+00, 3.407e-02, 1.756e+00, 1.013e-03, 1.318e-04, 1.443e-02, 3.901e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_gt14-20t_Euro-III
-        { 2.897e+03, 1.601e+02, 5.778e+03, 0.000e+00, 0.000e+00, 3.605e+02, 0.000e+00 }, // CO2(total)
-        { 1.207e+01, 0.000e+00, 3.366e+00, 0.000e+00, 1.385e-05, 0.000e+00, 3.494e-03 }, // CO
-        { 1.880e+00, 1.795e-02, 6.011e-01, 0.000e+00, 0.000e+00, 4.904e-02, 0.000e+00 }, // HC
-        { 9.309e+02, 5.145e+01, 1.857e+03, 0.000e+00, 0.000e+00, 1.159e+02, 0.000e+00 }, // FC
-        { 2.470e+01, 1.177e+00, 4.356e+01, 0.000e+00, 0.000e+00, 2.588e+00, 0.000e+00 }, // NOx
-        { 2.412e+00, 1.454e-02, 2.086e-01, 0.000e+00, 2.759e-06, 3.600e-02, 1.507e-05 }, // PM + PM (non-exhaust)
+        { 2.897e+03, 5.763e+02, 5.778e+03, 0.000e+00, 0.000e+00, 1.298e+03, 0.000e+00 }, // CO2(total)
+        { 1.207e+01, 0.000e+00, 3.366e+00, 0.000e+00, 6.463e-04, 0.000e+00, 4.528e-02 }, // CO
+        { 1.880e+00, 6.464e-02, 6.011e-01, 0.000e+00, 0.000e+00, 1.766e-01, 0.000e+00 }, // HC
+        { 9.309e+02, 1.852e+02, 1.857e+03, 0.000e+00, 0.000e+00, 4.171e+02, 0.000e+00 }, // FC
+        { 2.470e+01, 4.238e+00, 4.356e+01, 0.000e+00, 0.000e+00, 9.318e+00, 0.000e+00 }, // NOx
+        { 2.412e+00, 5.233e-02, 2.086e-01, 0.000e+00, 1.287e-04, 1.296e-01, 1.953e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_gt14-20t_Euro-IV_EGR
-        { 1.894e+03, 1.787e+02, 3.940e+03, 0.000e+00, 0.000e+00, 4.102e+02, 0.000e+00 }, // CO2(total)
-        { 4.449e+00, 1.239e-01, 3.725e+00, 0.000e+00, 3.700e-06, 3.489e-01, 0.000e+00 }, // CO
-        { 2.861e-01, 4.050e-03, 5.044e-01, 4.625e-05, 0.000e+00, 5.446e-03, 1.337e-04 }, // HC
-        { 6.087e+02, 5.742e+01, 1.266e+03, 0.000e+00, 0.000e+00, 1.318e+02, 0.000e+00 }, // FC
-        { 2.457e+01, 7.979e-01, 4.652e+01, 0.000e+00, 2.403e-05, 1.517e+00, 5.871e-03 }, // NOx
-        { 1.780e+00, 0.000e+00, 3.800e-01, 0.000e+00, 3.218e-06, 8.091e-04, 8.745e-05 }, // PM + PM (non-exhaust)
+        { 1.894e+03, 6.432e+02, 3.940e+03, 0.000e+00, 0.000e+00, 1.477e+03, 0.000e+00 }, // CO2(total)
+        { 4.449e+00, 4.459e-01, 3.725e+00, 0.000e+00, 1.726e-04, 1.256e+00, 0.000e+00 }, // CO
+        { 2.861e-01, 1.458e-02, 5.044e-01, 5.993e-04, 0.000e+00, 1.961e-02, 1.733e-03 }, // HC
+        { 6.087e+02, 2.067e+02, 1.266e+03, 0.000e+00, 0.000e+00, 4.746e+02, 0.000e+00 }, // FC
+        { 2.457e+01, 2.872e+00, 4.652e+01, 0.000e+00, 1.121e-03, 5.463e+00, 7.608e-02 }, // NOx
+        { 1.780e+00, 0.000e+00, 3.800e-01, 0.000e+00, 1.501e-04, 2.913e-03, 1.133e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_gt14-20t_Euro-IV_SCR
-        { 2.681e+03, 1.542e+02, 6.238e+03, 0.000e+00, 0.000e+00, 3.369e+02, 0.000e+00 }, // CO2(total)
-        { 1.630e+01, 1.775e-01, 1.756e+01, 0.000e+00, 1.926e-05, 7.093e-01, 0.000e+00 }, // CO
-        { 1.085e-01, 2.892e-03, 1.555e-01, 0.000e+00, 0.000e+00, 6.442e-03, 0.000e+00 }, // HC
-        { 8.617e+02, 4.956e+01, 2.005e+03, 0.000e+00, 0.000e+00, 1.083e+02, 0.000e+00 }, // FC
-        { 1.794e+01, 4.799e-01, 9.664e-01, 0.000e+00, 0.000e+00, 1.299e+00, 0.000e+00 }, // NOx
-        { 1.727e+00, 3.442e-03, 3.746e-01, 0.000e+00, 2.955e-06, 9.382e-03, 2.959e-05 }, // PM + PM (non-exhaust)
+        { 2.681e+03, 5.551e+02, 6.238e+03, 0.000e+00, 0.000e+00, 1.213e+03, 0.000e+00 }, // CO2(total)
+        { 1.630e+01, 6.392e-01, 1.756e+01, 0.000e+00, 8.984e-04, 2.554e+00, 0.000e+00 }, // CO
+        { 1.085e-01, 1.041e-02, 1.555e-01, 0.000e+00, 0.000e+00, 2.319e-02, 0.000e+00 }, // HC
+        { 8.617e+02, 1.784e+02, 2.005e+03, 0.000e+00, 0.000e+00, 3.898e+02, 0.000e+00 }, // FC
+        { 1.794e+01, 1.728e+00, 9.664e-01, 0.000e+00, 0.000e+00, 4.677e+00, 0.000e+00 }, // NOx
+        { 1.727e+00, 1.239e-02, 3.746e-01, 0.000e+00, 1.379e-04, 3.378e-02, 3.835e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_gt14-20t_Euro-IV_SCRs
-        { 2.681e+03, 1.542e+02, 6.238e+03, 0.000e+00, 0.000e+00, 3.369e+02, 0.000e+00 }, // CO2(total)
-        { 1.630e+01, 1.775e-01, 1.756e+01, 0.000e+00, 1.926e-05, 7.093e-01, 0.000e+00 }, // CO
-        { 1.085e-01, 2.892e-03, 1.555e-01, 0.000e+00, 0.000e+00, 6.442e-03, 0.000e+00 }, // HC
-        { 8.617e+02, 4.956e+01, 2.005e+03, 0.000e+00, 0.000e+00, 1.083e+02, 0.000e+00 }, // FC
-        { 2.967e+01, 1.528e+00, 5.750e+01, 0.000e+00, 0.000e+00, 3.362e+00, 0.000e+00 }, // NOx
-        { 1.727e+00, 3.442e-03, 3.746e-01, 0.000e+00, 2.955e-06, 9.382e-03, 2.959e-05 }, // PM + PM (non-exhaust)
+        { 2.681e+03, 5.551e+02, 6.238e+03, 0.000e+00, 0.000e+00, 1.213e+03, 0.000e+00 }, // CO2(total)
+        { 1.630e+01, 6.392e-01, 1.756e+01, 0.000e+00, 8.984e-04, 2.554e+00, 0.000e+00 }, // CO
+        { 1.085e-01, 1.041e-02, 1.555e-01, 0.000e+00, 0.000e+00, 2.319e-02, 0.000e+00 }, // HC
+        { 8.617e+02, 1.784e+02, 2.005e+03, 0.000e+00, 0.000e+00, 3.898e+02, 0.000e+00 }, // FC
+        { 2.967e+01, 5.502e+00, 5.750e+01, 0.000e+00, 0.000e+00, 1.210e+01, 0.000e+00 }, // NOx
+        { 1.727e+00, 1.239e-02, 3.746e-01, 0.000e+00, 1.379e-04, 3.378e-02, 3.835e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_gt14-20t_Euro-V_EGR
-        { 1.185e+03, 1.869e+02, 1.382e+03, 0.000e+00, 0.000e+00, 4.485e+02, 0.000e+00 }, // CO2(total)
-        { 5.617e+00, 6.602e-02, 1.130e+01, 0.000e+00, 0.000e+00, 6.500e-02, 0.000e+00 }, // CO
-        { 7.145e-01, 4.519e-03, 8.008e-01, 0.000e+00, 5.374e-07, 7.071e-03, 1.657e-04 }, // HC
-        { 3.808e+02, 6.006e+01, 4.442e+02, 0.000e+00, 0.000e+00, 1.441e+02, 0.000e+00 }, // FC
-        { 1.927e+01, 7.815e-01, 3.162e+01, 0.000e+00, 0.000e+00, 1.657e+00, 0.000e+00 }, // NOx
-        { 1.646e+00, 2.796e-03, 3.275e-01, 0.000e+00, 2.937e-06, 5.682e-03, 7.406e-05 }, // PM + PM (non-exhaust)
+        { 1.185e+03, 6.728e+02, 1.382e+03, 0.000e+00, 0.000e+00, 1.614e+03, 0.000e+00 }, // CO2(total)
+        { 5.617e+00, 2.377e-01, 1.130e+01, 0.000e+00, 0.000e+00, 2.340e-01, 0.000e+00 }, // CO
+        { 7.145e-01, 1.627e-02, 8.008e-01, 0.000e+00, 2.508e-05, 2.546e-02, 2.148e-03 }, // HC
+        { 3.808e+02, 2.162e+02, 4.442e+02, 0.000e+00, 0.000e+00, 5.189e+02, 0.000e+00 }, // FC
+        { 1.927e+01, 2.813e+00, 3.162e+01, 0.000e+00, 0.000e+00, 5.967e+00, 0.000e+00 }, // NOx
+        { 1.646e+00, 1.006e-02, 3.275e-01, 0.000e+00, 1.370e-04, 2.045e-02, 9.598e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_gt14-20t_Euro-V_SCR
-        { 1.130e+03, 1.838e+02, 1.274e+03, 0.000e+00, 0.000e+00, 4.416e+02, 0.000e+00 }, // CO2(total)
-        { 1.571e+01, 2.539e-01, 2.996e+01, 0.000e+00, 5.771e-06, 4.163e-01, 0.000e+00 }, // CO
-        { 1.070e-01, 3.866e-03, 2.613e-02, 0.000e+00, 0.000e+00, 9.602e-03, 0.000e+00 }, // HC
-        { 3.632e+02, 5.908e+01, 4.095e+02, 0.000e+00, 0.000e+00, 1.419e+02, 0.000e+00 }, // FC
-        { 2.422e+01, 1.685e-01, 0.000e+00, 0.000e+00, 0.000e+00, 2.934e-01, 3.145e-03 }, // NOx
-        { 1.810e+00, 4.098e-03, 6.721e-01, 0.000e+00, 2.810e-06, 4.890e-03, 3.881e-05 }, // PM + PM (non-exhaust)
+        { 1.130e+03, 6.618e+02, 1.274e+03, 0.000e+00, 0.000e+00, 1.590e+03, 0.000e+00 }, // CO2(total)
+        { 1.571e+01, 9.141e-01, 2.996e+01, 0.000e+00, 2.692e-04, 1.499e+00, 0.000e+00 }, // CO
+        { 1.070e-01, 1.392e-02, 2.613e-02, 0.000e+00, 0.000e+00, 3.457e-02, 0.000e+00 }, // HC
+        { 3.632e+02, 2.127e+02, 4.095e+02, 0.000e+00, 0.000e+00, 5.109e+02, 0.000e+00 }, // FC
+        { 2.422e+01, 6.067e-01, 0.000e+00, 0.000e+00, 0.000e+00, 1.056e+00, 4.076e-02 }, // NOx
+        { 1.810e+00, 1.475e-02, 6.721e-01, 0.000e+00, 1.311e-04, 1.760e-02, 5.030e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_gt14-20t_Euro-V_SCRs
-        { 1.130e+03, 1.838e+02, 1.274e+03, 0.000e+00, 0.000e+00, 4.416e+02, 0.000e+00 }, // CO2(total)
-        { 1.571e+01, 2.539e-01, 2.996e+01, 0.000e+00, 5.771e-06, 4.163e-01, 0.000e+00 }, // CO
-        { 1.070e-01, 3.866e-03, 2.613e-02, 0.000e+00, 0.000e+00, 9.602e-03, 0.000e+00 }, // HC
-        { 3.632e+02, 5.908e+01, 4.095e+02, 0.000e+00, 0.000e+00, 1.419e+02, 0.000e+00 }, // FC
-        { 2.553e+01, 1.810e+00, 2.100e+01, 0.000e+00, 0.000e+00, 4.222e+00, 0.000e+00 }, // NOx
-        { 1.810e+00, 4.098e-03, 6.721e-01, 0.000e+00, 2.810e-06, 4.890e-03, 3.881e-05 }, // PM + PM (non-exhaust)
+        { 1.130e+03, 6.618e+02, 1.274e+03, 0.000e+00, 0.000e+00, 1.590e+03, 0.000e+00 }, // CO2(total)
+        { 1.571e+01, 9.141e-01, 2.996e+01, 0.000e+00, 2.692e-04, 1.499e+00, 0.000e+00 }, // CO
+        { 1.070e-01, 1.392e-02, 2.613e-02, 0.000e+00, 0.000e+00, 3.457e-02, 0.000e+00 }, // HC
+        { 3.632e+02, 2.127e+02, 4.095e+02, 0.000e+00, 0.000e+00, 5.109e+02, 0.000e+00 }, // FC
+        { 2.553e+01, 6.517e+00, 2.100e+01, 0.000e+00, 0.000e+00, 1.520e+01, 0.000e+00 }, // NOx
+        { 1.810e+00, 1.475e-02, 6.721e-01, 0.000e+00, 1.311e-04, 1.760e-02, 5.030e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_gt14-20t_Euro-VI_A-C
-        { 6.377e+02, 1.901e+02, 0.000e+00, 0.000e+00, 0.000e+00, 4.627e+02, 0.000e+00 }, // CO2(total)
-        { 2.101e+00, 0.000e+00, 2.304e+00, 0.000e+00, 1.053e-06, 0.000e+00, 9.721e-05 }, // CO
-        { 1.393e-01, 2.036e-03, 4.641e-02, 0.000e+00, 0.000e+00, 4.805e-03, 0.000e+00 }, // HC
-        { 2.049e+02, 6.110e+01, 0.000e+00, 0.000e+00, 0.000e+00, 1.487e+02, 0.000e+00 }, // FC
-        { 4.529e+00, 0.000e+00, 5.443e-02, 0.000e+00, 2.672e-06, 0.000e+00, 0.000e+00 }, // NOx
-        { 1.549e+00, 0.000e+00, 1.283e-01, 0.000e+00, 2.708e-06, 7.700e-04, 1.358e-06 }, // PM + PM (non-exhaust)
+        { 6.377e+02, 6.844e+02, 0.000e+00, 0.000e+00, 0.000e+00, 1.666e+03, 0.000e+00 }, // CO2(total)
+        { 2.101e+00, 0.000e+00, 2.304e+00, 0.000e+00, 4.911e-05, 0.000e+00, 1.260e-03 }, // CO
+        { 1.393e-01, 7.328e-03, 4.641e-02, 0.000e+00, 0.000e+00, 1.730e-02, 0.000e+00 }, // HC
+        { 2.049e+02, 2.200e+02, 0.000e+00, 0.000e+00, 0.000e+00, 5.353e+02, 0.000e+00 }, // FC
+        { 4.529e+00, 0.000e+00, 5.443e-02, 0.000e+00, 1.247e-04, 0.000e+00, 0.000e+00 }, // NOx
+        { 1.549e+00, 0.000e+00, 1.283e-01, 0.000e+00, 1.263e-04, 2.772e-03, 1.759e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_gt14-20t_Euro-VIs_A-C
-        { 4.116e+02, 1.640e+02, 9.977e+02, 0.000e+00, 0.000e+00, 3.658e+02, 0.000e+00 }, // CO2(total)
-        { 1.811e+00, 5.835e-03, 2.506e+00, 0.000e+00, 0.000e+00, 1.032e-02, 0.000e+00 }, // CO
-        { 9.688e-02, 1.307e-03, 8.203e-04, 1.293e-05, 0.000e+00, 3.541e-03, 3.259e-05 }, // HC
-        { 1.323e+02, 5.270e+01, 3.207e+02, 0.000e+00, 0.000e+00, 1.176e+02, 0.000e+00 }, // FC
-        { 7.645e+00, 1.075e+00, 2.215e+01, 0.000e+00, 0.000e+00, 2.316e+00, 0.000e+00 }, // NOx
-        { 1.531e+00, 0.000e+00, 1.583e-01, 0.000e+00, 2.697e-06, 3.750e-04, 6.921e-07 }, // PM + PM (non-exhaust)
+        { 4.116e+02, 5.903e+02, 9.977e+02, 0.000e+00, 0.000e+00, 1.317e+03, 0.000e+00 }, // CO2(total)
+        { 1.811e+00, 2.101e-02, 2.506e+00, 0.000e+00, 0.000e+00, 3.713e-02, 0.000e+00 }, // CO
+        { 9.688e-02, 4.705e-03, 8.203e-04, 1.676e-04, 0.000e+00, 1.275e-02, 4.223e-04 }, // HC
+        { 1.323e+02, 1.897e+02, 3.207e+02, 0.000e+00, 0.000e+00, 4.232e+02, 0.000e+00 }, // FC
+        { 7.645e+00, 3.872e+00, 2.215e+01, 0.000e+00, 0.000e+00, 8.339e+00, 0.000e+00 }, // NOx
+        { 1.531e+00, 0.000e+00, 1.583e-01, 0.000e+00, 1.258e-04, 1.350e-03, 8.970e-06 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_gt14-20t_Euro-VI_D-E
-        { 1.934e+02, 1.966e+02, 0.000e+00, 0.000e+00, 0.000e+00, 4.432e+02, 3.103e-01 }, // CO2(total)
-        { 9.441e-01, 0.000e+00, 7.025e-01, 0.000e+00, 4.428e-07, 0.000e+00, 0.000e+00 }, // CO
-        { 2.976e-01, 1.398e-03, 0.000e+00, 6.430e-06, 0.000e+00, 5.585e-03, 6.866e-08 }, // HC
-        { 6.216e+01, 6.317e+01, 0.000e+00, 0.000e+00, 0.000e+00, 1.424e+02, 9.971e-02 }, // FC
-        { 1.692e+00, 1.323e-02, 7.204e-02, 0.000e+00, 0.000e+00, 0.000e+00, 2.394e-04 }, // NOx
-        { 1.441e+00, 5.223e-04, 0.000e+00, 0.000e+00, 2.701e-06, 1.511e-03, 6.110e-06 }, // PM + PM (non-exhaust)
+        { 1.934e+02, 7.077e+02, 0.000e+00, 0.000e+00, 0.000e+00, 1.596e+03, 4.021e+00 }, // CO2(total)
+        { 9.441e-01, 0.000e+00, 7.025e-01, 0.000e+00, 2.066e-05, 0.000e+00, 0.000e+00 }, // CO
+        { 2.976e-01, 5.032e-03, 0.000e+00, 8.333e-05, 0.000e+00, 2.010e-02, 8.898e-07 }, // HC
+        { 6.216e+01, 2.274e+02, 0.000e+00, 0.000e+00, 0.000e+00, 5.128e+02, 1.292e+00 }, // FC
+        { 1.692e+00, 4.764e-02, 7.204e-02, 0.000e+00, 0.000e+00, 0.000e+00, 3.103e-03 }, // NOx
+        { 1.441e+00, 1.880e-03, 0.000e+00, 0.000e+00, 1.260e-04, 5.440e-03, 7.919e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_gt14-20t_Euro-VIs_D-E
-        { 1.884e+02, 1.661e+02, 3.397e+02, 0.000e+00, 0.000e+00, 3.735e+02, 0.000e+00 }, // CO2(total)
+        { 1.884e+02, 5.980e+02, 3.397e+02, 0.000e+00, 0.000e+00, 1.345e+03, 0.000e+00 }, // CO2(total)
         { 8.133e-01, 0.000e+00, 1.002e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 2.375e-01, 0.000e+00, 1.084e-01, 0.000e+00, 1.496e-07, 0.000e+00, 2.621e-05 }, // HC
-        { 6.054e+01, 5.338e+01, 1.092e+02, 0.000e+00, 0.000e+00, 1.200e+02, 0.000e+00 }, // FC
-        { 1.956e+01, 1.126e+00, 6.143e+01, 0.000e+00, 0.000e+00, 2.073e+00, 0.000e+00 }, // NOx
-        { 1.438e+00, 3.353e-04, 0.000e+00, 1.209e-06, 2.696e-06, 1.354e-03, 1.203e-06 }, // PM + PM (non-exhaust)
+        { 2.375e-01, 0.000e+00, 1.084e-01, 0.000e+00, 6.980e-06, 0.000e+00, 3.397e-04 }, // HC
+        { 6.054e+01, 1.922e+02, 1.092e+02, 0.000e+00, 0.000e+00, 4.321e+02, 0.000e+00 }, // FC
+        { 1.956e+01, 4.053e+00, 6.143e+01, 0.000e+00, 0.000e+00, 7.462e+00, 0.000e+00 }, // NOx
+        { 1.438e+00, 1.207e-03, 0.000e+00, 1.566e-05, 1.258e-04, 4.876e-03, 1.560e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_gt7_5-14t_50ties
-        { 0.000e+00, 1.626e+02, 0.000e+00, 1.985e-01, 0.000e+00, 3.520e+02, 1.818e-02 }, // CO2(total)
-        { 1.565e+01, 3.569e-01, 0.000e+00, 5.657e-03, 0.000e+00, 1.128e+00, 8.149e-03 }, // CO
-        { 1.569e+01, 0.000e+00, 4.644e+00, 0.000e+00, 1.609e-05, 0.000e+00, 6.290e-04 }, // HC
-        { 0.000e+00, 5.227e+01, 0.000e+00, 6.378e-02, 0.000e+00, 1.131e+02, 5.843e-03 }, // FC
-        { 1.103e+01, 1.710e+00, 0.000e+00, 4.555e-03, 0.000e+00, 4.132e+00, 3.478e-03 }, // NOx
-        { 2.833e+00, 1.226e-01, 0.000e+00, 0.000e+00, 2.740e-06, 2.209e-01, 1.040e-05 }, // PM + PM (non-exhaust)
+        { 0.000e+00, 5.855e+02, 0.000e+00, 2.572e+00, 0.000e+00, 1.267e+03, 2.356e-01 }, // CO2(total)
+        { 1.565e+01, 1.285e+00, 0.000e+00, 7.331e-02, 0.000e+00, 4.061e+00, 1.056e-01 }, // CO
+        { 1.569e+01, 0.000e+00, 4.644e+00, 0.000e+00, 7.508e-04, 0.000e+00, 8.152e-03 }, // HC
+        { 0.000e+00, 1.882e+02, 0.000e+00, 8.266e-01, 0.000e+00, 4.073e+02, 7.572e-02 }, // FC
+        { 1.103e+01, 6.156e+00, 0.000e+00, 5.903e-02, 0.000e+00, 1.488e+01, 4.508e-02 }, // NOx
+        { 2.833e+00, 4.414e-01, 0.000e+00, 0.000e+00, 1.278e-04, 7.954e-01, 1.347e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_gt7_5-14t_60ties
-        { 0.000e+00, 1.626e+02, 0.000e+00, 1.985e-01, 0.000e+00, 3.520e+02, 1.818e-02 }, // CO2(total)
-        { 1.565e+01, 3.569e-01, 0.000e+00, 5.657e-03, 0.000e+00, 1.128e+00, 8.149e-03 }, // CO
-        { 1.569e+01, 0.000e+00, 4.644e+00, 0.000e+00, 1.609e-05, 0.000e+00, 6.290e-04 }, // HC
-        { 0.000e+00, 5.227e+01, 0.000e+00, 6.378e-02, 0.000e+00, 1.131e+02, 5.843e-03 }, // FC
-        { 1.103e+01, 1.710e+00, 0.000e+00, 4.555e-03, 0.000e+00, 4.132e+00, 3.478e-03 }, // NOx
-        { 2.833e+00, 1.226e-01, 0.000e+00, 0.000e+00, 2.740e-06, 2.209e-01, 1.040e-05 }, // PM + PM (non-exhaust)
+        { 0.000e+00, 5.855e+02, 0.000e+00, 2.572e+00, 0.000e+00, 1.267e+03, 2.356e-01 }, // CO2(total)
+        { 1.565e+01, 1.285e+00, 0.000e+00, 7.331e-02, 0.000e+00, 4.061e+00, 1.056e-01 }, // CO
+        { 1.569e+01, 0.000e+00, 4.644e+00, 0.000e+00, 7.508e-04, 0.000e+00, 8.152e-03 }, // HC
+        { 0.000e+00, 1.882e+02, 0.000e+00, 8.266e-01, 0.000e+00, 4.073e+02, 7.572e-02 }, // FC
+        { 1.103e+01, 6.156e+00, 0.000e+00, 5.903e-02, 0.000e+00, 1.488e+01, 4.508e-02 }, // NOx
+        { 2.833e+00, 4.414e-01, 0.000e+00, 0.000e+00, 1.278e-04, 7.954e-01, 1.347e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_gt7_5-14t_70ties
-        { 0.000e+00, 1.626e+02, 0.000e+00, 1.985e-01, 0.000e+00, 3.520e+02, 1.818e-02 }, // CO2(total)
-        { 1.565e+01, 3.569e-01, 0.000e+00, 5.657e-03, 0.000e+00, 1.128e+00, 8.149e-03 }, // CO
-        { 1.569e+01, 0.000e+00, 4.644e+00, 0.000e+00, 1.609e-05, 0.000e+00, 6.290e-04 }, // HC
-        { 0.000e+00, 5.227e+01, 0.000e+00, 6.378e-02, 0.000e+00, 1.131e+02, 5.843e-03 }, // FC
-        { 1.103e+01, 1.710e+00, 0.000e+00, 4.555e-03, 0.000e+00, 4.132e+00, 3.478e-03 }, // NOx
-        { 2.833e+00, 1.226e-01, 0.000e+00, 0.000e+00, 2.740e-06, 2.209e-01, 1.040e-05 }, // PM + PM (non-exhaust)
+        { 0.000e+00, 5.855e+02, 0.000e+00, 2.572e+00, 0.000e+00, 1.267e+03, 2.356e-01 }, // CO2(total)
+        { 1.565e+01, 1.285e+00, 0.000e+00, 7.331e-02, 0.000e+00, 4.061e+00, 1.056e-01 }, // CO
+        { 1.569e+01, 0.000e+00, 4.644e+00, 0.000e+00, 7.508e-04, 0.000e+00, 8.152e-03 }, // HC
+        { 0.000e+00, 1.882e+02, 0.000e+00, 8.266e-01, 0.000e+00, 4.073e+02, 7.572e-02 }, // FC
+        { 1.103e+01, 6.156e+00, 0.000e+00, 5.903e-02, 0.000e+00, 1.488e+01, 4.508e-02 }, // NOx
+        { 2.833e+00, 4.414e-01, 0.000e+00, 0.000e+00, 1.278e-04, 7.954e-01, 1.347e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_gt7_5-14t_80ties
-        { 0.000e+00, 1.626e+02, 0.000e+00, 1.985e-01, 0.000e+00, 3.520e+02, 1.818e-02 }, // CO2(total)
-        { 1.565e+01, 3.569e-01, 0.000e+00, 5.657e-03, 0.000e+00, 1.128e+00, 8.149e-03 }, // CO
-        { 1.569e+01, 0.000e+00, 4.644e+00, 0.000e+00, 1.609e-05, 0.000e+00, 6.290e-04 }, // HC
-        { 0.000e+00, 5.227e+01, 0.000e+00, 6.378e-02, 0.000e+00, 1.131e+02, 5.843e-03 }, // FC
-        { 1.103e+01, 1.710e+00, 0.000e+00, 4.555e-03, 0.000e+00, 4.132e+00, 3.478e-03 }, // NOx
-        { 2.833e+00, 1.226e-01, 0.000e+00, 0.000e+00, 2.740e-06, 2.209e-01, 1.040e-05 }, // PM + PM (non-exhaust)
+        { 0.000e+00, 5.855e+02, 0.000e+00, 2.572e+00, 0.000e+00, 1.267e+03, 2.356e-01 }, // CO2(total)
+        { 1.565e+01, 1.285e+00, 0.000e+00, 7.331e-02, 0.000e+00, 4.061e+00, 1.056e-01 }, // CO
+        { 1.569e+01, 0.000e+00, 4.644e+00, 0.000e+00, 7.508e-04, 0.000e+00, 8.152e-03 }, // HC
+        { 0.000e+00, 1.882e+02, 0.000e+00, 8.266e-01, 0.000e+00, 4.073e+02, 7.572e-02 }, // FC
+        { 1.103e+01, 6.156e+00, 0.000e+00, 5.903e-02, 0.000e+00, 1.488e+01, 4.508e-02 }, // NOx
+        { 2.833e+00, 4.414e-01, 0.000e+00, 0.000e+00, 1.278e-04, 7.954e-01, 1.347e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_gt7_5-14t_Euro-I
-        { 0.000e+00, 1.621e+02, 0.000e+00, 1.333e-01, 0.000e+00, 3.493e+02, 0.000e+00 }, // CO2(total)
-        { 1.017e+01, 3.462e-02, 1.151e+01, 1.206e-03, 0.000e+00, 0.000e+00, 2.844e-03 }, // CO
-        { 3.479e+00, 0.000e+00, 1.163e+00, 0.000e+00, 6.150e-06, 3.635e-02, 6.447e-04 }, // HC
-        { 0.000e+00, 5.208e+01, 0.000e+00, 4.283e-02, 0.000e+00, 1.123e+02, 0.000e+00 }, // FC
-        { 3.625e+00, 1.530e+00, 0.000e+00, 0.000e+00, 0.000e+00, 3.289e+00, 0.000e+00 }, // NOx
-        { 2.600e+00, 3.655e-02, 0.000e+00, 1.206e-04, 2.718e-06, 7.437e-02, 2.030e-04 }, // PM + PM (non-exhaust)
+        { 0.000e+00, 5.834e+02, 0.000e+00, 1.727e+00, 0.000e+00, 1.258e+03, 0.000e+00 }, // CO2(total)
+        { 1.017e+01, 1.246e-01, 1.151e+01, 1.563e-02, 0.000e+00, 0.000e+00, 3.686e-02 }, // CO
+        { 3.479e+00, 0.000e+00, 1.163e+00, 0.000e+00, 2.869e-04, 1.309e-01, 8.355e-03 }, // HC
+        { 0.000e+00, 1.875e+02, 0.000e+00, 5.550e-01, 0.000e+00, 4.041e+02, 0.000e+00 }, // FC
+        { 3.625e+00, 5.508e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.184e+01, 0.000e+00 }, // NOx
+        { 2.600e+00, 1.316e-01, 0.000e+00, 1.562e-03, 1.268e-04, 2.677e-01, 2.631e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_gt7_5-14t_Euro-II
-        { 1.016e+03, 1.106e+02, 0.000e+00, 5.319e-01, 0.000e+00, 3.089e+02, 3.441e-01 }, // CO2(total)
-        { 1.036e+01, 7.568e-02, 1.828e+01, 0.000e+00, 0.000e+00, 9.182e-02, 0.000e+00 }, // CO
-        { 2.383e+00, 0.000e+00, 6.374e-01, 0.000e+00, 3.836e-06, 0.000e+00, 6.188e-04 }, // HC
-        { 3.266e+02, 3.553e+01, 0.000e+00, 1.709e-01, 0.000e+00, 9.926e+01, 1.106e-01 }, // FC
-        { 1.044e+01, 1.458e+00, 8.778e+00, 0.000e+00, 0.000e+00, 3.129e+00, 0.000e+00 }, // NOx
-        { 2.254e+00, 1.203e-02, 5.531e-01, 8.838e-05, 2.685e-06, 3.747e-02, 0.000e+00 }, // PM + PM (non-exhaust)
+        { 1.016e+03, 3.980e+02, 0.000e+00, 6.894e+00, 0.000e+00, 1.112e+03, 4.459e+00 }, // CO2(total)
+        { 1.036e+01, 2.724e-01, 1.828e+01, 0.000e+00, 0.000e+00, 3.306e-01, 0.000e+00 }, // CO
+        { 2.383e+00, 0.000e+00, 6.374e-01, 0.000e+00, 1.790e-04, 0.000e+00, 8.020e-03 }, // HC
+        { 3.266e+02, 1.279e+02, 0.000e+00, 2.215e+00, 0.000e+00, 3.574e+02, 1.433e+00 }, // FC
+        { 1.044e+01, 5.247e+00, 8.778e+00, 0.000e+00, 0.000e+00, 1.127e+01, 0.000e+00 }, // NOx
+        { 2.254e+00, 4.329e-02, 5.531e-01, 1.145e-03, 1.253e-04, 1.349e-01, 0.000e+00 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_gt7_5-14t_Euro-III
-        { 6.886e+02, 1.330e+02, 0.000e+00, 3.253e-01, 0.000e+00, 3.255e+02, 2.236e-01 }, // CO2(total)
-        { 1.176e+01, 6.484e-02, 9.207e+00, 0.000e+00, 0.000e+00, 1.151e-01, 0.000e+00 }, // CO
-        { 2.324e+00, 0.000e+00, 8.327e-01, 0.000e+00, 2.437e-06, 0.000e+00, 4.303e-04 }, // HC
-        { 2.213e+02, 4.274e+01, 0.000e+00, 1.045e-01, 0.000e+00, 1.046e+02, 7.186e-02 }, // FC
-        { 1.000e+01, 1.084e+00, 7.203e+00, 0.000e+00, 0.000e+00, 2.503e+00, 0.000e+00 }, // NOx
-        { 2.724e+00, 0.000e+00, 3.934e-01, 0.000e+00, 4.120e-06, 3.247e-03, 2.526e-04 }, // PM + PM (non-exhaust)
+        { 6.886e+02, 4.788e+02, 0.000e+00, 4.216e+00, 0.000e+00, 1.172e+03, 2.898e+00 }, // CO2(total)
+        { 1.176e+01, 2.334e-01, 9.207e+00, 0.000e+00, 0.000e+00, 4.144e-01, 0.000e+00 }, // CO
+        { 2.324e+00, 0.000e+00, 8.327e-01, 0.000e+00, 1.137e-04, 0.000e+00, 5.577e-03 }, // HC
+        { 2.213e+02, 1.539e+02, 0.000e+00, 1.355e+00, 0.000e+00, 3.766e+02, 9.313e-01 }, // FC
+        { 1.000e+01, 3.902e+00, 7.203e+00, 0.000e+00, 0.000e+00, 9.012e+00, 0.000e+00 }, // NOx
+        { 2.724e+00, 0.000e+00, 3.934e-01, 0.000e+00, 1.922e-04, 1.169e-02, 3.273e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_gt7_5-14t_Euro-IV_EGR
-        { 0.000e+00, 1.457e+02, 0.000e+00, 2.553e-01, 0.000e+00, 3.387e+02, 1.293e-01 }, // CO2(total)
-        { 6.722e+00, 4.074e-02, 1.429e+01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 1.374e-01, 7.199e-03, 7.390e-01, 0.000e+00, 0.000e+00, 1.157e-03, 0.000e+00 }, // HC
-        { 0.000e+00, 4.682e+01, 0.000e+00, 8.206e-02, 0.000e+00, 1.089e+02, 4.156e-02 }, // FC
-        { 2.809e+01, 5.304e-01, 6.047e+01, 0.000e+00, 0.000e+00, 1.167e+00, 0.000e+00 }, // NOx
-        { 1.742e+00, 1.529e-03, 6.174e-01, 0.000e+00, 2.688e-06, 6.034e-04, 0.000e+00 }, // PM + PM (non-exhaust)
+        { 0.000e+00, 5.244e+02, 0.000e+00, 3.309e+00, 0.000e+00, 1.219e+03, 1.676e+00 }, // CO2(total)
+        { 6.722e+00, 1.467e-01, 1.429e+01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
+        { 1.374e-01, 2.592e-02, 7.390e-01, 0.000e+00, 0.000e+00, 4.166e-03, 0.000e+00 }, // HC
+        { 0.000e+00, 1.685e+02, 0.000e+00, 1.063e+00, 0.000e+00, 3.919e+02, 5.386e-01 }, // FC
+        { 2.809e+01, 1.909e+00, 6.047e+01, 0.000e+00, 0.000e+00, 4.202e+00, 0.000e+00 }, // NOx
+        { 1.742e+00, 5.504e-03, 6.174e-01, 0.000e+00, 1.254e-04, 2.172e-03, 0.000e+00 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_gt7_5-14t_Euro-IV_SCR
-        { 0.000e+00, 1.446e+02, 0.000e+00, 2.448e-01, 0.000e+00, 3.357e+02, 1.113e-01 }, // CO2(total)
+        { 0.000e+00, 5.204e+02, 0.000e+00, 3.173e+00, 0.000e+00, 1.209e+03, 1.443e+00 }, // CO2(total)
         { 2.111e+01, 0.000e+00, 4.039e+01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 9.162e-02, 1.244e-03, 7.566e-02, 0.000e+00, 3.998e-07, 5.731e-03, 0.000e+00 }, // HC
-        { 0.000e+00, 4.646e+01, 0.000e+00, 7.868e-02, 0.000e+00, 1.079e+02, 3.577e-02 }, // FC
-        { 1.052e+01, 3.918e-01, 0.000e+00, 1.174e-03, 0.000e+00, 7.360e-01, 3.116e-03 }, // NOx
-        { 1.805e+00, 7.668e-04, 7.167e-01, 0.000e+00, 2.763e-06, 6.443e-04, 0.000e+00 }, // PM + PM (non-exhaust)
+        { 9.162e-02, 4.479e-03, 7.566e-02, 0.000e+00, 1.865e-05, 2.063e-02, 0.000e+00 }, // HC
+        { 0.000e+00, 1.673e+02, 0.000e+00, 1.020e+00, 0.000e+00, 3.884e+02, 4.636e-01 }, // FC
+        { 1.052e+01, 1.411e+00, 0.000e+00, 1.521e-02, 0.000e+00, 2.650e+00, 4.038e-02 }, // NOx
+        { 1.805e+00, 2.760e-03, 7.167e-01, 0.000e+00, 1.289e-04, 2.319e-03, 0.000e+00 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_gt7_5-14t_Euro-IV_SCRs
-        { 0.000e+00, 1.446e+02, 0.000e+00, 2.448e-01, 0.000e+00, 3.357e+02, 1.113e-01 }, // CO2(total)
+        { 0.000e+00, 5.204e+02, 0.000e+00, 3.173e+00, 0.000e+00, 1.209e+03, 1.443e+00 }, // CO2(total)
         { 2.111e+01, 0.000e+00, 4.039e+01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 9.162e-02, 1.244e-03, 7.566e-02, 0.000e+00, 3.998e-07, 5.731e-03, 0.000e+00 }, // HC
-        { 0.000e+00, 4.646e+01, 0.000e+00, 7.868e-02, 0.000e+00, 1.079e+02, 3.577e-02 }, // FC
-        { 3.563e+00, 1.538e+00, 7.666e-01, 0.000e+00, 0.000e+00, 3.257e+00, 0.000e+00 }, // NOx
-        { 1.805e+00, 7.668e-04, 7.167e-01, 0.000e+00, 2.763e-06, 6.443e-04, 0.000e+00 }, // PM + PM (non-exhaust)
+        { 9.162e-02, 4.479e-03, 7.566e-02, 0.000e+00, 1.865e-05, 2.063e-02, 0.000e+00 }, // HC
+        { 0.000e+00, 1.673e+02, 0.000e+00, 1.020e+00, 0.000e+00, 3.884e+02, 4.636e-01 }, // FC
+        { 3.563e+00, 5.536e+00, 7.666e-01, 0.000e+00, 0.000e+00, 1.173e+01, 0.000e+00 }, // NOx
+        { 1.805e+00, 2.760e-03, 7.167e-01, 0.000e+00, 1.289e-04, 2.319e-03, 0.000e+00 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_gt7_5-14t_Euro-V_EGR
-        { 0.000e+00, 1.434e+02, 0.000e+00, 2.073e-01, 0.000e+00, 3.345e+02, 7.853e-02 }, // CO2(total)
+        { 0.000e+00, 5.161e+02, 0.000e+00, 2.687e+00, 0.000e+00, 1.204e+03, 1.018e+00 }, // CO2(total)
         { 6.291e+00, 0.000e+00, 1.024e+01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 4.937e-01, 2.049e-03, 3.758e-01, 0.000e+00, 7.562e-07, 1.326e-02, 0.000e+00 }, // HC
-        { 0.000e+00, 4.608e+01, 0.000e+00, 6.663e-02, 0.000e+00, 1.075e+02, 2.524e-02 }, // FC
-        { 2.603e+01, 2.795e-01, 5.663e+01, 0.000e+00, 0.000e+00, 3.990e-01, 0.000e+00 }, // NOx
-        { 1.554e+00, 0.000e+00, 9.193e-02, 0.000e+00, 3.777e-06, 7.784e-04, 1.547e-04 }, // PM + PM (non-exhaust)
+        { 4.937e-01, 7.378e-03, 3.758e-01, 0.000e+00, 3.528e-05, 4.773e-02, 0.000e+00 }, // HC
+        { 0.000e+00, 1.659e+02, 0.000e+00, 8.635e-01, 0.000e+00, 3.870e+02, 3.271e-01 }, // FC
+        { 2.603e+01, 1.006e+00, 5.663e+01, 0.000e+00, 0.000e+00, 1.436e+00, 0.000e+00 }, // NOx
+        { 1.554e+00, 0.000e+00, 9.193e-02, 0.000e+00, 1.762e-04, 2.802e-03, 2.004e-03 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_gt7_5-14t_Euro-V_SCR
-        { 0.000e+00, 1.409e+02, 0.000e+00, 1.956e-01, 0.000e+00, 3.287e+02, 5.786e-02 }, // CO2(total)
+        { 0.000e+00, 5.072e+02, 0.000e+00, 2.535e+00, 0.000e+00, 1.183e+03, 7.498e-01 }, // CO2(total)
         { 1.941e+01, 0.000e+00, 3.546e+01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 8.249e-02, 1.958e-03, 3.485e-02, 0.000e+00, 2.514e-07, 6.336e-03, 0.000e+00 }, // HC
-        { 0.000e+00, 4.528e+01, 0.000e+00, 6.287e-02, 0.000e+00, 1.056e+02, 1.859e-02 }, // FC
-        { 1.518e+01, 7.876e-02, 0.000e+00, 1.224e-03, 0.000e+00, 0.000e+00, 5.562e-03 }, // NOx
-        { 1.827e+00, 5.557e-04, 6.742e-01, 0.000e+00, 2.729e-06, 8.115e-04, 0.000e+00 }, // PM + PM (non-exhaust)
+        { 8.249e-02, 7.048e-03, 3.485e-02, 0.000e+00, 1.173e-05, 2.281e-02, 0.000e+00 }, // HC
+        { 0.000e+00, 1.630e+02, 0.000e+00, 8.148e-01, 0.000e+00, 3.802e+02, 2.410e-01 }, // FC
+        { 1.518e+01, 2.835e-01, 0.000e+00, 1.586e-02, 0.000e+00, 0.000e+00, 7.208e-02 }, // NOx
+        { 1.827e+00, 2.001e-03, 6.742e-01, 0.000e+00, 1.273e-04, 2.921e-03, 0.000e+00 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_gt7_5-14t_Euro-V_SCRs
-        { 0.000e+00, 1.409e+02, 0.000e+00, 1.956e-01, 0.000e+00, 3.287e+02, 5.786e-02 }, // CO2(total)
+        { 0.000e+00, 5.072e+02, 0.000e+00, 2.535e+00, 0.000e+00, 1.183e+03, 7.498e-01 }, // CO2(total)
         { 1.941e+01, 0.000e+00, 3.546e+01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 8.249e-02, 1.958e-03, 3.485e-02, 0.000e+00, 2.514e-07, 6.336e-03, 0.000e+00 }, // HC
-        { 0.000e+00, 4.528e+01, 0.000e+00, 6.287e-02, 0.000e+00, 1.056e+02, 1.859e-02 }, // FC
-        { 5.880e+00, 1.513e+00, 0.000e+00, 0.000e+00, 0.000e+00, 2.994e+00, 3.099e-03 }, // NOx
-        { 1.827e+00, 5.557e-04, 6.742e-01, 0.000e+00, 2.729e-06, 8.115e-04, 0.000e+00 }, // PM + PM (non-exhaust)
+        { 8.249e-02, 7.048e-03, 3.485e-02, 0.000e+00, 1.173e-05, 2.281e-02, 0.000e+00 }, // HC
+        { 0.000e+00, 1.630e+02, 0.000e+00, 8.148e-01, 0.000e+00, 3.802e+02, 2.410e-01 }, // FC
+        { 5.880e+00, 5.446e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.078e+01, 4.016e-02 }, // NOx
+        { 1.827e+00, 2.001e-03, 6.742e-01, 0.000e+00, 1.273e-04, 2.921e-03, 0.000e+00 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_gt7_5-14t_Euro-VI_A-C
-        { 0.000e+00, 1.389e+02, 0.000e+00, 2.163e-01, 0.000e+00, 3.239e+02, 2.040e-01 }, // CO2(total)
-        { 1.383e+00, 7.105e-03, 2.189e+00, 0.000e+00, 2.370e-07, 0.000e+00, 0.000e+00 }, // CO
-        { 2.982e-02, 3.261e-03, 0.000e+00, 0.000e+00, 0.000e+00, 5.826e-03, 0.000e+00 }, // HC
-        { 0.000e+00, 4.463e+01, 0.000e+00, 6.952e-02, 0.000e+00, 1.041e+02, 6.556e-02 }, // FC
-        { 2.327e+00, 5.954e-03, 0.000e+00, 4.172e-04, 0.000e+00, 0.000e+00, 4.432e-04 }, // NOx
-        { 1.480e+00, 0.000e+00, 7.698e-02, 0.000e+00, 2.920e-06, 4.341e-04, 1.009e-05 }, // PM + PM (non-exhaust)
+        { 0.000e+00, 5.000e+02, 0.000e+00, 2.803e+00, 0.000e+00, 1.166e+03, 2.644e+00 }, // CO2(total)
+        { 1.383e+00, 2.558e-02, 2.189e+00, 0.000e+00, 1.106e-05, 0.000e+00, 0.000e+00 }, // CO
+        { 2.982e-02, 1.174e-02, 0.000e+00, 0.000e+00, 0.000e+00, 2.097e-02, 0.000e+00 }, // HC
+        { 0.000e+00, 1.607e+02, 0.000e+00, 9.009e-01, 0.000e+00, 3.747e+02, 8.497e-01 }, // FC
+        { 2.327e+00, 2.144e-02, 0.000e+00, 5.407e-03, 0.000e+00, 0.000e+00, 5.745e-03 }, // NOx
+        { 1.480e+00, 0.000e+00, 7.698e-02, 0.000e+00, 1.362e-04, 1.563e-03, 1.308e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_gt7_5-14t_Euro-VIs_A-C
-        { 0.000e+00, 1.389e+02, 0.000e+00, 2.163e-01, 0.000e+00, 3.239e+02, 2.040e-01 }, // CO2(total)
-        { 1.383e+00, 7.105e-03, 2.189e+00, 0.000e+00, 2.370e-07, 0.000e+00, 0.000e+00 }, // CO
-        { 2.982e-02, 3.261e-03, 0.000e+00, 0.000e+00, 0.000e+00, 5.826e-03, 0.000e+00 }, // HC
-        { 0.000e+00, 4.463e+01, 0.000e+00, 6.952e-02, 0.000e+00, 1.041e+02, 6.556e-02 }, // FC
-        { 5.888e-01, 9.088e-01, 0.000e+00, 1.513e-03, 0.000e+00, 2.021e+00, 2.325e-03 }, // NOx
-        { 1.480e+00, 0.000e+00, 7.698e-02, 0.000e+00, 2.920e-06, 4.341e-04, 1.009e-05 }, // PM + PM (non-exhaust)
+        { 0.000e+00, 5.000e+02, 0.000e+00, 2.803e+00, 0.000e+00, 1.166e+03, 2.644e+00 }, // CO2(total)
+        { 1.383e+00, 2.558e-02, 2.189e+00, 0.000e+00, 1.106e-05, 0.000e+00, 0.000e+00 }, // CO
+        { 2.982e-02, 1.174e-02, 0.000e+00, 0.000e+00, 0.000e+00, 2.097e-02, 0.000e+00 }, // HC
+        { 0.000e+00, 1.607e+02, 0.000e+00, 9.009e-01, 0.000e+00, 3.747e+02, 8.497e-01 }, // FC
+        { 5.888e-01, 3.272e+00, 0.000e+00, 1.961e-02, 0.000e+00, 7.277e+00, 3.013e-02 }, // NOx
+        { 1.480e+00, 0.000e+00, 7.698e-02, 0.000e+00, 1.362e-04, 1.563e-03, 1.308e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_gt7_5-14t_Euro-VI_D-E
-        { 0.000e+00, 1.362e+02, 0.000e+00, 2.357e-01, 0.000e+00, 3.168e+02, 2.690e-01 }, // CO2(total)
+        { 0.000e+00, 4.903e+02, 0.000e+00, 3.054e+00, 0.000e+00, 1.141e+03, 3.487e+00 }, // CO2(total)
         { 5.022e-01, 0.000e+00, 6.107e-01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 1.979e-01, 0.000e+00, 7.798e-02, 0.000e+00, 2.425e-07, 1.347e-03, 0.000e+00 }, // HC
-        { 0.000e+00, 4.377e+01, 0.000e+00, 7.574e-02, 0.000e+00, 1.018e+02, 8.647e-02 }, // FC
-        { 7.158e-01, 1.160e-02, 1.748e-01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // NOx
-        { 1.445e+00, 0.000e+00, 0.000e+00, 4.382e-06, 2.715e-06, 1.279e-03, 7.637e-06 }, // PM + PM (non-exhaust)
+        { 1.979e-01, 0.000e+00, 7.798e-02, 0.000e+00, 1.131e-05, 4.849e-03, 0.000e+00 }, // HC
+        { 0.000e+00, 1.576e+02, 0.000e+00, 9.816e-01, 0.000e+00, 3.665e+02, 1.121e+00 }, // FC
+        { 7.158e-01, 4.177e-02, 1.748e-01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // NOx
+        { 1.445e+00, 0.000e+00, 0.000e+00, 5.679e-05, 1.267e-04, 4.605e-03, 9.898e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_gt7_5-14t_Euro-VIs_D-E
-        { 0.000e+00, 1.362e+02, 0.000e+00, 2.357e-01, 0.000e+00, 3.168e+02, 2.690e-01 }, // CO2(total)
+        { 0.000e+00, 4.903e+02, 0.000e+00, 3.054e+00, 0.000e+00, 1.141e+03, 3.487e+00 }, // CO2(total)
         { 5.022e-01, 0.000e+00, 6.107e-01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 1.979e-01, 0.000e+00, 7.798e-02, 0.000e+00, 2.425e-07, 1.347e-03, 0.000e+00 }, // HC
-        { 0.000e+00, 4.377e+01, 0.000e+00, 7.574e-02, 0.000e+00, 1.018e+02, 8.647e-02 }, // FC
-        { 1.513e+01, 8.491e-01, 4.129e+01, 0.000e+00, 5.052e-06, 1.348e+00, 2.292e-03 }, // NOx
-        { 1.445e+00, 0.000e+00, 0.000e+00, 4.382e-06, 2.715e-06, 1.279e-03, 7.637e-06 }, // PM + PM (non-exhaust)
+        { 1.979e-01, 0.000e+00, 7.798e-02, 0.000e+00, 1.131e-05, 4.849e-03, 0.000e+00 }, // HC
+        { 0.000e+00, 1.576e+02, 0.000e+00, 9.816e-01, 0.000e+00, 3.665e+02, 1.121e+00 }, // FC
+        { 1.513e+01, 3.057e+00, 4.129e+01, 0.000e+00, 2.357e-04, 4.854e+00, 2.970e-02 }, // NOx
+        { 1.445e+00, 0.000e+00, 0.000e+00, 5.679e-05, 1.267e-04, 4.605e-03, 9.898e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // HGV_CNG_le7_5t_Euro-IV
-        { 2.172e+03, 0.000e+00, 0.000e+00, 1.412e+00, 5.345e-04, 1.657e+02, 1.090e+00 }, // CO2(total)
-        { 2.707e+00, 1.133e-01, 4.701e+00, 0.000e+00, 0.000e+00, 1.324e-01, 0.000e+00 }, // CO
-        { 2.108e+00, 2.217e-02, 2.908e+00, 0.000e+00, 7.326e-06, 0.000e+00, 1.286e-03 }, // HC
-        { 6.989e+02, 0.000e+00, 0.000e+00, 4.544e-01, 1.720e-04, 5.332e+01, 3.507e-01 }, // FC
-        { 1.532e+00, 9.930e-01, 0.000e+00, 1.941e-03, 0.000e+00, 1.873e+00, 1.130e-03 }, // NOx
-        { 1.439e+00, 4.221e-04, 2.808e-02, 0.000e+00, 2.711e-06, 1.466e-04, 1.259e-05 }, // PM + PM (non-exhaust)
+        { 2.172e+03, 0.000e+00, 0.000e+00, 1.830e+01, 2.494e-02, 5.966e+02, 1.413e+01 }, // CO2(total)
+        { 2.707e+00, 4.080e-01, 4.701e+00, 0.000e+00, 0.000e+00, 4.767e-01, 0.000e+00 }, // CO
+        { 2.108e+00, 7.983e-02, 2.908e+00, 0.000e+00, 3.418e-04, 0.000e+00, 1.666e-02 }, // HC
+        { 6.989e+02, 0.000e+00, 0.000e+00, 5.889e+00, 8.024e-03, 1.920e+02, 4.545e+00 }, // FC
+        { 1.532e+00, 3.575e+00, 0.000e+00, 2.516e-02, 0.000e+00, 6.741e+00, 1.464e-02 }, // NOx
+        { 1.439e+00, 1.519e-03, 2.808e-02, 0.000e+00, 1.265e-04, 5.278e-04, 1.632e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // HGV_CNG_le7_5t_Euro-V
-        { 2.117e+03, 0.000e+00, 0.000e+00, 1.389e+00, 2.057e-04, 1.618e+02, 1.087e+00 }, // CO2(total)
-        { 1.572e+00, 0.000e+00, 0.000e+00, 1.032e-03, 1.528e-07, 1.202e-01, 8.076e-04 }, // CO
-        { 7.419e-01, 0.000e+00, 0.000e+00, 4.870e-04, 7.210e-08, 5.670e-02, 3.810e-04 }, // HC
-        { 6.811e+02, 0.000e+00, 0.000e+00, 4.470e-01, 6.618e-05, 5.205e+01, 3.498e-01 }, // FC
-        { 2.859e+00, 0.000e+00, 0.000e+00, 1.877e-03, 2.779e-07, 2.186e-01, 1.469e-03 }, // NOx
-        { 1.440e+00, 0.000e+00, 0.000e+00, 8.053e-06, 2.721e-06, 9.377e-04, 1.733e-05 }, // PM + PM (non-exhaust)
+        { 2.117e+03, 0.000e+00, 0.000e+00, 1.800e+01, 9.596e-03, 5.824e+02, 1.409e+01 }, // CO2(total)
+        { 1.572e+00, 0.000e+00, 0.000e+00, 1.338e-02, 7.129e-06, 4.326e-01, 1.047e-02 }, // CO
+        { 7.419e-01, 0.000e+00, 0.000e+00, 6.311e-03, 3.364e-06, 2.041e-01, 4.938e-03 }, // HC
+        { 6.811e+02, 0.000e+00, 0.000e+00, 5.794e+00, 3.088e-03, 1.874e+02, 4.533e+00 }, // FC
+        { 2.859e+00, 0.000e+00, 0.000e+00, 2.432e-02, 1.296e-05, 7.868e-01, 1.903e-02 }, // NOx
+        { 1.440e+00, 0.000e+00, 0.000e+00, 1.044e-04, 1.270e-04, 3.376e-03, 2.246e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // HGV_CNG_le7_5t_Euro-VI
-        { 2.109e+03, 0.000e+00, 0.000e+00, 1.363e+00, 1.495e-04, 1.668e+02, 1.011e+00 }, // CO2(total)
-        { 1.366e+00, 0.000e+00, 0.000e+00, 8.827e-04, 9.683e-08, 1.080e-01, 6.549e-04 }, // CO
-        { 3.619e-01, 0.000e+00, 0.000e+00, 2.339e-04, 2.566e-08, 2.862e-02, 1.735e-04 }, // HC
-        { 6.786e+02, 0.000e+00, 0.000e+00, 4.386e-01, 4.811e-05, 5.367e+01, 3.254e-01 }, // FC
-        { 9.067e-01, 0.000e+00, 0.000e+00, 5.860e-04, 6.428e-08, 7.171e-02, 4.347e-04 }, // NOx
-        { 1.438e+00, 0.000e+00, 0.000e+00, 7.901e-06, 2.718e-06, 9.668e-04, 1.566e-05 }, // PM + PM (non-exhaust)
+        { 2.109e+03, 0.000e+00, 0.000e+00, 1.766e+01, 6.975e-03, 6.004e+02, 1.310e+01 }, // CO2(total)
+        { 1.366e+00, 0.000e+00, 0.000e+00, 1.144e-02, 4.518e-06, 3.889e-01, 8.487e-03 }, // CO
+        { 3.619e-01, 0.000e+00, 0.000e+00, 3.031e-03, 1.197e-06, 1.030e-01, 2.249e-03 }, // HC
+        { 6.786e+02, 0.000e+00, 0.000e+00, 5.684e+00, 2.244e-03, 1.932e+02, 4.217e+00 }, // FC
+        { 9.067e-01, 0.000e+00, 0.000e+00, 7.594e-03, 2.999e-06, 2.581e-01, 5.634e-03 }, // NOx
+        { 1.438e+00, 0.000e+00, 0.000e+00, 1.024e-04, 1.268e-04, 3.480e-03, 2.030e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // HGV_CNG_gt7_5-12t_Euro-IV
-        { 0.000e+00, 1.543e+02, 0.000e+00, 2.704e-01, 0.000e+00, 3.588e+02, 1.370e-01 }, // CO2(total)
-        { 8.067e+00, 4.889e-02, 1.715e+01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 1.649e+00, 8.639e-02, 8.868e+00, 0.000e+00, 0.000e+00, 1.389e-02, 0.000e+00 }, // HC
-        { 0.000e+00, 4.965e+01, 0.000e+00, 8.702e-02, 0.000e+00, 1.154e+02, 4.407e-02 }, // FC
-        { 3.652e+01, 6.895e-01, 7.861e+01, 0.000e+00, 0.000e+00, 1.517e+00, 0.000e+00 }, // NOx
-        { 1.466e+00, 1.530e-04, 6.176e-02, 0.000e+00, 2.688e-06, 6.034e-04, 0.000e+00 }, // PM + PM (non-exhaust)
+        { 0.000e+00, 5.555e+02, 0.000e+00, 3.505e+00, 0.000e+00, 1.292e+03, 1.775e+00 }, // CO2(total)
+        { 8.067e+00, 1.760e-01, 1.715e+01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
+        { 1.649e+00, 3.110e-01, 8.868e+00, 0.000e+00, 0.000e+00, 4.999e-02, 0.000e+00 }, // HC
+        { 0.000e+00, 1.787e+02, 0.000e+00, 1.128e+00, 0.000e+00, 4.156e+02, 5.712e-01 }, // FC
+        { 3.652e+01, 2.482e+00, 7.861e+01, 0.000e+00, 0.000e+00, 5.463e+00, 0.000e+00 }, // NOx
+        { 1.466e+00, 5.506e-04, 6.176e-02, 0.000e+00, 1.254e-04, 2.172e-03, 0.000e+00 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // HGV_CNG_gt7_5-12t_Euro-V
-        { 0.000e+00, 1.535e+02, 0.000e+00, 2.131e-01, 0.000e+00, 3.580e+02, 6.303e-02 }, // CO2(total)
-        { 0.000e+00, 1.140e-01, 0.000e+00, 1.583e-04, 0.000e+00, 2.660e-01, 4.683e-05 }, // CO
-        { 0.000e+00, 5.380e-02, 0.000e+00, 7.471e-05, 0.000e+00, 1.255e-01, 2.209e-05 }, // HC
-        { 0.000e+00, 4.939e+01, 0.000e+00, 6.858e-02, 0.000e+00, 1.152e+02, 2.028e-02 }, // FC
-        { 0.000e+00, 2.074e-01, 0.000e+00, 2.879e-04, 0.000e+00, 4.837e-01, 8.516e-05 }, // NOx
-        { 1.438e+00, 8.897e-04, 0.000e+00, 1.235e-06, 2.691e-06, 2.887e-03, 3.654e-07 }, // PM + PM (non-exhaust)
+        { 0.000e+00, 5.526e+02, 0.000e+00, 2.762e+00, 0.000e+00, 1.289e+03, 8.169e-01 }, // CO2(total)
+        { 0.000e+00, 4.105e-01, 0.000e+00, 2.052e-03, 0.000e+00, 9.576e-01, 6.069e-04 }, // CO
+        { 0.000e+00, 1.937e-01, 0.000e+00, 9.682e-04, 0.000e+00, 4.518e-01, 2.863e-04 }, // HC
+        { 0.000e+00, 1.778e+02, 0.000e+00, 8.888e-01, 0.000e+00, 4.148e+02, 2.629e-01 }, // FC
+        { 0.000e+00, 7.465e-01, 0.000e+00, 3.732e-03, 0.000e+00, 1.741e+00, 1.104e-03 }, // NOx
+        { 1.438e+00, 3.203e-03, 0.000e+00, 1.601e-05, 1.255e-04, 1.039e-02, 4.735e-06 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // HGV_CNG_gt7_5-12t_Euro-VI
-        { 0.000e+00, 1.513e+02, 0.000e+00, 2.357e-01, 0.000e+00, 3.529e+02, 2.222e-01 }, // CO2(total)
-        { 0.000e+00, 9.799e-02, 0.000e+00, 1.526e-04, 0.000e+00, 2.285e-01, 1.439e-04 }, // CO
-        { 0.000e+00, 2.597e-02, 0.000e+00, 4.044e-05, 0.000e+00, 6.056e-02, 3.814e-05 }, // HC
-        { 0.000e+00, 4.869e+01, 0.000e+00, 7.583e-02, 0.000e+00, 1.135e+02, 7.151e-02 }, // FC
-        { 0.000e+00, 6.505e-02, 0.000e+00, 1.013e-04, 0.000e+00, 1.517e-01, 9.555e-05 }, // NOx
-        { 1.431e+00, 8.771e-04, 0.000e+00, 1.366e-06, 2.717e-06, 2.479e-03, 8.951e-06 }, // PM + PM (non-exhaust)
+        { 0.000e+00, 5.447e+02, 0.000e+00, 3.054e+00, 0.000e+00, 1.270e+03, 2.880e+00 }, // CO2(total)
+        { 0.000e+00, 3.528e-01, 0.000e+00, 1.978e-03, 0.000e+00, 8.227e-01, 1.865e-03 }, // CO
+        { 0.000e+00, 9.348e-02, 0.000e+00, 5.241e-04, 0.000e+00, 2.180e-01, 4.943e-04 }, // HC
+        { 0.000e+00, 1.753e+02, 0.000e+00, 9.827e-01, 0.000e+00, 4.088e+02, 9.268e-01 }, // FC
+        { 0.000e+00, 2.342e-01, 0.000e+00, 1.313e-03, 0.000e+00, 5.461e-01, 1.238e-03 }, // NOx
+        { 1.431e+00, 3.157e-03, 0.000e+00, 1.770e-05, 1.267e-04, 8.926e-03, 1.160e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // HGV_CNG_gt12t_Euro-IV
-        { 2.006e+03, 1.893e+02, 4.173e+03, 0.000e+00, 0.000e+00, 4.345e+02, 0.000e+00 }, // CO2(total)
-        { 5.339e+00, 1.486e-01, 4.470e+00, 0.000e+00, 4.440e-06, 4.187e-01, 0.000e+00 }, // CO
-        { 3.433e+00, 4.860e-02, 6.052e+00, 5.549e-04, 0.000e+00, 6.535e-02, 1.605e-03 }, // HC
-        { 6.456e+02, 6.090e+01, 1.343e+03, 0.000e+00, 0.000e+00, 1.398e+02, 0.000e+00 }, // FC
-        { 3.194e+01, 1.037e+00, 6.048e+01, 0.000e+00, 3.123e-05, 1.973e+00, 7.632e-03 }, // NOx
-        { 1.468e+00, 0.000e+00, 3.802e-02, 0.000e+00, 2.769e-06, 8.091e-04, 1.168e-05 }, // PM + PM (non-exhaust)
+        { 2.006e+03, 6.813e+02, 4.173e+03, 0.000e+00, 0.000e+00, 1.564e+03, 0.000e+00 }, // CO2(total)
+        { 5.339e+00, 5.351e-01, 4.470e+00, 0.000e+00, 2.071e-04, 1.507e+00, 0.000e+00 }, // CO
+        { 3.433e+00, 1.750e-01, 6.052e+00, 7.192e-03, 0.000e+00, 2.353e-01, 2.080e-02 }, // HC
+        { 6.456e+02, 2.192e+02, 1.343e+03, 0.000e+00, 0.000e+00, 5.033e+02, 0.000e+00 }, // FC
+        { 3.194e+01, 3.734e+00, 6.048e+01, 0.000e+00, 1.457e-03, 7.102e+00, 9.891e-02 }, // NOx
+        { 1.468e+00, 0.000e+00, 3.802e-02, 0.000e+00, 1.292e-04, 2.913e-03, 1.514e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // HGV_CNG_gt12t_Euro-V
-        { 1.231e+03, 2.003e+02, 1.388e+03, 0.000e+00, 0.000e+00, 4.811e+02, 0.000e+00 }, // CO2(total)
-        { 9.146e-01, 1.488e-01, 1.031e+00, 0.000e+00, 0.000e+00, 3.574e-01, 0.000e+00 }, // CO
-        { 4.315e-01, 7.020e-02, 4.866e-01, 0.000e+00, 0.000e+00, 1.686e-01, 0.000e+00 }, // HC
-        { 3.961e+02, 6.444e+01, 4.467e+02, 0.000e+00, 0.000e+00, 1.548e+02, 0.000e+00 }, // FC
-        { 1.663e+00, 2.706e-01, 1.875e+00, 0.000e+00, 0.000e+00, 6.499e-01, 0.000e+00 }, // NOx
-        { 1.446e+00, 1.161e-03, 1.489e-02, 0.000e+00, 2.687e-06, 3.475e-03, 0.000e+00 }, // PM + PM (non-exhaust)
+        { 1.231e+03, 7.210e+02, 1.388e+03, 0.000e+00, 0.000e+00, 1.732e+03, 0.000e+00 }, // CO2(total)
+        { 9.146e-01, 5.356e-01, 1.031e+00, 0.000e+00, 0.000e+00, 1.287e+00, 0.000e+00 }, // CO
+        { 4.315e-01, 2.527e-01, 4.866e-01, 0.000e+00, 0.000e+00, 6.070e-01, 0.000e+00 }, // HC
+        { 3.961e+02, 2.320e+02, 4.467e+02, 0.000e+00, 0.000e+00, 5.573e+02, 0.000e+00 }, // FC
+        { 1.663e+00, 9.740e-01, 1.875e+00, 0.000e+00, 0.000e+00, 2.340e+00, 0.000e+00 }, // NOx
+        { 1.446e+00, 4.179e-03, 1.489e-02, 0.000e+00, 1.254e-04, 1.251e-02, 0.000e+00 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // HGV_CNG_gt12t_Euro-VI
-        { 6.947e+02, 2.071e+02, 0.000e+00, 0.000e+00, 0.000e+00, 5.040e+02, 0.000e+00 }, // CO2(total)
-        { 4.499e-01, 1.341e-01, 0.000e+00, 0.000e+00, 0.000e+00, 3.264e-01, 0.000e+00 }, // CO
-        { 1.192e-01, 3.555e-02, 0.000e+00, 0.000e+00, 0.000e+00, 8.650e-02, 0.000e+00 }, // HC
-        { 2.235e+02, 6.665e+01, 0.000e+00, 0.000e+00, 0.000e+00, 1.622e+02, 0.000e+00 }, // FC
-        { 2.987e-01, 8.905e-02, 0.000e+00, 0.000e+00, 0.000e+00, 2.167e-01, 0.000e+00 }, // NOx
-        { 1.437e+00, 1.201e-03, 0.000e+00, 0.000e+00, 2.705e-06, 3.692e-03, 1.358e-06 }, // PM + PM (non-exhaust)
+        { 6.947e+02, 7.457e+02, 0.000e+00, 0.000e+00, 0.000e+00, 1.815e+03, 0.000e+00 }, // CO2(total)
+        { 4.499e-01, 4.829e-01, 0.000e+00, 0.000e+00, 0.000e+00, 1.175e+00, 0.000e+00 }, // CO
+        { 1.192e-01, 1.280e-01, 0.000e+00, 0.000e+00, 0.000e+00, 3.114e-01, 0.000e+00 }, // HC
+        { 2.235e+02, 2.399e+02, 0.000e+00, 0.000e+00, 0.000e+00, 5.839e+02, 0.000e+00 }, // FC
+        { 2.987e-01, 3.206e-01, 0.000e+00, 0.000e+00, 0.000e+00, 7.802e-01, 0.000e+00 }, // NOx
+        { 1.437e+00, 4.322e-03, 0.000e+00, 0.000e+00, 1.262e-04, 1.329e-02, 1.759e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_CNG_Euro-IV
-        { 8.416e+03, 2.217e+02, 1.979e+04, 0.000e+00, 0.000e+00, 5.401e+02, 0.000e+00 }, // CO2(total)
-        { 6.253e+00, 1.647e-01, 1.470e+01, 0.000e+00, 0.000e+00, 4.012e-01, 0.000e+00 }, // CO
-        { 2.950e+00, 7.771e-02, 6.938e+00, 0.000e+00, 0.000e+00, 1.893e-01, 0.000e+00 }, // HC
-        { 2.708e+03, 7.134e+01, 6.369e+03, 0.000e+00, 0.000e+00, 1.738e+02, 0.000e+00 }, // FC
-        { 1.137e+01, 2.995e-01, 2.674e+01, 0.000e+00, 0.000e+00, 7.297e-01, 0.000e+00 }, // NOx
-        { 1.490e+00, 1.285e-03, 1.147e-01, 0.000e+00, 2.679e-06, 3.811e-03, 0.000e+00 }, // PM + PM (non-exhaust)
+        { 8.416e+03, 7.982e+02, 1.979e+04, 0.000e+00, 0.000e+00, 1.944e+03, 0.000e+00 }, // CO2(total)
+        { 6.253e+00, 5.930e-01, 1.470e+01, 0.000e+00, 0.000e+00, 1.444e+00, 0.000e+00 }, // CO
+        { 2.950e+00, 2.798e-01, 6.938e+00, 0.000e+00, 0.000e+00, 6.815e-01, 0.000e+00 }, // HC
+        { 2.708e+03, 2.568e+02, 6.369e+03, 0.000e+00, 0.000e+00, 6.257e+02, 0.000e+00 }, // FC
+        { 1.137e+01, 1.078e+00, 2.674e+01, 0.000e+00, 0.000e+00, 2.627e+00, 0.000e+00 }, // NOx
+        { 1.490e+00, 4.627e-03, 1.147e-01, 0.000e+00, 1.250e-04, 1.372e-02, 0.000e+00 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_CNG_Euro-V
-        { 8.416e+03, 2.217e+02, 1.979e+04, 0.000e+00, 0.000e+00, 5.401e+02, 0.000e+00 }, // CO2(total)
-        { 6.253e+00, 1.647e-01, 1.470e+01, 0.000e+00, 0.000e+00, 4.012e-01, 0.000e+00 }, // CO
-        { 2.950e+00, 7.771e-02, 6.938e+00, 0.000e+00, 0.000e+00, 1.893e-01, 0.000e+00 }, // HC
-        { 2.708e+03, 7.134e+01, 6.369e+03, 0.000e+00, 0.000e+00, 1.738e+02, 0.000e+00 }, // FC
-        { 1.137e+01, 2.995e-01, 2.674e+01, 0.000e+00, 0.000e+00, 7.297e-01, 0.000e+00 }, // NOx
-        { 1.490e+00, 1.285e-03, 1.147e-01, 0.000e+00, 2.679e-06, 3.811e-03, 0.000e+00 }, // PM + PM (non-exhaust)
+        { 8.416e+03, 7.982e+02, 1.979e+04, 0.000e+00, 0.000e+00, 1.944e+03, 0.000e+00 }, // CO2(total)
+        { 6.253e+00, 5.930e-01, 1.470e+01, 0.000e+00, 0.000e+00, 1.444e+00, 0.000e+00 }, // CO
+        { 2.950e+00, 2.798e-01, 6.938e+00, 0.000e+00, 0.000e+00, 6.815e-01, 0.000e+00 }, // HC
+        { 2.708e+03, 2.568e+02, 6.369e+03, 0.000e+00, 0.000e+00, 6.257e+02, 0.000e+00 }, // FC
+        { 1.137e+01, 1.078e+00, 2.674e+01, 0.000e+00, 0.000e+00, 2.627e+00, 0.000e+00 }, // NOx
+        { 1.490e+00, 4.627e-03, 1.147e-01, 0.000e+00, 1.250e-04, 1.372e-02, 0.000e+00 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_CNG_Euro-VI
-        { 8.426e+03, 2.177e+02, 1.997e+04, 0.000e+00, 0.000e+00, 5.299e+02, 0.000e+00 }, // CO2(total)
-        { 5.457e+00, 1.410e-01, 1.293e+01, 0.000e+00, 0.000e+00, 3.432e-01, 0.000e+00 }, // CO
-        { 1.446e+00, 3.736e-02, 3.427e+00, 0.000e+00, 0.000e+00, 9.094e-02, 0.000e+00 }, // HC
-        { 2.711e+03, 7.006e+01, 6.426e+03, 0.000e+00, 0.000e+00, 1.705e+02, 0.000e+00 }, // FC
-        { 3.623e+00, 9.360e-02, 8.586e+00, 0.000e+00, 0.000e+00, 2.278e-01, 0.000e+00 }, // NOx
-        { 1.491e+00, 1.262e-03, 1.158e-01, 0.000e+00, 2.677e-06, 3.744e-03, 0.000e+00 }, // PM + PM (non-exhaust)
+        { 8.426e+03, 7.838e+02, 1.997e+04, 0.000e+00, 0.000e+00, 1.908e+03, 0.000e+00 }, // CO2(total)
+        { 5.457e+00, 5.076e-01, 1.293e+01, 0.000e+00, 0.000e+00, 1.236e+00, 0.000e+00 }, // CO
+        { 1.446e+00, 1.345e-01, 3.427e+00, 0.000e+00, 0.000e+00, 3.274e-01, 0.000e+00 }, // HC
+        { 2.711e+03, 2.522e+02, 6.426e+03, 0.000e+00, 0.000e+00, 6.138e+02, 0.000e+00 }, // FC
+        { 3.623e+00, 3.370e-01, 8.586e+00, 0.000e+00, 0.000e+00, 8.202e-01, 0.000e+00 }, // NOx
+        { 1.491e+00, 4.543e-03, 1.158e-01, 0.000e+00, 1.249e-04, 1.348e-02, 0.000e+00 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // HGV_LNG_le7_5t_Euro-IV
-        { 2.172e+03, 0.000e+00, 0.000e+00, 1.412e+00, 5.345e-04, 1.657e+02, 1.090e+00 }, // CO2(total)
-        { 2.707e+00, 1.133e-01, 4.701e+00, 0.000e+00, 0.000e+00, 1.324e-01, 0.000e+00 }, // CO
-        { 2.108e+00, 2.217e-02, 2.908e+00, 0.000e+00, 7.326e-06, 0.000e+00, 1.286e-03 }, // HC
-        { 6.989e+02, 0.000e+00, 0.000e+00, 4.544e-01, 1.720e-04, 5.332e+01, 3.507e-01 }, // FC
-        { 1.532e+00, 9.930e-01, 0.000e+00, 1.941e-03, 0.000e+00, 1.873e+00, 1.130e-03 }, // NOx
-        { 1.439e+00, 4.221e-04, 2.808e-02, 0.000e+00, 2.711e-06, 1.466e-04, 1.259e-05 }, // PM + PM (non-exhaust)
+        { 2.172e+03, 0.000e+00, 0.000e+00, 1.830e+01, 2.494e-02, 5.966e+02, 1.413e+01 }, // CO2(total)
+        { 2.707e+00, 4.080e-01, 4.701e+00, 0.000e+00, 0.000e+00, 4.767e-01, 0.000e+00 }, // CO
+        { 2.108e+00, 7.983e-02, 2.908e+00, 0.000e+00, 3.418e-04, 0.000e+00, 1.666e-02 }, // HC
+        { 6.989e+02, 0.000e+00, 0.000e+00, 5.889e+00, 8.024e-03, 1.920e+02, 4.545e+00 }, // FC
+        { 1.532e+00, 3.575e+00, 0.000e+00, 2.516e-02, 0.000e+00, 6.741e+00, 1.464e-02 }, // NOx
+        { 1.439e+00, 1.519e-03, 2.808e-02, 0.000e+00, 1.265e-04, 5.278e-04, 1.632e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // HGV_LNG_le7_5t_Euro-V
-        { 2.117e+03, 0.000e+00, 0.000e+00, 1.389e+00, 2.057e-04, 1.618e+02, 1.087e+00 }, // CO2(total)
-        { 1.572e+00, 0.000e+00, 0.000e+00, 1.032e-03, 1.528e-07, 1.202e-01, 8.076e-04 }, // CO
-        { 7.419e-01, 0.000e+00, 0.000e+00, 4.870e-04, 7.210e-08, 5.670e-02, 3.810e-04 }, // HC
-        { 6.811e+02, 0.000e+00, 0.000e+00, 4.470e-01, 6.618e-05, 5.205e+01, 3.498e-01 }, // FC
-        { 2.859e+00, 0.000e+00, 0.000e+00, 1.877e-03, 2.779e-07, 2.186e-01, 1.469e-03 }, // NOx
-        { 1.440e+00, 0.000e+00, 0.000e+00, 8.053e-06, 2.721e-06, 9.377e-04, 1.733e-05 }, // PM + PM (non-exhaust)
+        { 2.117e+03, 0.000e+00, 0.000e+00, 1.800e+01, 9.596e-03, 5.824e+02, 1.409e+01 }, // CO2(total)
+        { 1.572e+00, 0.000e+00, 0.000e+00, 1.338e-02, 7.129e-06, 4.326e-01, 1.047e-02 }, // CO
+        { 7.419e-01, 0.000e+00, 0.000e+00, 6.311e-03, 3.364e-06, 2.041e-01, 4.938e-03 }, // HC
+        { 6.811e+02, 0.000e+00, 0.000e+00, 5.794e+00, 3.088e-03, 1.874e+02, 4.533e+00 }, // FC
+        { 2.859e+00, 0.000e+00, 0.000e+00, 2.432e-02, 1.296e-05, 7.868e-01, 1.903e-02 }, // NOx
+        { 1.440e+00, 0.000e+00, 0.000e+00, 1.044e-04, 1.270e-04, 3.376e-03, 2.246e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // HGV_LNG_le7_5t_Euro-VI
-        { 2.109e+03, 0.000e+00, 0.000e+00, 1.363e+00, 1.495e-04, 1.668e+02, 1.011e+00 }, // CO2(total)
-        { 1.366e+00, 0.000e+00, 0.000e+00, 8.827e-04, 9.683e-08, 1.080e-01, 6.549e-04 }, // CO
-        { 3.619e-01, 0.000e+00, 0.000e+00, 2.339e-04, 2.566e-08, 2.862e-02, 1.735e-04 }, // HC
-        { 6.786e+02, 0.000e+00, 0.000e+00, 4.386e-01, 4.811e-05, 5.367e+01, 3.254e-01 }, // FC
-        { 9.067e-01, 0.000e+00, 0.000e+00, 5.860e-04, 6.428e-08, 7.171e-02, 4.347e-04 }, // NOx
-        { 1.438e+00, 0.000e+00, 0.000e+00, 7.901e-06, 2.718e-06, 9.668e-04, 1.566e-05 }, // PM + PM (non-exhaust)
+        { 2.109e+03, 0.000e+00, 0.000e+00, 1.766e+01, 6.975e-03, 6.004e+02, 1.310e+01 }, // CO2(total)
+        { 1.366e+00, 0.000e+00, 0.000e+00, 1.144e-02, 4.518e-06, 3.889e-01, 8.487e-03 }, // CO
+        { 3.619e-01, 0.000e+00, 0.000e+00, 3.031e-03, 1.197e-06, 1.030e-01, 2.249e-03 }, // HC
+        { 6.786e+02, 0.000e+00, 0.000e+00, 5.684e+00, 2.244e-03, 1.932e+02, 4.217e+00 }, // FC
+        { 9.067e-01, 0.000e+00, 0.000e+00, 7.594e-03, 2.999e-06, 2.581e-01, 5.634e-03 }, // NOx
+        { 1.438e+00, 0.000e+00, 0.000e+00, 1.024e-04, 1.268e-04, 3.480e-03, 2.030e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // HGV_LNG_gt7_5-12t_Euro-IV
-        { 0.000e+00, 1.543e+02, 0.000e+00, 2.704e-01, 0.000e+00, 3.588e+02, 1.370e-01 }, // CO2(total)
-        { 8.067e+00, 4.889e-02, 1.715e+01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
-        { 1.649e+00, 8.639e-02, 8.868e+00, 0.000e+00, 0.000e+00, 1.389e-02, 0.000e+00 }, // HC
-        { 0.000e+00, 4.965e+01, 0.000e+00, 8.702e-02, 0.000e+00, 1.154e+02, 4.407e-02 }, // FC
-        { 3.652e+01, 6.895e-01, 7.861e+01, 0.000e+00, 0.000e+00, 1.517e+00, 0.000e+00 }, // NOx
-        { 1.466e+00, 1.530e-04, 6.176e-02, 0.000e+00, 2.688e-06, 6.034e-04, 0.000e+00 }, // PM + PM (non-exhaust)
+        { 0.000e+00, 5.555e+02, 0.000e+00, 3.505e+00, 0.000e+00, 1.292e+03, 1.775e+00 }, // CO2(total)
+        { 8.067e+00, 1.760e-01, 1.715e+01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
+        { 1.649e+00, 3.110e-01, 8.868e+00, 0.000e+00, 0.000e+00, 4.999e-02, 0.000e+00 }, // HC
+        { 0.000e+00, 1.787e+02, 0.000e+00, 1.128e+00, 0.000e+00, 4.156e+02, 5.712e-01 }, // FC
+        { 3.652e+01, 2.482e+00, 7.861e+01, 0.000e+00, 0.000e+00, 5.463e+00, 0.000e+00 }, // NOx
+        { 1.466e+00, 5.506e-04, 6.176e-02, 0.000e+00, 1.254e-04, 2.172e-03, 0.000e+00 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // HGV_LNG_gt7_5-12t_Euro-V
-        { 0.000e+00, 1.535e+02, 0.000e+00, 2.131e-01, 0.000e+00, 3.580e+02, 6.303e-02 }, // CO2(total)
-        { 0.000e+00, 1.140e-01, 0.000e+00, 1.583e-04, 0.000e+00, 2.660e-01, 4.683e-05 }, // CO
-        { 0.000e+00, 5.380e-02, 0.000e+00, 7.471e-05, 0.000e+00, 1.255e-01, 2.209e-05 }, // HC
-        { 0.000e+00, 4.939e+01, 0.000e+00, 6.858e-02, 0.000e+00, 1.152e+02, 2.028e-02 }, // FC
-        { 0.000e+00, 2.074e-01, 0.000e+00, 2.879e-04, 0.000e+00, 4.837e-01, 8.516e-05 }, // NOx
-        { 1.438e+00, 8.897e-04, 0.000e+00, 1.235e-06, 2.691e-06, 2.887e-03, 3.654e-07 }, // PM + PM (non-exhaust)
+        { 0.000e+00, 5.526e+02, 0.000e+00, 2.762e+00, 0.000e+00, 1.289e+03, 8.169e-01 }, // CO2(total)
+        { 0.000e+00, 4.105e-01, 0.000e+00, 2.052e-03, 0.000e+00, 9.576e-01, 6.069e-04 }, // CO
+        { 0.000e+00, 1.937e-01, 0.000e+00, 9.682e-04, 0.000e+00, 4.518e-01, 2.863e-04 }, // HC
+        { 0.000e+00, 1.778e+02, 0.000e+00, 8.888e-01, 0.000e+00, 4.148e+02, 2.629e-01 }, // FC
+        { 0.000e+00, 7.465e-01, 0.000e+00, 3.732e-03, 0.000e+00, 1.741e+00, 1.104e-03 }, // NOx
+        { 1.438e+00, 3.203e-03, 0.000e+00, 1.601e-05, 1.255e-04, 1.039e-02, 4.735e-06 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // HGV_LNG_gt7_5-12t_Euro-VI
-        { 0.000e+00, 1.513e+02, 0.000e+00, 2.357e-01, 0.000e+00, 3.529e+02, 2.222e-01 }, // CO2(total)
-        { 0.000e+00, 9.799e-02, 0.000e+00, 1.526e-04, 0.000e+00, 2.285e-01, 1.439e-04 }, // CO
-        { 0.000e+00, 2.597e-02, 0.000e+00, 4.044e-05, 0.000e+00, 6.056e-02, 3.814e-05 }, // HC
-        { 0.000e+00, 4.869e+01, 0.000e+00, 7.583e-02, 0.000e+00, 1.135e+02, 7.151e-02 }, // FC
-        { 0.000e+00, 6.505e-02, 0.000e+00, 1.013e-04, 0.000e+00, 1.517e-01, 9.555e-05 }, // NOx
-        { 1.431e+00, 8.771e-04, 0.000e+00, 1.366e-06, 2.717e-06, 2.479e-03, 8.951e-06 }, // PM + PM (non-exhaust)
+        { 0.000e+00, 5.447e+02, 0.000e+00, 3.054e+00, 0.000e+00, 1.270e+03, 2.880e+00 }, // CO2(total)
+        { 0.000e+00, 3.528e-01, 0.000e+00, 1.978e-03, 0.000e+00, 8.227e-01, 1.865e-03 }, // CO
+        { 0.000e+00, 9.348e-02, 0.000e+00, 5.241e-04, 0.000e+00, 2.180e-01, 4.943e-04 }, // HC
+        { 0.000e+00, 1.753e+02, 0.000e+00, 9.827e-01, 0.000e+00, 4.088e+02, 9.268e-01 }, // FC
+        { 0.000e+00, 2.342e-01, 0.000e+00, 1.313e-03, 0.000e+00, 5.461e-01, 1.238e-03 }, // NOx
+        { 1.431e+00, 3.157e-03, 0.000e+00, 1.770e-05, 1.267e-04, 8.926e-03, 1.160e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // HGV_LNG_gt12t_Euro-IV
-        { 2.006e+03, 1.893e+02, 4.173e+03, 0.000e+00, 0.000e+00, 4.345e+02, 0.000e+00 }, // CO2(total)
-        { 5.339e+00, 1.486e-01, 4.470e+00, 0.000e+00, 4.440e-06, 4.187e-01, 0.000e+00 }, // CO
-        { 3.433e+00, 4.860e-02, 6.052e+00, 5.549e-04, 0.000e+00, 6.535e-02, 1.605e-03 }, // HC
-        { 6.456e+02, 6.090e+01, 1.343e+03, 0.000e+00, 0.000e+00, 1.398e+02, 0.000e+00 }, // FC
-        { 3.194e+01, 1.037e+00, 6.048e+01, 0.000e+00, 3.123e-05, 1.973e+00, 7.632e-03 }, // NOx
-        { 1.468e+00, 0.000e+00, 3.802e-02, 0.000e+00, 2.769e-06, 8.091e-04, 1.168e-05 }, // PM + PM (non-exhaust)
+        { 2.006e+03, 6.813e+02, 4.173e+03, 0.000e+00, 0.000e+00, 1.564e+03, 0.000e+00 }, // CO2(total)
+        { 5.339e+00, 5.351e-01, 4.470e+00, 0.000e+00, 2.071e-04, 1.507e+00, 0.000e+00 }, // CO
+        { 3.433e+00, 1.750e-01, 6.052e+00, 7.192e-03, 0.000e+00, 2.353e-01, 2.080e-02 }, // HC
+        { 6.456e+02, 2.192e+02, 1.343e+03, 0.000e+00, 0.000e+00, 5.033e+02, 0.000e+00 }, // FC
+        { 3.194e+01, 3.734e+00, 6.048e+01, 0.000e+00, 1.457e-03, 7.102e+00, 9.891e-02 }, // NOx
+        { 1.468e+00, 0.000e+00, 3.802e-02, 0.000e+00, 1.292e-04, 2.913e-03, 1.514e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // HGV_LNG_gt12t_Euro-V
-        { 1.231e+03, 2.003e+02, 1.388e+03, 0.000e+00, 0.000e+00, 4.811e+02, 0.000e+00 }, // CO2(total)
-        { 9.146e-01, 1.488e-01, 1.031e+00, 0.000e+00, 0.000e+00, 3.574e-01, 0.000e+00 }, // CO
-        { 4.315e-01, 7.020e-02, 4.866e-01, 0.000e+00, 0.000e+00, 1.686e-01, 0.000e+00 }, // HC
-        { 3.961e+02, 6.444e+01, 4.467e+02, 0.000e+00, 0.000e+00, 1.548e+02, 0.000e+00 }, // FC
-        { 1.663e+00, 2.706e-01, 1.875e+00, 0.000e+00, 0.000e+00, 6.499e-01, 0.000e+00 }, // NOx
-        { 1.446e+00, 1.161e-03, 1.489e-02, 0.000e+00, 2.687e-06, 3.475e-03, 0.000e+00 }, // PM + PM (non-exhaust)
+        { 1.231e+03, 7.210e+02, 1.388e+03, 0.000e+00, 0.000e+00, 1.732e+03, 0.000e+00 }, // CO2(total)
+        { 9.146e-01, 5.356e-01, 1.031e+00, 0.000e+00, 0.000e+00, 1.287e+00, 0.000e+00 }, // CO
+        { 4.315e-01, 2.527e-01, 4.866e-01, 0.000e+00, 0.000e+00, 6.070e-01, 0.000e+00 }, // HC
+        { 3.961e+02, 2.320e+02, 4.467e+02, 0.000e+00, 0.000e+00, 5.573e+02, 0.000e+00 }, // FC
+        { 1.663e+00, 9.740e-01, 1.875e+00, 0.000e+00, 0.000e+00, 2.340e+00, 0.000e+00 }, // NOx
+        { 1.446e+00, 4.179e-03, 1.489e-02, 0.000e+00, 1.254e-04, 1.251e-02, 0.000e+00 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // HGV_LNG_gt12t_Euro-VI
-        { 6.947e+02, 2.071e+02, 0.000e+00, 0.000e+00, 0.000e+00, 5.040e+02, 0.000e+00 }, // CO2(total)
-        { 4.499e-01, 1.341e-01, 0.000e+00, 0.000e+00, 0.000e+00, 3.264e-01, 0.000e+00 }, // CO
-        { 1.192e-01, 3.555e-02, 0.000e+00, 0.000e+00, 0.000e+00, 8.650e-02, 0.000e+00 }, // HC
-        { 2.235e+02, 6.665e+01, 0.000e+00, 0.000e+00, 0.000e+00, 1.622e+02, 0.000e+00 }, // FC
-        { 2.987e-01, 8.905e-02, 0.000e+00, 0.000e+00, 0.000e+00, 2.167e-01, 0.000e+00 }, // NOx
-        { 1.437e+00, 1.201e-03, 0.000e+00, 0.000e+00, 2.705e-06, 3.692e-03, 1.358e-06 }, // PM + PM (non-exhaust)
+        { 6.947e+02, 7.457e+02, 0.000e+00, 0.000e+00, 0.000e+00, 1.815e+03, 0.000e+00 }, // CO2(total)
+        { 4.499e-01, 4.829e-01, 0.000e+00, 0.000e+00, 0.000e+00, 1.175e+00, 0.000e+00 }, // CO
+        { 1.192e-01, 1.280e-01, 0.000e+00, 0.000e+00, 0.000e+00, 3.114e-01, 0.000e+00 }, // HC
+        { 2.235e+02, 2.399e+02, 0.000e+00, 0.000e+00, 0.000e+00, 5.839e+02, 0.000e+00 }, // FC
+        { 2.987e-01, 3.206e-01, 0.000e+00, 0.000e+00, 0.000e+00, 7.802e-01, 0.000e+00 }, // NOx
+        { 1.437e+00, 4.322e-03, 0.000e+00, 0.000e+00, 1.262e-04, 1.329e-02, 1.759e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_LNG_Euro-IV
-        { 8.416e+03, 2.217e+02, 1.979e+04, 0.000e+00, 0.000e+00, 5.401e+02, 0.000e+00 }, // CO2(total)
-        { 6.253e+00, 1.647e-01, 1.470e+01, 0.000e+00, 0.000e+00, 4.012e-01, 0.000e+00 }, // CO
-        { 2.950e+00, 7.771e-02, 6.938e+00, 0.000e+00, 0.000e+00, 1.893e-01, 0.000e+00 }, // HC
-        { 2.708e+03, 7.134e+01, 6.369e+03, 0.000e+00, 0.000e+00, 1.738e+02, 0.000e+00 }, // FC
-        { 1.137e+01, 2.995e-01, 2.674e+01, 0.000e+00, 0.000e+00, 7.297e-01, 0.000e+00 }, // NOx
-        { 1.490e+00, 1.285e-03, 1.147e-01, 0.000e+00, 2.679e-06, 3.811e-03, 0.000e+00 }, // PM + PM (non-exhaust)
+        { 8.416e+03, 7.982e+02, 1.979e+04, 0.000e+00, 0.000e+00, 1.944e+03, 0.000e+00 }, // CO2(total)
+        { 6.253e+00, 5.930e-01, 1.470e+01, 0.000e+00, 0.000e+00, 1.444e+00, 0.000e+00 }, // CO
+        { 2.950e+00, 2.798e-01, 6.938e+00, 0.000e+00, 0.000e+00, 6.815e-01, 0.000e+00 }, // HC
+        { 2.708e+03, 2.568e+02, 6.369e+03, 0.000e+00, 0.000e+00, 6.257e+02, 0.000e+00 }, // FC
+        { 1.137e+01, 1.078e+00, 2.674e+01, 0.000e+00, 0.000e+00, 2.627e+00, 0.000e+00 }, // NOx
+        { 1.490e+00, 4.627e-03, 1.147e-01, 0.000e+00, 1.250e-04, 1.372e-02, 0.000e+00 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_LNG_Euro-V
-        { 8.416e+03, 2.217e+02, 1.979e+04, 0.000e+00, 0.000e+00, 5.401e+02, 0.000e+00 }, // CO2(total)
-        { 6.253e+00, 1.647e-01, 1.470e+01, 0.000e+00, 0.000e+00, 4.012e-01, 0.000e+00 }, // CO
-        { 2.950e+00, 7.771e-02, 6.938e+00, 0.000e+00, 0.000e+00, 1.893e-01, 0.000e+00 }, // HC
-        { 2.708e+03, 7.134e+01, 6.369e+03, 0.000e+00, 0.000e+00, 1.738e+02, 0.000e+00 }, // FC
-        { 1.137e+01, 2.995e-01, 2.674e+01, 0.000e+00, 0.000e+00, 7.297e-01, 0.000e+00 }, // NOx
-        { 1.490e+00, 1.285e-03, 1.147e-01, 0.000e+00, 2.679e-06, 3.811e-03, 0.000e+00 }, // PM + PM (non-exhaust)
+        { 8.416e+03, 7.982e+02, 1.979e+04, 0.000e+00, 0.000e+00, 1.944e+03, 0.000e+00 }, // CO2(total)
+        { 6.253e+00, 5.930e-01, 1.470e+01, 0.000e+00, 0.000e+00, 1.444e+00, 0.000e+00 }, // CO
+        { 2.950e+00, 2.798e-01, 6.938e+00, 0.000e+00, 0.000e+00, 6.815e-01, 0.000e+00 }, // HC
+        { 2.708e+03, 2.568e+02, 6.369e+03, 0.000e+00, 0.000e+00, 6.257e+02, 0.000e+00 }, // FC
+        { 1.137e+01, 1.078e+00, 2.674e+01, 0.000e+00, 0.000e+00, 2.627e+00, 0.000e+00 }, // NOx
+        { 1.490e+00, 4.627e-03, 1.147e-01, 0.000e+00, 1.250e-04, 1.372e-02, 0.000e+00 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_LNG_Euro-VI_(CI)
-        { 7.082e+03, 1.830e+02, 1.679e+04, 0.000e+00, 0.000e+00, 4.454e+02, 0.000e+00 }, // CO2(total)
-        { 2.762e+00, 1.541e-02, 3.229e+00, 0.000e+00, 0.000e+00, 4.081e-02, 0.000e+00 }, // CO
-        { 3.894e+00, 1.040e-01, 9.575e+00, 0.000e+00, 0.000e+00, 2.469e-01, 0.000e+00 }, // HC
-        { 2.279e+03, 5.888e+01, 5.401e+03, 0.000e+00, 0.000e+00, 1.433e+02, 0.000e+00 }, // FC
-        { 6.535e+00, 0.000e+00, 1.371e-01, 0.000e+00, 0.000e+00, 0.000e+00, 2.818e-04 }, // NOx
-        { 1.599e+00, 0.000e+00, 1.509e-01, 0.000e+00, 2.681e-06, 6.726e-04, 1.725e-05 }, // PM + PM (non-exhaust)
+        { 7.082e+03, 6.588e+02, 1.679e+04, 0.000e+00, 0.000e+00, 1.603e+03, 0.000e+00 }, // CO2(total)
+        { 2.762e+00, 5.547e-02, 3.229e+00, 0.000e+00, 0.000e+00, 1.469e-01, 0.000e+00 }, // CO
+        { 3.894e+00, 3.744e-01, 9.575e+00, 0.000e+00, 0.000e+00, 8.888e-01, 0.000e+00 }, // HC
+        { 2.279e+03, 2.120e+02, 5.401e+03, 0.000e+00, 0.000e+00, 5.159e+02, 0.000e+00 }, // FC
+        { 6.535e+00, 0.000e+00, 1.371e-01, 0.000e+00, 0.000e+00, 0.000e+00, 3.652e-03 }, // NOx
+        { 1.599e+00, 0.000e+00, 1.509e-01, 0.000e+00, 1.251e-04, 2.421e-03, 2.235e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
@@ -8211,8 +8211,8 @@
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // HC
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // NOx
-        { 1.277e+00, 0.000e+00, 0.000e+00, 0.000e+00, 3.015e-06, 0.000e+00, 5.663e-06 }, // PM + PM (non-exhaust)
-        { 2.148e+00, 4.215e-01, 3.458e+00, 0.000e+00, 0.000e+00, 2.003e+00, 0.000e+00 }, // FC_MJ
+        { 1.277e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.407e-04, 0.000e+00, 7.340e-05 }, // PM + PM (non-exhaust)
+        { 2.148e+00, 1.517e+00, 3.458e+00, 0.000e+00, 0.000e+00, 7.210e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RigidTruck_BEV_le7.5t
@@ -8221,8 +8221,8 @@
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // HC
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // NOx
-        { 1.420e+00, 0.000e+00, 0.000e+00, 0.000e+00, 2.727e-06, 0.000e+00, 1.015e-05 }, // PM + PM (non-exhaust)
-        { 0.000e+00, 1.114e-01, 0.000e+00, 1.199e-04, 1.435e-05, 4.310e-01, 2.518e-04 }, // FC_MJ
+        { 1.420e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.272e-04, 0.000e+00, 1.316e-04 }, // PM + PM (non-exhaust)
+        { 0.000e+00, 4.011e-01, 0.000e+00, 1.554e-03, 6.693e-04, 1.552e+00, 3.263e-03 }, // FC_MJ
     },
     {
         // RigidTruck_BEV_gt7.5-12t
@@ -8231,8 +8231,8 @@
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // HC
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // NOx
-        { 1.431e+00, 0.000e+00, 0.000e+00, 0.000e+00, 2.747e-06, 4.572e-04, 1.357e-05 }, // PM + PM (non-exhaust)
-        { 0.000e+00, 1.514e-01, 0.000e+00, 1.139e-03, 0.000e+00, 7.438e-01, 0.000e+00 }, // FC_MJ
+        { 1.431e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.282e-04, 1.646e-03, 1.758e-04 }, // PM + PM (non-exhaust)
+        { 0.000e+00, 5.451e-01, 0.000e+00, 1.477e-02, 0.000e+00, 2.678e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RigidTruck_BEV_gt12t
@@ -8241,8 +8241,8 @@
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // HC
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // NOx
-        { 1.385e+00, 0.000e+00, 0.000e+00, 0.000e+00, 2.795e-06, 0.000e+00, 6.966e-06 }, // PM + PM (non-exhaust)
-        { 0.000e+00, 2.511e-01, 4.224e-02, 2.353e-04, 0.000e+00, 1.071e+00, 0.000e+00 }, // FC_MJ
+        { 1.385e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.304e-04, 0.000e+00, 9.027e-05 }, // PM + PM (non-exhaust)
+        { 0.000e+00, 9.041e-01, 4.224e-02, 3.050e-03, 0.000e+00, 3.855e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RigidTruck_PHEV_le7_5t_Euro-VI-(El)
@@ -8251,17 +8251,17 @@
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // HC
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // NOx
-        { 1.420e+00, 0.000e+00, 0.000e+00, 0.000e+00, 2.727e-06, 0.000e+00, 1.015e-05 }, // PM + PM (non-exhaust)
-        { 0.000e+00, 1.114e-01, 0.000e+00, 1.199e-04, 1.435e-05, 4.310e-01, 2.518e-04 }, // FC_MJ
+        { 1.420e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.272e-04, 0.000e+00, 1.316e-04 }, // PM + PM (non-exhaust)
+        { 0.000e+00, 4.011e-01, 0.000e+00, 1.554e-03, 6.693e-04, 1.552e+00, 3.263e-03 }, // FC_MJ
     },
     {
         // RigidTruck_PHEV_le7_5t_Euro-VI-(D)
-        { 1.372e+03, 6.344e+00, 7.058e+02, 1.228e+00, 0.000e+00, 1.508e+02, 1.158e+00 }, // CO2(total)
-        { 1.053e+00, 1.003e-03, 1.179e+00, 6.279e-05, 0.000e+00, 0.000e+00, 2.462e-05 }, // CO
-        { 8.609e-02, 0.000e+00, 1.124e-02, 1.401e-05, 1.868e-08, 1.272e-03, 2.040e-05 }, // HC
-        { 4.410e+02, 2.039e+00, 2.268e+02, 3.947e-01, 0.000e+00, 4.846e+01, 3.721e-01 }, // FC
-        { 1.158e-01, 6.448e-02, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 7.758e-04 }, // NOx
-        { 1.483e+00, 0.000e+00, 4.753e-02, 0.000e+00, 2.742e-06, 0.000e+00, 9.802e-06 }, // PM + PM (non-exhaust)
+        { 1.372e+03, 2.284e+01, 7.058e+02, 1.592e+01, 0.000e+00, 5.428e+02, 1.501e+01 }, // CO2(total)
+        { 1.053e+00, 3.609e-03, 1.179e+00, 8.138e-04, 0.000e+00, 0.000e+00, 3.190e-04 }, // CO
+        { 8.609e-02, 0.000e+00, 1.124e-02, 1.815e-04, 8.715e-07, 4.578e-03, 2.644e-04 }, // HC
+        { 4.410e+02, 7.339e+00, 2.268e+02, 5.115e+00, 0.000e+00, 1.745e+02, 4.822e+00 }, // FC
+        { 1.158e-01, 2.321e-01, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.005e-02 }, // NOx
+        { 1.483e+00, 0.000e+00, 4.753e-02, 0.000e+00, 1.279e-04, 0.000e+00, 1.270e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
@@ -8271,17 +8271,17 @@
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // HC
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // NOx
-        { 1.431e+00, 0.000e+00, 0.000e+00, 0.000e+00, 2.747e-06, 4.572e-04, 1.357e-05 }, // PM + PM (non-exhaust)
-        { 0.000e+00, 1.514e-01, 0.000e+00, 1.139e-03, 0.000e+00, 7.438e-01, 0.000e+00 }, // FC_MJ
+        { 1.431e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.282e-04, 1.646e-03, 1.758e-04 }, // PM + PM (non-exhaust)
+        { 0.000e+00, 5.451e-01, 0.000e+00, 1.477e-02, 0.000e+00, 2.678e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RigidTruck_PHEV_gt7_5-12t_Euro-VI-(D)
-        { 0.000e+00, 1.230e+02, 0.000e+00, 4.379e-01, 0.000e+00, 3.578e+02, 2.678e-02 }, // CO2(total)
-        { 1.383e+00, 7.105e-03, 2.189e+00, 0.000e+00, 2.370e-07, 0.000e+00, 0.000e+00 }, // CO
-        { 2.982e-02, 3.261e-03, 0.000e+00, 0.000e+00, 0.000e+00, 5.826e-03, 0.000e+00 }, // HC
-        { 0.000e+00, 3.951e+01, 0.000e+00, 1.407e-01, 0.000e+00, 1.150e+02, 8.607e-03 }, // FC
-        { 2.327e+00, 5.954e-03, 0.000e+00, 4.172e-04, 0.000e+00, 0.000e+00, 4.432e-04 }, // NOx
-        { 1.480e+00, 0.000e+00, 7.698e-02, 0.000e+00, 2.920e-06, 4.341e-04, 1.009e-05 }, // PM + PM (non-exhaust)
+        { 0.000e+00, 4.426e+02, 0.000e+00, 5.675e+00, 0.000e+00, 1.288e+03, 3.471e-01 }, // CO2(total)
+        { 1.383e+00, 2.558e-02, 2.189e+00, 0.000e+00, 1.106e-05, 0.000e+00, 0.000e+00 }, // CO
+        { 2.982e-02, 1.174e-02, 0.000e+00, 0.000e+00, 0.000e+00, 2.097e-02, 0.000e+00 }, // HC
+        { 0.000e+00, 1.422e+02, 0.000e+00, 1.824e+00, 0.000e+00, 4.139e+02, 1.115e-01 }, // FC
+        { 2.327e+00, 2.144e-02, 0.000e+00, 5.407e-03, 0.000e+00, 0.000e+00, 5.745e-03 }, // NOx
+        { 1.480e+00, 0.000e+00, 7.698e-02, 0.000e+00, 1.362e-04, 1.563e-03, 1.308e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
@@ -8291,17 +8291,17 @@
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // HC
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // NOx
-        { 1.385e+00, 0.000e+00, 0.000e+00, 0.000e+00, 2.795e-06, 0.000e+00, 6.966e-06 }, // PM + PM (non-exhaust)
-        { 0.000e+00, 2.511e-01, 4.224e-02, 2.353e-04, 0.000e+00, 1.071e+00, 0.000e+00 }, // FC_MJ
+        { 1.385e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.304e-04, 0.000e+00, 9.027e-05 }, // PM + PM (non-exhaust)
+        { 0.000e+00, 9.041e-01, 4.224e-02, 3.050e-03, 0.000e+00, 3.855e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // RigidTruck_PHEV_gt12t_Euro-VI-(D)
-        { 3.127e+02, 1.939e+02, 3.658e+03, 0.000e+00, 0.000e+00, 4.210e+02, 0.000e+00 }, // CO2(total)
-        { 1.970e+00, 0.000e+00, 1.758e+00, 0.000e+00, 1.429e-06, 0.000e+00, 2.167e-04 }, // CO
-        { 1.453e-01, 1.864e-03, 6.744e-02, 0.000e+00, 0.000e+00, 4.196e-03, 0.000e+00 }, // HC
-        { 1.005e+02, 6.230e+01, 1.176e+03, 0.000e+00, 0.000e+00, 1.353e+02, 0.000e+00 }, // FC
-        { 4.309e+00, 0.000e+00, 3.291e-02, 0.000e+00, 3.273e-06, 0.000e+00, 0.000e+00 }, // NOx
-        { 1.547e+00, 0.000e+00, 1.211e-01, 0.000e+00, 2.713e-06, 5.479e-04, 4.198e-06 }, // PM + PM (non-exhaust)
+        { 3.127e+02, 6.979e+02, 3.658e+03, 0.000e+00, 0.000e+00, 1.516e+03, 0.000e+00 }, // CO2(total)
+        { 1.970e+00, 0.000e+00, 1.758e+00, 0.000e+00, 6.669e-05, 0.000e+00, 2.808e-03 }, // CO
+        { 1.453e-01, 6.710e-03, 6.744e-02, 0.000e+00, 0.000e+00, 1.511e-02, 0.000e+00 }, // HC
+        { 1.005e+02, 2.243e+02, 1.176e+03, 0.000e+00, 0.000e+00, 4.871e+02, 0.000e+00 }, // FC
+        { 4.309e+00, 0.000e+00, 3.291e-02, 0.000e+00, 1.527e-04, 0.000e+00, 0.000e+00 }, // NOx
+        { 1.547e+00, 0.000e+00, 1.211e-01, 0.000e+00, 1.266e-04, 1.972e-03, 5.441e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
@@ -8311,17 +8311,17 @@
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // HC
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // NOx
-        { 1.277e+00, 0.000e+00, 0.000e+00, 0.000e+00, 3.015e-06, 0.000e+00, 5.663e-06 }, // PM + PM (non-exhaust)
-        { 2.148e+00, 4.215e-01, 3.458e+00, 0.000e+00, 0.000e+00, 2.003e+00, 0.000e+00 }, // FC_MJ
+        { 1.277e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.407e-04, 0.000e+00, 7.340e-05 }, // PM + PM (non-exhaust)
+        { 2.148e+00, 1.517e+00, 3.458e+00, 0.000e+00, 0.000e+00, 7.210e+00, 0.000e+00 }, // FC_MJ
     },
     {
         // TT_AT_PHEV_Euro-VI-(D)
-        { 6.259e+03, 2.272e+02, 2.107e+04, 0.000e+00, 0.000e+00, 4.824e+02, 0.000e+00 }, // CO2(total)
-        { 2.762e+00, 1.541e-02, 3.229e+00, 0.000e+00, 0.000e+00, 4.081e-02, 0.000e+00 }, // CO
-        { 3.050e-01, 2.563e-03, 4.805e-01, 0.000e+00, 0.000e+00, 5.845e-03, 0.000e+00 }, // HC
-        { 2.012e+03, 7.301e+01, 6.770e+03, 0.000e+00, 0.000e+00, 1.550e+02, 0.000e+00 }, // FC
-        { 6.535e+00, 0.000e+00, 1.363e-01, 0.000e+00, 0.000e+00, 0.000e+00, 2.818e-04 }, // NOx
-        { 1.599e+00, 0.000e+00, 1.509e-01, 0.000e+00, 2.681e-06, 6.726e-04, 1.725e-05 }, // PM + PM (non-exhaust)
+        { 6.259e+03, 8.178e+02, 2.107e+04, 0.000e+00, 0.000e+00, 1.737e+03, 0.000e+00 }, // CO2(total)
+        { 2.762e+00, 5.547e-02, 3.229e+00, 0.000e+00, 0.000e+00, 1.469e-01, 0.000e+00 }, // CO
+        { 3.050e-01, 9.227e-03, 4.805e-01, 0.000e+00, 0.000e+00, 2.104e-02, 0.000e+00 }, // HC
+        { 2.012e+03, 2.628e+02, 6.770e+03, 0.000e+00, 0.000e+00, 5.581e+02, 0.000e+00 }, // FC
+        { 6.535e+00, 0.000e+00, 1.363e-01, 0.000e+00, 0.000e+00, 0.000e+00, 3.652e-03 }, // NOx
+        { 1.599e+00, 0.000e+00, 1.509e-01, 0.000e+00, 1.251e-04, 2.421e-03, 2.235e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
@@ -8329,9 +8329,9 @@
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO2(total)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // HC
-        { 0.000e+00, 6.170e+00, 0.000e+00, 6.641e-03, 7.945e-04, 2.387e+01, 1.394e-02 }, // FC
+        { 0.000e+00, 2.221e+01, 0.000e+00, 8.607e-02, 3.707e-02, 8.594e+01, 1.807e-01 }, // FC
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // NOx
-        { 1.420e+00, 0.000e+00, 0.000e+00, 0.000e+00, 2.727e-06, 0.000e+00, 1.015e-05 }, // PM + PM (non-exhaust)
+        { 1.420e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.272e-04, 0.000e+00, 1.316e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
@@ -8339,9 +8339,9 @@
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO2(total)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // HC
-        { 0.000e+00, 8.387e+00, 0.000e+00, 6.311e-02, 0.000e+00, 4.119e+01, 0.000e+00 }, // FC
+        { 0.000e+00, 3.019e+01, 0.000e+00, 8.179e-01, 0.000e+00, 1.483e+02, 0.000e+00 }, // FC
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // NOx
-        { 1.431e+00, 0.000e+00, 0.000e+00, 0.000e+00, 2.747e-06, 4.572e-04, 1.357e-05 }, // PM + PM (non-exhaust)
+        { 1.431e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.282e-04, 1.646e-03, 1.758e-04 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
@@ -8349,9 +8349,9 @@
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO2(total)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // HC
-        { 0.000e+00, 1.391e+01, 2.339e+00, 1.303e-02, 0.000e+00, 5.930e+01, 0.000e+00 }, // FC
+        { 0.000e+00, 5.007e+01, 2.339e+00, 1.689e-01, 0.000e+00, 2.135e+02, 0.000e+00 }, // FC
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // NOx
-        { 1.385e+00, 0.000e+00, 0.000e+00, 0.000e+00, 2.795e-06, 0.000e+00, 6.966e-06 }, // PM + PM (non-exhaust)
+        { 1.385e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.304e-04, 0.000e+00, 9.027e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
     {
@@ -8359,9 +8359,9 @@
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO2(total)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // CO
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // HC
-        { 1.190e+02, 2.334e+01, 1.915e+02, 0.000e+00, 0.000e+00, 1.109e+02, 0.000e+00 }, // FC
+        { 1.190e+02, 8.403e+01, 1.915e+02, 0.000e+00, 0.000e+00, 3.993e+02, 0.000e+00 }, // FC
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // NOx
-        { 1.277e+00, 0.000e+00, 0.000e+00, 0.000e+00, 3.015e-06, 0.000e+00, 5.663e-06 }, // PM + PM (non-exhaust)
+        { 1.277e+00, 0.000e+00, 0.000e+00, 0.000e+00, 1.407e-04, 0.000e+00, 7.340e-05 }, // PM + PM (non-exhaust)
         { 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00 }, // FC_MJ
     },
 };
diff -Nru sumo-1.17.0/src/utils/emissions/HelpersHBEFA4.h sumo-1.18.0/src/utils/emissions/HelpersHBEFA4.h
--- sumo-1.17.0/src/utils/emissions/HelpersHBEFA4.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/emissions/HelpersHBEFA4.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/emissions/HelpersHBEFA.cpp sumo-1.18.0/src/utils/emissions/HelpersHBEFA.cpp
--- sumo-1.17.0/src/utils/emissions/HelpersHBEFA.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/emissions/HelpersHBEFA.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/emissions/HelpersHBEFA.h sumo-1.18.0/src/utils/emissions/HelpersHBEFA.h
--- sumo-1.17.0/src/utils/emissions/HelpersHBEFA.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/emissions/HelpersHBEFA.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/emissions/HelpersMMPEVEM.cpp sumo-1.18.0/src/utils/emissions/HelpersMMPEVEM.cpp
--- sumo-1.17.0/src/utils/emissions/HelpersMMPEVEM.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/emissions/HelpersMMPEVEM.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2002-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/emissions/HelpersMMPEVEM.h sumo-1.18.0/src/utils/emissions/HelpersMMPEVEM.h
--- sumo-1.17.0/src/utils/emissions/HelpersMMPEVEM.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/emissions/HelpersMMPEVEM.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2002-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/emissions/HelpersPHEMlight5.cpp sumo-1.18.0/src/utils/emissions/HelpersPHEMlight5.cpp
--- sumo-1.17.0/src/utils/emissions/HelpersPHEMlight5.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/emissions/HelpersPHEMlight5.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2013-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/emissions/HelpersPHEMlight5.h sumo-1.18.0/src/utils/emissions/HelpersPHEMlight5.h
--- sumo-1.17.0/src/utils/emissions/HelpersPHEMlight5.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/emissions/HelpersPHEMlight5.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2013-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/emissions/HelpersPHEMlight.cpp sumo-1.18.0/src/utils/emissions/HelpersPHEMlight.cpp
--- sumo-1.17.0/src/utils/emissions/HelpersPHEMlight.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/emissions/HelpersPHEMlight.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2013-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/emissions/HelpersPHEMlight.h sumo-1.18.0/src/utils/emissions/HelpersPHEMlight.h
--- sumo-1.17.0/src/utils/emissions/HelpersPHEMlight.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/emissions/HelpersPHEMlight.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2013-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/emissions/PHEMCEP.cpp sumo-1.18.0/src/utils/emissions/PHEMCEP.cpp
--- sumo-1.17.0/src/utils/emissions/PHEMCEP.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/emissions/PHEMCEP.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2013-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/emissions/PHEMCEP.h sumo-1.18.0/src/utils/emissions/PHEMCEP.h
--- sumo-1.17.0/src/utils/emissions/PHEMCEP.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/emissions/PHEMCEP.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2013-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/emissions/PHEMCEPHandler.cpp sumo-1.18.0/src/utils/emissions/PHEMCEPHandler.cpp
--- sumo-1.17.0/src/utils/emissions/PHEMCEPHandler.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/emissions/PHEMCEPHandler.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2013-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/emissions/PHEMCEPHandler.h sumo-1.18.0/src/utils/emissions/PHEMCEPHandler.h
--- sumo-1.17.0/src/utils/emissions/PHEMCEPHandler.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/emissions/PHEMCEPHandler.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2013-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/emissions/PHEMConstants.h sumo-1.18.0/src/utils/emissions/PHEMConstants.h
--- sumo-1.17.0/src/utils/emissions/PHEMConstants.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/emissions/PHEMConstants.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2013-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/emissions/PollutantsInterface.cpp sumo-1.18.0/src/utils/emissions/PollutantsInterface.cpp
--- sumo-1.17.0/src/utils/emissions/PollutantsInterface.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/emissions/PollutantsInterface.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2013-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/emissions/PollutantsInterface.h sumo-1.18.0/src/utils/emissions/PollutantsInterface.h
--- sumo-1.17.0/src/utils/emissions/PollutantsInterface.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/emissions/PollutantsInterface.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2013-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/foxtools/CMakeLists.txt sumo-1.18.0/src/utils/foxtools/CMakeLists.txt
--- sumo-1.17.0/src/utils/foxtools/CMakeLists.txt	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/foxtools/CMakeLists.txt	2023-06-28 20:02:17.000000000 +0000
@@ -5,31 +5,33 @@
    MFXBaseObject.h
    MFXButtonTooltip.cpp
    MFXButtonTooltip.h
-   MFXDecalsTable.cpp
-   MFXDecalsTable.h
-   MFXToggleButtonTooltip.cpp
-   MFXToggleButtonTooltip.h
+   MFXCheckButtonTooltip.cpp
+   MFXCheckButtonTooltip.h
    MFXCheckableButton.cpp
    MFXCheckableButton.h
    MFXComboBox.cpp
    MFXComboBox.h
-   MFXGroupBoxModule.cpp
-   MFXGroupBoxModule.h
    MFXComboBoxIcon.cpp
    MFXComboBoxIcon.h
-   MFXListIcon.cpp
-   MFXListIcon.h
-   MFXListItemIcon.cpp
-   MFXListItemIcon.h
+   MFXDecalsTable.cpp
+   MFXDecalsTable.h
+   MFXDynamicLabel.cpp
+   MFXDynamicLabel.h
+   MFXGroupBoxModule.cpp
+   MFXGroupBoxModule.h
    MFXImageHelper.cpp
    MFXImageHelper.h
    MFXInterThreadEventClient.h
-   MFXLabelTooltip.cpp
-   MFXLabelTooltip.h
    MFXLCDLabel.cpp
    MFXLCDLabel.h
+   MFXLabelTooltip.cpp
+   MFXLabelTooltip.h
    MFXLinkLabel.cpp
    MFXLinkLabel.h
+   MFXListIcon.cpp
+   MFXListIcon.h
+   MFXListItemIcon.cpp
+   MFXListItemIcon.h
    MFXMenuButtonTooltip.cpp
    MFXMenuButtonTooltip.h
    MFXMenuCheckIcon.cpp
@@ -50,10 +52,14 @@
    MFXSynchSet.h
    MFXTextFieldIcon.cpp
    MFXTextFieldIcon.h
+   MFXTextFieldSearch.cpp
+   MFXTextFieldSearch.h
    MFXTextFieldTooltip.cpp
    MFXTextFieldTooltip.h
    MFXThreadEvent.cpp
    MFXThreadEvent.h
+   MFXToggleButtonTooltip.cpp
+   MFXToggleButtonTooltip.h
    MFXTreeListDynamic.cpp
    MFXTreeListDynamic.h
    MFXUtils.cpp
diff -Nru sumo-1.17.0/src/utils/foxtools/fxexdefs.h sumo-1.18.0/src/utils/foxtools/fxexdefs.h
--- sumo-1.17.0/src/utils/foxtools/fxexdefs.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/foxtools/fxexdefs.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2004-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/foxtools/fxheader.h sumo-1.18.0/src/utils/foxtools/fxheader.h
--- sumo-1.17.0/src/utils/foxtools/fxheader.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/foxtools/fxheader.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/foxtools/MFXBaseObject.cpp sumo-1.18.0/src/utils/foxtools/MFXBaseObject.cpp
--- sumo-1.17.0/src/utils/foxtools/MFXBaseObject.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/foxtools/MFXBaseObject.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2003-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/foxtools/MFXBaseObject.h sumo-1.18.0/src/utils/foxtools/MFXBaseObject.h
--- sumo-1.17.0/src/utils/foxtools/MFXBaseObject.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/foxtools/MFXBaseObject.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2004-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/foxtools/MFXButtonTooltip.cpp sumo-1.18.0/src/utils/foxtools/MFXButtonTooltip.cpp
--- sumo-1.17.0/src/utils/foxtools/MFXButtonTooltip.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/foxtools/MFXButtonTooltip.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/foxtools/MFXButtonTooltip.h sumo-1.18.0/src/utils/foxtools/MFXButtonTooltip.h
--- sumo-1.17.0/src/utils/foxtools/MFXButtonTooltip.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/foxtools/MFXButtonTooltip.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/foxtools/MFXCheckableButton.cpp sumo-1.18.0/src/utils/foxtools/MFXCheckableButton.cpp
--- sumo-1.17.0/src/utils/foxtools/MFXCheckableButton.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/foxtools/MFXCheckableButton.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2004-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/foxtools/MFXCheckableButton.h sumo-1.18.0/src/utils/foxtools/MFXCheckableButton.h
--- sumo-1.17.0/src/utils/foxtools/MFXCheckableButton.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/foxtools/MFXCheckableButton.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2004-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/foxtools/MFXCheckButtonTooltip.cpp sumo-1.18.0/src/utils/foxtools/MFXCheckButtonTooltip.cpp
--- sumo-1.17.0/src/utils/foxtools/MFXCheckButtonTooltip.cpp	1970-01-01 00:00:00.000000000 +0000
+++ sumo-1.18.0/src/utils/foxtools/MFXCheckButtonTooltip.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -0,0 +1,81 @@
+/****************************************************************************/
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
+// Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License 2.0 which is available at
+// https://www.eclipse.org/legal/epl-2.0/
+// This Source Code 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
+/****************************************************************************/
+/// @file    MFXCheckButtonTooltip.cpp
+/// @author  Pablo Alvarez Lopez
+/// @date    May 23
+///
+// CheckButton similar to FXCheckButton but with the possibility of showing tooltips
+/****************************************************************************/
+#include 
+
+#include "MFXCheckButtonTooltip.h"
+
+
+FXDEFMAP(MFXCheckButtonTooltip) MFXCheckButtonTooltipMap[] = {
+    FXMAPFUNC(SEL_ENTER,    0,  MFXCheckButtonTooltip::onEnter),
+    FXMAPFUNC(SEL_LEAVE,    0,  MFXCheckButtonTooltip::onLeave),
+    FXMAPFUNC(SEL_MOTION,   0,  MFXCheckButtonTooltip::onMotion),
+};
+
+// Object implementation
+FXIMPLEMENT(MFXCheckButtonTooltip, FXCheckButton, MFXCheckButtonTooltipMap, ARRAYNUMBER(MFXCheckButtonTooltipMap))
+
+
+MFXCheckButtonTooltip::MFXCheckButtonTooltip(FXComposite* p, MFXStaticToolTip* staticToolTip, const FXString& text, FXObject* tgt,
+        FXSelector sel, FXuint opts, FXint x, FXint y, FXint w, FXint h, FXint pl, FXint pr, FXint pt, FXint pb) :
+    FXCheckButton(p, text, tgt, sel, opts, x, y, w, h, pl, pr, pt, pb),
+    myStaticToolTip(staticToolTip) {
+}
+
+
+MFXCheckButtonTooltip::~MFXCheckButtonTooltip() {}
+
+
+void
+MFXCheckButtonTooltip::setToolTipText(const FXString& toolTip) {
+    myToolTipText = toolTip;
+}
+
+
+long
+MFXCheckButtonTooltip::onEnter(FXObject* sender, FXSelector sel, void* ptr) {
+    // check if show toolTip text
+    if (!myToolTipText.empty()) {
+        // show toolTip text
+        setTipText(myToolTipText);
+        // show tip show
+        myStaticToolTip->showStaticToolTip(getTipText());
+    }
+    // continue with FXCheckButton function
+    return FXCheckButton::onEnter(sender, sel, ptr);
+}
+
+
+long
+MFXCheckButtonTooltip::onLeave(FXObject* sender, FXSelector sel, void* ptr) {
+    // hide static toolTip
+    myStaticToolTip->hideStaticToolTip();
+    // continue with FXCheckButton function
+    return FXCheckButton::onLeave(sender, sel, ptr);
+}
+
+
+long
+MFXCheckButtonTooltip::onMotion(FXObject* sender, FXSelector sel, void* ptr) {
+    // update static tooltip
+    myStaticToolTip->onUpdate(sender, sel, ptr);
+    return FXCheckButton::onMotion(sender, sel, ptr);
+}
+
+/****************************************************************************/
diff -Nru sumo-1.17.0/src/utils/foxtools/MFXCheckButtonTooltip.h sumo-1.18.0/src/utils/foxtools/MFXCheckButtonTooltip.h
--- sumo-1.17.0/src/utils/foxtools/MFXCheckButtonTooltip.h	1970-01-01 00:00:00.000000000 +0000
+++ sumo-1.18.0/src/utils/foxtools/MFXCheckButtonTooltip.h	2023-06-28 20:02:17.000000000 +0000
@@ -0,0 +1,74 @@
+/****************************************************************************/
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
+// Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License 2.0 which is available at
+// https://www.eclipse.org/legal/epl-2.0/
+// This Source Code 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
+/****************************************************************************/
+/// @file    MFXCheckButtonTooltip.h
+/// @author  Pablo Alvarez Lopez
+/// @date    May 23
+///
+// CheckButton similar to FXCheckButton but with the possibility of showing tooltips
+/****************************************************************************/
+#pragma once
+#include 
+
+#include "fxheader.h"
+#include "MFXStaticToolTip.h"
+
+/**
+ * @class MFXCheckButtonTooltip
+ */
+class MFXCheckButtonTooltip : public FXCheckButton {
+    /// @brief fox declaration
+    FXDECLARE(MFXCheckButtonTooltip)
+
+public:
+    /// @brief constructor (Exactly like the FXCheckButton constructor)
+    MFXCheckButtonTooltip(FXComposite* p, MFXStaticToolTip* staticToolTip, const FXString& text, FXObject* tgt, FXSelector sel,
+                          FXuint opts = TEXTFIELD_NORMAL, FXint x = 0, FXint y = 0, FXint w = 0, FXint h = 0,
+                          FXint pl = DEFAULT_PAD, FXint pr = DEFAULT_PAD, FXint pt = DEFAULT_PAD, FXint pb = DEFAULT_PAD);
+
+    /// @brief destructor (Called automatically)
+    ~MFXCheckButtonTooltip();
+
+    /// @brief set toolTip
+    void setToolTipText(const FXString& toolTip);
+
+    /// @name FOX callbacks
+    /// @{
+    /// @brief called when mouse enter in MFXCheckButtonTooltip
+    long onEnter(FXObject*, FXSelector, void*);
+
+    /// @brief called when mouse leaves in MFXCheckButtonTooltip
+    long onLeave(FXObject*, FXSelector, void*);
+
+    /// @brief called when mouse motion in MFXCheckButtonTooltip
+    long onMotion(FXObject*, FXSelector, void*);
+
+    /// @}
+
+protected:
+    /// @brief FOX needs this
+    FOX_CONSTRUCTOR(MFXCheckButtonTooltip)
+
+    /// @brief static tooltip
+    MFXStaticToolTip* myStaticToolTip = nullptr;
+
+    /// @brief toolTip text (if set, tooltip will be always show)
+    FXString myToolTipText;
+
+private:
+    /// @brief Invalidated copy constructor.
+    MFXCheckButtonTooltip(const MFXCheckButtonTooltip&) = delete;
+
+    /// @brief Invalidated assignment operator.
+    MFXCheckButtonTooltip& operator=(const MFXCheckButtonTooltip&) = delete;
+};
diff -Nru sumo-1.17.0/src/utils/foxtools/MFXComboBox.cpp sumo-1.18.0/src/utils/foxtools/MFXComboBox.cpp
--- sumo-1.17.0/src/utils/foxtools/MFXComboBox.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/foxtools/MFXComboBox.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2004-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/foxtools/MFXComboBox.h sumo-1.18.0/src/utils/foxtools/MFXComboBox.h
--- sumo-1.17.0/src/utils/foxtools/MFXComboBox.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/foxtools/MFXComboBox.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2004-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/foxtools/MFXComboBoxIcon.cpp sumo-1.18.0/src/utils/foxtools/MFXComboBoxIcon.cpp
--- sumo-1.17.0/src/utils/foxtools/MFXComboBoxIcon.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/foxtools/MFXComboBoxIcon.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2006-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/foxtools/MFXComboBoxIcon.h sumo-1.18.0/src/utils/foxtools/MFXComboBoxIcon.h
--- sumo-1.17.0/src/utils/foxtools/MFXComboBoxIcon.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/foxtools/MFXComboBoxIcon.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2006-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/foxtools/MFXDecalsTable.cpp sumo-1.18.0/src/utils/foxtools/MFXDecalsTable.cpp
--- sumo-1.17.0/src/utils/foxtools/MFXDecalsTable.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/foxtools/MFXDecalsTable.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -111,11 +111,11 @@
         myColumns.push_back(new Column(this, i, columnsType.at(i)));
     }
     // get num decals
-    const int numDecals = decals.size() < MAXROWS? (int)decals.size() : MAXROWS;
+    const int numDecals = decals.size() < MAXROWS ? (int)decals.size() : MAXROWS;
     // create rows
     for (int i = 0; i < numDecals; i++) {
         // get decal
-        const auto &decal = decals.at(i);
+        const auto& decal = decals.at(i);
         // create row
         auto row = new Row(this);
         // fill cells
diff -Nru sumo-1.17.0/src/utils/foxtools/MFXDecalsTable.h sumo-1.18.0/src/utils/foxtools/MFXDecalsTable.h
--- sumo-1.17.0/src/utils/foxtools/MFXDecalsTable.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/foxtools/MFXDecalsTable.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/foxtools/MFXDynamicLabel.cpp sumo-1.18.0/src/utils/foxtools/MFXDynamicLabel.cpp
--- sumo-1.17.0/src/utils/foxtools/MFXDynamicLabel.cpp	1970-01-01 00:00:00.000000000 +0000
+++ sumo-1.18.0/src/utils/foxtools/MFXDynamicLabel.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -0,0 +1,164 @@
+/****************************************************************************/
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
+// Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License 2.0 which is available at
+// https://www.eclipse.org/legal/epl-2.0/
+// This Source Code 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
+/****************************************************************************/
+/// @file    MFXDynamicLabel.cpp
+/// @author  Mirko Barthauer
+/// @date    31.03.2023
+///
+// Text label with dynamic multi-line text (inserts line line breaks on the fly)
+/****************************************************************************/
+#include 
+#include "MFXDynamicLabel.h"
+
+// ===========================================================================
+// FOX callback mapping
+// ===========================================================================
+
+FXDEFMAP(MFXDynamicLabel) MFXLabelMap[] = {
+    FXMAPFUNC(SEL_UPDATE,       0,                          MFXDynamicLabel::onUpdate),
+};
+
+// Object implementation
+FXIMPLEMENT(MFXDynamicLabel, FXLabel, MFXLabelMap, ARRAYNUMBER(MFXLabelMap))
+
+// ===========================================================================
+// method definitions
+// ===========================================================================
+
+// ---------------------------------------------------------------------------
+// MFXLabel - public methods
+// ---------------------------------------------------------------------------
+
+MFXDynamicLabel::MFXDynamicLabel(FXComposite* p, const FXString& text, FXIcon* ic, FXuint opts, FXint x, FXint y, FXint w, FXint h, FXint pl, FXint pr, FXint pt, FXint pb, std::string indent):
+    FXLabel(p, text, ic, opts, x, y, w, h, pl, pr, pt, pb), myOriginalString(text.text()), myIndentString(indent), myPreviousWidth(0) {
+    computeIndentation();
+}
+
+
+long
+MFXDynamicLabel::onUpdate(FXObject* sender, FXSelector sel, void* ptr) {
+    const int curWidth = getWidth();
+    if (myPreviousWidth - curWidth != 0 && curWidth > 1) {
+        reformatLineBreaks(curWidth);
+        myPreviousWidth = curWidth;
+    }
+    return FXLabel::onUpdate(sender, sel, ptr);
+}
+
+
+void
+MFXDynamicLabel::setText(const FXString& text) {
+    FXLabel::setText(text);
+    myOriginalString = text.text();
+    computeIndentation();
+}
+
+
+void
+MFXDynamicLabel::position(FXint x, FXint y, FXint w, FXint h) {
+    FXLabel::position(x, y, w, h);
+    reformatLineBreaks(w);
+}
+
+
+FXint
+MFXDynamicLabel::getDefaultHeight() {
+    int pWidth = getParent()->getWidth();
+    if (pWidth > 1) { // sign that it has been initialised
+        FXFrame* frame = dynamic_cast(getParent());
+        int padding = 0;
+        if (frame != nullptr) {
+            padding = frame->getPadLeft() + frame->getPadRight();
+        }
+        reformatLineBreaks(pWidth - padding);
+    }
+    return FXLabel::getDefaultHeight();
+}
+
+
+void
+MFXDynamicLabel::computeIndentation() {
+    if (myOriginalString.find(myIndentString) == 0 || myOriginalString.find("\n" + myIndentString) != std::string::npos) {
+        myIndent = (int)myIndentString.size();
+    } else {
+        myIndent = 0;
+    }
+}
+
+
+void
+MFXDynamicLabel::reformatLineBreaks(const int curWidth) {
+    const int preferredWidth = curWidth - getPadLeft() - getPadRight();
+    const int textWidth = getApp()->getNormalFont()->getTextWidth(label);
+    if (textWidth <= preferredWidth || preferredWidth < 1) {
+        return;
+    }
+    std::string newLine = "\n" + std::string(myIndent, ' ');
+    const int newLineOffset = (int)newLine.size();
+    std::string msg = myOriginalString;
+    int pos = 0;
+    int finalPos = (int)msg.size() - 1;
+    std::string::size_type nextLineBreak;
+    while (pos < finalPos) {
+        nextLineBreak = msg.find('\n', pos);
+        int subPos = (nextLineBreak != std::string::npos) ? (int)nextLineBreak : finalPos;
+        if (getApp()->getNormalFont()->getTextWidth(msg.substr(pos, subPos - pos).c_str()) <= preferredWidth) {
+            pos = subPos + 1;
+            continue;
+        }
+        if (myIndent > 0 && msg.substr(pos, myIndent) == myIndentString) {
+            pos += myIndent;
+        }
+        // select position for next line break
+        const int endPos = (nextLineBreak != std::string::npos) ? (int)nextLineBreak - 1 : finalPos;
+        std::string::size_type nextSpace = std::string::npos;
+        int lastSpacePos = -1;
+        int pos2 = pos;
+        while (pos2 < endPos) {
+            nextSpace = msg.find(' ', pos2);
+            if (nextSpace != std::string::npos && (int)nextSpace <= pos + myIndent) {
+                nextSpace = std::string::npos;
+                pos2 += myIndent + 1;
+            } else if (nextSpace != std::string::npos && (int)nextSpace < endPos) {
+                std::string testString = msg.substr(pos, nextSpace - pos);
+                if (getApp()->getNormalFont()->getTextWidth(msg.substr(pos, nextSpace - pos).c_str()) > preferredWidth) {
+                    if (lastSpacePos > 0) {
+                        msg.replace(lastSpacePos, 1, newLine);
+                        pos2 = lastSpacePos + newLineOffset;
+                        finalPos += newLineOffset;
+                    } else {
+                        msg.replace(nextSpace, 1, newLine);
+                        pos2 = (int)nextSpace + newLineOffset;
+                        finalPos += newLineOffset;
+                    }
+                    break;
+                } else {
+                    pos2 = (int)nextSpace + 1;
+                    if (msg.find(' ', pos2) == std::string::npos && lastSpacePos > 0) { // string end condition
+                        msg.replace(lastSpacePos, 1, newLine);
+                        pos2 += newLineOffset;
+                        break;
+                    }
+                }
+                lastSpacePos = (int)nextSpace;
+            } else {
+                pos2 = endPos + 2;
+            }
+        }
+        pos = pos2;
+    }
+    label = msg.c_str();
+}
+
+
+MFXDynamicLabel::MFXDynamicLabel() {}
diff -Nru sumo-1.17.0/src/utils/foxtools/MFXDynamicLabel.h sumo-1.18.0/src/utils/foxtools/MFXDynamicLabel.h
--- sumo-1.17.0/src/utils/foxtools/MFXDynamicLabel.h	1970-01-01 00:00:00.000000000 +0000
+++ sumo-1.18.0/src/utils/foxtools/MFXDynamicLabel.h	2023-06-28 20:02:17.000000000 +0000
@@ -0,0 +1,65 @@
+/****************************************************************************/
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
+// Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License 2.0 which is available at
+// https://www.eclipse.org/legal/epl-2.0/
+// This Source Code 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
+/****************************************************************************/
+/// @file    MFXDynamicLabel.h
+/// @author  Mirko Barthauer
+/// @date    31.03.2023
+///
+// Text label with dynamic multi-line text (inserts line breaks on the fly)
+/****************************************************************************/
+
+#include 
+
+#include "fxheader.h"
+
+
+/// @brief A list item which allows for custom coloring
+class MFXDynamicLabel : public FXLabel {
+    /// @brief FOX declaration
+    FXDECLARE(MFXDynamicLabel)
+
+public:
+    /// @brief enum for events
+    enum {
+        MID_LABEL_WIDTHCHANGE,
+    };
+
+    /// @brief Construct label with given text and icon
+    MFXDynamicLabel(FXComposite* p, const FXString& text, FXIcon* ic = 0, FXuint opts = LABEL_NORMAL, FXint x = 0, FXint y = 0, FXint w = 0, FXint h = 0, FXint pl = DEFAULT_PAD, FXint pr = DEFAULT_PAD, FXint pt = DEFAULT_PAD, FXint pb = DEFAULT_PAD, std::string indent = "- ");
+
+    virtual ~MFXDynamicLabel() {};
+
+    /// @brief overload text label updates to store the original string as backup for when width changes again
+    void setText(const FXString& text);
+
+    /// @brief overload to be informed when the label text has to be reformatted due to width changes
+    long onUpdate(FXObject* sender, FXSelector, void*);
+
+    /// @brief overload position to be informed when the parent has done the layout
+    void position(FXint x, FXint y, FXint w, FXint h);
+
+    FXint getDefaultHeight();
+
+protected:
+    /// @brief fox needs this
+    MFXDynamicLabel();
+
+private:
+    void computeIndentation();
+    void reformatLineBreaks(const int curWidth);
+
+    std::string myOriginalString;
+    std::string myIndentString;
+    int myIndent;
+    int myPreviousWidth;
+};
diff -Nru sumo-1.17.0/src/utils/foxtools/MFXGroupBoxModule.cpp sumo-1.18.0/src/utils/foxtools/MFXGroupBoxModule.cpp
--- sumo-1.17.0/src/utils/foxtools/MFXGroupBoxModule.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/foxtools/MFXGroupBoxModule.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2006-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/foxtools/MFXGroupBoxModule.h sumo-1.18.0/src/utils/foxtools/MFXGroupBoxModule.h
--- sumo-1.17.0/src/utils/foxtools/MFXGroupBoxModule.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/foxtools/MFXGroupBoxModule.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2006-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/foxtools/MFXImageHelper.cpp sumo-1.18.0/src/utils/foxtools/MFXImageHelper.cpp
--- sumo-1.17.0/src/utils/foxtools/MFXImageHelper.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/foxtools/MFXImageHelper.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2005-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/foxtools/MFXImageHelper.h sumo-1.18.0/src/utils/foxtools/MFXImageHelper.h
--- sumo-1.17.0/src/utils/foxtools/MFXImageHelper.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/foxtools/MFXImageHelper.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2005-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/foxtools/MFXInterThreadEventClient.h sumo-1.18.0/src/utils/foxtools/MFXInterThreadEventClient.h
--- sumo-1.17.0/src/utils/foxtools/MFXInterThreadEventClient.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/foxtools/MFXInterThreadEventClient.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2004-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/foxtools/MFXLabelTooltip.cpp sumo-1.18.0/src/utils/foxtools/MFXLabelTooltip.cpp
--- sumo-1.17.0/src/utils/foxtools/MFXLabelTooltip.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/foxtools/MFXLabelTooltip.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/foxtools/MFXLabelTooltip.h sumo-1.18.0/src/utils/foxtools/MFXLabelTooltip.h
--- sumo-1.17.0/src/utils/foxtools/MFXLabelTooltip.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/foxtools/MFXLabelTooltip.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/foxtools/MFXLCDLabel.cpp sumo-1.18.0/src/utils/foxtools/MFXLCDLabel.cpp
--- sumo-1.17.0/src/utils/foxtools/MFXLCDLabel.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/foxtools/MFXLCDLabel.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2004-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/foxtools/MFXLCDLabel.h sumo-1.18.0/src/utils/foxtools/MFXLCDLabel.h
--- sumo-1.17.0/src/utils/foxtools/MFXLCDLabel.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/foxtools/MFXLCDLabel.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2004-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/foxtools/MFXLinkLabel.cpp sumo-1.18.0/src/utils/foxtools/MFXLinkLabel.cpp
--- sumo-1.17.0/src/utils/foxtools/MFXLinkLabel.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/foxtools/MFXLinkLabel.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2006-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/foxtools/MFXLinkLabel.h sumo-1.18.0/src/utils/foxtools/MFXLinkLabel.h
--- sumo-1.17.0/src/utils/foxtools/MFXLinkLabel.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/foxtools/MFXLinkLabel.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2006-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/foxtools/MFXListIcon.cpp sumo-1.18.0/src/utils/foxtools/MFXListIcon.cpp
--- sumo-1.17.0/src/utils/foxtools/MFXListIcon.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/foxtools/MFXListIcon.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2006-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/foxtools/MFXListIcon.h sumo-1.18.0/src/utils/foxtools/MFXListIcon.h
--- sumo-1.17.0/src/utils/foxtools/MFXListIcon.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/foxtools/MFXListIcon.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2006-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/foxtools/MFXListItemIcon.cpp sumo-1.18.0/src/utils/foxtools/MFXListItemIcon.cpp
--- sumo-1.17.0/src/utils/foxtools/MFXListItemIcon.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/foxtools/MFXListItemIcon.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2006-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/foxtools/MFXListItemIcon.h sumo-1.18.0/src/utils/foxtools/MFXListItemIcon.h
--- sumo-1.17.0/src/utils/foxtools/MFXListItemIcon.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/foxtools/MFXListItemIcon.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2006-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/foxtools/MFXMenuButtonTooltip.cpp sumo-1.18.0/src/utils/foxtools/MFXMenuButtonTooltip.cpp
--- sumo-1.17.0/src/utils/foxtools/MFXMenuButtonTooltip.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/foxtools/MFXMenuButtonTooltip.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/foxtools/MFXMenuButtonTooltip.h sumo-1.18.0/src/utils/foxtools/MFXMenuButtonTooltip.h
--- sumo-1.17.0/src/utils/foxtools/MFXMenuButtonTooltip.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/foxtools/MFXMenuButtonTooltip.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/foxtools/MFXMenuCheckIcon.cpp sumo-1.18.0/src/utils/foxtools/MFXMenuCheckIcon.cpp
--- sumo-1.17.0/src/utils/foxtools/MFXMenuCheckIcon.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/foxtools/MFXMenuCheckIcon.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2004-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/foxtools/MFXMenuCheckIcon.h sumo-1.18.0/src/utils/foxtools/MFXMenuCheckIcon.h
--- sumo-1.17.0/src/utils/foxtools/MFXMenuCheckIcon.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/foxtools/MFXMenuCheckIcon.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2004-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/foxtools/MFXMenuHeader.cpp sumo-1.18.0/src/utils/foxtools/MFXMenuHeader.cpp
--- sumo-1.17.0/src/utils/foxtools/MFXMenuHeader.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/foxtools/MFXMenuHeader.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2004-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/foxtools/MFXMenuHeader.h sumo-1.18.0/src/utils/foxtools/MFXMenuHeader.h
--- sumo-1.17.0/src/utils/foxtools/MFXMenuHeader.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/foxtools/MFXMenuHeader.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2004-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/foxtools/MFXRealSpinner.cpp sumo-1.18.0/src/utils/foxtools/MFXRealSpinner.cpp
--- sumo-1.17.0/src/utils/foxtools/MFXRealSpinner.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/foxtools/MFXRealSpinner.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2004-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/foxtools/MFXRealSpinner.h sumo-1.18.0/src/utils/foxtools/MFXRealSpinner.h
--- sumo-1.17.0/src/utils/foxtools/MFXRealSpinner.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/foxtools/MFXRealSpinner.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2004-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/foxtools/MFXRecentNetworks.cpp sumo-1.18.0/src/utils/foxtools/MFXRecentNetworks.cpp
--- sumo-1.17.0/src/utils/foxtools/MFXRecentNetworks.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/foxtools/MFXRecentNetworks.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2004-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/foxtools/MFXRecentNetworks.h sumo-1.18.0/src/utils/foxtools/MFXRecentNetworks.h
--- sumo-1.17.0/src/utils/foxtools/MFXRecentNetworks.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/foxtools/MFXRecentNetworks.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2004-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/foxtools/MFXSevenSegment.cpp sumo-1.18.0/src/utils/foxtools/MFXSevenSegment.cpp
--- sumo-1.17.0/src/utils/foxtools/MFXSevenSegment.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/foxtools/MFXSevenSegment.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2004-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/foxtools/MFXSevenSegment.h sumo-1.18.0/src/utils/foxtools/MFXSevenSegment.h
--- sumo-1.17.0/src/utils/foxtools/MFXSevenSegment.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/foxtools/MFXSevenSegment.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2004-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/foxtools/MFXSingleEventThread.cpp sumo-1.18.0/src/utils/foxtools/MFXSingleEventThread.cpp
--- sumo-1.17.0/src/utils/foxtools/MFXSingleEventThread.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/foxtools/MFXSingleEventThread.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2004-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/foxtools/MFXSingleEventThread.h sumo-1.18.0/src/utils/foxtools/MFXSingleEventThread.h
--- sumo-1.17.0/src/utils/foxtools/MFXSingleEventThread.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/foxtools/MFXSingleEventThread.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2004-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/foxtools/MFXStaticToolTip.cpp sumo-1.18.0/src/utils/foxtools/MFXStaticToolTip.cpp
--- sumo-1.17.0/src/utils/foxtools/MFXStaticToolTip.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/foxtools/MFXStaticToolTip.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2006-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/foxtools/MFXStaticToolTip.h sumo-1.18.0/src/utils/foxtools/MFXStaticToolTip.h
--- sumo-1.17.0/src/utils/foxtools/MFXStaticToolTip.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/foxtools/MFXStaticToolTip.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2006-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/foxtools/MFXSynchQue.h sumo-1.18.0/src/utils/foxtools/MFXSynchQue.h
--- sumo-1.17.0/src/utils/foxtools/MFXSynchQue.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/foxtools/MFXSynchQue.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2004-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/foxtools/MFXSynchSet.h sumo-1.18.0/src/utils/foxtools/MFXSynchSet.h
--- sumo-1.17.0/src/utils/foxtools/MFXSynchSet.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/foxtools/MFXSynchSet.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2004-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/foxtools/MFXTextFieldIcon.cpp sumo-1.18.0/src/utils/foxtools/MFXTextFieldIcon.cpp
--- sumo-1.17.0/src/utils/foxtools/MFXTextFieldIcon.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/foxtools/MFXTextFieldIcon.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2006-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/foxtools/MFXTextFieldIcon.h sumo-1.18.0/src/utils/foxtools/MFXTextFieldIcon.h
--- sumo-1.17.0/src/utils/foxtools/MFXTextFieldIcon.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/foxtools/MFXTextFieldIcon.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2006-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/foxtools/MFXTextFieldSearch.cpp sumo-1.18.0/src/utils/foxtools/MFXTextFieldSearch.cpp
--- sumo-1.17.0/src/utils/foxtools/MFXTextFieldSearch.cpp	1970-01-01 00:00:00.000000000 +0000
+++ sumo-1.18.0/src/utils/foxtools/MFXTextFieldSearch.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -0,0 +1,199 @@
+/****************************************************************************/
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
+// Copyright (C) 2006-2023 German Aerospace Center (DLR) and others.
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License 2.0 which is available at
+// https://www.eclipse.org/legal/epl-2.0/
+// This Source Code 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
+/****************************************************************************/
+/// @file    MFXTextFieldSearch.cpp
+/// @author  Pablo Alvarez Lopez
+/// @date    May 2023
+///
+// TextField for search elements
+/****************************************************************************/
+
+#include 
+#include 
+
+#include "MFXTextFieldSearch.h"
+
+// ===========================================================================
+// FOX callback mapping
+// ===========================================================================
+
+FXDEFMAP(MFXTextFieldSearch) MFXTextFieldSearchMap[] = {
+    FXMAPFUNC(SEL_PAINT,        0,  MFXTextFieldSearch::onPaint),
+    FXMAPFUNC(SEL_FOCUSIN,      0,  MFXTextFieldSearch::onFocusIn),
+    FXMAPFUNC(SEL_FOCUSOUT,     0,  MFXTextFieldSearch::onFocusOut),
+    FXMAPFUNC(SEL_FOCUS_SELF,   0,  MFXTextFieldSearch::onFocusSelf),
+    FXMAPFUNC(SEL_KEYPRESS,     0,  MFXTextFieldSearch::onKeyPress),
+};
+
+// Object implementation
+FXIMPLEMENT(MFXTextFieldSearch, FXTextField, MFXTextFieldSearchMap, ARRAYNUMBER(MFXTextFieldSearchMap))
+
+// ===========================================================================
+// member method definitions
+// ===========================================================================
+
+MFXTextFieldSearch::MFXTextFieldSearch(FXComposite* p, FXint ncols, FXObject* tgt, FXSelector sel, FXuint opt, FXint x, FXint y, FXint w, FXint h, FXint pl, FXint pr, FXint pt, FXint pb) :
+    FXTextField(p, ncols, tgt, sel, opt, x, y, w, h, pl, pr, pt, pb),
+    myTarget(tgt) {
+}
+
+
+long
+MFXTextFieldSearch::onKeyPress(FXObject* obj, FXSelector sel, void* ptr) {
+    FXTextField::onKeyPress(obj, sel, ptr);
+    return myTarget->handle(this, FXSEL(SEL_COMMAND, MID_MTFS_UPDATED), ptr);
+}
+
+
+long
+MFXTextFieldSearch::onPaint(FXObject* obj, FXSelector sel, void* ptr) {
+    if (hasFocus() || (contents.count() > 0)) {
+        return FXTextField::onPaint(obj, sel, ptr);
+    } else {
+        FXEvent* ev = (FXEvent*)ptr;
+        FXDCWindow dc(this, ev);
+        // declare text to search
+        std::string searchString = TL("Type to search...");
+        // Draw frame
+        drawFrame(dc, 0, 0, width, height);
+        // Gray background if disabled
+        if (isEnabled()) {
+            dc.setForeground(backColor);
+        } else {
+            dc.setForeground(baseColor);
+        }
+        // Draw background
+        dc.fillRectangle(border, border, width - (border << 1), height - (border << 1));
+        // Draw text,  clipped against frame interior
+        dc.setClipRectangle(border, border, width - (border << 1), height - (border << 1));
+        drawSearchTextRange(searchString.c_str(), dc);
+        // Draw caret
+        if (flags & FLAG_CARET) {
+            int xx = coord(cursor) - 1;
+            dc.setForeground(cursorColor);
+            dc.fillRectangle(xx, padtop + border, 1, height - padbottom - padtop - (border << 1));
+            dc.fillRectangle(xx - 2, padtop + border, 5, 1);
+            dc.fillRectangle(xx - 2, height - border - padbottom - 1, 5, 1);
+        }
+        return 1;
+    }
+}
+
+
+long
+MFXTextFieldSearch::onFocusIn(FXObject* sender, FXSelector sel, void* ptr) {
+    update();
+    return FXTextField::onFocusIn(sender, sel, ptr);
+}
+
+
+
+long
+MFXTextFieldSearch::onFocusOut(FXObject* sender, FXSelector sel, void* ptr) {
+    update();
+    return FXTextField::onFocusOut(sender, sel, ptr);
+}
+
+
+
+long
+MFXTextFieldSearch::onFocusSelf(FXObject* sender, FXSelector sel, void* ptr) {
+    //onPaint(sender, sel, ptr);
+    return FXTextField::onFocusSelf(sender, sel, ptr);
+}
+
+
+MFXTextFieldSearch::MFXTextFieldSearch() :
+    FXTextField() {
+}
+
+
+void
+MFXTextFieldSearch::drawSearchTextRange(const FXString& searchString, FXDCWindow& dc) {
+    FXint xx, yy, cw, hh, ww, si, ei, lx, rx, t;
+    FXint rr = width - border - padright;
+    FXint ll = border + padleft;
+    FXint mm = (ll + rr) / 2;
+    FXint fm = 0;
+    FXint to = (int)searchString.length();
+    if (to <= fm) {
+        return;
+    }
+    dc.setFont(font);
+    // Text color
+    dc.setForeground(FXRGBA(128, 128, 128, 255));
+    // Height
+    hh = font->getFontHeight();
+    // Text sticks to top of field
+    if (options & JUSTIFY_TOP) {
+        yy = padtop + border;
+    } else if (options & JUSTIFY_BOTTOM) {
+        // Text sticks to bottom of field
+        yy = height - padbottom - border - hh;
+    } else {
+        // Text centered in y
+        yy = border + padtop + (height - padbottom - padtop - (border << 1) - hh) / 2;
+    }
+    if (anchor < cursor) {
+        si = anchor;
+        ei = cursor;
+    } else {
+        si = cursor;
+        ei = anchor;
+    }
+    // Normal mode
+    ww = font->getTextWidth(searchString.text(), searchString.length());
+    // Text sticks to right of field
+    if (options & JUSTIFY_RIGHT) {
+        xx = shift + rr - ww;
+    } else if (options & JUSTIFY_LEFT) {
+        // Text sticks on left of field
+        xx = shift + ll;
+    } else {
+        // Text centered in field
+        xx = shift + mm - ww / 2;
+    }
+
+    // Reduce to avoid drawing excessive amounts of text
+    lx = xx + font->getTextWidth(&searchString[0], fm);
+    rx = lx + font->getTextWidth(&searchString[fm], to - fm);
+    while (fm < to) {
+        t = searchString.inc(fm);
+        cw = font->getTextWidth(&searchString[fm], t - fm);
+        if (lx + cw >= 0) {
+            break;
+        }
+        lx += cw;
+        fm = t;
+    }
+    while (fm < to) {
+        t = searchString.dec(to);
+        cw = font->getTextWidth(&searchString[t], to - t);
+        if (rx - cw < width) {
+            break;
+        }
+        rx -= cw;
+        to = t;
+    }
+    // Adjust selected range
+    if (si < fm) {
+        si = fm;
+    }
+    if (ei > to) {
+        ei = to;
+    }
+    // draw text
+    xx += font->getTextWidth(searchString.text(), fm);
+    yy += font->getFontAscent();
+    dc.drawText(xx, yy, &searchString[fm], to - fm);
+}
diff -Nru sumo-1.17.0/src/utils/foxtools/MFXTextFieldSearch.h sumo-1.18.0/src/utils/foxtools/MFXTextFieldSearch.h
--- sumo-1.17.0/src/utils/foxtools/MFXTextFieldSearch.h	1970-01-01 00:00:00.000000000 +0000
+++ sumo-1.18.0/src/utils/foxtools/MFXTextFieldSearch.h	2023-06-28 20:02:17.000000000 +0000
@@ -0,0 +1,63 @@
+/****************************************************************************/
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
+// Copyright (C) 2006-2023 German Aerospace Center (DLR) and others.
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License 2.0 which is available at
+// https://www.eclipse.org/legal/epl-2.0/
+// This Source Code 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
+/****************************************************************************/
+/// @file    MFXTextFieldSearch.h
+/// @author  Pablo Alvarez Lopez
+/// @date    May 2023
+///
+// TextField for search elements
+/****************************************************************************/
+
+#pragma once
+#include 
+
+#include "fxheader.h"
+
+
+/// @brief FXTextFieldIcon (based on FXTextFieldIcon)
+class MFXTextFieldSearch : public FXTextField {
+    /// @brief FOX declaration
+    FXDECLARE(MFXTextFieldSearch)
+
+public:
+    /// @brief constructor
+    MFXTextFieldSearch(FXComposite* p, FXint ncols, FXObject* tgt = NULL, FXSelector sel = 0,
+                       FXuint opts = TEXTFIELD_NORMAL, FXint x = 0, FXint y = 0, FXint w = 0, FXint h = 0,
+                       FXint pl = DEFAULT_PAD, FXint pr = DEFAULT_PAD, FXint pt = DEFAULT_PAD, FXint pb = DEFAULT_PAD);
+
+    /// @brief key press
+    long onKeyPress(FXObject* obj, FXSelector sel, void* ptr);
+
+    /// @brief paint
+    long onPaint(FXObject* obj, FXSelector sel, void* ptr);
+
+    /// @brief focus in
+    long onFocusIn(FXObject* sender, FXSelector sel, void* ptr);
+
+    /// @brief focus out
+    long onFocusOut(FXObject* sender, FXSelector sel, void* ptr);
+
+    /// @brief focus self
+    long onFocusSelf(FXObject* sender, FXSelector sel, void* ptr);
+
+protected:
+    /// @brief FOX need this
+    MFXTextFieldSearch();
+
+private:
+    /// @brief target
+    FXObject* myTarget = nullptr;
+
+    /// @brief draw search text range
+    void drawSearchTextRange(const FXString& searchString, FXDCWindow& dc);
+};
diff -Nru sumo-1.17.0/src/utils/foxtools/MFXTextFieldTooltip.cpp sumo-1.18.0/src/utils/foxtools/MFXTextFieldTooltip.cpp
--- sumo-1.17.0/src/utils/foxtools/MFXTextFieldTooltip.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/foxtools/MFXTextFieldTooltip.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/foxtools/MFXTextFieldTooltip.h sumo-1.18.0/src/utils/foxtools/MFXTextFieldTooltip.h
--- sumo-1.17.0/src/utils/foxtools/MFXTextFieldTooltip.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/foxtools/MFXTextFieldTooltip.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/foxtools/MFXThreadEvent.cpp sumo-1.18.0/src/utils/foxtools/MFXThreadEvent.cpp
--- sumo-1.17.0/src/utils/foxtools/MFXThreadEvent.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/foxtools/MFXThreadEvent.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2004-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/foxtools/MFXThreadEvent.h sumo-1.18.0/src/utils/foxtools/MFXThreadEvent.h
--- sumo-1.17.0/src/utils/foxtools/MFXThreadEvent.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/foxtools/MFXThreadEvent.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2004-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/foxtools/MFXThreadMessageRetriever.h sumo-1.18.0/src/utils/foxtools/MFXThreadMessageRetriever.h
--- sumo-1.17.0/src/utils/foxtools/MFXThreadMessageRetriever.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/foxtools/MFXThreadMessageRetriever.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2004-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/foxtools/MFXToggleButtonTooltip.cpp sumo-1.18.0/src/utils/foxtools/MFXToggleButtonTooltip.cpp
--- sumo-1.17.0/src/utils/foxtools/MFXToggleButtonTooltip.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/foxtools/MFXToggleButtonTooltip.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/foxtools/MFXToggleButtonTooltip.h sumo-1.18.0/src/utils/foxtools/MFXToggleButtonTooltip.h
--- sumo-1.17.0/src/utils/foxtools/MFXToggleButtonTooltip.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/foxtools/MFXToggleButtonTooltip.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/foxtools/MFXTreeListDynamic.cpp sumo-1.18.0/src/utils/foxtools/MFXTreeListDynamic.cpp
--- sumo-1.17.0/src/utils/foxtools/MFXTreeListDynamic.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/foxtools/MFXTreeListDynamic.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2004-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/foxtools/MFXTreeListDynamic.h sumo-1.18.0/src/utils/foxtools/MFXTreeListDynamic.h
--- sumo-1.17.0/src/utils/foxtools/MFXTreeListDynamic.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/foxtools/MFXTreeListDynamic.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2004-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/foxtools/MFXUtils.cpp sumo-1.18.0/src/utils/foxtools/MFXUtils.cpp
--- sumo-1.17.0/src/utils/foxtools/MFXUtils.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/foxtools/MFXUtils.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2006-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/foxtools/MFXUtils.h sumo-1.18.0/src/utils/foxtools/MFXUtils.h
--- sumo-1.17.0/src/utils/foxtools/MFXUtils.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/foxtools/MFXUtils.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2006-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/foxtools/MFXWorkerThread.h sumo-1.18.0/src/utils/foxtools/MFXWorkerThread.h
--- sumo-1.17.0/src/utils/foxtools/MFXWorkerThread.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/foxtools/MFXWorkerThread.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2004-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/foxtools/MsgHandlerSynchronized.h sumo-1.18.0/src/utils/foxtools/MsgHandlerSynchronized.h
--- sumo-1.17.0/src/utils/foxtools/MsgHandlerSynchronized.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/foxtools/MsgHandlerSynchronized.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2003-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/geom/AbstractPoly.h sumo-1.18.0/src/utils/geom/AbstractPoly.h
--- sumo-1.17.0/src/utils/geom/AbstractPoly.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/geom/AbstractPoly.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/geom/Boundary.cpp sumo-1.18.0/src/utils/geom/Boundary.cpp
--- sumo-1.17.0/src/utils/geom/Boundary.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/geom/Boundary.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/geom/Boundary.h sumo-1.18.0/src/utils/geom/Boundary.h
--- sumo-1.17.0/src/utils/geom/Boundary.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/geom/Boundary.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/geom/Bresenham.cpp sumo-1.18.0/src/utils/geom/Bresenham.cpp
--- sumo-1.17.0/src/utils/geom/Bresenham.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/geom/Bresenham.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/geom/Bresenham.h sumo-1.18.0/src/utils/geom/Bresenham.h
--- sumo-1.17.0/src/utils/geom/Bresenham.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/geom/Bresenham.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/geom/GeoConvHelper.cpp sumo-1.18.0/src/utils/geom/GeoConvHelper.cpp
--- sumo-1.17.0/src/utils/geom/GeoConvHelper.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/geom/GeoConvHelper.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/geom/GeoConvHelper.h sumo-1.18.0/src/utils/geom/GeoConvHelper.h
--- sumo-1.17.0/src/utils/geom/GeoConvHelper.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/geom/GeoConvHelper.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/geom/GeomConvHelper.cpp sumo-1.18.0/src/utils/geom/GeomConvHelper.cpp
--- sumo-1.17.0/src/utils/geom/GeomConvHelper.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/geom/GeomConvHelper.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/geom/GeomConvHelper.h sumo-1.18.0/src/utils/geom/GeomConvHelper.h
--- sumo-1.17.0/src/utils/geom/GeomConvHelper.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/geom/GeomConvHelper.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/geom/GeomHelper.cpp sumo-1.18.0/src/utils/geom/GeomHelper.cpp
--- sumo-1.17.0/src/utils/geom/GeomHelper.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/geom/GeomHelper.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/geom/GeomHelper.h sumo-1.18.0/src/utils/geom/GeomHelper.h
--- sumo-1.17.0/src/utils/geom/GeomHelper.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/geom/GeomHelper.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/geom/Position.cpp sumo-1.18.0/src/utils/geom/Position.cpp
--- sumo-1.17.0/src/utils/geom/Position.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/geom/Position.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/geom/Position.h sumo-1.18.0/src/utils/geom/Position.h
--- sumo-1.17.0/src/utils/geom/Position.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/geom/Position.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/geom/PositionVector.cpp sumo-1.18.0/src/utils/geom/PositionVector.cpp
--- sumo-1.17.0/src/utils/geom/PositionVector.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/geom/PositionVector.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -1527,7 +1527,7 @@
 
 bool
 PositionVector::almostSame(const PositionVector& v2, double maxDiv) const {
-    if (length() != v2.length()) {
+    if (size() != v2.size()) {
         return false;
     }
     auto i2 = v2.begin();
@@ -1545,8 +1545,8 @@
     if (size() < 2) {
         return false;
     }
-    for (const_iterator i = begin(); i != end() - 1; i++) {
-        if ((*i).z() != (*(i + 1)).z()) {
+    for (const_iterator i = begin(); i != end(); i++) {
+        if ((*i).z() != 0) {
             return true;
         }
     }
@@ -1862,7 +1862,7 @@
         }
         t += step;
         Position current(x, y, z);
-        if (prev != current && !ISNAN(x) && !ISNAN(y) && !ISNAN(z)) {
+        if (prev != current && !std::isnan(x) && !std::isnan(y) && !std::isnan(z)) {
             ret.push_back(current);
         }
         prev = current;
diff -Nru sumo-1.17.0/src/utils/geom/PositionVector.h sumo-1.18.0/src/utils/geom/PositionVector.h
--- sumo-1.17.0/src/utils/geom/PositionVector.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/geom/PositionVector.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/gui/cursors/Delete_cursor.cpp sumo-1.18.0/src/utils/gui/cursors/Delete_cursor.cpp
--- sumo-1.17.0/src/utils/gui/cursors/Delete_cursor.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/cursors/Delete_cursor.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/gui/cursors/GUICursors.h sumo-1.18.0/src/utils/gui/cursors/GUICursors.h
--- sumo-1.17.0/src/utils/gui/cursors/GUICursors.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/cursors/GUICursors.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/gui/cursors/GUICursorSubSys.cpp sumo-1.18.0/src/utils/gui/cursors/GUICursorSubSys.cpp
--- sumo-1.17.0/src/utils/gui/cursors/GUICursorSubSys.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/cursors/GUICursorSubSys.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/gui/cursors/GUICursorSubSys.h sumo-1.18.0/src/utils/gui/cursors/GUICursorSubSys.h
--- sumo-1.17.0/src/utils/gui/cursors/GUICursorSubSys.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/cursors/GUICursorSubSys.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/gui/cursors/Inspect_cursor.cpp sumo-1.18.0/src/utils/gui/cursors/Inspect_cursor.cpp
--- sumo-1.17.0/src/utils/gui/cursors/Inspect_cursor.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/cursors/Inspect_cursor.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/gui/cursors/InspectLane_cursor.cpp sumo-1.18.0/src/utils/gui/cursors/InspectLane_cursor.cpp
--- sumo-1.17.0/src/utils/gui/cursors/InspectLane_cursor.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/cursors/InspectLane_cursor.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/gui/cursors/MoveElement_cursor.cpp sumo-1.18.0/src/utils/gui/cursors/MoveElement_cursor.cpp
--- sumo-1.17.0/src/utils/gui/cursors/MoveElement_cursor.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/cursors/MoveElement_cursor.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/gui/cursors/Select_cursor.cpp sumo-1.18.0/src/utils/gui/cursors/Select_cursor.cpp
--- sumo-1.17.0/src/utils/gui/cursors/Select_cursor.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/cursors/Select_cursor.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/gui/cursors/SelectLane_cursor.cpp sumo-1.18.0/src/utils/gui/cursors/SelectLane_cursor.cpp
--- sumo-1.17.0/src/utils/gui/cursors/SelectLane_cursor.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/cursors/SelectLane_cursor.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/gui/div/GLHelper.cpp sumo-1.18.0/src/utils/gui/div/GLHelper.cpp
--- sumo-1.17.0/src/utils/gui/div/GLHelper.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/div/GLHelper.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/gui/div/GLHelper.h sumo-1.18.0/src/utils/gui/div/GLHelper.h
--- sumo-1.17.0/src/utils/gui/div/GLHelper.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/div/GLHelper.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/gui/div/GLObjectValuePassConnector.h sumo-1.18.0/src/utils/gui/div/GLObjectValuePassConnector.h
--- sumo-1.17.0/src/utils/gui/div/GLObjectValuePassConnector.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/div/GLObjectValuePassConnector.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/gui/div/GUIBasePersonHelper.cpp sumo-1.18.0/src/utils/gui/div/GUIBasePersonHelper.cpp
--- sumo-1.17.0/src/utils/gui/div/GUIBasePersonHelper.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/div/GUIBasePersonHelper.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/gui/div/GUIBasePersonHelper.h sumo-1.18.0/src/utils/gui/div/GUIBasePersonHelper.h
--- sumo-1.17.0/src/utils/gui/div/GUIBasePersonHelper.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/div/GUIBasePersonHelper.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/gui/div/GUIBaseVehicleHelper.cpp sumo-1.18.0/src/utils/gui/div/GUIBaseVehicleHelper.cpp
--- sumo-1.17.0/src/utils/gui/div/GUIBaseVehicleHelper.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/div/GUIBaseVehicleHelper.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/gui/div/GUIBaseVehicleHelper.h sumo-1.18.0/src/utils/gui/div/GUIBaseVehicleHelper.h
--- sumo-1.17.0/src/utils/gui/div/GUIBaseVehicleHelper.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/div/GUIBaseVehicleHelper.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/gui/div/GUIDesigns.cpp sumo-1.18.0/src/utils/gui/div/GUIDesigns.cpp
--- sumo-1.17.0/src/utils/gui/div/GUIDesigns.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/div/GUIDesigns.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/gui/div/GUIDesigns.h sumo-1.18.0/src/utils/gui/div/GUIDesigns.h
--- sumo-1.17.0/src/utils/gui/div/GUIDesigns.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/div/GUIDesigns.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -186,6 +186,9 @@
 /// @brief checkButton placed in left position
 #define GUIDesignCheckButton                (CHECKBUTTON_NORMAL | JUSTIFY_CENTER_Y | LAYOUT_FIX_HEIGHT | JUSTIFY_LEFT), 0, 0, 0, GUIDesignHeight, 2, 2, 2, 2
 
+/// @brief checkButton placed in left position
+#define GUIDesignCheckButtonThick           (CHECKBUTTON_NORMAL | FRAME_THICK | JUSTIFY_CENTER_Y | LAYOUT_FIX_HEIGHT | JUSTIFY_LEFT), 0, 0, 0, GUIDesignHeight, 2, 2, 2, 2
+
 /// @brief checkButton placed in left position with double size
 #define GUIDesignCheckButtonExtraHeight     (CHECKBUTTON_NORMAL | JUSTIFY_CENTER_Y | LAYOUT_FIX_HEIGHT | JUSTIFY_LEFT), 0, 0, 0, GUIDesignHeight + 10, 2, 2, 2, 2
 
@@ -316,10 +319,13 @@
 /// @brief Thick frame extended over frame parent
 #define GUIDesignFrameThick                 (FRAME_THICK | LAYOUT_FILL_X | LAYOUT_FILL_Y), 0, 0, 0, 0, 2, 2, 2, 2, 2, 2
 
-/// @brief Horizontal frame extended over frame parent
+/// @brief Horizontal frame extended over frame parent with padding and spacing
 #define GUIDesignHorizontalFrame            (LAYOUT_FILL_X), 0, 0, 0, 0, 4, 4, 4, 4, 4, 4
 
-/// @brief Vertical frame extended over frame parent
+/// @brief Horizontal frame extended over frame parent without padding and spacing
+#define GUIDesignHorizontalFrameNoPadding   (LAYOUT_FILL_X), 0, 0, 0, 0, 0, 0, 4, 4, 4, 4
+
+/// @brief Vertical frame extended over frame parent with padding and spacing
 #define GUIDesignVerticalFrame              (LAYOUT_FILL_Y), 0, 0, 0, 0, 4, 4, 4, 4, 4, 4
 
 /// @brief Horizontal frame used for pack icons
@@ -372,7 +378,7 @@
 /// @brief design for the main content frame of every frame/dialog
 #define GUIDesignChildWindowContentFrame        (FRAME_SUNKEN | LAYOUT_SIDE_TOP | LAYOUT_FILL_X | LAYOUT_FILL_Y)
 
-/// @brief design for the main content frame of every frame/dialog
+/// @brief design for the main content frame of every frame/dialog with padding and spacing
 #define GUIDesignContentsFrame                  (LAYOUT_FILL_X | LAYOUT_FILL_Y)
 
 /// @brief design for auxiliar (Without borders) frame extended in all directions
@@ -387,7 +393,7 @@
 /// @brief design for auxiliar (Without borders) horizontal frame used to pack another frames
 #define GUIDesignAuxiliarHorizontalFrame        (LAYOUT_FILL_X), 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
 
-/// @brief design for auxiliar (Without borders) horizontal frame used to pack another frames  uniform
+/// @brief design for auxiliar (Without borders) horizontal frame used to pack another frames uniform
 #define GUIDesignAuxiliarHorizontalFrameUniform (LAYOUT_FILL_X | PACK_UNIFORM_WIDTH), 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
 
 /// @brief design for auxiliar (Without borders) horizontal frame used to pack another frames
@@ -656,14 +662,14 @@
 
 /// @name design for MFXTreeListDynamic
 /// @{
-/// @brief treeListDinamic used in Inspector frame
-#define GUIDesignTreeListDinamic                (TREELIST_SHOWS_LINES | TREELIST_SHOWS_BOXES | TREELIST_SINGLESELECT | FRAME_SUNKEN | FRAME_THICK | LAYOUT_FILL_X | LAYOUT_FIX_HEIGHT)
+/// @brief tree list with fixed width
+#define GUIDesignTreeListFixedWidth             (TREELIST_SHOWS_LINES | TREELIST_SHOWS_BOXES | TREELIST_SINGLESELECT | FRAME_SUNKEN | FRAME_THICK | LAYOUT_FIX_WIDTH | LAYOUT_FILL_Y)
 
-/// @}
+/// @brief tree list with fixed height
+#define GUIDesignTreeListFixedHeight            (TREELIST_SHOWS_LINES | TREELIST_SHOWS_BOXES | TREELIST_SINGLESELECT | FRAME_SUNKEN | FRAME_THICK | LAYOUT_FILL_X | LAYOUT_FIX_HEIGHT)
 
+/// @}
 
-/// @brief Tree list used in frames to represent elements children
-#define GUIDesignTreeListFrame                  (TREELIST_SHOWS_LINES | TREELIST_SHOWS_BOXES | TREELIST_SINGLESELECT | FRAME_SUNKEN | FRAME_THICK | LAYOUT_FILL_X | LAYOUT_FIX_HEIGHT), 0, 0, 0, 200
 
 /// @brief design for FXLists
 #define GUIDesignList                           (LIST_NORMAL | FRAME_NORMAL | LAYOUT_FILL_X)
@@ -677,9 +683,6 @@
 /// @brief design for FXLists
 #define GUIDesignListExtended                   (LIST_NORMAL | FRAME_SUNKEN | FRAME_THICK | LAYOUT_FILL_X | LAYOUT_FILL_Y)
 
-/// @brief design for TabBooks
-#define GUIDesignTabBook                        (TABBOOK_LEFTTABS | PACK_UNIFORM_WIDTH | PACK_UNIFORM_HEIGHT | LAYOUT_FILL_X | LAYOUT_FILL_Y | LAYOUT_RIGHT)
-
 // ===========================================================================
 // Implementation
 // ===========================================================================
diff -Nru sumo-1.17.0/src/utils/gui/div/GUIDialog_GLChosenEditor.cpp sumo-1.18.0/src/utils/gui/div/GUIDialog_GLChosenEditor.cpp
--- sumo-1.17.0/src/utils/gui/div/GUIDialog_GLChosenEditor.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/div/GUIDialog_GLChosenEditor.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/gui/div/GUIDialog_GLChosenEditor.h sumo-1.18.0/src/utils/gui/div/GUIDialog_GLChosenEditor.h
--- sumo-1.17.0/src/utils/gui/div/GUIDialog_GLChosenEditor.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/div/GUIDialog_GLChosenEditor.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/gui/div/GUIDottedGeometry.cpp sumo-1.18.0/src/utils/gui/div/GUIDottedGeometry.cpp
--- sumo-1.17.0/src/utils/gui/div/GUIDottedGeometry.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/div/GUIDottedGeometry.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/gui/div/GUIDottedGeometry.h sumo-1.18.0/src/utils/gui/div/GUIDottedGeometry.h
--- sumo-1.17.0/src/utils/gui/div/GUIDottedGeometry.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/div/GUIDottedGeometry.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/gui/div/GUIGeometry.cpp sumo-1.18.0/src/utils/gui/div/GUIGeometry.cpp
--- sumo-1.17.0/src/utils/gui/div/GUIGeometry.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/div/GUIGeometry.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/gui/div/GUIGeometry.h sumo-1.18.0/src/utils/gui/div/GUIGeometry.h
--- sumo-1.17.0/src/utils/gui/div/GUIGeometry.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/div/GUIGeometry.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/gui/div/GUIGlobalPostDrawing.cpp sumo-1.18.0/src/utils/gui/div/GUIGlobalPostDrawing.cpp
--- sumo-1.17.0/src/utils/gui/div/GUIGlobalPostDrawing.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/div/GUIGlobalPostDrawing.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/gui/div/GUIGlobalPostDrawing.h sumo-1.18.0/src/utils/gui/div/GUIGlobalPostDrawing.h
--- sumo-1.17.0/src/utils/gui/div/GUIGlobalPostDrawing.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/div/GUIGlobalPostDrawing.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/gui/div/GUIGlobalSelection.cpp sumo-1.18.0/src/utils/gui/div/GUIGlobalSelection.cpp
--- sumo-1.17.0/src/utils/gui/div/GUIGlobalSelection.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/div/GUIGlobalSelection.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/gui/div/GUIGlobalSelection.h sumo-1.18.0/src/utils/gui/div/GUIGlobalSelection.h
--- sumo-1.17.0/src/utils/gui/div/GUIGlobalSelection.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/div/GUIGlobalSelection.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/gui/div/GUIIOGlobals.cpp sumo-1.18.0/src/utils/gui/div/GUIIOGlobals.cpp
--- sumo-1.17.0/src/utils/gui/div/GUIIOGlobals.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/div/GUIIOGlobals.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/gui/div/GUIIOGlobals.h sumo-1.18.0/src/utils/gui/div/GUIIOGlobals.h
--- sumo-1.17.0/src/utils/gui/div/GUIIOGlobals.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/div/GUIIOGlobals.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/gui/div/GUIMessageWindow.cpp sumo-1.18.0/src/utils/gui/div/GUIMessageWindow.cpp
--- sumo-1.17.0/src/utils/gui/div/GUIMessageWindow.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/div/GUIMessageWindow.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2003-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/gui/div/GUIMessageWindow.h sumo-1.18.0/src/utils/gui/div/GUIMessageWindow.h
--- sumo-1.17.0/src/utils/gui/div/GUIMessageWindow.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/div/GUIMessageWindow.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2003-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/gui/div/GUIParameterTableItem.h sumo-1.18.0/src/utils/gui/div/GUIParameterTableItem.h
--- sumo-1.17.0/src/utils/gui/div/GUIParameterTableItem.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/div/GUIParameterTableItem.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/gui/div/GUIParameterTableWindow.cpp sumo-1.18.0/src/utils/gui/div/GUIParameterTableWindow.cpp
--- sumo-1.17.0/src/utils/gui/div/GUIParameterTableWindow.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/div/GUIParameterTableWindow.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2002-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -60,8 +60,8 @@
 // ===========================================================================
 // method definitions
 // ===========================================================================
-GUIParameterTableWindow::GUIParameterTableWindow(GUIMainWindow& app, GUIGlObject& o) :
-    FXMainWindow(app.getApp(), (o.getFullName() + " Parameter").c_str(), nullptr, nullptr, DECOR_ALL, 20, 40, 200, 500),
+GUIParameterTableWindow::GUIParameterTableWindow(GUIMainWindow& app, GUIGlObject& o, const std::string& title) :
+    FXMainWindow(app.getApp(), ((title == "" ? o.getFullName() : title) + " Parameter").c_str(), nullptr, nullptr, DECOR_ALL, 20, 40, 200, 500),
     GUIPersistentWindowPos(this, "DIALOG_PARAMETERS", false, 20, 40),
     myObject(&o),
     myApplication(&app),
diff -Nru sumo-1.17.0/src/utils/gui/div/GUIParameterTableWindow.h sumo-1.18.0/src/utils/gui/div/GUIParameterTableWindow.h
--- sumo-1.17.0/src/utils/gui/div/GUIParameterTableWindow.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/div/GUIParameterTableWindow.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2002-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -66,7 +66,7 @@
      * @param[in] app The application this window belongs to
      * @param[in] o The gl-object this table describes
      */
-    GUIParameterTableWindow(GUIMainWindow& app, GUIGlObject& o);
+    GUIParameterTableWindow(GUIMainWindow& app, GUIGlObject& o, const std::string& title = "");
 
 
     /// @brief Destructor
diff -Nru sumo-1.17.0/src/utils/gui/div/GUIParam_PopupMenu.cpp sumo-1.18.0/src/utils/gui/div/GUIParam_PopupMenu.cpp
--- sumo-1.17.0/src/utils/gui/div/GUIParam_PopupMenu.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/div/GUIParam_PopupMenu.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/gui/div/GUIParam_PopupMenu.h sumo-1.18.0/src/utils/gui/div/GUIParam_PopupMenu.h
--- sumo-1.17.0/src/utils/gui/div/GUIParam_PopupMenu.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/div/GUIParam_PopupMenu.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/gui/div/GUIPersistentWindowPos.cpp sumo-1.18.0/src/utils/gui/div/GUIPersistentWindowPos.cpp
--- sumo-1.17.0/src/utils/gui/div/GUIPersistentWindowPos.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/div/GUIPersistentWindowPos.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/gui/div/GUIPersistentWindowPos.h sumo-1.18.0/src/utils/gui/div/GUIPersistentWindowPos.h
--- sumo-1.17.0/src/utils/gui/div/GUIPersistentWindowPos.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/div/GUIPersistentWindowPos.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/gui/div/GUISelectedStorage.cpp sumo-1.18.0/src/utils/gui/div/GUISelectedStorage.cpp
--- sumo-1.17.0/src/utils/gui/div/GUISelectedStorage.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/div/GUISelectedStorage.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/gui/div/GUISelectedStorage.h sumo-1.18.0/src/utils/gui/div/GUISelectedStorage.h
--- sumo-1.17.0/src/utils/gui/div/GUISelectedStorage.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/div/GUISelectedStorage.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/gui/div/GUIUserIO.cpp sumo-1.18.0/src/utils/gui/div/GUIUserIO.cpp
--- sumo-1.17.0/src/utils/gui/div/GUIUserIO.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/div/GUIUserIO.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/gui/div/GUIUserIO.h sumo-1.18.0/src/utils/gui/div/GUIUserIO.h
--- sumo-1.17.0/src/utils/gui/div/GUIUserIO.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/div/GUIUserIO.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/gui/div/GUIVideoEncoder.h sumo-1.18.0/src/utils/gui/div/GUIVideoEncoder.h
--- sumo-1.17.0/src/utils/gui/div/GUIVideoEncoder.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/div/GUIVideoEncoder.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/gui/div/Roboto.h sumo-1.18.0/src/utils/gui/div/Roboto.h
--- sumo-1.17.0/src/utils/gui/div/Roboto.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/div/Roboto.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/gui/events/GUIEvent_AddView.h sumo-1.18.0/src/utils/gui/events/GUIEvent_AddView.h
--- sumo-1.17.0/src/utils/gui/events/GUIEvent_AddView.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/events/GUIEvent_AddView.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/gui/events/GUIEvent_CloseView.h sumo-1.18.0/src/utils/gui/events/GUIEvent_CloseView.h
--- sumo-1.17.0/src/utils/gui/events/GUIEvent_CloseView.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/events/GUIEvent_CloseView.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/gui/events/GUIEvent.h sumo-1.18.0/src/utils/gui/events/GUIEvent.h
--- sumo-1.17.0/src/utils/gui/events/GUIEvent.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/events/GUIEvent.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/gui/events/GUIEvent_Message.h sumo-1.18.0/src/utils/gui/events/GUIEvent_Message.h
--- sumo-1.17.0/src/utils/gui/events/GUIEvent_Message.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/events/GUIEvent_Message.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/gui/events/GUIEvent_SimulationStep.h sumo-1.18.0/src/utils/gui/events/GUIEvent_SimulationStep.h
--- sumo-1.17.0/src/utils/gui/events/GUIEvent_SimulationStep.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/events/GUIEvent_SimulationStep.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/gui/globjects/GLIncludes.h sumo-1.18.0/src/utils/gui/globjects/GLIncludes.h
--- sumo-1.17.0/src/utils/gui/globjects/GLIncludes.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/globjects/GLIncludes.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/gui/globjects/GUICursorDialog.cpp sumo-1.18.0/src/utils/gui/globjects/GUICursorDialog.cpp
--- sumo-1.17.0/src/utils/gui/globjects/GUICursorDialog.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/globjects/GUICursorDialog.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/gui/globjects/GUICursorDialog.h sumo-1.18.0/src/utils/gui/globjects/GUICursorDialog.h
--- sumo-1.17.0/src/utils/gui/globjects/GUICursorDialog.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/globjects/GUICursorDialog.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/gui/globjects/GUIGlObject_AbstractAdd.cpp sumo-1.18.0/src/utils/gui/globjects/GUIGlObject_AbstractAdd.cpp
--- sumo-1.17.0/src/utils/gui/globjects/GUIGlObject_AbstractAdd.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/globjects/GUIGlObject_AbstractAdd.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/gui/globjects/GUIGlObject_AbstractAdd.h sumo-1.18.0/src/utils/gui/globjects/GUIGlObject_AbstractAdd.h
--- sumo-1.17.0/src/utils/gui/globjects/GUIGlObject_AbstractAdd.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/globjects/GUIGlObject_AbstractAdd.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/gui/globjects/GUIGlObject.cpp sumo-1.18.0/src/utils/gui/globjects/GUIGlObject.cpp
--- sumo-1.17.0/src/utils/gui/globjects/GUIGlObject.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/globjects/GUIGlObject.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -24,6 +24,7 @@
 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -272,7 +273,7 @@
 
 void
 GUIGlObject::buildCenterPopupEntry(GUIGLObjectPopupMenu* ret, bool addSeparator) {
-    GUIDesigns::buildFXMenuCommand(ret, "Center", GUIIconSubSys::getIcon(GUIIcon::RECENTERVIEW), ret, MID_CENTER);
+    GUIDesigns::buildFXMenuCommand(ret, TL("Center"), GUIIconSubSys::getIcon(GUIIcon::RECENTERVIEW), ret, MID_CENTER);
     if (addSeparator) {
         new FXMenuSeparator(ret);
     }
@@ -281,8 +282,8 @@
 
 void
 GUIGlObject::buildNameCopyPopupEntry(GUIGLObjectPopupMenu* ret, bool addSeparator) {
-    GUIDesigns::buildFXMenuCommand(ret, "Copy name to clipboard", nullptr, ret, MID_COPY_NAME);
-    GUIDesigns::buildFXMenuCommand(ret, "Copy typed name to clipboard", nullptr, ret, MID_COPY_TYPED_NAME);
+    GUIDesigns::buildFXMenuCommand(ret, TL("Copy name to clipboard"), nullptr, ret, MID_COPY_NAME);
+    GUIDesigns::buildFXMenuCommand(ret, TL("Copy typed name to clipboard"), nullptr, ret, MID_COPY_TYPED_NAME);
     if (addSeparator) {
         new FXMenuSeparator(ret);
     }
@@ -292,9 +293,9 @@
 void
 GUIGlObject::buildSelectionPopupEntry(GUIGLObjectPopupMenu* ret, bool addSeparator) {
     if (gSelected.isSelected(getType(), getGlID())) {
-        GUIDesigns::buildFXMenuCommand(ret, "Remove From Selected", GUIIconSubSys::getIcon(GUIIcon::FLAG_MINUS), ret, MID_REMOVESELECT);
+        GUIDesigns::buildFXMenuCommand(ret, TL("Remove From Selected"), GUIIconSubSys::getIcon(GUIIcon::FLAG_MINUS), ret, MID_REMOVESELECT);
     } else {
-        GUIDesigns::buildFXMenuCommand(ret, "Add To Selected", GUIIconSubSys::getIcon(GUIIcon::FLAG_PLUS), ret, MID_ADDSELECT);
+        GUIDesigns::buildFXMenuCommand(ret, TL("Add To Selected"), GUIIconSubSys::getIcon(GUIIcon::FLAG_PLUS), ret, MID_ADDSELECT);
     }
     if (addSeparator) {
         new FXMenuSeparator(ret);
@@ -304,7 +305,7 @@
 
 void
 GUIGlObject::buildShowParamsPopupEntry(GUIGLObjectPopupMenu* ret, bool addSeparator) {
-    GUIDesigns::buildFXMenuCommand(ret, "Show Parameter", GUIIconSubSys::getIcon(GUIIcon::APP_TABLE), ret, MID_SHOWPARS);
+    GUIDesigns::buildFXMenuCommand(ret, TL("Show Parameter"), GUIIconSubSys::getIcon(GUIIcon::APP_TABLE), ret, MID_SHOWPARS);
     if (addSeparator) {
         new FXMenuSeparator(ret);
     }
@@ -313,7 +314,7 @@
 
 void
 GUIGlObject::buildShowTypeParamsPopupEntry(GUIGLObjectPopupMenu* ret, bool addSeparator) {
-    GUIDesigns::buildFXMenuCommand(ret, "Show Type Parameter", GUIIconSubSys::getIcon(GUIIcon::APP_TABLE), ret, MID_SHOWTYPEPARS);
+    GUIDesigns::buildFXMenuCommand(ret, TL("Show Type Parameter"), GUIIconSubSys::getIcon(GUIIcon::APP_TABLE), ret, MID_SHOWTYPEPARS);
     if (addSeparator) {
         new FXMenuSeparator(ret);
     }
@@ -322,13 +323,13 @@
 
 void
 GUIGlObject::buildPositionCopyEntry(GUIGLObjectPopupMenu* ret, const GUIMainWindow& app) const {
-    GUIDesigns::buildFXMenuCommand(ret, "Copy cursor position to clipboard", nullptr, ret, MID_COPY_CURSOR_POSITION);
+    GUIDesigns::buildFXMenuCommand(ret, TL("Copy cursor position to clipboard"), nullptr, ret, MID_COPY_CURSOR_POSITION);
     if (GeoConvHelper::getFinal().usingGeoProjection()) {
-        GUIDesigns::buildFXMenuCommand(ret, "Copy cursor geo-position to clipboard", nullptr, ret, MID_COPY_CURSOR_GEOPOSITION);
+        GUIDesigns::buildFXMenuCommand(ret, TL("Copy cursor geo-position to clipboard"), nullptr, ret, MID_COPY_CURSOR_GEOPOSITION);
         // create menu pane for edge operations
         FXMenuPane* showCursorGeoPositionPane = new FXMenuPane(ret);
         ret->insertMenuPaneChild(showCursorGeoPositionPane);
-        new FXMenuCascade(ret, "Show cursor geo-position in ", nullptr, showCursorGeoPositionPane);
+        new FXMenuCascade(ret, TL("Show cursor geo-position in "), nullptr, showCursorGeoPositionPane);
         for (const auto& mapper : app.getOnlineMaps()) {
             if (mapper.first == "GeoHack") {
                 GUIDesigns::buildFXMenuCommand(showCursorGeoPositionPane, mapper.first, GUIIconSubSys::getIcon(GUIIcon::GEOHACK), ret, MID_SHOW_GEOPOSITION_ONLINE);
@@ -346,7 +347,7 @@
 
 void
 GUIGlObject::buildShowManipulatorPopupEntry(GUIGLObjectPopupMenu* ret, bool addSeparator) {
-    GUIDesigns::buildFXMenuCommand(ret, "Open Manipulator...", GUIIconSubSys::getIcon(GUIIcon::MANIP), ret, MID_MANIP);
+    GUIDesigns::buildFXMenuCommand(ret, TL("Open Manipulator..."), GUIIconSubSys::getIcon(GUIIcon::MANIP), ret, MID_MANIP);
     if (addSeparator) {
         new FXMenuSeparator(ret);
     }
@@ -385,7 +386,7 @@
     buildPositionCopyEntry(ret, app);
     // only show type if isn't empty
     if (type != "") {
-        GUIDesigns::buildFXMenuCommand(ret, ("type: " + type + "").c_str(), nullptr, nullptr, 0);
+        GUIDesigns::buildFXMenuCommand(ret, TLF("type: %", type).c_str(), nullptr, nullptr, 0);
         new FXMenuSeparator(ret);
     }
 }
@@ -408,7 +409,7 @@
     buildPositionCopyEntry(ret, app);
     // only show type if isn't empty
     if (type != "") {
-        GUIDesigns::buildFXMenuCommand(ret, ("type: " + type + "").c_str(), nullptr, nullptr, 0);
+        GUIDesigns::buildFXMenuCommand(ret, TLF("type: %", type).c_str(), nullptr, nullptr, 0);
         new FXMenuSeparator(ret);
     }
 }
diff -Nru sumo-1.17.0/src/utils/gui/globjects/GUIGlObject.h sumo-1.18.0/src/utils/gui/globjects/GUIGlObject.h
--- sumo-1.17.0/src/utils/gui/globjects/GUIGlObject.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/globjects/GUIGlObject.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/gui/globjects/GUIGLObjectPopupMenu.cpp sumo-1.18.0/src/utils/gui/globjects/GUIGLObjectPopupMenu.cpp
--- sumo-1.17.0/src/utils/gui/globjects/GUIGLObjectPopupMenu.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/globjects/GUIGLObjectPopupMenu.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/gui/globjects/GUIGLObjectPopupMenu.h sumo-1.18.0/src/utils/gui/globjects/GUIGLObjectPopupMenu.h
--- sumo-1.17.0/src/utils/gui/globjects/GUIGLObjectPopupMenu.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/globjects/GUIGLObjectPopupMenu.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/gui/globjects/GUIGlObjectStorage.cpp sumo-1.18.0/src/utils/gui/globjects/GUIGlObjectStorage.cpp
--- sumo-1.17.0/src/utils/gui/globjects/GUIGlObjectStorage.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/globjects/GUIGlObjectStorage.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/gui/globjects/GUIGlObjectStorage.h sumo-1.18.0/src/utils/gui/globjects/GUIGlObjectStorage.h
--- sumo-1.17.0/src/utils/gui/globjects/GUIGlObjectStorage.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/globjects/GUIGlObjectStorage.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/gui/globjects/GUIGlObjectTypes.h sumo-1.18.0/src/utils/gui/globjects/GUIGlObjectTypes.h
--- sumo-1.17.0/src/utils/gui/globjects/GUIGlObjectTypes.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/globjects/GUIGlObjectTypes.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/gui/globjects/GUIPointOfInterest.cpp sumo-1.18.0/src/utils/gui/globjects/GUIPointOfInterest.cpp
--- sumo-1.17.0/src/utils/gui/globjects/GUIPointOfInterest.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/globjects/GUIPointOfInterest.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/gui/globjects/GUIPointOfInterest.h sumo-1.18.0/src/utils/gui/globjects/GUIPointOfInterest.h
--- sumo-1.17.0/src/utils/gui/globjects/GUIPointOfInterest.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/globjects/GUIPointOfInterest.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/gui/globjects/GUIPolygon.cpp sumo-1.18.0/src/utils/gui/globjects/GUIPolygon.cpp
--- sumo-1.17.0/src/utils/gui/globjects/GUIPolygon.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/globjects/GUIPolygon.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -39,7 +39,6 @@
 #define CALLBACK
 #endif
 
-
 // ===========================================================================
 // static members
 // ===========================================================================
@@ -119,7 +118,11 @@
     if (myTesselation.empty()) {
         myCurrentTesselated = this;
         // draw the tesselated shape
-        double* points = new double[shape.size() * 3];
+        size_t numPoints = shape.size() * 3;
+        for (const PositionVector& hole : myHoles) {
+            numPoints += hole.size() * 3;
+        }
+        double* points = new double[numPoints];
         GLUtesselator* tobj = gluNewTess();
 #ifdef _MSC_VER
 #pragma warning(push)
@@ -150,11 +153,21 @@
             gluTessVertex(tobj, points + 3 * i, points + 3 * i);
         }
         gluTessEndContour(tobj);
-
+        size_t startIndex = shape.size() * 3;
+        for (const PositionVector& hole : myHoles) {
+            gluTessBeginContour(tobj);
+            for (int i = 0; i < (int)hole.size(); i++) {
+                points[startIndex + 3 * i] = hole[i].x();
+                points[startIndex + 3 * i + 1] = hole[i].y();
+                points[startIndex + 3 * i + 2] = 0.;
+                gluTessVertex(tobj, points + startIndex + 3 * i, points + startIndex + 3 * i);
+            }
+            startIndex += hole.size() * 3;
+            gluTessEndContour(tobj);
+        }
         gluTessEndPolygon(tobj);
         gluDeleteTess(tobj);
         delete[] points;
-
     }
     for (GLPrimitive& pr : myTesselation) {
         // XXX change to glDrawArrays
diff -Nru sumo-1.17.0/src/utils/gui/globjects/GUIPolygon.h sumo-1.18.0/src/utils/gui/globjects/GUIPolygon.h
--- sumo-1.17.0/src/utils/gui/globjects/GUIPolygon.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/globjects/GUIPolygon.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -67,15 +67,11 @@
     /// @brief Destructor
     ~TesselatedPolygon() {}
 
-    // @brief perform the tesselation / drawing
+    /// @brief perform the tesselation / drawing
     void drawTesselation(const PositionVector& shape) const;
 
     /// @brief id of the display list for the cached tesselation
     mutable std::vector myTesselation;
-
-    PositionVector& getShapeRef() {
-        return myShape;
-    }
 };
 
 /*
diff -Nru sumo-1.17.0/src/utils/gui/globjects/GUISaveDialog.cpp sumo-1.18.0/src/utils/gui/globjects/GUISaveDialog.cpp
--- sumo-1.17.0/src/utils/gui/globjects/GUISaveDialog.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/globjects/GUISaveDialog.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/gui/globjects/GUISaveDialog.h sumo-1.18.0/src/utils/gui/globjects/GUISaveDialog.h
--- sumo-1.17.0/src/utils/gui/globjects/GUISaveDialog.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/globjects/GUISaveDialog.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/gui/globjects/GUIShapeContainer.cpp sumo-1.18.0/src/utils/gui/globjects/GUIShapeContainer.cpp
--- sumo-1.17.0/src/utils/gui/globjects/GUIShapeContainer.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/globjects/GUIShapeContainer.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/gui/globjects/GUIShapeContainer.h sumo-1.18.0/src/utils/gui/globjects/GUIShapeContainer.h
--- sumo-1.17.0/src/utils/gui/globjects/GUIShapeContainer.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/globjects/GUIShapeContainer.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2009-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/gui/images/flag.cpp sumo-1.18.0/src/utils/gui/images/flag.cpp
--- sumo-1.17.0/src/utils/gui/images/flag.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/images/flag.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/gui/images/flag_minus.cpp sumo-1.18.0/src/utils/gui/images/flag_minus.cpp
--- sumo-1.17.0/src/utils/gui/images/flag_minus.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/images/flag_minus.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/gui/images/flag_plus.cpp sumo-1.18.0/src/utils/gui/images/flag_plus.cpp
--- sumo-1.17.0/src/utils/gui/images/flag_plus.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/images/flag_plus.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/gui/images/flowtazs.xpm sumo-1.18.0/src/utils/gui/images/flowtazs.xpm
--- sumo-1.17.0/src/utils/gui/images/flowtazs.xpm	1970-01-01 00:00:00.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/images/flowtazs.xpm	2023-06-28 20:02:17.000000000 +0000
@@ -0,0 +1,28 @@
+/* XPM */
+static const char *flowtazs_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 6 1",
+"  c black",
+". c #7092BE",
+"X c #FFD800",
+"o c cyan",
+"O c #808080",
+"+ c None",
+/* pixels */
+"++++++++++++++++",
+"+++..........+++",
+"++.oooooooooo.++",
+"++.oo oooo oo.++",
+"+..o   oo   o..+",
+"+..............+",
+"................",
+".XX..........XX.",
+".XX.OOOOOOOO.XX.",
+"................",
+"....OOOOOOOO....",
+"................",
+"+  ++++++++++  +",
+"+  ++++++++++  +",
+"++++++++++++++++",
+"++++++++++++++++"
+};
diff -Nru sumo-1.17.0/src/utils/gui/images/GNETexture_E3.cpp sumo-1.18.0/src/utils/gui/images/GNETexture_E3.cpp
--- sumo-1.17.0/src/utils/gui/images/GNETexture_E3.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/images/GNETexture_E3.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/gui/images/GNETexture_E3Selected.cpp sumo-1.18.0/src/utils/gui/images/GNETexture_E3Selected.cpp
--- sumo-1.17.0/src/utils/gui/images/GNETexture_E3Selected.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/images/GNETexture_E3Selected.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/gui/images/GNETexture_LaneBike.cpp sumo-1.18.0/src/utils/gui/images/GNETexture_LaneBike.cpp
--- sumo-1.17.0/src/utils/gui/images/GNETexture_LaneBike.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/images/GNETexture_LaneBike.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/gui/images/GNETexture_LaneBus.cpp sumo-1.18.0/src/utils/gui/images/GNETexture_LaneBus.cpp
--- sumo-1.17.0/src/utils/gui/images/GNETexture_LaneBus.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/images/GNETexture_LaneBus.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/gui/images/GNETexture_LanePedestrian.cpp sumo-1.18.0/src/utils/gui/images/GNETexture_LanePedestrian.cpp
--- sumo-1.17.0/src/utils/gui/images/GNETexture_LanePedestrian.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/images/GNETexture_LanePedestrian.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/gui/images/GNETexture_Lock.cpp sumo-1.18.0/src/utils/gui/images/GNETexture_Lock.cpp
--- sumo-1.17.0/src/utils/gui/images/GNETexture_Lock.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/images/GNETexture_Lock.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/gui/images/GNETexture_NotMoving.cpp sumo-1.18.0/src/utils/gui/images/GNETexture_NotMoving.cpp
--- sumo-1.17.0/src/utils/gui/images/GNETexture_NotMoving.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/images/GNETexture_NotMoving.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/gui/images/GNETexture_NotMovingSelected.cpp sumo-1.18.0/src/utils/gui/images/GNETexture_NotMovingSelected.cpp
--- sumo-1.17.0/src/utils/gui/images/GNETexture_NotMovingSelected.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/images/GNETexture_NotMovingSelected.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/gui/images/GNETexture_Rerouter_ClosingLaneReroute.cpp sumo-1.18.0/src/utils/gui/images/GNETexture_Rerouter_ClosingLaneReroute.cpp
--- sumo-1.17.0/src/utils/gui/images/GNETexture_Rerouter_ClosingLaneReroute.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/images/GNETexture_Rerouter_ClosingLaneReroute.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/gui/images/GNETexture_Rerouter_ClosingReroute.cpp sumo-1.18.0/src/utils/gui/images/GNETexture_Rerouter_ClosingReroute.cpp
--- sumo-1.17.0/src/utils/gui/images/GNETexture_Rerouter_ClosingReroute.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/images/GNETexture_Rerouter_ClosingReroute.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/gui/images/GNETexture_Rerouter.cpp sumo-1.18.0/src/utils/gui/images/GNETexture_Rerouter.cpp
--- sumo-1.17.0/src/utils/gui/images/GNETexture_Rerouter.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/images/GNETexture_Rerouter.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/gui/images/GNETexture_Rerouter_DestProbReroute.cpp sumo-1.18.0/src/utils/gui/images/GNETexture_Rerouter_DestProbReroute.cpp
--- sumo-1.17.0/src/utils/gui/images/GNETexture_Rerouter_DestProbReroute.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/images/GNETexture_Rerouter_DestProbReroute.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/gui/images/GNETexture_Rerouter_Interval.cpp sumo-1.18.0/src/utils/gui/images/GNETexture_Rerouter_Interval.cpp
--- sumo-1.17.0/src/utils/gui/images/GNETexture_Rerouter_Interval.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/images/GNETexture_Rerouter_Interval.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/gui/images/GNETexture_Rerouter_ParkingAreaReroute.cpp sumo-1.18.0/src/utils/gui/images/GNETexture_Rerouter_ParkingAreaReroute.cpp
--- sumo-1.17.0/src/utils/gui/images/GNETexture_Rerouter_ParkingAreaReroute.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/images/GNETexture_Rerouter_ParkingAreaReroute.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/gui/images/GNETexture_Rerouter_RouteProbReroute.cpp sumo-1.18.0/src/utils/gui/images/GNETexture_Rerouter_RouteProbReroute.cpp
--- sumo-1.17.0/src/utils/gui/images/GNETexture_Rerouter_RouteProbReroute.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/images/GNETexture_Rerouter_RouteProbReroute.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/gui/images/GNETexture_RerouterSelected.cpp sumo-1.18.0/src/utils/gui/images/GNETexture_RerouterSelected.cpp
--- sumo-1.17.0/src/utils/gui/images/GNETexture_RerouterSelected.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/images/GNETexture_RerouterSelected.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/gui/images/GNETexture_RouteProbe.cpp sumo-1.18.0/src/utils/gui/images/GNETexture_RouteProbe.cpp
--- sumo-1.17.0/src/utils/gui/images/GNETexture_RouteProbe.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/images/GNETexture_RouteProbe.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/gui/images/GNETexture_RouteProbeSelected.cpp sumo-1.18.0/src/utils/gui/images/GNETexture_RouteProbeSelected.cpp
--- sumo-1.17.0/src/utils/gui/images/GNETexture_RouteProbeSelected.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/images/GNETexture_RouteProbeSelected.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/gui/images/GNETexture_StopContainer.cpp sumo-1.18.0/src/utils/gui/images/GNETexture_StopContainer.cpp
--- sumo-1.17.0/src/utils/gui/images/GNETexture_StopContainer.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/images/GNETexture_StopContainer.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/gui/images/GNETexture_StopContainerSelected.cpp sumo-1.18.0/src/utils/gui/images/GNETexture_StopContainerSelected.cpp
--- sumo-1.17.0/src/utils/gui/images/GNETexture_StopContainerSelected.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/images/GNETexture_StopContainerSelected.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/gui/images/GNETexture_Stop.cpp sumo-1.18.0/src/utils/gui/images/GNETexture_Stop.cpp
--- sumo-1.17.0/src/utils/gui/images/GNETexture_Stop.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/images/GNETexture_Stop.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/gui/images/GNETexture_StopPerson.cpp sumo-1.18.0/src/utils/gui/images/GNETexture_StopPerson.cpp
--- sumo-1.17.0/src/utils/gui/images/GNETexture_StopPerson.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/images/GNETexture_StopPerson.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/gui/images/GNETexture_StopPersonSelected.cpp sumo-1.18.0/src/utils/gui/images/GNETexture_StopPersonSelected.cpp
--- sumo-1.17.0/src/utils/gui/images/GNETexture_StopPersonSelected.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/images/GNETexture_StopPersonSelected.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/gui/images/GNETexture_StopSelected.cpp sumo-1.18.0/src/utils/gui/images/GNETexture_StopSelected.cpp
--- sumo-1.17.0/src/utils/gui/images/GNETexture_StopSelected.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/images/GNETexture_StopSelected.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/gui/images/GNETexture_TLS.cpp sumo-1.18.0/src/utils/gui/images/GNETexture_TLS.cpp
--- sumo-1.17.0/src/utils/gui/images/GNETexture_TLS.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/images/GNETexture_TLS.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/gui/images/GNETexture_TractionSubstation.cpp sumo-1.18.0/src/utils/gui/images/GNETexture_TractionSubstation.cpp
--- sumo-1.17.0/src/utils/gui/images/GNETexture_TractionSubstation.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/images/GNETexture_TractionSubstation.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2021-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/gui/images/GNETexture_TractionSubstationSelected.cpp sumo-1.18.0/src/utils/gui/images/GNETexture_TractionSubstationSelected.cpp
--- sumo-1.17.0/src/utils/gui/images/GNETexture_TractionSubstationSelected.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/images/GNETexture_TractionSubstationSelected.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2021-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/gui/images/GNETexture_Vaporizer.cpp sumo-1.18.0/src/utils/gui/images/GNETexture_Vaporizer.cpp
--- sumo-1.17.0/src/utils/gui/images/GNETexture_Vaporizer.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/images/GNETexture_Vaporizer.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/gui/images/GNETexture_VaporizerSelected.cpp sumo-1.18.0/src/utils/gui/images/GNETexture_VaporizerSelected.cpp
--- sumo-1.17.0/src/utils/gui/images/GNETexture_VaporizerSelected.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/images/GNETexture_VaporizerSelected.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/gui/images/GNETexture_VariableSpeedSign.cpp sumo-1.18.0/src/utils/gui/images/GNETexture_VariableSpeedSign.cpp
--- sumo-1.17.0/src/utils/gui/images/GNETexture_VariableSpeedSign.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/images/GNETexture_VariableSpeedSign.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/gui/images/GNETexture_VariableSpeedSignSelected.cpp sumo-1.18.0/src/utils/gui/images/GNETexture_VariableSpeedSignSelected.cpp
--- sumo-1.17.0/src/utils/gui/images/GNETexture_VariableSpeedSignSelected.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/images/GNETexture_VariableSpeedSignSelected.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/gui/images/GNETexture_VariableSpeedSign_Step.cpp sumo-1.18.0/src/utils/gui/images/GNETexture_VariableSpeedSign_Step.cpp
--- sumo-1.17.0/src/utils/gui/images/GNETexture_VariableSpeedSign_Step.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/images/GNETexture_VariableSpeedSign_Step.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/gui/images/GUIIcons.h sumo-1.18.0/src/utils/gui/images/GUIIcons.h
--- sumo-1.17.0/src/utils/gui/images/GUIIcons.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/images/GUIIcons.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -367,6 +367,7 @@
     MODEROUTE,
     MODEVEHICLE,
     MODETYPE,
+    MODETYPEDISTRIBUTION,
     MODESTOP,
     MODEPERSON,
     MODEPERSONPLAN,
@@ -466,8 +467,10 @@
     VEHICLE,
     TRIP,
     TRIP_JUNCTIONS,
+    TRIP_TAZS,
     FLOW,
     FLOW_JUNCTIONS,
+    FLOW_TAZS,
     ROUTEFLOW,
     STOPELEMENT,
     WAYPOINT,
@@ -475,14 +478,17 @@
     PERSONFLOW,
     PERSONTRIP_FROMTO,
     PERSONTRIP_BUSSTOP,
+    PERSONTRIP_TRAINSTOP,
     PERSONTRIP_JUNCTIONS,
     WALK_EDGES,
     WALK_FROMTO,
     WALK_BUSSTOP,
+    WALK_TRAINSTOP,
     WALK_ROUTE,
     WALK_JUNCTIONS,
     RIDE_FROMTO,
     RIDE_BUSSTOP,
+    RIDE_TRAINSTOP,
     CONTAINER,
     CONTAINERFLOW,
     TRANSPORT_FROMTO,
diff -Nru sumo-1.17.0/src/utils/gui/images/GUIIconSubSys.cpp sumo-1.18.0/src/utils/gui/images/GUIIconSubSys.cpp
--- sumo-1.17.0/src/utils/gui/images/GUIIconSubSys.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/images/GUIIconSubSys.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -257,6 +257,7 @@
 #include "modestop.xpm"
 #include "modevehicle.xpm"
 #include "modetype.xpm"
+#include "modetypedistribution.xpm"
 
 #include "modeedgedata.xpm"
 #include "modeedgereldata.xpm"
@@ -335,8 +336,10 @@
 #include "vehicle.xpm"
 #include "trip.xpm"
 #include "tripjunctions.xpm"
+#include "triptazs.xpm"
 #include "flow.xpm"
 #include "flowjunctions.xpm"
+#include "flowtazs.xpm"
 #include "routeflow.xpm"
 #include "stopelement.xpm"
 #include "waypoint.xpm"
@@ -344,14 +347,17 @@
 #include "personflow.xpm"
 #include "persontripfromto.xpm"
 #include "persontripbusstop.xpm"
+#include "persontriptrainstop.xpm"
 #include "persontripjunctions.xpm"
 #include "walkedges.xpm"
 #include "walkfromto.xpm"
 #include "walkbusstop.xpm"
+#include "walktrainstop.xpm"
 #include "walkroute.xpm"
 #include "walkjunctions.xpm"
 #include "ridefromto.xpm"
 #include "ridebusstop.xpm"
+#include "ridetrainstop.xpm"
 #include "container.xpm"
 #include "containerflow.xpm"
 #include "transhipcontainerstop.xpm"
@@ -726,6 +732,7 @@
     myIcons[GUIIcon::MODEROUTE] = new FXXPMIcon(a, moderoute_xpm);
     myIcons[GUIIcon::MODEVEHICLE] = new FXXPMIcon(a, modevehicle_xpm);
     myIcons[GUIIcon::MODETYPE] = new FXXPMIcon(a, modetype_xpm);
+    myIcons[GUIIcon::MODETYPEDISTRIBUTION] = new FXXPMIcon(a, modetypedistribution_xpm);
     myIcons[GUIIcon::MODESTOP] = new FXXPMIcon(a, modestop_xpm);
     myIcons[GUIIcon::MODEPERSON] = new FXXPMIcon(a, modeperson_xpm);
     myIcons[GUIIcon::MODEPERSONPLAN] = new FXXPMIcon(a, modepersonplan_xpm);
@@ -803,8 +810,10 @@
     myIcons[GUIIcon::VEHICLE] = new FXXPMIcon(a, vehicle_xpm);
     myIcons[GUIIcon::TRIP] = new FXXPMIcon(a, trip_xpm);
     myIcons[GUIIcon::TRIP_JUNCTIONS] = new FXXPMIcon(a, tripjunctions_xpm);
+    myIcons[GUIIcon::TRIP_TAZS] = new FXXPMIcon(a, triptazs_xpm);
     myIcons[GUIIcon::FLOW] = new FXXPMIcon(a, flow_xpm);
     myIcons[GUIIcon::FLOW_JUNCTIONS] = new FXXPMIcon(a, flowjunctions_xpm);
+    myIcons[GUIIcon::FLOW_TAZS] = new FXXPMIcon(a, flowtazs_xpm);
     myIcons[GUIIcon::ROUTEFLOW] = new FXXPMIcon(a, routeflow_xpm);
     myIcons[GUIIcon::STOPELEMENT] = new FXXPMIcon(a, stopelement_xpm);
     myIcons[GUIIcon::WAYPOINT] = new FXXPMIcon(a, waypoint_xpm);
@@ -812,14 +821,17 @@
     myIcons[GUIIcon::PERSONFLOW] = new FXXPMIcon(a, personflow_xpm);
     myIcons[GUIIcon::PERSONTRIP_FROMTO] = new FXXPMIcon(a, persontripfromto_xpm);
     myIcons[GUIIcon::PERSONTRIP_BUSSTOP] = new FXXPMIcon(a, persontripbusstop_xpm);
+    myIcons[GUIIcon::PERSONTRIP_TRAINSTOP] = new FXXPMIcon(a, persontriptrainstop_xpm);
     myIcons[GUIIcon::PERSONTRIP_JUNCTIONS] = new FXXPMIcon(a, persontripjunctions_xpm);
     myIcons[GUIIcon::WALK_EDGES] = new FXXPMIcon(a, walkedges_xpm);
     myIcons[GUIIcon::WALK_FROMTO] = new FXXPMIcon(a, walkfromto_xpm);
     myIcons[GUIIcon::WALK_BUSSTOP] = new FXXPMIcon(a, walkbusstop_xpm);
+    myIcons[GUIIcon::WALK_TRAINSTOP] = new FXXPMIcon(a, walktrainstop_xpm);
     myIcons[GUIIcon::WALK_ROUTE] = new FXXPMIcon(a, walkroute_xpm);
     myIcons[GUIIcon::WALK_JUNCTIONS] = new FXXPMIcon(a, walkjunctions_xpm);
     myIcons[GUIIcon::RIDE_FROMTO] = new FXXPMIcon(a, ridefromto_xpm);
     myIcons[GUIIcon::RIDE_BUSSTOP] = new FXXPMIcon(a, ridebusstop_xpm);
+    myIcons[GUIIcon::RIDE_TRAINSTOP] = new FXXPMIcon(a, ridetrainstop_xpm);
 
     myIcons[GUIIcon::CONTAINER] = new FXXPMIcon(a, container_xpm);
     myIcons[GUIIcon::CONTAINERFLOW] = new FXXPMIcon(a, containerflow_xpm);
diff -Nru sumo-1.17.0/src/utils/gui/images/GUIIconSubSys.h sumo-1.18.0/src/utils/gui/images/GUIIconSubSys.h
--- sumo-1.17.0/src/utils/gui/images/GUIIconSubSys.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/images/GUIIconSubSys.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/gui/images/GUITextures.h sumo-1.18.0/src/utils/gui/images/GUITextures.h
--- sumo-1.17.0/src/utils/gui/images/GUITextures.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/images/GUITextures.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/gui/images/GUITexturesHelper.cpp sumo-1.18.0/src/utils/gui/images/GUITexturesHelper.cpp
--- sumo-1.17.0/src/utils/gui/images/GUITexturesHelper.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/images/GUITexturesHelper.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2004-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/gui/images/GUITexturesHelper.h sumo-1.18.0/src/utils/gui/images/GUITexturesHelper.h
--- sumo-1.17.0/src/utils/gui/images/GUITexturesHelper.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/images/GUITexturesHelper.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2006-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/gui/images/GUITextureSubSys.cpp sumo-1.18.0/src/utils/gui/images/GUITextureSubSys.cpp
--- sumo-1.17.0/src/utils/gui/images/GUITextureSubSys.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/images/GUITextureSubSys.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/gui/images/GUITextureSubSys.h sumo-1.18.0/src/utils/gui/images/GUITextureSubSys.h
--- sumo-1.17.0/src/utils/gui/images/GUITextureSubSys.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/images/GUITextureSubSys.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/gui/images/manip.cpp sumo-1.18.0/src/utils/gui/images/manip.cpp
--- sumo-1.17.0/src/utils/gui/images/manip.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/images/manip.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/gui/images/modetypedistribution.xpm sumo-1.18.0/src/utils/gui/images/modetypedistribution.xpm
--- sumo-1.17.0/src/utils/gui/images/modetypedistribution.xpm	1970-01-01 00:00:00.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/images/modetypedistribution.xpm	2023-06-28 20:02:17.000000000 +0000
@@ -0,0 +1,31 @@
+/* XPM */
+static const char *modetypedistribution_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 9 1",
+"  c gray22",
+". c gray25",
+"X c gray39",
+"o c gray46",
+"O c #02BDFF",
+"+ c #50B2C9",
+"@ c #F7ECB6",
+"# c #FAAFC1",
+"$ c none",
+/* pixels */
+"$$$$OOOO$$$$$$$$",
+"$$$$OOOO$$$$$$$$",
+"$$$$OOOO####$$$$",
+"++++OOOO####$$$$",
+"+++        #@@@@",
+"++++XXXXXX##@@@@",
+"+++       ##@@@@",
+" + oooooo   @@ @",
+" + o...oooo    X",
+" X o.X.ooooooo X",
+" X o......oooo X",
+" + oooo.X.oooo X",
+" +  ooo...o    X",
+"+++  ooooo  @@ @",
+"++++       #@@@@",
+"++++OOOO####@@@@"
+};
diff -Nru sumo-1.17.0/src/utils/gui/images/persontriptrainstop.xpm sumo-1.18.0/src/utils/gui/images/persontriptrainstop.xpm
--- sumo-1.17.0/src/utils/gui/images/persontriptrainstop.xpm	1970-01-01 00:00:00.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/images/persontriptrainstop.xpm	2023-06-28 20:02:17.000000000 +0000
@@ -0,0 +1,29 @@
+/* XPM */
+static const char *persontriptrainstop_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 7 1",
+"  c black",
+". c red",
+"X c #4CAA32",
+"o c #FFEB00",
+"O c #0026FF",
+"+ c #C800FF",
+"@ c white",
+/* pixels */
+"++O+++++++++++++",
+"++O+++++++++++++",
+"++O++++       ++",
+"OOOOO++ @ @ @ ++",
+"+OOO+++       ++",
+"++O++++ @ + @ ++",
+"          +   ++",
+"  . @ @ @ + @ ++",
+"          +   ++",
+"+++++++++++ @ ++",
+"+++XXX+++++   ++",
+"+++XoX+++++ @ ++",
+"XXXXXXXXX     ++",
+"XXXXXX.X@ @ @ ++",
+"XXXXXXXXX     ++",
+"++++++++++++++++"
+};
diff -Nru sumo-1.17.0/src/utils/gui/images/ridetrainstop.xpm sumo-1.18.0/src/utils/gui/images/ridetrainstop.xpm
--- sumo-1.17.0/src/utils/gui/images/ridetrainstop.xpm	1970-01-01 00:00:00.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/images/ridetrainstop.xpm	2023-06-28 20:02:17.000000000 +0000
@@ -0,0 +1,32 @@
+/* XPM */
+static const char *ridetrainstop_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 10 1",
+"  c blue",
+". c black",
+"X c #007F46",
+"o c #0A7F4A",
+"O c red",
+"+ c #4CAA32",
+"@ c #FFD800",
+"# c #FFEB00",
+"$ c cyan",
+"% c white",
+/* pixels */
+"                ",
+" XXXX           ",
+" X$$X  .......  ",
+"X@XX@X .%.%.%.  ",
+"XXXXoX .......  ",
+".    . .%. .%.  ",
+".......... ...  ",
+"..O.%.%.%. .%.  ",
+".......... ...  ",
+"           .%.  ",
+"   +++     ...  ",
+"   +#+     .%.  ",
+"+++++++++.....  ",
+"++++++O+%.%.%.  ",
+"+++++++++.....  ",
+"                "
+};
diff -Nru sumo-1.17.0/src/utils/gui/images/triptazs.xpm sumo-1.18.0/src/utils/gui/images/triptazs.xpm
--- sumo-1.17.0/src/utils/gui/images/triptazs.xpm	1970-01-01 00:00:00.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/images/triptazs.xpm	2023-06-28 20:02:17.000000000 +0000
@@ -0,0 +1,28 @@
+/* XPM */
+static const char *triptazs_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 6 1",
+"  c black",
+". c #D8496D",
+"X c #FFD800",
+"o c cyan",
+"O c #808080",
+"+ c None",
+/* pixels */
+"++++++++++++++++",
+"+++..........+++",
+"++.oooooooooo.++",
+"++.oo oooo oo.++",
+"+..o   oo   o..+",
+"+..............+",
+"................",
+".XX..........XX.",
+".XX.OOOOOOOO.XX.",
+"................",
+"....OOOOOOOO....",
+"................",
+"+  ++++++++++  +",
+"+  ++++++++++  +",
+"++++++++++++++++",
+"++++++++++++++++"
+};
diff -Nru sumo-1.17.0/src/utils/gui/images/VClassIcons.cpp sumo-1.18.0/src/utils/gui/images/VClassIcons.cpp
--- sumo-1.17.0/src/utils/gui/images/VClassIcons.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/images/VClassIcons.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/gui/images/VClassIcons.h sumo-1.18.0/src/utils/gui/images/VClassIcons.h
--- sumo-1.17.0/src/utils/gui/images/VClassIcons.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/images/VClassIcons.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/gui/images/vtypedistribution.xpm sumo-1.18.0/src/utils/gui/images/vtypedistribution.xpm
--- sumo-1.17.0/src/utils/gui/images/vtypedistribution.xpm	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/images/vtypedistribution.xpm	2023-06-28 20:02:17.000000000 +0000
@@ -1,23 +1,31 @@
 /* XPM */
 static const char *vtypedistribution_xpm[] = {
 /* columns rows colors chars-per-pixel */
-"16 16 1 1",
-"U c None",
+"16 16 9 1",
+"  c gray22",
+". c gray25",
+"X c gray39",
+"o c gray46",
+"O c #02BDFF",
+"+ c #50B2C9",
+"@ c #F7ECB6",
+"# c #FAAFC1",
+"$ c none",
 /* pixels */
-"UUUUUUUUUUUUUUUU",
-"UUUUUUUUUUUUUUUU",
-"UUUUUUUUUUUUUUUU",
-"UUUUUUUUUUUUUUUU",
-"UUUUUUUUUUUUUUUU",
-"UUUUUUUUUUUUUUUU",
-"UUUUUUUUUUUUUUUU",
-"UUUUUUUUUUUUUUUU",
-"UUUUUUUUUUUUUUUU",
-"UUUUUUUUUUUUUUUU",
-"UUUUUUUUUUUUUUUU",
-"UUUUUUUUUUUUUUUU",
-"UUUUUUUUUUUUUUUU",
-"UUUUUUUUUUUUUUUU",
-"UUUUUUUUUUUUUUUU",
-"UUUUUUUUUUUUUUUU"
+"$$$$OOOO$$$$$$$$",
+"$$$$OOOO$$$$$$$$",
+"$$$$OOOO####$$$$",
+"++++OOOO####$$$$",
+"+++        #@@@@",
+"++++XXXXXX##@@@@",
+"+++       ##@@@@",
+" + oooooo   @@ @",
+" + o...oooo    X",
+" X o.X.ooooooo X",
+" X o......oooo X",
+" + oooo.X.oooo X",
+" +  ooo...o    X",
+"+++  ooooo  @@ @",
+"++++       #@@@@",
+"++++OOOO####@@@@"
 };
diff -Nru sumo-1.17.0/src/utils/gui/images/walktrainstop.xpm sumo-1.18.0/src/utils/gui/images/walktrainstop.xpm
--- sumo-1.17.0/src/utils/gui/images/walktrainstop.xpm	1970-01-01 00:00:00.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/images/walktrainstop.xpm	2023-06-28 20:02:17.000000000 +0000
@@ -0,0 +1,29 @@
+/* XPM */
+static const char *walktrainstop_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 7 1",
+"  c green",
+". c black",
+"X c red",
+"o c #4CAA32",
+"O c #FFEB00",
+"+ c #0026FF",
+"@ c white",
+/* pixels */
+"  +             ",
+"  +             ",
+"  +    .......  ",
+"+++++  .@.@.@.  ",
+" +++   .......  ",
+"  +    .@. .@.  ",
+".......... ...  ",
+"..X.@.@.@. .@.  ",
+".......... ...  ",
+"           .@.  ",
+"   ooo     ...  ",
+"   oOo     .@.  ",
+"ooooooooo.....  ",
+"ooooooXo@.@.@.  ",
+"ooooooooo.....  ",
+"                "
+};
diff -Nru sumo-1.17.0/src/utils/gui/settings/GUICompleteSchemeStorage.cpp sumo-1.18.0/src/utils/gui/settings/GUICompleteSchemeStorage.cpp
--- sumo-1.17.0/src/utils/gui/settings/GUICompleteSchemeStorage.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/settings/GUICompleteSchemeStorage.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/gui/settings/GUICompleteSchemeStorage.h sumo-1.18.0/src/utils/gui/settings/GUICompleteSchemeStorage.h
--- sumo-1.17.0/src/utils/gui/settings/GUICompleteSchemeStorage.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/settings/GUICompleteSchemeStorage.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/gui/settings/GUIPostDrawing.cpp sumo-1.18.0/src/utils/gui/settings/GUIPostDrawing.cpp
--- sumo-1.17.0/src/utils/gui/settings/GUIPostDrawing.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/settings/GUIPostDrawing.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/gui/settings/GUIPostDrawing.h sumo-1.18.0/src/utils/gui/settings/GUIPostDrawing.h
--- sumo-1.17.0/src/utils/gui/settings/GUIPostDrawing.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/settings/GUIPostDrawing.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/gui/settings/GUIPropertyScheme.h sumo-1.18.0/src/utils/gui/settings/GUIPropertyScheme.h
--- sumo-1.17.0/src/utils/gui/settings/GUIPropertyScheme.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/settings/GUIPropertyScheme.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -105,7 +105,7 @@
         myNames.clear();
     }
 
-    const T getColor(const double value) const {
+    T getColor(const double value) const {
         if (myColors.size() == 1 || value < myThresholds.front()) {
             return myColors.front();
         }
diff -Nru sumo-1.17.0/src/utils/gui/settings/GUIPropertySchemeStorage.h sumo-1.18.0/src/utils/gui/settings/GUIPropertySchemeStorage.h
--- sumo-1.17.0/src/utils/gui/settings/GUIPropertySchemeStorage.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/settings/GUIPropertySchemeStorage.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/gui/settings/GUISettingsHandler.cpp sumo-1.18.0/src/utils/gui/settings/GUISettingsHandler.cpp
--- sumo-1.17.0/src/utils/gui/settings/GUISettingsHandler.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/settings/GUISettingsHandler.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/gui/settings/GUISettingsHandler.h sumo-1.18.0/src/utils/gui/settings/GUISettingsHandler.h
--- sumo-1.17.0/src/utils/gui/settings/GUISettingsHandler.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/settings/GUISettingsHandler.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/gui/settings/GUIVisualizationSettings.cpp sumo-1.18.0/src/utils/gui/settings/GUIVisualizationSettings.cpp
--- sumo-1.17.0/src/utils/gui/settings/GUIVisualizationSettings.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/settings/GUIVisualizationSettings.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/gui/settings/GUIVisualizationSettings.h sumo-1.18.0/src/utils/gui/settings/GUIVisualizationSettings.h
--- sumo-1.17.0/src/utils/gui/settings/GUIVisualizationSettings.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/settings/GUIVisualizationSettings.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/gui/shortcuts/GUIShortcuts.h sumo-1.18.0/src/utils/gui/shortcuts/GUIShortcuts.h
--- sumo-1.17.0/src/utils/gui/shortcuts/GUIShortcuts.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/shortcuts/GUIShortcuts.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/gui/shortcuts/GUIShortcutsSubSys.cpp sumo-1.18.0/src/utils/gui/shortcuts/GUIShortcutsSubSys.cpp
--- sumo-1.17.0/src/utils/gui/shortcuts/GUIShortcutsSubSys.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/shortcuts/GUIShortcutsSubSys.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -35,8 +35,8 @@
     accelTable->addAccel(parseKey(KEY_a), target, FXSEL(SEL_COMMAND, MID_HOTKEY_A_MODE_STARTSIMULATION_ADDITIONALSTOP));
     accelTable->addAccel(parseKey(KEY_A), target, FXSEL(SEL_COMMAND, MID_HOTKEY_A_MODE_STARTSIMULATION_ADDITIONALSTOP));
 
-    accelTable->addAccel(parseKey(KEY_c), target, FXSEL(SEL_COMMAND, MID_HOTKEY_C_MODE_CONNECT_PERSONPLAN));
-    accelTable->addAccel(parseKey(KEY_C), target, FXSEL(SEL_COMMAND, MID_HOTKEY_C_MODE_CONNECT_PERSONPLAN));
+    accelTable->addAccel(parseKey(KEY_c), target, FXSEL(SEL_COMMAND, MID_HOTKEY_C_MODE_CONNECT_CONTAINER));
+    accelTable->addAccel(parseKey(KEY_C), target, FXSEL(SEL_COMMAND, MID_HOTKEY_C_MODE_CONNECT_CONTAINER));
 
     accelTable->addAccel(parseKey(KEY_d), target, FXSEL(SEL_COMMAND, MID_HOTKEY_D_MODE_SINGLESIMULATIONSTEP_DELETE));
     accelTable->addAccel(parseKey(KEY_D), target, FXSEL(SEL_COMMAND, MID_HOTKEY_D_MODE_SINGLESIMULATIONSTEP_DELETE));
@@ -44,15 +44,15 @@
     accelTable->addAccel(parseKey(KEY_e), target, FXSEL(SEL_COMMAND, MID_HOTKEY_E_MODE_EDGE_EDGEDATA));
     accelTable->addAccel(parseKey(KEY_E), target, FXSEL(SEL_COMMAND, MID_HOTKEY_E_MODE_EDGE_EDGEDATA));
 
-    accelTable->addAccel(parseKey(KEY_g), target, FXSEL(SEL_COMMAND, MID_HOTKEY_G_MODE_CONTAINER));
-    accelTable->addAccel(parseKey(KEY_G), target, FXSEL(SEL_COMMAND, MID_HOTKEY_G_MODE_CONTAINER));
-
     accelTable->addAccel(parseKey(KEY_h), target, FXSEL(SEL_COMMAND, MID_HOTKEY_H_MODE_PROHIBITION_CONTAINERPLAN));
     accelTable->addAccel(parseKey(KEY_H), target, FXSEL(SEL_COMMAND, MID_HOTKEY_H_MODE_PROHIBITION_CONTAINERPLAN));
 
     accelTable->addAccel(parseKey(KEY_i), target, FXSEL(SEL_COMMAND, MID_HOTKEY_I_MODE_INSPECT));
     accelTable->addAccel(parseKey(KEY_I), target, FXSEL(SEL_COMMAND, MID_HOTKEY_I_MODE_INSPECT));
 
+    accelTable->addAccel(parseKey(KEY_l), target, FXSEL(SEL_COMMAND, MID_HOTKEY_L_MODE_PERSONPLAN));
+    accelTable->addAccel(parseKey(KEY_L), target, FXSEL(SEL_COMMAND, MID_HOTKEY_L_MODE_PERSONPLAN));
+
     accelTable->addAccel(parseKey(KEY_m), target, FXSEL(SEL_COMMAND, MID_HOTKEY_M_MODE_MOVE_MEANDATA));
     accelTable->addAccel(parseKey(KEY_M), target, FXSEL(SEL_COMMAND, MID_HOTKEY_M_MODE_MOVE_MEANDATA));
 
@@ -68,6 +68,9 @@
     accelTable->addAccel(parseKey(KEY_t), target, FXSEL(SEL_COMMAND, MID_HOTKEY_T_MODE_TLS_TYPE));
     accelTable->addAccel(parseKey(KEY_T), target, FXSEL(SEL_COMMAND, MID_HOTKEY_T_MODE_TLS_TYPE));
 
+    accelTable->addAccel(parseKey(KEY_u), target, FXSEL(SEL_COMMAND, MID_HOTKEY_U_MODE_TYPEDISTRIBUTION));
+    accelTable->addAccel(parseKey(KEY_U), target, FXSEL(SEL_COMMAND, MID_HOTKEY_U_MODE_TYPEDISTRIBUTION));
+
     accelTable->addAccel(parseKey(KEY_v), target, FXSEL(SEL_COMMAND, MID_HOTKEY_V_MODE_VEHICLE));
     accelTable->addAccel(parseKey(KEY_V), target, FXSEL(SEL_COMMAND, MID_HOTKEY_V_MODE_VEHICLE));
 
diff -Nru sumo-1.17.0/src/utils/gui/shortcuts/GUIShortcutsSubSys.h sumo-1.18.0/src/utils/gui/shortcuts/GUIShortcutsSubSys.h
--- sumo-1.17.0/src/utils/gui/shortcuts/GUIShortcutsSubSys.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/shortcuts/GUIShortcutsSubSys.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/gui/tracker/GUIParameterTracker.cpp sumo-1.18.0/src/utils/gui/tracker/GUIParameterTracker.cpp
--- sumo-1.17.0/src/utils/gui/tracker/GUIParameterTracker.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/tracker/GUIParameterTracker.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/gui/tracker/GUIParameterTracker.h sumo-1.18.0/src/utils/gui/tracker/GUIParameterTracker.h
--- sumo-1.17.0/src/utils/gui/tracker/GUIParameterTracker.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/tracker/GUIParameterTracker.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/gui/tracker/TrackerValueDesc.cpp sumo-1.18.0/src/utils/gui/tracker/TrackerValueDesc.cpp
--- sumo-1.17.0/src/utils/gui/tracker/TrackerValueDesc.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/tracker/TrackerValueDesc.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/gui/tracker/TrackerValueDesc.h sumo-1.18.0/src/utils/gui/tracker/TrackerValueDesc.h
--- sumo-1.17.0/src/utils/gui/tracker/TrackerValueDesc.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/tracker/TrackerValueDesc.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/gui/windows/CMakeLists.txt sumo-1.18.0/src/utils/gui/windows/CMakeLists.txt
--- sumo-1.17.0/src/utils/gui/windows/CMakeLists.txt	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/windows/CMakeLists.txt	2023-06-28 20:02:17.000000000 +0000
@@ -6,8 +6,6 @@
    GUIDialog_EditViewport.h
    GUIDialog_ViewSettings.cpp
    GUIDialog_ViewSettings.h
-   GUIDialog_Options.h
-   GUIDialog_Options.cpp
    GUIGlChildWindow.cpp
    GUIGlChildWindow.h
    GUIMainWindow.cpp
diff -Nru sumo-1.17.0/src/utils/gui/windows/GUIAppEnum.h sumo-1.18.0/src/utils/gui/windows/GUIAppEnum.h
--- sumo-1.17.0/src/utils/gui/windows/GUIAppEnum.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/windows/GUIAppEnum.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -41,18 +41,18 @@
 
     /// @brief hotkey for start simulation in SUMO and set editing mode additionals AND stops in netedit
     MID_HOTKEY_A_MODE_STARTSIMULATION_ADDITIONALSTOP,
-    /// @brief hotkey for mode connecting lanes ABD person plan
-    MID_HOTKEY_C_MODE_CONNECT_PERSONPLAN,
+    /// @brief hotkey for mode connecting lanes AND container
+    MID_HOTKEY_C_MODE_CONNECT_CONTAINER,
     /// @brief hotkey for perform a single simulation step in SUMO and set delete mode in netedit
     MID_HOTKEY_D_MODE_SINGLESIMULATIONSTEP_DELETE,
     /// @brief hotkey for mode adding edges AND edgeDatas
     MID_HOTKEY_E_MODE_EDGE_EDGEDATA,
-    /// @brief hotkey for mode container
-    MID_HOTKEY_G_MODE_CONTAINER,
     /// @brief hotkey for mode prohibition AND container plan
     MID_HOTKEY_H_MODE_PROHIBITION_CONTAINERPLAN,
     /// @brief hotkey for mode inspecting object attributes
     MID_HOTKEY_I_MODE_INSPECT,
+    /// @brief hotkey for mode person plan
+    MID_HOTKEY_L_MODE_PERSONPLAN,
     /// @brief hotkey for mode moving element AND mean data
     MID_HOTKEY_M_MODE_MOVE_MEANDATA,
     /// @brief hotkey for mode creating polygons
@@ -63,6 +63,8 @@
     MID_HOTKEY_R_MODE_CROSSING_ROUTE_EDGERELDATA,
     /// @brief hotkey for mode editing TLS AND Vehicle Types
     MID_HOTKEY_T_MODE_TLS_TYPE,
+    /// @brief hotkey for mode type distribution
+    MID_HOTKEY_U_MODE_TYPEDISTRIBUTION,
     /// @brief hotkey for mode create vehicles
     MID_HOTKEY_V_MODE_VEHICLE,
     /// @brief hotkey for mode editing overhead wires
@@ -897,7 +899,6 @@
     /// @name GNEFrame messages
     /// @{
 
-    // MID_GNE_WIZARD,
     /// @brief attribute added
     MID_GNE_ADD_ATTRIBUTE,
     /// @brief attribute removed
@@ -1360,6 +1361,8 @@
     MID_GNE_BUTTON_ABORT,
     /// @brief back button
     MID_GNE_BUTTON_BACK,
+    /// @brief default button
+    MID_GNE_BUTTON_DEFAULT,
 
     /// @}
 
@@ -1476,6 +1479,14 @@
 
     /// @}
 
+    /// @name GNEOptionsDialog
+    /// @{
+
+    /// @brief use search description
+    MID_GNE_SEARCH_USEDESCRIPTION,
+
+    /// @}
+
     /// @name MFXDecalsTable
     /// @{
 
@@ -1510,6 +1521,13 @@
 
     /// @}
 
+    /// @brief callback for MFXTextFieldSearch
+    /// @{
+
+    MID_MTFS_UPDATED,
+
+    /// @}
+
     /// @brief callback for MFXMenuButtonTooltip
     /// @{
 
diff -Nru sumo-1.17.0/src/utils/gui/windows/GUIDanielPerspectiveChanger.cpp sumo-1.18.0/src/utils/gui/windows/GUIDanielPerspectiveChanger.cpp
--- sumo-1.17.0/src/utils/gui/windows/GUIDanielPerspectiveChanger.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/windows/GUIDanielPerspectiveChanger.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/gui/windows/GUIDanielPerspectiveChanger.h sumo-1.18.0/src/utils/gui/windows/GUIDanielPerspectiveChanger.h
--- sumo-1.17.0/src/utils/gui/windows/GUIDanielPerspectiveChanger.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/windows/GUIDanielPerspectiveChanger.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/gui/windows/GUIDialog_ChooserAbstract.cpp sumo-1.18.0/src/utils/gui/windows/GUIDialog_ChooserAbstract.cpp
--- sumo-1.17.0/src/utils/gui/windows/GUIDialog_ChooserAbstract.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/windows/GUIDialog_ChooserAbstract.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/gui/windows/GUIDialog_ChooserAbstract.h sumo-1.18.0/src/utils/gui/windows/GUIDialog_ChooserAbstract.h
--- sumo-1.17.0/src/utils/gui/windows/GUIDialog_ChooserAbstract.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/windows/GUIDialog_ChooserAbstract.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/gui/windows/GUIDialog_EditViewport.cpp sumo-1.18.0/src/utils/gui/windows/GUIDialog_EditViewport.cpp
--- sumo-1.17.0/src/utils/gui/windows/GUIDialog_EditViewport.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/windows/GUIDialog_EditViewport.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2005-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/gui/windows/GUIDialog_EditViewport.h sumo-1.18.0/src/utils/gui/windows/GUIDialog_EditViewport.h
--- sumo-1.17.0/src/utils/gui/windows/GUIDialog_EditViewport.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/windows/GUIDialog_EditViewport.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/gui/windows/GUIDialog_Options.cpp sumo-1.18.0/src/utils/gui/windows/GUIDialog_Options.cpp
--- sumo-1.17.0/src/utils/gui/windows/GUIDialog_Options.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/windows/GUIDialog_Options.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,285 +0,0 @@
-/****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
-// Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
-// This program and the accompanying materials are made available under the
-// terms of the Eclipse Public License 2.0 which is available at
-// https://www.eclipse.org/legal/epl-2.0/
-// This Source Code 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
-/****************************************************************************/
-/// @file    GUIDialog_Options.cpp
-/// @author  Jakob Erdmann
-/// @date    Feb 2011
-///
-// The "About" - dialog for netedit, (adapted from GUIDialog_AboutSUMO)
-/****************************************************************************/
-#include 
-
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-
-#include "GUIDialog_Options.h"
-
-
-// ===========================================================================
-// FOX callback mapping
-// ===========================================================================
-
-FXDEFMAP(GUIDialog_Options) GUIDialogOptionsMap[] = {
-    FXMAPFUNC(SEL_COMMAND,  MID_GNE_RUNNETGENERATE, GUIDialog_Options::onCmdRunNetgenerate),
-};
-
-FXDEFMAP(GUIDialog_Options::InputOption) InputOptionMap[] = {
-    FXMAPFUNC(SEL_COMMAND,  MID_GNE_SET_ATTRIBUTE, GUIDialog_Options::InputOption::onCmdSetOption),
-};
-
-// Object implementation
-FXIMPLEMENT(GUIDialog_Options,                          FXDialogBox,        GUIDialogOptionsMap,    ARRAYNUMBER(GUIDialogOptionsMap))
-FXIMPLEMENT_ABSTRACT(GUIDialog_Options::InputOption,    FXHorizontalFrame,  InputOptionMap,         ARRAYNUMBER(InputOptionMap))
-
-// ===========================================================================
-// method definitions
-// ===========================================================================
-
-std::pair
-GUIDialog_Options::Options(GUIMainWindow* windows, OptionsCont* optionsContainer, const char* titleName) {
-    GUIDialog_Options* optionsDialog = new GUIDialog_Options(windows, optionsContainer, titleName, false);
-    return std::make_pair(optionsDialog->execute(), optionsDialog->myModified);
-}
-
-
-std::pair
-GUIDialog_Options::Run(GUIMainWindow* windows, OptionsCont* optionsContainer, const char* titleName) {
-    GUIDialog_Options* optionsDialog = new GUIDialog_Options(windows, optionsContainer, titleName, true);
-    return std::make_pair(optionsDialog->execute(), optionsDialog->myModified);
-}
-
-
-GUIDialog_Options::~GUIDialog_Options() { }
-
-
-long
-GUIDialog_Options::onCmdRunNetgenerate(FXObject*, FXSelector, void*) {
-    // close dialog accepting changes
-    handle(this, FXSEL(SEL_COMMAND, ID_ACCEPT), nullptr);
-    // run tool in mainWindow
-    return myMainWindowParent->handle(this, FXSEL(SEL_COMMAND, MID_GNE_RUNNETGENERATE), nullptr);
-}
-
-// ===========================================================================
-// Option input classes method definitions
-// ===========================================================================
-
-GUIDialog_Options::InputOption::InputOption(GUIDialog_Options* GUIDialogOptions, FXComposite* parent, const std::string& name) :
-    FXHorizontalFrame(parent, LAYOUT_FILL_X),
-    myGUIDialogOptions(GUIDialogOptions),
-    myName(name) {
-    // build label with name
-    new FXLabel(this, (name + "\t\t" + myGUIDialogOptions->myOptionsContainer->getDescription(name)).c_str());
-}
-
-
-long
-GUIDialog_Options::InputOption::onCmdSetOption(FXObject*, FXSelector, void*) {
-    // try to set option and mark as modified if was sucessfully
-    if (setOption()) {
-        myGUIDialogOptions->myModified = true;
-    }
-    return 1;
-}
-
-
-GUIDialog_Options::InputString::InputString(GUIDialog_Options* GUIDialogOptions, FXComposite* parent, const std::string& name) :
-    InputOption(GUIDialogOptions, parent, name) {
-    myTextField = new FXTextField(this, 100, this, MID_GNE_SET_ATTRIBUTE, TEXTFIELD_NORMAL | LAYOUT_RIGHT, 0, 0, 0, 0, 4, 2, 0, 2);
-    myTextField->setText(myGUIDialogOptions->myOptionsContainer->getString(name).c_str());
-}
-
-
-bool
-GUIDialog_Options::InputString::setOption() {
-    myGUIDialogOptions->myOptionsContainer->resetWritable();
-    myGUIDialogOptions->myOptionsContainer->set(myName, myTextField->getText().text());
-    return true;
-}
-
-
-GUIDialog_Options::InputStringVector::InputStringVector(GUIDialog_Options* GUIDialogOptions, FXComposite* parent, const std::string& name) :
-    InputOption(GUIDialogOptions, parent, name) {
-    myTextField = new FXTextField(this, 100, this, MID_GNE_SET_ATTRIBUTE, TEXTFIELD_NORMAL | LAYOUT_RIGHT, 0, 0, 0, 0, 4, 2, 0, 2);
-    myTextField->setText(toString(myGUIDialogOptions->myOptionsContainer->getStringVector(name)).c_str());
-}
-
-
-bool
-GUIDialog_Options::InputStringVector::setOption() {
-    myGUIDialogOptions->myOptionsContainer->resetWritable();
-    myGUIDialogOptions->myOptionsContainer->set(myName, myTextField->getText().text());
-    return true;
-}
-
-
-GUIDialog_Options::InputBool::InputBool(GUIDialog_Options* GUIDialogOptions, FXComposite* parent, const std::string& name) :
-    InputOption(GUIDialogOptions, parent, name) {
-    myCheck = new FXMenuCheck(this, "", this, MID_GNE_SET_ATTRIBUTE);
-    myCheck->setCheck(myGUIDialogOptions->myOptionsContainer->getBool(name));
-}
-
-
-bool
-GUIDialog_Options::InputBool::setOption() {
-    myGUIDialogOptions->myOptionsContainer->resetWritable();
-    myGUIDialogOptions->myOptionsContainer->set(myName, myCheck->getCheck() ? "true" : "false");
-    // special checks for Debug flags
-    if ((myName == "gui-testing-debug") && myGUIDialogOptions->myOptionsContainer->isSet("gui-testing-debug")) {
-        MsgHandler::enableDebugMessages(myGUIDialogOptions->myOptionsContainer->getBool("gui-testing-debug"));
-    }
-    if ((myName == "gui-testing-debug-gl") && myGUIDialogOptions->myOptionsContainer->isSet("gui-testing-debug-gl")) {
-        MsgHandler::enableDebugGLMessages(myGUIDialogOptions->myOptionsContainer->getBool("gui-testing-debug-gl"));
-    }
-    return true;
-}
-
-
-GUIDialog_Options::InputInt::InputInt(GUIDialog_Options* GUIDialogOptions, FXComposite* parent, const std::string& name) :
-    InputOption(GUIDialogOptions, parent, name) {
-    myTextField = new FXTextField(this, 100, this, MID_GNE_SET_ATTRIBUTE, TEXTFIELD_INTEGER | LAYOUT_RIGHT, 0, 0, 0, 0, 4, 2, 0, 2);
-    myTextField->setText(toString(myGUIDialogOptions->myOptionsContainer->getInt(name)).c_str());
-}
-
-
-bool
-GUIDialog_Options::InputInt::setOption() {
-    myGUIDialogOptions->myOptionsContainer->resetWritable();
-    myGUIDialogOptions->myOptionsContainer->set(myName, myTextField->getText().text());
-    return true;
-}
-
-
-GUIDialog_Options::InputIntVector::InputIntVector(GUIDialog_Options* GUIDialogOptions, FXComposite* parent, const std::string& name) :
-    InputOption(GUIDialogOptions, parent, name) {
-    myTextField = new FXTextField(this, 100, this, MID_GNE_SET_ATTRIBUTE, TEXTFIELD_NORMAL | LAYOUT_RIGHT, 0, 0, 0, 0, 4, 2, 0, 2);
-    myTextField->setText(toString(myGUIDialogOptions->myOptionsContainer->getIntVector(name)).c_str());
-}
-
-
-bool
-GUIDialog_Options::InputIntVector::setOption() {
-    try {
-        // check that int vector can be parsed
-        const auto intVector = StringTokenizer(myTextField->getText().text()).getVector();
-        for (const auto& intValue : intVector) {
-            StringUtils::toInt(intValue);
-        }
-        myGUIDialogOptions->myOptionsContainer->resetWritable();
-        myGUIDialogOptions->myOptionsContainer->set(myName, myTextField->getText().text());
-        myTextField->setTextColor(FXRGB(0, 0, 0));
-        return true;
-    } catch (...) {
-        myTextField->setTextColor(FXRGB(255, 0, 0));
-    }
-    return false;
-}
-
-
-GUIDialog_Options::InputFloat::InputFloat(GUIDialog_Options* GUIDialogOptions, FXComposite* parent, const std::string& name) :
-    InputOption(GUIDialogOptions, parent, name) {
-    myTextField = new FXTextField(this, 100, this, MID_GNE_SET_ATTRIBUTE, TEXTFIELD_REAL | LAYOUT_RIGHT, 0, 0, 0, 0, 4, 2, 0, 2);
-    myTextField->setText(toString(myGUIDialogOptions->myOptionsContainer->getFloat(name)).c_str());
-}
-
-
-bool
-GUIDialog_Options::InputFloat::setOption() {
-    myGUIDialogOptions->myOptionsContainer->resetWritable();
-    myGUIDialogOptions->myOptionsContainer->set(myName, myTextField->getText().text());
-    return true;
-}
-
-
-GUIDialog_Options::InputFilename::InputFilename(GUIDialog_Options* GUIDialogOptions, FXComposite* parent, const std::string& name) :
-    InputOption(GUIDialogOptions, parent, name) {
-    myTextField = new FXTextField(this, 100, this, MID_GNE_SET_ATTRIBUTE, TEXTFIELD_NORMAL | LAYOUT_RIGHT, 0, 0, 0, 0, 4, 2, 0, 2);
-    myTextField->setText(myGUIDialogOptions->myOptionsContainer->getString(name).c_str());
-}
-
-
-bool
-GUIDialog_Options::InputFilename::setOption() {
-    if (SUMOXMLDefinitions::isValidFilename(myTextField->getText().text())) {
-        myGUIDialogOptions->myOptionsContainer->resetWritable();
-        myGUIDialogOptions->myOptionsContainer->set(myName, myTextField->getText().text());
-        myTextField->setTextColor(FXRGB(0, 0, 0));
-        return true;
-    } else {
-        myTextField->setTextColor(FXRGB(255, 0, 0));
-        return false;
-    }
-}
-
-
-GUIDialog_Options::GUIDialog_Options(GUIMainWindow* parent, OptionsCont* optionsContainer, const char* titleName, const bool runDialog) :
-    FXDialogBox(parent, titleName, GUIDesignDialogBoxResizable, 0, 0, parent->getWidth(), parent->getHeight()),
-    myMainWindowParent(parent),
-    myOptionsContainer(optionsContainer) {
-    new FXStatusBar(this, GUIDesignStatusBar);
-    FXVerticalFrame* contentFrame = new FXVerticalFrame(this, GUIDesignContentsFrame);
-    // create tabbook
-    FXTabBook* tabbook = new FXTabBook(contentFrame, nullptr, 0, GUIDesignTabBook);
-    // iterate over all topics
-    for (const auto& topic : myOptionsContainer->getSubTopics()) {
-        // ignore configuration
-        if (topic != "Configuration") {
-            new FXTabItem(tabbook, topic.c_str(), nullptr, TAB_LEFT_NORMAL);
-            FXScrollWindow* scrollTab = new FXScrollWindow(tabbook, LAYOUT_FILL_X | LAYOUT_FILL_Y);
-            FXVerticalFrame* tabContent = new FXVerticalFrame(scrollTab, FRAME_THICK | FRAME_RAISED | LAYOUT_FILL_X | LAYOUT_FILL_Y);
-            const std::vector entries = myOptionsContainer->getSubTopicsEntries(topic);
-            for (const auto& entry : entries) {
-                if (entry != "geometry.remove" && entry != "edges.join" && entry != "geometry.split" && entry != "ramps.guess" && entry != "ramps.set") {
-                    const std::string type = myOptionsContainer->getTypeName(entry);
-                    if (type == "STR") {
-                        new InputString(this, tabContent, entry);
-                    } else if ((type == "FILE") || (type == "NETWORK") || (type == "ADDITIONAL") || (type == "ROUTE") || (type == "DATA")) {
-                        new InputFilename(this, tabContent, entry);
-                    } else if (type == "BOOL") {
-                        new InputBool(this, tabContent, entry);
-                    } else if (type == "INT") {
-                        new InputInt(this, tabContent, entry);
-                    } else if (type == "FLOAT") {
-                        new InputFloat(this, tabContent, entry);
-                    } else if (type == "INT[]") {
-                        new InputIntVector(this, tabContent, entry);
-                    } else if (type == "STR[]") {
-                        new InputStringVector(this, tabContent, entry);
-                    }
-                }
-            }
-        }
-    }
-    // create buttons frame
-    FXHorizontalFrame* buttonsFrame = new FXHorizontalFrame(contentFrame, GUIDesignHorizontalFrame);
-    new FXHorizontalFrame(buttonsFrame, GUIDesignAuxiliarHorizontalFrame);
-    // continue depending of dialog type
-    if (runDialog) {
-        new FXButton(buttonsFrame, (TL("Run") + std::string("\t\t") + TL("Run tool")).c_str(), GUIIconSubSys::getIcon(GUIIcon::ACCEPT), this, MID_GNE_RUNNETGENERATE, GUIDesignButtonOK);
-        new FXButton(buttonsFrame, (TL("Cancel") + std::string("\t\t") + TL("Cancel tool")).c_str(), GUIIconSubSys::getIcon(GUIIcon::CANCEL), this, ID_CANCEL, GUIDesignButtonOK);
-    } else {
-        new FXButton(buttonsFrame, (TL("OK") + std::string("\t\t") + TL("Accept settings")).c_str(), GUIIconSubSys::getIcon(GUIIcon::ACCEPT), this, ID_ACCEPT, GUIDesignButtonOK);
-    }
-    new FXHorizontalFrame(buttonsFrame, GUIDesignAuxiliarHorizontalFrame);
-}
-
-/****************************************************************************/
diff -Nru sumo-1.17.0/src/utils/gui/windows/GUIDialog_Options.h sumo-1.18.0/src/utils/gui/windows/GUIDialog_Options.h
--- sumo-1.17.0/src/utils/gui/windows/GUIDialog_Options.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/windows/GUIDialog_Options.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,226 +0,0 @@
-/****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
-// Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
-// This program and the accompanying materials are made available under the
-// terms of the Eclipse Public License 2.0 which is available at
-// https://www.eclipse.org/legal/epl-2.0/
-// This Source Code 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
-/****************************************************************************/
-/// @file    GUIDialog_Options.h
-/// @author  Jakob Erdmann
-/// @date    July 2011
-///
-// A Dialog for setting options (see OptionsCont)
-/****************************************************************************/
-#pragma once
-#include 
-
-#include 
-
-
-// ===========================================================================
-// class declaration
-// ===========================================================================
-
-class GUIMainWindow;
-
-// ===========================================================================
-// class definitions
-// ===========================================================================
-/**
- * @class GUIDialog_Options
- * @briefA Dialog for setting options (see OptionsCont)
- */
-class GUIDialog_Options : public FXDialogBox {
-    /// @brief FOX-declaration
-    FXDECLARE(GUIDialog_Options)
-
-public:
-    /**@brief Constructor for options dialogs
-     *
-     * @param[in] parent The parent window
-     * @param[in] optionsContainer edited option container
-     * @param[in] name The title to show
-     * @return pair with int (TRUE, FALSE) depending of execution, and bool for check if options were modified
-     */
-    static std::pair Options(GUIMainWindow* windows, OptionsCont* optionsContainer, const char* titleName);
-
-    /**@brief Constructor for run dialogs
-     *
-     * @param[in] parent The parent window
-     * @param[in] optionsContainer edited option container
-     * @param[in] name The title to show
-     * @return pair with int (TRUE, FALSE) depending of execution, and bool for check if options were modified
-     */
-    static std::pair Run(GUIMainWindow* windows, OptionsCont* optionsContainer, const char* titleName);
-
-    /// @brief Destructor
-    ~GUIDialog_Options();
-
-    /// @brief called when user press run netgenerate button
-    long onCmdRunNetgenerate(FXObject*, FXSelector, void*);
-
-    // ===========================================================================
-    // Option input classes
-    // ===========================================================================
-
-    class InputOption : public FXHorizontalFrame {
-        /// @brief FOX-declaration
-        FXDECLARE_ABSTRACT(GUIDialog_Options::InputOption)
-
-    public:
-        /// @brief constructor
-        InputOption(GUIDialog_Options* GUIDialogOptions, FXComposite* parent, const std::string& name);
-
-        /// @brief try to set new attribute value
-        long onCmdSetOption(FXObject*, FXSelector, void*);
-
-    protected:
-        /// @brief FOX needs this
-        FOX_CONSTRUCTOR(InputOption)
-
-        /// @brief GUIDialog_Options parent
-        GUIDialog_Options* myGUIDialogOptions = nullptr;
-
-        /// @brief name
-        const std::string myName;
-
-    private:
-        /// @brief set new option value
-        virtual bool setOption() = 0;
-    };
-
-    class InputString : public InputOption {
-
-    public:
-        /// @brief constructor
-        InputString(GUIDialog_Options* GUIDialogOptions, FXComposite* parent, const std::string& name);
-
-    private:
-        /// @brief set new option value
-        bool setOption();
-
-        /// @brief text field
-        FXTextField* myTextField;
-    };
-
-    class InputStringVector : public InputOption {
-
-    public:
-        /// @brief constructor
-        InputStringVector(GUIDialog_Options* GUIDialogOptions, FXComposite* parent, const std::string& name);
-
-    private:
-        /// @brief set new option value
-        bool setOption();
-
-        /// @brief text field
-        FXTextField* myTextField;
-    };
-
-    class InputBool : public InputOption {
-
-    public:
-        /// @brief constructor
-        InputBool(GUIDialog_Options* GUIDialogOptions, FXComposite* parent, const std::string& name);
-
-    private:
-        /// @brief set new option value
-        bool setOption();
-
-        /// @brief menu check
-        FXMenuCheck* myCheck;
-    };
-
-    class InputInt : public InputOption {
-
-    public:
-        /// @brief
-        InputInt(GUIDialog_Options* GUIDialogOptions, FXComposite* parent, const std::string& name);
-
-    private:
-        /// @brief set new option value
-        bool setOption();
-
-        /// @brief text field
-        FXTextField* myTextField;
-    };
-
-    class InputIntVector : public InputOption {
-
-    public:
-        /// @brief
-        InputIntVector(GUIDialog_Options* GUIDialogOptions, FXComposite* parent, const std::string& name);
-
-    private:
-        /// @brief set new option value
-        bool setOption();
-
-        /// @brief text field
-        FXTextField* myTextField;
-    };
-
-    class InputFloat : public InputOption {
-
-    public:
-        /// @brief constructor
-        InputFloat(GUIDialog_Options* GUIDialogOptions, FXComposite* parent, const std::string& name);
-
-    private:
-        /// @brief set new option value
-        bool setOption();
-
-        /// @brief text field
-        FXTextField* myTextField;
-    };
-
-    class InputFilename : public InputOption {
-
-    public:
-        /// @brief constructor
-        InputFilename(GUIDialog_Options* GUIDialogOptions, FXComposite* parent, const std::string& name);
-
-    private:
-        /// @brief set new option value
-        bool setOption();
-
-        /// @brief text field
-        FXTextField* myTextField;
-    };
-
-protected:
-    /// @brief FOX needs this
-    FOX_CONSTRUCTOR(GUIDialog_Options)
-
-    /// @brief pointer to main window parent
-    GUIMainWindow* myMainWindowParent;
-
-    /// @brief refecente to edited Option container
-    OptionsCont* myOptionsContainer;
-
-    /// @brief flag for check if value was modified
-    bool myModified = false;
-
-private:
-    /**@brief Constructor
-     *
-     * @param[in] parent The parent window
-     * @param[in] optionsContainer edited option container
-     * @param[in] name The title to show
-     * @param[in] width The initial width of the dialog
-     * @param[in] height The initial height of the dialog
-     * @param[in] runDialog check if this is a run dialog
-     */
-    GUIDialog_Options(GUIMainWindow* parent, OptionsCont* optionsContainer, const char* titleName, const bool runDialog);
-
-    /// @brief Invalidated copy constructor.
-    GUIDialog_Options(const GUIDialog_Options&) = delete;
-
-    /// @brief Invalidated assignment operator.
-    GUIDialog_Options& operator=(const GUIDialog_Options&) = delete;
-};
diff -Nru sumo-1.17.0/src/utils/gui/windows/GUIDialog_ViewSettings.cpp sumo-1.18.0/src/utils/gui/windows/GUIDialog_ViewSettings.cpp
--- sumo-1.17.0/src/utils/gui/windows/GUIDialog_ViewSettings.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/windows/GUIDialog_ViewSettings.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/gui/windows/GUIDialog_ViewSettings.h sumo-1.18.0/src/utils/gui/windows/GUIDialog_ViewSettings.h
--- sumo-1.17.0/src/utils/gui/windows/GUIDialog_ViewSettings.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/windows/GUIDialog_ViewSettings.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/gui/windows/GUIGlChildWindow.cpp sumo-1.18.0/src/utils/gui/windows/GUIGlChildWindow.cpp
--- sumo-1.17.0/src/utils/gui/windows/GUIGlChildWindow.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/windows/GUIGlChildWindow.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/gui/windows/GUIGlChildWindow.h sumo-1.18.0/src/utils/gui/windows/GUIGlChildWindow.h
--- sumo-1.17.0/src/utils/gui/windows/GUIGlChildWindow.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/windows/GUIGlChildWindow.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/gui/windows/GUIMainWindow.cpp sumo-1.18.0/src/utils/gui/windows/GUIMainWindow.cpp
--- sumo-1.17.0/src/utils/gui/windows/GUIMainWindow.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/windows/GUIMainWindow.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/gui/windows/GUIMainWindow.h sumo-1.18.0/src/utils/gui/windows/GUIMainWindow.h
--- sumo-1.17.0/src/utils/gui/windows/GUIMainWindow.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/windows/GUIMainWindow.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/gui/windows/GUIPerspectiveChanger.cpp sumo-1.18.0/src/utils/gui/windows/GUIPerspectiveChanger.cpp
--- sumo-1.17.0/src/utils/gui/windows/GUIPerspectiveChanger.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/windows/GUIPerspectiveChanger.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/gui/windows/GUIPerspectiveChanger.h sumo-1.18.0/src/utils/gui/windows/GUIPerspectiveChanger.h
--- sumo-1.17.0/src/utils/gui/windows/GUIPerspectiveChanger.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/windows/GUIPerspectiveChanger.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/gui/windows/GUISUMOAbstractView.cpp sumo-1.18.0/src/utils/gui/windows/GUISUMOAbstractView.cpp
--- sumo-1.17.0/src/utils/gui/windows/GUISUMOAbstractView.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/windows/GUISUMOAbstractView.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -910,13 +910,16 @@
 GUISUMOAbstractView::centerTo(GUIGlID id, bool applyZoom, double zoomDist) {
     GUIGlObject* o = GUIGlObjectStorage::gIDStorage.getObjectBlocking(id);
     if (o != nullptr && dynamic_cast(o) != nullptr) {
-        if (applyZoom && zoomDist < 0) {
-            myChanger->setViewport(o->getCenteringBoundary());
-            update(); // only update when centering onto an object once
-        } else {
-            // called during tracking. update is triggered somewhere else
-            myChanger->centerTo(o->getCenteringBoundary().getCenter(), zoomDist, applyZoom);
-            updatePositionInformationLabel();
+        const Boundary& b = o->getCenteringBoundary();
+        if (b.getCenter() != Position::INVALID) {
+            if (applyZoom && zoomDist < 0) {
+                myChanger->setViewport(b);
+                update(); // only update when centering onto an object once
+            } else {
+                // called during tracking. update is triggered somewhere else
+                myChanger->centerTo(b.getCenter(), zoomDist, applyZoom);
+                updatePositionInformationLabel();
+            }
         }
     }
     GUIGlObjectStorage::gIDStorage.unblockObject(id);
@@ -1094,7 +1097,9 @@
 GUISUMOAbstractView::onMiddleBtnPress(FXObject*, FXSelector, void* ptr) {
     destroyPopup();
     setFocus();
-    myChanger->onMiddleBtnPress(ptr);
+    if (!myApp->isGaming()) {
+        myChanger->onMiddleBtnPress(ptr);
+    }
     grab();
     // enable panning
     myPanning = true;
@@ -1108,7 +1113,9 @@
 long
 GUISUMOAbstractView::onMiddleBtnRelease(FXObject*, FXSelector, void* ptr) {
     destroyPopup();
-    myChanger->onMiddleBtnRelease(ptr);
+    if (!myApp->isGaming()) {
+        myChanger->onMiddleBtnRelease(ptr);
+    }
     ungrab();
     // disable panning
     myPanning = false;
@@ -1122,7 +1129,9 @@
 long
 GUISUMOAbstractView::onRightBtnPress(FXObject*, FXSelector, void* ptr) {
     destroyPopup();
-    myChanger->onRightBtnPress(ptr);
+    if (!myApp->isGaming()) {
+        myChanger->onRightBtnPress(ptr);
+    }
     grab();
     return 1;
 }
diff -Nru sumo-1.17.0/src/utils/gui/windows/GUISUMOAbstractView.h sumo-1.18.0/src/utils/gui/windows/GUISUMOAbstractView.h
--- sumo-1.17.0/src/utils/gui/windows/GUISUMOAbstractView.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/gui/windows/GUISUMOAbstractView.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/handlers/AdditionalHandler.cpp sumo-1.18.0/src/utils/handlers/AdditionalHandler.cpp
--- sumo-1.17.0/src/utils/handlers/AdditionalHandler.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/handlers/AdditionalHandler.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -314,6 +314,7 @@
                              obj->getDoubleAttribute(SUMO_ATTR_WIDTH),
                              obj->getDoubleAttribute(SUMO_ATTR_LENGTH),
                              obj->getDoubleAttribute(SUMO_ATTR_ANGLE),
+                             obj->getBoolAttribute(SUMO_ATTR_LEFTHAND),
                              obj->getParameters());
             break;
         case SUMO_TAG_PARKING_SPACE:
@@ -866,6 +867,7 @@
     const double width = attrs.getOpt(SUMO_ATTR_WIDTH, id.c_str(), parsedOk, 0);
     const double length = attrs.getOpt(SUMO_ATTR_LENGTH, id.c_str(), parsedOk, 0);
     const double angle = attrs.getOpt(SUMO_ATTR_ANGLE, id.c_str(), parsedOk, 0);
+    const bool lefthand = attrs.getOpt(SUMO_ATTR_LEFTHAND, id.c_str(), parsedOk, false);
     // continue if flag is ok
     if (parsedOk) {
         // set tag
@@ -883,6 +885,7 @@
         myCommonXMLStructure.getCurrentSumoBaseObject()->addDoubleAttribute(SUMO_ATTR_WIDTH, width);
         myCommonXMLStructure.getCurrentSumoBaseObject()->addDoubleAttribute(SUMO_ATTR_LENGTH, length);
         myCommonXMLStructure.getCurrentSumoBaseObject()->addDoubleAttribute(SUMO_ATTR_ANGLE, angle);
+        myCommonXMLStructure.getCurrentSumoBaseObject()->addBoolAttribute(SUMO_ATTR_LEFTHAND, lefthand);
     }
 }
 
diff -Nru sumo-1.17.0/src/utils/handlers/AdditionalHandler.h sumo-1.18.0/src/utils/handlers/AdditionalHandler.h
--- sumo-1.17.0/src/utils/handlers/AdditionalHandler.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/handlers/AdditionalHandler.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -148,12 +148,13 @@
      * @param[in] width ParkingArea's width
      * @param[in] length ParkingArea's length
      * @param[in] angle ParkingArea's angle
+     * @param[in] lefthand enable or disable lefthand
      * @param[in] parameters generic parameters
      */
     virtual void buildParkingArea(const CommonXMLStructure::SumoBaseObject* sumoBaseObject, const std::string& id, const std::string& laneID,
                                   const double startPos, const double endPos, const std::string& departPos, const std::string& name,
                                   const bool friendlyPosition, const int roadSideCapacity, const bool onRoad, const double width,
-                                  const double length, const double angle, const Parameterised::Map& parameters) = 0;
+                                  const double length, const double angle, const bool lefthand, const Parameterised::Map& parameters) = 0;
 
     /**@brief Builds a Parking Space
      * @param[in] sumoBaseObject sumo base object used for build
diff -Nru sumo-1.17.0/src/utils/handlers/DataHandler.cpp sumo-1.18.0/src/utils/handlers/DataHandler.cpp
--- sumo-1.17.0/src/utils/handlers/DataHandler.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/handlers/DataHandler.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/handlers/DataHandler.h sumo-1.18.0/src/utils/handlers/DataHandler.h
--- sumo-1.17.0/src/utils/handlers/DataHandler.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/handlers/DataHandler.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/handlers/GeneralHandler.cpp sumo-1.18.0/src/utils/handlers/GeneralHandler.cpp
--- sumo-1.17.0/src/utils/handlers/GeneralHandler.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/handlers/GeneralHandler.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/handlers/GeneralHandler.h sumo-1.18.0/src/utils/handlers/GeneralHandler.h
--- sumo-1.17.0/src/utils/handlers/GeneralHandler.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/handlers/GeneralHandler.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/handlers/MeanDataHandler.cpp sumo-1.18.0/src/utils/handlers/MeanDataHandler.cpp
--- sumo-1.17.0/src/utils/handlers/MeanDataHandler.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/handlers/MeanDataHandler.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/handlers/MeanDataHandler.h sumo-1.18.0/src/utils/handlers/MeanDataHandler.h
--- sumo-1.17.0/src/utils/handlers/MeanDataHandler.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/handlers/MeanDataHandler.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/handlers/RouteHandler.cpp sumo-1.18.0/src/utils/handlers/RouteHandler.cpp
--- sumo-1.17.0/src/utils/handlers/RouteHandler.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/handlers/RouteHandler.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -225,18 +225,28 @@
         // vehicles
         case SUMO_TAG_TRIP:
             if (obj->hasStringAttribute(SUMO_ATTR_FROM) &&
-                    obj->hasStringAttribute(SUMO_ATTR_TO)) {
+                obj->hasStringAttribute(SUMO_ATTR_TO)) {
                 // build trip with from-to edges
                 buildTrip(obj,
                           obj->getVehicleParameter(),
                           obj->getStringAttribute(SUMO_ATTR_FROM),
                           obj->getStringAttribute(SUMO_ATTR_TO));
-            } else {
+            } else if (obj->hasStringAttribute(SUMO_ATTR_FROMJUNCTION) &&
+                       obj->hasStringAttribute(SUMO_ATTR_TOJUNCTION)) {
                 // build trip with from-to junctions
                 buildTripJunctions(obj,
                                    obj->getVehicleParameter(),
                                    obj->getStringAttribute(SUMO_ATTR_FROMJUNCTION),
                                    obj->getStringAttribute(SUMO_ATTR_TOJUNCTION));
+            } else if (obj->hasStringAttribute(SUMO_ATTR_FROM_TAZ) &&
+                       obj->hasStringAttribute(SUMO_ATTR_TO_TAZ)) {
+                // build trip with from-to TAZs
+                buildTripTAZs(obj,
+                              obj->getVehicleParameter(),
+                              obj->getStringAttribute(SUMO_ATTR_FROM_TAZ),
+                              obj->getStringAttribute(SUMO_ATTR_TO_TAZ));
+            } else {
+                throw ProcessError("Invalid from-to values in trips");
             }
             break;
         case SUMO_TAG_VEHICLE:
@@ -265,6 +275,13 @@
                                    obj->getVehicleParameter(),
                                    obj->getStringAttribute(SUMO_ATTR_FROMJUNCTION),
                                    obj->getStringAttribute(SUMO_ATTR_TOJUNCTION));
+            } else if (obj->hasStringAttribute(SUMO_ATTR_FROM_TAZ) &&
+                       obj->hasStringAttribute(SUMO_ATTR_TO_TAZ)) {
+                // build flow with from-to TAZs
+                buildFlowTAZs(obj,
+                              obj->getVehicleParameter(),
+                              obj->getStringAttribute(SUMO_ATTR_FROM_TAZ),
+                              obj->getStringAttribute(SUMO_ATTR_TO_TAZ));
             }
             break;
         // persons
@@ -284,6 +301,7 @@
                             obj->getStringAttribute(SUMO_ATTR_FROMJUNCTION),
                             obj->getStringAttribute(SUMO_ATTR_TOJUNCTION),
                             obj->getStringAttribute(SUMO_ATTR_BUS_STOP),
+                            obj->getStringAttribute(SUMO_ATTR_TRAIN_STOP),
                             obj->getDoubleAttribute(SUMO_ATTR_ARRIVALPOS),
                             obj->getStringListAttribute(SUMO_ATTR_VTYPES),
                             obj->getStringListAttribute(SUMO_ATTR_MODES),
@@ -294,6 +312,7 @@
                       obj->getStringAttribute(SUMO_ATTR_FROM),
                       obj->getStringAttribute(SUMO_ATTR_TO),
                       obj->getStringAttribute(SUMO_ATTR_BUS_STOP),
+                      obj->getStringAttribute(SUMO_ATTR_TRAIN_STOP),
                       obj->getDoubleAttribute(SUMO_ATTR_ARRIVALPOS),
                       obj->getStringListAttribute(SUMO_ATTR_LINES));
             break;
@@ -304,6 +323,7 @@
                       obj->getStringAttribute(SUMO_ATTR_FROMJUNCTION),
                       obj->getStringAttribute(SUMO_ATTR_TOJUNCTION),
                       obj->getStringAttribute(SUMO_ATTR_BUS_STOP),
+                      obj->getStringAttribute(SUMO_ATTR_TRAIN_STOP),
                       obj->getStringListAttribute(SUMO_ATTR_EDGES),
                       obj->getStringAttribute(SUMO_ATTR_ROUTE),
                       obj->getDoubleAttribute(SUMO_ATTR_ARRIVALPOS));
@@ -478,10 +498,10 @@
     SUMOVehicleParameter* tripParameter = SUMOVehicleParserHelper::parseVehicleAttributes(SUMO_TAG_TRIP, attrs, myHardFail);
     if (tripParameter) {
         // check from/to edge/junction
-        if (attrs.hasAttribute(SUMO_ATTR_FROM) && attrs.hasAttribute(SUMO_ATTR_FROMJUNCTION)) {
-            writeError(TL("Attributes 'from' and 'fromJunction' cannot be defined together"));
-        } else if (attrs.hasAttribute(SUMO_ATTR_TO) && attrs.hasAttribute(SUMO_ATTR_TOJUNCTION)) {
-            writeError(TL("Attributes 'to' and 'toJunction' cannot be defined together"));
+        if ((attrs.hasAttribute(SUMO_ATTR_FROM) + attrs.hasAttribute(SUMO_ATTR_FROMJUNCTION) + attrs.hasAttribute(SUMO_ATTR_FROM_TAZ)) > 1) {
+            writeError(TL("Attributes 'from', 'fromJunction' and 'fromTaz' cannot be defined together"));
+        } else if ((attrs.hasAttribute(SUMO_ATTR_TO) + attrs.hasAttribute(SUMO_ATTR_TOJUNCTION) + attrs.hasAttribute(SUMO_ATTR_TO_TAZ)) > 1) {
+            writeError(TL("Attributes 'to', 'toJunction' and 'toTaz' cannot be defined together"));
         } else if (attrs.hasAttribute(SUMO_ATTR_FROM) && attrs.hasAttribute(SUMO_ATTR_TO)) {
             // from-to attributes
             const std::string from = attrs.getOpt(SUMO_ATTR_FROM, tripParameter->id.c_str(), parsedOk, "");
@@ -511,8 +531,21 @@
                 myCommonXMLStructure.getCurrentSumoBaseObject()->addStringAttribute(SUMO_ATTR_FROMJUNCTION, fromJunction);
                 myCommonXMLStructure.getCurrentSumoBaseObject()->addStringAttribute(SUMO_ATTR_TOJUNCTION, toJunction);
             }
+        } else if (attrs.hasAttribute(SUMO_ATTR_FROM_TAZ) && attrs.hasAttribute(SUMO_ATTR_TO_TAZ)) {
+            // from-to attributes
+            const std::string fromJunction = attrs.getOpt(SUMO_ATTR_FROM_TAZ, tripParameter->id.c_str(), parsedOk, "");
+            const std::string toJunction = attrs.getOpt(SUMO_ATTR_TO_TAZ, tripParameter->id.c_str(), parsedOk, "");
+            if (parsedOk) {
+                // set tag
+                myCommonXMLStructure.getCurrentSumoBaseObject()->setTag(SUMO_TAG_TRIP);
+                // set vehicle parameters
+                myCommonXMLStructure.getCurrentSumoBaseObject()->setVehicleParameter(tripParameter);
+                // add other attributes
+                myCommonXMLStructure.getCurrentSumoBaseObject()->addStringAttribute(SUMO_ATTR_FROM_TAZ, fromJunction);
+                myCommonXMLStructure.getCurrentSumoBaseObject()->addStringAttribute(SUMO_ATTR_TO_TAZ, toJunction);
+            }
         } else {
-            writeError(TL("trip definition needs either 'from/to' or 'fromJunction/toJunction'"));
+            writeError(TL("trip definition needs either 'from/to' or 'fromJunction/toJunction' or 'fromTaz/toTaz'"));
         }
         // delete trip parameter (because in XMLStructure we have a copy)
         delete tripParameter;
@@ -545,10 +578,10 @@
         // set vehicle parameters
         myCommonXMLStructure.getCurrentSumoBaseObject()->setVehicleParameter(flowParameter);
         // check from/to edge/junction
-        if (attrs.hasAttribute(SUMO_ATTR_FROM) && attrs.hasAttribute(SUMO_ATTR_FROMJUNCTION)) {
-            writeError(TL("Attributes 'from' and 'fromJunction' cannot be defined together"));
-        } else if (attrs.hasAttribute(SUMO_ATTR_TO) && attrs.hasAttribute(SUMO_ATTR_TOJUNCTION)) {
-            writeError(TL("Attributes 'to' and 'toJunction' cannot be defined together"));
+        if ((attrs.hasAttribute(SUMO_ATTR_FROM) + attrs.hasAttribute(SUMO_ATTR_FROMJUNCTION) + attrs.hasAttribute(SUMO_ATTR_FROM_TAZ)) > 1) {
+            writeError(TL("Attributes 'from', 'fromJunction' and 'fromTaz' cannot be defined together"));
+        } else if ((attrs.hasAttribute(SUMO_ATTR_TO) + attrs.hasAttribute(SUMO_ATTR_TOJUNCTION) + attrs.hasAttribute(SUMO_ATTR_TO_TAZ)) > 1) {
+            writeError(TL("Attributes 'to', 'toJunction' and 'toTaz' cannot be defined together"));
         } else if (attrs.hasAttribute(SUMO_ATTR_FROM) && attrs.hasAttribute(SUMO_ATTR_TO)) {
             // from-to attributes
             const std::string from = attrs.get(SUMO_ATTR_FROM, flowParameter->id.c_str(), parsedOk);
@@ -574,6 +607,17 @@
                 myCommonXMLStructure.getCurrentSumoBaseObject()->addStringAttribute(SUMO_ATTR_FROMJUNCTION, fromJunction);
                 myCommonXMLStructure.getCurrentSumoBaseObject()->addStringAttribute(SUMO_ATTR_TOJUNCTION, toJunction);
             }
+        } else if (attrs.hasAttribute(SUMO_ATTR_FROM_TAZ) && attrs.hasAttribute(SUMO_ATTR_TO_TAZ)) {
+            // from-to attributes
+            const std::string fromJunction = attrs.get(SUMO_ATTR_FROM_TAZ, flowParameter->id.c_str(), parsedOk);
+            const std::string toJunction = attrs.get(SUMO_ATTR_TO_TAZ, flowParameter->id.c_str(), parsedOk);
+            if (parsedOk) {
+                // set tag
+                myCommonXMLStructure.getCurrentSumoBaseObject()->setTag(SUMO_TAG_FLOW);
+                // add other attributes
+                myCommonXMLStructure.getCurrentSumoBaseObject()->addStringAttribute(SUMO_ATTR_FROM_TAZ, fromJunction);
+                myCommonXMLStructure.getCurrentSumoBaseObject()->addStringAttribute(SUMO_ATTR_TO_TAZ, toJunction);
+            }
         } else if (attrs.hasAttribute(SUMO_ATTR_ROUTE)) {
             // from-to attributes
             const std::string route = attrs.get(SUMO_ATTR_ROUTE, flowParameter->id.c_str(), parsedOk);
@@ -652,6 +696,7 @@
     const std::string toJunction = attrs.getOpt(SUMO_ATTR_TOJUNCTION, "", parsedOk, "");
     const std::vector via = attrs.getOpt >(SUMO_ATTR_VIA, "", parsedOk);
     const std::string busStop = attrs.getOpt(SUMO_ATTR_BUS_STOP, "", parsedOk, "");
+    const std::string trainStop = attrs.getOpt(SUMO_ATTR_TRAIN_STOP, "", parsedOk, "");
     const std::vector vTypes = attrs.getOpt >(SUMO_ATTR_VTYPES, "", parsedOk);
     const std::vector lines = attrs.getOpt >(SUMO_ATTR_LINES, "", parsedOk);
     std::vector modes = attrs.getOpt >(SUMO_ATTR_MODES, "", parsedOk);
@@ -674,6 +719,7 @@
         myCommonXMLStructure.getCurrentSumoBaseObject()->addStringAttribute(SUMO_ATTR_TOJUNCTION, toJunction);
         myCommonXMLStructure.getCurrentSumoBaseObject()->addStringListAttribute(SUMO_ATTR_VIA, via);
         myCommonXMLStructure.getCurrentSumoBaseObject()->addStringAttribute(SUMO_ATTR_BUS_STOP, busStop);
+        myCommonXMLStructure.getCurrentSumoBaseObject()->addStringAttribute(SUMO_ATTR_TRAIN_STOP, trainStop);
         myCommonXMLStructure.getCurrentSumoBaseObject()->addStringListAttribute(SUMO_ATTR_VTYPES, vTypes);
         myCommonXMLStructure.getCurrentSumoBaseObject()->addStringListAttribute(SUMO_ATTR_MODES, modes);
         myCommonXMLStructure.getCurrentSumoBaseObject()->addStringListAttribute(SUMO_ATTR_LINES, lines);
@@ -695,6 +741,7 @@
     const std::string fromJunction = attrs.getOpt(SUMO_ATTR_FROMJUNCTION, "", parsedOk, "");
     const std::string toJunction = attrs.getOpt(SUMO_ATTR_TOJUNCTION, "", parsedOk, "");
     const std::string busStop = attrs.getOpt(SUMO_ATTR_BUS_STOP, "", parsedOk, "");
+    const std::string trainStop = attrs.getOpt(SUMO_ATTR_TRAIN_STOP, "", parsedOk, "");
     const double duration = attrs.getOpt(SUMO_ATTR_DURATION, "", parsedOk, 0);
     const double speed = attrs.getOpt(SUMO_ATTR_SPEED, "", parsedOk, 0);
     const double departPos = attrs.getOpt(SUMO_ATTR_DEPARTPOS, "", parsedOk, -1);
@@ -711,6 +758,7 @@
         myCommonXMLStructure.getCurrentSumoBaseObject()->addStringAttribute(SUMO_ATTR_FROMJUNCTION, fromJunction);
         myCommonXMLStructure.getCurrentSumoBaseObject()->addStringAttribute(SUMO_ATTR_TOJUNCTION, toJunction);
         myCommonXMLStructure.getCurrentSumoBaseObject()->addStringAttribute(SUMO_ATTR_BUS_STOP, busStop);
+        myCommonXMLStructure.getCurrentSumoBaseObject()->addStringAttribute(SUMO_ATTR_TRAIN_STOP, trainStop);
         myCommonXMLStructure.getCurrentSumoBaseObject()->addDoubleAttribute(SUMO_ATTR_DURATION, duration);
         myCommonXMLStructure.getCurrentSumoBaseObject()->addDoubleAttribute(SUMO_ATTR_SPEED, speed);
         myCommonXMLStructure.getCurrentSumoBaseObject()->addDoubleAttribute(SUMO_ATTR_DEPARTPOS, departPos);
@@ -728,6 +776,7 @@
     const std::string from = attrs.getOpt(SUMO_ATTR_FROM, "", parsedOk, "");
     const std::string to = attrs.getOpt(SUMO_ATTR_TO, "", parsedOk, "");
     const std::string busStop = attrs.getOpt(SUMO_ATTR_BUS_STOP, "", parsedOk, "");
+    const std::string trainStop = attrs.getOpt(SUMO_ATTR_TRAIN_STOP, "", parsedOk, "");
     const std::vector lines = attrs.getOpt >(SUMO_ATTR_LINES, "", parsedOk);
     const double arrivalPos = attrs.getOpt(SUMO_ATTR_ARRIVALPOS, "", parsedOk, -1);
     if (parsedOk) {
@@ -737,6 +786,7 @@
         myCommonXMLStructure.getCurrentSumoBaseObject()->addStringAttribute(SUMO_ATTR_FROM, from);
         myCommonXMLStructure.getCurrentSumoBaseObject()->addStringAttribute(SUMO_ATTR_TO, to);
         myCommonXMLStructure.getCurrentSumoBaseObject()->addStringAttribute(SUMO_ATTR_BUS_STOP, busStop);
+        myCommonXMLStructure.getCurrentSumoBaseObject()->addStringAttribute(SUMO_ATTR_TRAIN_STOP, trainStop);
         myCommonXMLStructure.getCurrentSumoBaseObject()->addStringListAttribute(SUMO_ATTR_LINES, lines);
         myCommonXMLStructure.getCurrentSumoBaseObject()->addDoubleAttribute(SUMO_ATTR_ARRIVALPOS, arrivalPos);
     }
@@ -972,7 +1022,9 @@
     }
     // stopping places
     stop.busstop = attrs.getOpt(SUMO_ATTR_BUS_STOP, nullptr, ok, "");
-    stop.busstop = attrs.getOpt(SUMO_ATTR_TRAIN_STOP, nullptr, ok, stop.busstop);
+    if (stop.busstop.empty()) {
+        stop.busstop = attrs.getOpt(SUMO_ATTR_TRAIN_STOP, nullptr, ok, stop.busstop);
+    }
     stop.chargingStation = attrs.getOpt(SUMO_ATTR_CHARGING_STATION, nullptr, ok, "");
     stop.overheadWireSegment = attrs.getOpt(SUMO_ATTR_OVERHEAD_WIRE_SEGMENT, nullptr, ok, "");
     stop.containerstop = attrs.getOpt(SUMO_ATTR_CONTAINER_STOP, nullptr, ok, "");
diff -Nru sumo-1.17.0/src/utils/handlers/RouteHandler.h sumo-1.18.0/src/utils/handlers/RouteHandler.h
--- sumo-1.17.0/src/utils/handlers/RouteHandler.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/handlers/RouteHandler.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -85,6 +85,10 @@
     virtual void buildTripJunctions(const CommonXMLStructure::SumoBaseObject* sumoBaseObject, const SUMOVehicleParameter& vehicleParameters,
                                     const std::string& fromJunctionID, const std::string& toJunctionID) = 0;
 
+    /// @brief build trip (from-to TAZs)
+    virtual void buildTripTAZs(const CommonXMLStructure::SumoBaseObject* sumoBaseObject, const SUMOVehicleParameter& vehicleParameters,
+                                    const std::string& fromTazID, const std::string& toTazID) = 0;
+
     /// @brief build flow (from-to edges)
     virtual void buildFlow(const CommonXMLStructure::SumoBaseObject* sumoBaseObject, const SUMOVehicleParameter& vehicleParameters,
                            const std::string& fromEdgeID, const std::string& toEdgeID) = 0;
@@ -93,6 +97,10 @@
     virtual void buildFlowJunctions(const CommonXMLStructure::SumoBaseObject* sumoBaseObject, const SUMOVehicleParameter& vehicleParameters,
                                     const std::string& fromJunctionID, const std::string& toJunctionID) = 0;
 
+    /// @brief build flow (from-to TAZs)
+    virtual void buildFlowTAZs(const CommonXMLStructure::SumoBaseObject* sumoBaseObject, const SUMOVehicleParameter& vehicleParameters,
+                                    const std::string& fromTAZID, const std::string& toTAZID) = 0;
+
     /// @brief build person
     virtual void buildPerson(const CommonXMLStructure::SumoBaseObject* sumoBaseObject, const SUMOVehicleParameter& personParameters) = 0;
 
@@ -101,17 +109,17 @@
 
     /// @brief build person trip
     virtual void buildPersonTrip(const CommonXMLStructure::SumoBaseObject* sumoBaseObject, const std::string& fromEdgeID, const std::string& toEdgeID,
-                                 const std::string& fromJunctionID, const std::string& toJunctionID, const std::string& toBusStopID, double arrivalPos,
-                                 const std::vector& types, const std::vector& modes, const std::vector& lines) = 0;
+                                 const std::string& fromJunctionID, const std::string& toJunctionID, const std::string& toBusStopID, const std::string& toTrainStopID,
+                                 double arrivalPos, const std::vector& types, const std::vector& modes, const std::vector& lines) = 0;
 
     /// @brief build walk
     virtual void buildWalk(const CommonXMLStructure::SumoBaseObject* sumoBaseObject, const std::string& fromEdgeID, const std::string& toEdgeID,
-                           const std::string& fromJunctionID, const std::string& toJunctionID, const std::string& toBusStopID,
+                           const std::string& fromJunctionID, const std::string& toJunctionID, const std::string& toBusStopID, const std::string& toTrainStopID,
                            const std::vector& edgeIDs, const std::string& routeID, double arrivalPos) = 0;
 
     /// @brief build ride
     virtual void buildRide(const CommonXMLStructure::SumoBaseObject* sumoBaseObject, const std::string& fromEdgeID, const std::string& toEdgeID,
-                           const std::string& toBusStopID, double arrivalPos, const std::vector& lines) = 0;
+                           const std::string& toBusStopID, const std::string& toTrainStopID, double arrivalPos, const std::vector& lines) = 0;
 
     /// @brief build container
     virtual void buildContainer(const CommonXMLStructure::SumoBaseObject* sumoBaseObject, const SUMOVehicleParameter& containerParameters) = 0;
diff -Nru sumo-1.17.0/src/utils/handlers/TemplateHandler.cpp sumo-1.18.0/src/utils/handlers/TemplateHandler.cpp
--- sumo-1.17.0/src/utils/handlers/TemplateHandler.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/handlers/TemplateHandler.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -157,16 +157,22 @@
             option = new Option_Integer(0);
             if (value.empty()) {
                 option->set(INVALID_INT_STR, "", true);
+            } else {
+                option->set(value, value, true);
             }
         } else if ((type == "FLOAT") || (type == "float") || (type == "TIME") || (type == "time")) {
             option = new Option_Float(0);
             if (value.empty()) {
                 option->set(INVALID_DOUBLE_STR, "", true);
+            } else {
+                option->set(value, value, true);
             }
         } else if ((type == "BOOL") || (type == "bool")) {
             option = new Option_Bool(false);
             if (value.empty()) {
                 option->set("false", "", true);
+            } else {
+                option->set(value, value, true);
             }
         } else if (type == "INT[]") {
             option = new Option_IntVector();
@@ -182,6 +188,14 @@
             option = new Option_Route(value);
         } else if ((type == "DATA") || (type == "data_file") || (type == "edgedata_file")) {
             option = new Option_Data(value);
+        } else if ((type == "SUMOCONFIG") || (type == "sumoconfig_file")) {
+            option = new Option_SumoConfig(value);
+        } else if ((type == "EDGE") || (type == "edge")) {
+            if (listSep.empty()) {
+                option = new Option_Edge(value);
+            } else {
+                option = new Option_EdgeVector(value);
+            }
         } else if (type.size() > 0) {
             WRITE_WARNING(type + " is an invalid type");
         }
diff -Nru sumo-1.17.0/src/utils/handlers/TemplateHandler.h sumo-1.18.0/src/utils/handlers/TemplateHandler.h
--- sumo-1.17.0/src/utils/handlers/TemplateHandler.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/handlers/TemplateHandler.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/importio/LineHandler.h sumo-1.18.0/src/utils/importio/LineHandler.h
--- sumo-1.17.0/src/utils/importio/LineHandler.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/importio/LineHandler.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/importio/LineReader.cpp sumo-1.18.0/src/utils/importio/LineReader.cpp
--- sumo-1.17.0/src/utils/importio/LineReader.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/importio/LineReader.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/importio/LineReader.h sumo-1.18.0/src/utils/importio/LineReader.h
--- sumo-1.17.0/src/utils/importio/LineReader.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/importio/LineReader.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/importio/NamedColumnsParser.cpp sumo-1.18.0/src/utils/importio/NamedColumnsParser.cpp
--- sumo-1.17.0/src/utils/importio/NamedColumnsParser.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/importio/NamedColumnsParser.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/importio/NamedColumnsParser.h sumo-1.18.0/src/utils/importio/NamedColumnsParser.h
--- sumo-1.17.0/src/utils/importio/NamedColumnsParser.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/importio/NamedColumnsParser.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/iodevices/OutputDevice_CERR.cpp sumo-1.18.0/src/utils/iodevices/OutputDevice_CERR.cpp
--- sumo-1.17.0/src/utils/iodevices/OutputDevice_CERR.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/iodevices/OutputDevice_CERR.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2004-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/iodevices/OutputDevice_CERR.h sumo-1.18.0/src/utils/iodevices/OutputDevice_CERR.h
--- sumo-1.17.0/src/utils/iodevices/OutputDevice_CERR.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/iodevices/OutputDevice_CERR.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2004-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/iodevices/OutputDevice_COUT.cpp sumo-1.18.0/src/utils/iodevices/OutputDevice_COUT.cpp
--- sumo-1.17.0/src/utils/iodevices/OutputDevice_COUT.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/iodevices/OutputDevice_COUT.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2004-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/iodevices/OutputDevice_COUT.h sumo-1.18.0/src/utils/iodevices/OutputDevice_COUT.h
--- sumo-1.17.0/src/utils/iodevices/OutputDevice_COUT.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/iodevices/OutputDevice_COUT.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2004-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/iodevices/OutputDevice.cpp sumo-1.18.0/src/utils/iodevices/OutputDevice.cpp
--- sumo-1.17.0/src/utils/iodevices/OutputDevice.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/iodevices/OutputDevice.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2004-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/iodevices/OutputDevice_File.cpp sumo-1.18.0/src/utils/iodevices/OutputDevice_File.cpp
--- sumo-1.17.0/src/utils/iodevices/OutputDevice_File.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/iodevices/OutputDevice_File.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2004-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/iodevices/OutputDevice_File.h sumo-1.18.0/src/utils/iodevices/OutputDevice_File.h
--- sumo-1.17.0/src/utils/iodevices/OutputDevice_File.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/iodevices/OutputDevice_File.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2004-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/iodevices/OutputDevice.h sumo-1.18.0/src/utils/iodevices/OutputDevice.h
--- sumo-1.17.0/src/utils/iodevices/OutputDevice.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/iodevices/OutputDevice.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2004-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/iodevices/OutputDevice_Network.cpp sumo-1.18.0/src/utils/iodevices/OutputDevice_Network.cpp
--- sumo-1.17.0/src/utils/iodevices/OutputDevice_Network.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/iodevices/OutputDevice_Network.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2006-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/iodevices/OutputDevice_Network.h sumo-1.18.0/src/utils/iodevices/OutputDevice_Network.h
--- sumo-1.17.0/src/utils/iodevices/OutputDevice_Network.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/iodevices/OutputDevice_Network.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2006-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/iodevices/OutputDevice_String.cpp sumo-1.18.0/src/utils/iodevices/OutputDevice_String.cpp
--- sumo-1.17.0/src/utils/iodevices/OutputDevice_String.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/iodevices/OutputDevice_String.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2009-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/iodevices/OutputDevice_String.h sumo-1.18.0/src/utils/iodevices/OutputDevice_String.h
--- sumo-1.17.0/src/utils/iodevices/OutputDevice_String.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/iodevices/OutputDevice_String.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2009-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/iodevices/OutputFormatter.h sumo-1.18.0/src/utils/iodevices/OutputFormatter.h
--- sumo-1.17.0/src/utils/iodevices/OutputFormatter.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/iodevices/OutputFormatter.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/iodevices/PlainXMLFormatter.cpp sumo-1.18.0/src/utils/iodevices/PlainXMLFormatter.cpp
--- sumo-1.17.0/src/utils/iodevices/PlainXMLFormatter.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/iodevices/PlainXMLFormatter.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/iodevices/PlainXMLFormatter.h sumo-1.18.0/src/utils/iodevices/PlainXMLFormatter.h
--- sumo-1.17.0/src/utils/iodevices/PlainXMLFormatter.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/iodevices/PlainXMLFormatter.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/options/Option.cpp sumo-1.18.0/src/utils/options/Option.cpp
--- sumo-1.17.0/src/utils/options/Option.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/options/Option.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -163,6 +163,24 @@
 
 
 bool
+Option::isSumoConfig() const {
+    return false;
+}
+
+
+bool
+Option::isEdge() const {
+    return false;
+}
+
+
+bool
+Option::isEdgeVector() const {
+    return false;
+}
+
+
+bool
 Option::isWriteable() const {
     return myAmWritable;
 }
@@ -514,7 +532,6 @@
     return true;
 }
 
-
 // -------------------------------------------------------------------------
 // Option_Additional - methods
 // -------------------------------------------------------------------------
@@ -529,7 +546,6 @@
     return true;
 }
 
-
 // -------------------------------------------------------------------------
 // Option_Route - methods
 // -------------------------------------------------------------------------
@@ -544,7 +560,6 @@
     return true;
 }
 
-
 // -------------------------------------------------------------------------
 // Option_Data - methods
 // -------------------------------------------------------------------------
@@ -559,4 +574,46 @@
     return true;
 }
 
+// -------------------------------------------------------------------------
+// Option_Data - methods
+// -------------------------------------------------------------------------
+
+Option_SumoConfig::Option_SumoConfig(const std::string& value) :
+    Option_String(value, "SUMOCONFIG") {
+}
+
+
+bool
+Option_SumoConfig::isSumoConfig() const {
+    return true;
+}
+
+// -------------------------------------------------------------------------
+// Option_Data - methods
+// -------------------------------------------------------------------------
+
+Option_Edge::Option_Edge(const std::string& value) :
+    Option_String(value, "EDGE") {
+}
+
+
+bool
+Option_Edge::isEdge() const {
+    return true;
+}
+
+// -------------------------------------------------------------------------
+// Option_Data - methods
+// -------------------------------------------------------------------------
+
+Option_EdgeVector::Option_EdgeVector(const std::string& value) :
+    Option_String(value, "EDGE[]") {
+}
+
+
+bool
+Option_EdgeVector::isEdgeVector() const {
+    return true;
+}
+
 /****************************************************************************/
diff -Nru sumo-1.17.0/src/utils/options/Option.h sumo-1.18.0/src/utils/options/Option.h
--- sumo-1.17.0/src/utils/options/Option.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/options/Option.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -236,6 +236,30 @@
      */
     virtual bool isData() const;
 
+    /** @brief Returns the information whether this option is a sumo config file
+     *
+     * Returns false. Only Option_SumoConfig overrides this method returning true.
+     *
+     * @return true if the Option is an Option_SumoConfig, false otherwise
+     */
+    virtual bool isSumoConfig() const;
+
+    /** @brief Returns the information whether this option is an edge
+     *
+     * Returns false. Only Option_Edge overrides this method returning true.
+     *
+     * @return true if the Option is an Option_Edge, false otherwise
+     */
+    virtual bool isEdge() const;
+
+    /** @brief Returns the information whether this option is a vector of edges
+     *
+     * Returns false. Only Option_EdgeVector overrides this method returning true.
+     *
+     * @return true if the Option is an Option_EdgeVector, false otherwise
+     */
+    virtual bool isEdgeVector() const;
+
     /** @brief Returns the information whether the option may be set a further time
      *
      * This method returns whether the option was not already set using command line
@@ -765,12 +789,77 @@
      */
     Option_Data(const std::string& value);
 
-    /** @brief Returns true, the information whether this option is a file name
+    /** @brief Returns true, the information whether this option is a data file
      *
      * Returns true.
      *
      * @return true
      */
     bool isData() const;
+};
+
+// -------------------------------------------------------------------------
+// Option_SumoConfig
+// -------------------------------------------------------------------------
+
+class Option_SumoConfig : public Option_String {
+
+public:
+    /** @brief Constructor for an option with a default value
+     *
+     * @param[in] value This option's default value
+     */
+    Option_SumoConfig(const std::string& value);
 
+    /** @brief Returns true, the information whether this option is a sumo config name
+     *
+     * Returns true.
+     *
+     * @return true
+     */
+    bool isSumoConfig() const;
+};
+
+// -------------------------------------------------------------------------
+// Option_Edge
+// -------------------------------------------------------------------------
+
+class Option_Edge : public Option_String {
+
+public:
+    /** @brief Constructor for an option with a default value
+     *
+     * @param[in] value This option's default value
+     */
+    Option_Edge(const std::string& value);
+
+    /** @brief Returns true, the information whether this option is a list of edges
+     *
+     * Returns true.
+     *
+     * @return true
+     */
+    bool isEdge() const;
+};
+
+// -------------------------------------------------------------------------
+// Option_EdgeVector
+// -------------------------------------------------------------------------
+
+class Option_EdgeVector : public Option_String {
+
+public:
+    /** @brief Constructor for an option with a default value
+     *
+     * @param[in] value This option's default value
+     */
+    Option_EdgeVector(const std::string& value);
+
+    /** @brief Returns true, the information whether this option is a list of edges
+     *
+     * Returns true.
+     *
+     * @return true
+     */
+    bool isEdgeVector() const;
 };
diff -Nru sumo-1.17.0/src/utils/options/OptionsCont.cpp sumo-1.18.0/src/utils/options/OptionsCont.cpp
--- sumo-1.17.0/src/utils/options/OptionsCont.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/options/OptionsCont.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -50,6 +50,7 @@
 // ===========================================================================
 
 OptionsCont OptionsCont::myOptions;
+OptionsCont OptionsCont::EMPTY_OPTIONS;
 
 // ===========================================================================
 // method definitions
@@ -890,8 +891,6 @@
     os << "isFileName() && relativeTo != "") {
                     StringVector fileList = StringTokenizer(o->getValueString(), ",").getVector();
                     for (auto& file : fileList) {
-                        file = FileHelpers::fixRelative(StringUtils::urlEncode(file, " ;%"), relativeTo,
-                                                        forceRelative || getBool("save-configuration.relative"));
+                        file = FileHelpers::fixRelative(
+                                   StringUtils::urlEncode(file, " ;%"),
+                                   StringUtils::urlEncode(relativeTo, " ;%"),
+                                   forceRelative || getBool("save-configuration.relative"));
                     }
                     os << StringUtils::escapeXML(joinToString(fileList, ','), inComment);
                 } else {
diff -Nru sumo-1.17.0/src/utils/options/OptionsCont.h sumo-1.18.0/src/utils/options/OptionsCont.h
--- sumo-1.17.0/src/utils/options/OptionsCont.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/options/OptionsCont.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -89,10 +89,12 @@
 class OptionsCont {
 
 public:
-
     /// @brief Retrieves the options
     static OptionsCont& getOptions();
 
+    /// @brief empty option container
+    static OptionsCont EMPTY_OPTIONS;
+
     /// @brief Constructor
     OptionsCont();
 
diff -Nru sumo-1.17.0/src/utils/options/OptionsIO.cpp sumo-1.18.0/src/utils/options/OptionsIO.cpp
--- sumo-1.17.0/src/utils/options/OptionsIO.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/options/OptionsIO.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/options/OptionsIO.h sumo-1.18.0/src/utils/options/OptionsIO.h
--- sumo-1.17.0/src/utils/options/OptionsIO.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/options/OptionsIO.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/options/OptionsLoader.cpp sumo-1.18.0/src/utils/options/OptionsLoader.cpp
--- sumo-1.17.0/src/utils/options/OptionsLoader.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/options/OptionsLoader.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/options/OptionsLoader.h sumo-1.18.0/src/utils/options/OptionsLoader.h
--- sumo-1.17.0/src/utils/options/OptionsLoader.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/options/OptionsLoader.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/options/OptionsParser.cpp sumo-1.18.0/src/utils/options/OptionsParser.cpp
--- sumo-1.17.0/src/utils/options/OptionsParser.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/options/OptionsParser.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/options/OptionsParser.h sumo-1.18.0/src/utils/options/OptionsParser.h
--- sumo-1.17.0/src/utils/options/OptionsParser.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/options/OptionsParser.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/router/AccessEdge.h sumo-1.18.0/src/utils/router/AccessEdge.h
--- sumo-1.17.0/src/utils/router/AccessEdge.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/router/AccessEdge.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/router/AStarLookupTable.h sumo-1.18.0/src/utils/router/AStarLookupTable.h
--- sumo-1.17.0/src/utils/router/AStarLookupTable.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/router/AStarLookupTable.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/router/AStarRouter.h sumo-1.18.0/src/utils/router/AStarRouter.h
--- sumo-1.17.0/src/utils/router/AStarRouter.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/router/AStarRouter.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/router/CarEdge.h sumo-1.18.0/src/utils/router/CarEdge.h
--- sumo-1.17.0/src/utils/router/CarEdge.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/router/CarEdge.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/router/CHBuilder.h sumo-1.18.0/src/utils/router/CHBuilder.h
--- sumo-1.17.0/src/utils/router/CHBuilder.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/router/CHBuilder.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/router/CHRouter.h sumo-1.18.0/src/utils/router/CHRouter.h
--- sumo-1.17.0/src/utils/router/CHRouter.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/router/CHRouter.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/router/CHRouterWrapper.h sumo-1.18.0/src/utils/router/CHRouterWrapper.h
--- sumo-1.17.0/src/utils/router/CHRouterWrapper.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/router/CHRouterWrapper.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/router/DijkstraRouter.h sumo-1.18.0/src/utils/router/DijkstraRouter.h
--- sumo-1.17.0/src/utils/router/DijkstraRouter.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/router/DijkstraRouter.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/router/EffortCalculator.h sumo-1.18.0/src/utils/router/EffortCalculator.h
--- sumo-1.17.0/src/utils/router/EffortCalculator.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/router/EffortCalculator.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/router/FareModul.h sumo-1.18.0/src/utils/router/FareModul.h
--- sumo-1.17.0/src/utils/router/FareModul.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/router/FareModul.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2002-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/router/FareToken.h sumo-1.18.0/src/utils/router/FareToken.h
--- sumo-1.17.0/src/utils/router/FareToken.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/router/FareToken.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2002-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/router/FareZones.h sumo-1.18.0/src/utils/router/FareZones.h
--- sumo-1.17.0/src/utils/router/FareZones.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/router/FareZones.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2002-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/router/GawronCalculator.h sumo-1.18.0/src/utils/router/GawronCalculator.h
--- sumo-1.17.0/src/utils/router/GawronCalculator.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/router/GawronCalculator.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2002-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -63,7 +63,7 @@
                 // see [Gawron, 1998] (4.3a, 4.3b)
                 double newPR = gawronF(pR->getProbability(), pS->getProbability(), delta);
                 double newPS = pR->getProbability() + pS->getProbability() - newPR;
-                if (ISNAN(newPR) || ISNAN(newPS)) {
+                if (std::isnan(newPR) || std::isnan(newPS)) {
                     newPR = pS->getCosts() > pR->getCosts()
                             ? (double) 1. : 0;
                     newPS = pS->getCosts() > pR->getCosts()
diff -Nru sumo-1.17.0/src/utils/router/IntermodalEdge.h sumo-1.18.0/src/utils/router/IntermodalEdge.h
--- sumo-1.17.0/src/utils/router/IntermodalEdge.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/router/IntermodalEdge.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/router/IntermodalNetwork.h sumo-1.18.0/src/utils/router/IntermodalNetwork.h
--- sumo-1.17.0/src/utils/router/IntermodalNetwork.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/router/IntermodalNetwork.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -509,7 +509,8 @@
         const bool transferWalkTaxi = (category == SUMO_TAG_BUS_STOP && (myCarWalkTransfer & TAXI_PICKUP_PT) != 0);
         const double pos = (startPos + endPos) / 2.;
 #ifdef IntermodalRouter_DEBUG_ACCESS
-        std::cout << "addAccess stopId=" << stopId << " stopEdge=" << stopEdge->getID() << " pos=" << pos << " length=" << length << " cat=" << category << "\n";
+        std::cout << "addAccess stopId=" << stopId << " stopEdge=" << stopEdge->getID() << " pos=" << pos << " length=" << length << " tag=" << toString(category)
+                  << " access=" << isAccess << " tWait=" << taxiWait << "\n";
 #endif
         if (myStopConnections.count(stopId) == 0) {
             myStopConnections[stopId] = new StopEdge(stopId, myNumericalID++, stopEdge, startPos, endPos);
@@ -600,6 +601,36 @@
                 ++splitIt;
             }
             splitList.insert(splitIt, stopConn);
+
+            if (!isAccess && (transferWalkTaxi || transferCarWalk || transferTaxiWalk)) {
+                _IntermodalEdge* carEdge =  myCarLookup[stopEdge];
+                double relPos;
+                bool needSplit;
+                const int splitIndex = findSplitIndex(carEdge, pos, relPos, needSplit);
+                if (needSplit) {
+                    _IntermodalEdge* carSplit = new CarEdge(myNumericalID++, stopEdge, pos);
+                    splitEdge(carEdge, splitIndex, carSplit, relPos, length, needSplit, stopConn, true, false, false);
+
+                    if (transferCarWalk || transferTaxiWalk) {
+                        // adding access from car to walk
+                        _IntermodalEdge* const beforeSplit = myAccessSplits[myCarLookup[stopEdge]][splitIndex];
+                        if (transferCarWalk) {
+                            _AccessEdge* access = new _AccessEdge(myNumericalID++, beforeSplit, stopConn, length);
+                            addEdge(access);
+                            beforeSplit->addSuccessor(access);
+                            access->addSuccessor(stopConn);
+                        } else if (transferTaxiWalk) {
+                            addRestrictedCarExit(beforeSplit, stopConn, SVC_TAXI);
+                        }
+                    }
+                    if (transferWalkTaxi) {
+                        _AccessEdge* access = new _AccessEdge(myNumericalID++, stopConn, carSplit, 0, SVC_TAXI, SVC_IGNORING, taxiWait);
+                        addEdge(access);
+                        stopConn->addSuccessor(access);
+                        access->addSuccessor(carSplit);
+                    }
+                }
+            }
         }
     }
 
diff -Nru sumo-1.17.0/src/utils/router/IntermodalRouter.h sumo-1.18.0/src/utils/router/IntermodalRouter.h
--- sumo-1.17.0/src/utils/router/IntermodalRouter.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/router/IntermodalRouter.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -120,7 +120,7 @@
         //std::cout << "compute from=" << from->getID() << " to=" << to->getID() << " dPos=" << departPos << " aPos=" << arrivalPos << " stopID=" << stopID << " speed=" << speed << " veh=" << Named::getIDSecure(vehicle) << " modeSet=" << modeSet << " t=" << msTime << " iFrom=" << myIntermodalNet->getDepartEdge(from, trip.departPos)->getID() << " iTo=" << (stopID != "" ? myIntermodalNet->getStopEdge(stopID) : myIntermodalNet->getArrivalEdge(to, trip.arrivalPos))->getID() << "\n";
         const _IntermodalEdge* iFrom = originStopID != "" ? myIntermodalNet->getStopEdge(originStopID) : myIntermodalNet->getDepartEdge(from, trip.departPos);
         const _IntermodalEdge* iTo = stopID != "" ? myIntermodalNet->getStopEdge(stopID) : myIntermodalNet->getArrivalEdge(to, trip.arrivalPos);
-        const bool success = myInternalRouter->compute(iFrom, iTo, &trip, msTime, intoEdges);
+        const bool success = myInternalRouter->compute(iFrom, iTo, &trip, msTime, intoEdges, true);
         if (success) {
             std::string lastLine = "";
             double time = STEPS2TIME(msTime);
@@ -184,6 +184,12 @@
                     }
                 }
             }
+        } else {
+            const std::string oType = originStopID != "" ? "stop" : "edge";
+            const std::string oID = originStopID != "" ? originStopID : from->getID();
+            const std::string dType = stopID != "" ? "stop" : "edge";
+            const std::string dID = stopID != "" ? stopID : to->getID();
+            this->myErrorMsgHandler->informf("No connection between % '%' and % '%' found.", oType, oID, dType, dID);
         }
         if (into.size() > 0) {
             into.back().arrivalPos = arrivalPos;
diff -Nru sumo-1.17.0/src/utils/router/IntermodalTrip.h sumo-1.18.0/src/utils/router/IntermodalTrip.h
--- sumo-1.17.0/src/utils/router/IntermodalTrip.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/router/IntermodalTrip.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/router/LogitCalculator.h sumo-1.18.0/src/utils/router/LogitCalculator.h
--- sumo-1.17.0/src/utils/router/LogitCalculator.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/router/LogitCalculator.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2002-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/router/PedestrianEdge.h sumo-1.18.0/src/utils/router/PedestrianEdge.h
--- sumo-1.17.0/src/utils/router/PedestrianEdge.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/router/PedestrianEdge.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/router/PedestrianRouter.h sumo-1.18.0/src/utils/router/PedestrianRouter.h
--- sumo-1.17.0/src/utils/router/PedestrianRouter.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/router/PedestrianRouter.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/router/PublicTransportEdge.h sumo-1.18.0/src/utils/router/PublicTransportEdge.h
--- sumo-1.17.0/src/utils/router/PublicTransportEdge.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/router/PublicTransportEdge.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/router/RailEdge.h sumo-1.18.0/src/utils/router/RailEdge.h
--- sumo-1.17.0/src/utils/router/RailEdge.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/router/RailEdge.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -143,8 +143,11 @@
                 std::cout << "RailEdge " << getID() << " actual turnaround " << myTurnaround->getID() << "\n";
 #endif
                 myTurnaround->myIsVirtual = false;
+                // ensure at least one virtual turnaround (at the start of the
+                // edge) to avoid driving up to the end of long edges
+                const double initialDist = MAX2(maxTrainLength - getLength(), POSITION_EPS);
                 addVirtualTurns(myOriginal, viaPair.first, railEdges, numericalID,
-                                maxTrainLength - getLength(), getLength(), std::vector {myOriginal});
+                                initialDist, getLength(), std::vector {myOriginal});
             } else {
                 myViaSuccessors.push_back(std::make_pair(viaPair.first->getRailwayRoutingEdge(),
                                           viaPair.second == nullptr ? nullptr : viaPair.second->getRailwayRoutingEdge()));
@@ -181,6 +184,7 @@
         } else {
             double seen = myStartLength;
             int nPushed = 0;
+            //std::cout << "insertOriginalEdges e=" << getID() << " length=" << length << " seen=" << seen << " into=" << toString(into) << "\n";
             if (seen >= length && !myIsVirtual) {
                 return;
             }
@@ -189,10 +193,10 @@
                 into.push_back(edge);
                 nPushed++;
                 seen += edge->getLength();
+                //std::cout << "insertOriginalEdges e=" << getID() << " length=" << length << " seen=" << seen << " into=" << toString(into) << "\n";
                 if (seen >= length && edge->isConnectedTo(*edge->getBidiEdge(), SVC_IGNORING)) {
                     break;
                 }
-                //std::cout << "insertOriginalEdges length=" << length << " seen=" << seen << " into=" << toString(into) << "\n";
             }
             const int last = (int)into.size() - 1;
             for (int i = 0; i < nPushed; i++) {
diff -Nru sumo-1.17.0/src/utils/router/RailwayRouter.h sumo-1.18.0/src/utils/router/RailwayRouter.h
--- sumo-1.17.0/src/utils/router/RailwayRouter.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/router/RailwayRouter.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -44,7 +44,7 @@
 /**
  * @class RailwayRouter
  * The router for rail vehicles for track networks where some sections may be used in both directions
- * and trains may reverse depending on location and train length length
+ * and trains may reverse depending on location and train length
  *
  * Example (assume each track section is 100m long) running from left to right and a negative sign indicates reverse direction
  *
@@ -122,6 +122,33 @@
     }
 
 
+    double recomputeCosts(const std::vector& edges, const V* const v, SUMOTime msTime, double* lengthp = nullptr) const {
+        double effort = SUMOAbstractRouter::recomputeCosts(edges, v, msTime, lengthp);
+        const E* prev = nullptr;
+        // reversal corrections
+        double timeCorrection = STEPS2TIME(msTime);
+        for (const E* const e : edges) {
+            if (prev != nullptr && e->getBidiEdge() == prev) {
+                if (e->getLength() > v->getLength()) {
+                    // vehicle doesn't need to drive to the end of the edge
+                    // @note exact timing correction for time-dependent effort is not done
+                    const double savingsFactor = 1 - v->getLength() / e->getLength();
+                    double effortCorrection = 0;
+                    double lengthCorrection = 0.;
+                    effortCorrection += this->getEffort(prev, v, timeCorrection);
+                    this->updateViaCost(prev, e, v, timeCorrection, effortCorrection, lengthCorrection);
+                    effort -= savingsFactor * effortCorrection;
+                    if (lengthp != nullptr) {
+                        *lengthp -= savingsFactor * lengthCorrection;
+                    }
+                }
+            }
+            prev = e;
+        }
+        return effort;
+    }
+
+
 private:
     RailwayRouter(RailwayRouter* other) :
         SUMOAbstractRouter(other),
@@ -144,8 +171,11 @@
         double backDist = vehicle->getLength() - from->getLength();
         const E* start = from;
         while (backDist > 0) {
-            const E* prev = getStraightPredecessor(start);
+            const E* prev = getStraightPredecessor(start, into, (int)backLengths.size());
             if (prev == nullptr) {
+#ifdef RailwayRouter_DEBUG_ROUTES
+                std::cout << " Could not determine back edge for vehicle '" << vehicle->getID() << "' when routing from edge '" << from->getID() << "' at time=" << time2string(msTime) << "\n";
+#endif
                 //WRITE_WARNING("Could not determine back edge for vehicle '" + vehicle->getID() + "' when routing from edge '" + from->getID() + "' at time=" + time2string(msTime));
                 break;
             }
@@ -162,7 +192,9 @@
                     break;
                 }
             }
-            backLengths.push_back(prev->getLength() + (backLengths.empty() ? from->getLength() : backLengths.back()));
+            backLengths.push_back(prev->getLength() + (backLengths.empty()
+                                  ? MIN2(vehicle->getLength(), from->getLength())
+                                  : backLengths.back()));
             start = prev;
         }
 
@@ -174,8 +206,11 @@
 #endif
         if (success) {
             const size_t intoSize = into.size();
-            const int backIndex = (int)backLengths.size() - 1;
+            int backIndex = (int)backLengths.size();
             for (const _RailEdge* railEdge : intoTmp) {
+                if (railEdge->getOriginal() != nullptr) {
+                    backIndex--;
+                }
                 // prevent premature reversal on back edge (extend train length)
                 const double length = backIndex >= 0 ? backLengths[backIndex] : vehicle->getLength();
                 railEdge->insertOriginalEdges(length, into);
@@ -254,18 +289,25 @@
                 const double lengthOnLastEdge = MAX2(0.0, veh->getLength() - seenDist);
                 return result + myReversalPenalty + lengthOnLastEdge * myReversalPenaltyFactor;
             } else {
-                // XXX if the edge from which this turnaround starts is longer
-                // than the vehicle, we could return a negative value here
-                // because the turnaround may happen once the vehicle has driven onto the edge
+                // if the edge from which this turnaround starts is longer
+                // than the vehicle then we are overstimating the cost
+                // (because the turnaround may happen before driving to the end)
+                // However, unless the vehicle starts on this edge, we should be taking a
+                // virtual turnaround at the end of the previous edge. Otherwise, the exaggerated cost doesn't
                 return myReversalPenalty;
             }
         }
     }
 
 
-    static const E* getStraightPredecessor(const E* edge) {
+    static const E* getStraightPredecessor(const E* edge, std::vector& prevRoute, int backIndex) {
         const E* result = nullptr;
-        //std::cout << "  getStraightPredecessor edge=" << edge->getID() << "\n";
+#ifdef RailwayRouter_DEBUG_ROUTES
+        std::cout << "  getStraightPredecessor edge=" << edge->getID() << " prevRouteSize=" << prevRoute.size() << " backIndex=" << backIndex << "\n";
+#endif
+        if ((int)prevRoute.size() > backIndex) {
+            return prevRoute[(int)prevRoute.size() - 1 - backIndex];
+        }
         for (const E* cand : edge->getPredecessors()) {
             if (!cand->isInternal() && cand->getBidiEdge() != edge) {
                 //std::cout << "    cand=" << cand->getID() << "\n";
diff -Nru sumo-1.17.0/src/utils/router/ReversedEdge.h sumo-1.18.0/src/utils/router/ReversedEdge.h
--- sumo-1.17.0/src/utils/router/ReversedEdge.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/router/ReversedEdge.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/router/RouteCostCalculator.h sumo-1.18.0/src/utils/router/RouteCostCalculator.h
--- sumo-1.17.0/src/utils/router/RouteCostCalculator.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/router/RouteCostCalculator.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2002-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/router/RouterProvider.h sumo-1.18.0/src/utils/router/RouterProvider.h
--- sumo-1.17.0/src/utils/router/RouterProvider.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/router/RouterProvider.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/router/SPTree.h sumo-1.18.0/src/utils/router/SPTree.h
--- sumo-1.17.0/src/utils/router/SPTree.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/router/SPTree.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/router/StopEdge.h sumo-1.18.0/src/utils/router/StopEdge.h
--- sumo-1.17.0/src/utils/router/StopEdge.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/router/StopEdge.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/router/SUMOAbstractRouter.h sumo-1.18.0/src/utils/router/SUMOAbstractRouter.h
--- sumo-1.17.0/src/utils/router/SUMOAbstractRouter.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/router/SUMOAbstractRouter.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2006-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -257,8 +257,16 @@
         length += e->getLength();
     }
 
+    bool isValid(const std::vector& edges, const V* const v) const {
+        for (const E* const e : edges) {
+            if (isProhibited(e, v)) {
+                return false;
+            }
+        }
+        return true;
+    }
 
-    inline double recomputeCosts(const std::vector& edges, const V* const v, SUMOTime msTime, double* lengthp = nullptr) const {
+    virtual double recomputeCosts(const std::vector& edges, const V* const v, SUMOTime msTime, double* lengthp = nullptr) const {
         double time = STEPS2TIME(msTime);
         double effort = 0.;
         double length = 0.;
@@ -269,9 +277,6 @@
         }
         const E* prev = nullptr;
         for (const E* const e : edges) {
-            if (isProhibited(e, v)) {
-                return -1;
-            }
             updateViaCost(prev, e, v, time, effort, *lengthp);
             prev = e;
         }
@@ -279,7 +284,7 @@
     }
 
 
-    inline double recomputeCosts(const std::vector& edges, const V* const v, double fromPos, double toPos, SUMOTime msTime, double* lengthp = nullptr) const {
+    inline double recomputeCostsPos(const std::vector& edges, const V* const v, double fromPos, double toPos, SUMOTime msTime, double* lengthp = nullptr) const {
         double effort = recomputeCosts(edges, v, msTime, lengthp);
         if (!edges.empty()) {
             double firstEffort = this->getEffort(edges.front(), v, STEPS2TIME(msTime));
diff -Nru sumo-1.17.0/src/utils/shapes/PointOfInterest.h sumo-1.18.0/src/utils/shapes/PointOfInterest.h
--- sumo-1.17.0/src/utils/shapes/PointOfInterest.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/shapes/PointOfInterest.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2005-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/shapes/PolygonDynamics.cpp sumo-1.18.0/src/utils/shapes/PolygonDynamics.cpp
--- sumo-1.17.0/src/utils/shapes/PolygonDynamics.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/shapes/PolygonDynamics.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2004-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/shapes/PolygonDynamics.h sumo-1.18.0/src/utils/shapes/PolygonDynamics.h
--- sumo-1.17.0/src/utils/shapes/PolygonDynamics.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/shapes/PolygonDynamics.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2004-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/shapes/ShapeContainer.cpp sumo-1.18.0/src/utils/shapes/ShapeContainer.cpp
--- sumo-1.17.0/src/utils/shapes/ShapeContainer.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/shapes/ShapeContainer.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2002-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/shapes/ShapeContainer.h sumo-1.18.0/src/utils/shapes/ShapeContainer.h
--- sumo-1.17.0/src/utils/shapes/ShapeContainer.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/shapes/ShapeContainer.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2005-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/shapes/Shape.cpp sumo-1.18.0/src/utils/shapes/Shape.cpp
--- sumo-1.17.0/src/utils/shapes/Shape.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/shapes/Shape.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/shapes/Shape.h sumo-1.18.0/src/utils/shapes/Shape.h
--- sumo-1.17.0/src/utils/shapes/Shape.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/shapes/Shape.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -37,7 +37,7 @@
  */
 class Shape : public Named {
 public:
-    /// @nane default shape's values
+    /// @name default shape's values
     /// @{
     static const std::string DEFAULT_TYPE;
     static const double DEFAULT_LAYER;
diff -Nru sumo-1.17.0/src/utils/shapes/ShapeHandler.cpp sumo-1.18.0/src/utils/shapes/ShapeHandler.cpp
--- sumo-1.17.0/src/utils/shapes/ShapeHandler.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/shapes/ShapeHandler.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/shapes/ShapeHandler.h sumo-1.18.0/src/utils/shapes/ShapeHandler.h
--- sumo-1.17.0/src/utils/shapes/ShapeHandler.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/shapes/ShapeHandler.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/shapes/SUMOPolygon.cpp sumo-1.18.0/src/utils/shapes/SUMOPolygon.cpp
--- sumo-1.17.0/src/utils/shapes/SUMOPolygon.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/shapes/SUMOPolygon.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2004-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -28,7 +28,6 @@
 
 #include "SUMOPolygon.h"
 
-
 // ===========================================================================
 // member definitions
 // ===========================================================================
@@ -54,6 +53,12 @@
 }
 
 
+const std::vector&
+SUMOPolygon::getHoles() const {
+    return myHoles;
+}
+
+
 bool
 SUMOPolygon::getFill() const {
     return myFill;
@@ -83,6 +88,11 @@
     myShape = shape;
 }
 
+void
+SUMOPolygon::setHoles(const std::vector& holes) {
+    myHoles = holes;
+}
+
 
 void
 SUMOPolygon::writeXML(OutputDevice& out, bool geo) const {
diff -Nru sumo-1.17.0/src/utils/shapes/SUMOPolygon.h sumo-1.18.0/src/utils/shapes/SUMOPolygon.h
--- sumo-1.17.0/src/utils/shapes/SUMOPolygon.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/shapes/SUMOPolygon.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2004-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -77,11 +77,16 @@
     /// @name Getter
     /// @{
 
-    /** @brief Returns whether the shape of the polygon
+    /** @brief Returns the shape of the polygon
      * @return The shape of the polygon
      */
     const PositionVector& getShape() const;
 
+    /** @brief Returns the holers of the polygon
+     * @return The holes of the polygon
+     */
+    const std::vector& getHoles() const;
+
     /** @brief Returns whether the polygon is filled
      * @return Whether the polygon is filled
      */
@@ -109,6 +114,11 @@
      */
     virtual void setShape(const PositionVector& shape);
 
+    /** @brief Sets the holes of the polygon
+     * @param[in] holes  The new holes of the polygon
+     */
+    virtual void setHoles(const std::vector& holes);
+
     /// @}
 
     /* @brief polygon definition to the given device
@@ -116,10 +126,18 @@
      */
     void writeXML(OutputDevice& out, bool geo = false) const;
 
+    /// @brief Return the exterior shape of the polygon.
+    PositionVector& getShapeRef() {
+        return myShape;
+    }
+
 protected:
     /// @brief The positions of the polygon
     PositionVector myShape;
 
+    /// @brief The collection of the holes of the polygon, each given by a sequence of coodinates.
+    std::vector myHoles;
+
     /// @brief specify if shape is handled as GEO coordinate (Main used in netedit)
     bool myGEO;
 
diff -Nru sumo-1.17.0/src/utils/threadpool/TaskQueue.h sumo-1.18.0/src/utils/threadpool/TaskQueue.h
--- sumo-1.17.0/src/utils/threadpool/TaskQueue.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/threadpool/TaskQueue.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2020-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/threadpool/WorkStealingThreadPool.h sumo-1.18.0/src/utils/threadpool/WorkStealingThreadPool.h
--- sumo-1.17.0/src/utils/threadpool/WorkStealingThreadPool.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/threadpool/WorkStealingThreadPool.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2020-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/traci/TraCIAPI.cpp sumo-1.18.0/src/utils/traci/TraCIAPI.cpp
--- sumo-1.17.0/src/utils/traci/TraCIAPI.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/traci/TraCIAPI.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/traci/TraCIAPI.h sumo-1.18.0/src/utils/traci/TraCIAPI.h
--- sumo-1.17.0/src/utils/traci/TraCIAPI.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/traci/TraCIAPI.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/traction_wire/Circuit.cpp sumo-1.18.0/src/utils/traction_wire/Circuit.cpp
--- sumo-1.17.0/src/utils/traction_wire/Circuit.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/traction_wire/Circuit.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/traction_wire/Circuit.h sumo-1.18.0/src/utils/traction_wire/Circuit.h
--- sumo-1.17.0/src/utils/traction_wire/Circuit.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/traction_wire/Circuit.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/traction_wire/Element.cpp sumo-1.18.0/src/utils/traction_wire/Element.cpp
--- sumo-1.17.0/src/utils/traction_wire/Element.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/traction_wire/Element.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/traction_wire/Element.h sumo-1.18.0/src/utils/traction_wire/Element.h
--- sumo-1.17.0/src/utils/traction_wire/Element.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/traction_wire/Element.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/traction_wire/Node.cpp sumo-1.18.0/src/utils/traction_wire/Node.cpp
--- sumo-1.17.0/src/utils/traction_wire/Node.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/traction_wire/Node.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/traction_wire/Node.h sumo-1.18.0/src/utils/traction_wire/Node.h
--- sumo-1.17.0/src/utils/traction_wire/Node.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/traction_wire/Node.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/vehicle/SUMORouteHandler.cpp sumo-1.18.0/src/utils/vehicle/SUMORouteHandler.cpp
--- sumo-1.17.0/src/utils/vehicle/SUMORouteHandler.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/vehicle/SUMORouteHandler.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -39,6 +39,7 @@
     SUMOSAXHandler(file, expectedRoot),
     myHardFail(hardFail),
     myVehicleParameter(nullptr),
+    myCurrentStop(nullptr),
     myLastDepart(-1),
     myActiveRouteColor(nullptr),
     myCurrentCosts(0.),
@@ -175,7 +176,7 @@
             openRouteDistribution(attrs);
             break;
         case SUMO_TAG_STOP:
-            addStop(attrs);
+            myCurrentStop = addStop(attrs);
             break;
         case SUMO_TAG_TRIP: {
             // delete if myVehicleParameter isn't null
@@ -238,6 +239,9 @@
 void
 SUMORouteHandler::myEndElement(int element) {
     switch (element) {
+        case SUMO_TAG_STOP:
+            myCurrentStop = nullptr;
+            break;
         case SUMO_TAG_ROUTE:
             closeRoute();
             break;
@@ -379,7 +383,9 @@
         // circumventing empty string test
         const std::string val = attrs.hasAttribute(SUMO_ATTR_VALUE) ? attrs.getString(SUMO_ATTR_VALUE) : "";
         // add parameter in current created element, or in myLoadedParameterised
-        if (myVehicleParameter != nullptr) {
+        if (myCurrentStop != nullptr) {
+            myCurrentStop->setParameter(key, val);
+        } else if (myVehicleParameter != nullptr) {
             myVehicleParameter->setParameter(key, val);
         } else if (myCurrentVType != nullptr) {
             myCurrentVType->setParameter(key, val);
diff -Nru sumo-1.17.0/src/utils/vehicle/SUMORouteHandler.h sumo-1.18.0/src/utils/vehicle/SUMORouteHandler.h
--- sumo-1.17.0/src/utils/vehicle/SUMORouteHandler.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/vehicle/SUMORouteHandler.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -165,7 +165,7 @@
     //@{
 
     /// @brief Processing of a stop
-    virtual void addStop(const SUMOSAXAttributes& attrs) = 0;
+    virtual Parameterised* addStop(const SUMOSAXAttributes& attrs) = 0;
 
     /// @brief add a routing request for a walking or intermodal person
     virtual void addPersonTrip(const SUMOSAXAttributes& attrs) = 0;
@@ -209,6 +209,9 @@
     /// @brief Parameter of the current vehicle, trip, person, container or flow
     SUMOVehicleParameter* myVehicleParameter;
 
+    /// @brief The currently parsed vehicle stop
+    Parameterised* myCurrentStop;
+
     /// @brief The insertion time of the vehicle read last
     SUMOTime myLastDepart;
 
diff -Nru sumo-1.17.0/src/utils/vehicle/SUMORouteLoaderControl.cpp sumo-1.18.0/src/utils/vehicle/SUMORouteLoaderControl.cpp
--- sumo-1.17.0/src/utils/vehicle/SUMORouteLoaderControl.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/vehicle/SUMORouteLoaderControl.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2002-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/vehicle/SUMORouteLoaderControl.h sumo-1.18.0/src/utils/vehicle/SUMORouteLoaderControl.h
--- sumo-1.17.0/src/utils/vehicle/SUMORouteLoaderControl.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/vehicle/SUMORouteLoaderControl.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2002-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/vehicle/SUMORouteLoader.cpp sumo-1.18.0/src/utils/vehicle/SUMORouteLoader.cpp
--- sumo-1.17.0/src/utils/vehicle/SUMORouteLoader.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/vehicle/SUMORouteLoader.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2002-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/vehicle/SUMORouteLoader.h sumo-1.18.0/src/utils/vehicle/SUMORouteLoader.h
--- sumo-1.17.0/src/utils/vehicle/SUMORouteLoader.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/vehicle/SUMORouteLoader.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2002-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/vehicle/SUMOTrafficObject.h sumo-1.18.0/src/utils/vehicle/SUMOTrafficObject.h
--- sumo-1.17.0/src/utils/vehicle/SUMOTrafficObject.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/vehicle/SUMOTrafficObject.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/vehicle/SUMOVehicle.h sumo-1.18.0/src/utils/vehicle/SUMOVehicle.h
--- sumo-1.17.0/src/utils/vehicle/SUMOVehicle.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/vehicle/SUMOVehicle.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/vehicle/SUMOVehicleParameter.cpp sumo-1.18.0/src/utils/vehicle/SUMOVehicleParameter.cpp
--- sumo-1.17.0/src/utils/vehicle/SUMOVehicleParameter.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/vehicle/SUMOVehicleParameter.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -307,6 +307,8 @@
         dev.writeAttr(SUMO_ATTR_ACTTYPE, actType);
     }
     if (close) {
+        // the user is closing the stop it is responsible for writing params
+        writeParams(dev);
         dev.closeTag();
     }
 }
diff -Nru sumo-1.17.0/src/utils/vehicle/SUMOVehicleParameter.h sumo-1.18.0/src/utils/vehicle/SUMOVehicleParameter.h
--- sumo-1.17.0/src/utils/vehicle/SUMOVehicleParameter.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/vehicle/SUMOVehicleParameter.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -70,6 +70,7 @@
 const int VEHPARS_ARRIVALEDGE_SET = 2 << 26;
 const int VEHPARS_CALIBRATORSPEED_SET = 2 << 27;
 const int VEHPARS_JUNCTIONMODEL_PARAMS_SET = 2 << 28;
+const int VEHPARS_CFMODEL_PARAMS_SET = 2 << 29;
 
 const int STOP_INDEX_END = -1;
 const int STOP_INDEX_FIT = -2;
diff -Nru sumo-1.17.0/src/utils/vehicle/SUMOVehicleParserHelper.cpp sumo-1.18.0/src/utils/vehicle/SUMOVehicleParserHelper.cpp
--- sumo-1.17.0/src/utils/vehicle/SUMOVehicleParserHelper.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/vehicle/SUMOVehicleParserHelper.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2008-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -45,7 +45,6 @@
 
 SUMOVehicleParserHelper::CFAttrMap SUMOVehicleParserHelper::allowedCFModelAttrs;
 SUMOVehicleParserHelper::LCAttrMap SUMOVehicleParserHelper::allowedLCModelAttrs;
-std::set SUMOVehicleParserHelper::allowedJMAttrs;
 
 
 // ===========================================================================
@@ -1560,21 +1559,7 @@
 
 bool
 SUMOVehicleParserHelper::parseJMParams(SUMOVTypeParameter* into, const SUMOSAXAttributes& attrs) {
-    if (allowedJMAttrs.size() == 0) {
-        // init static set (there is only one model)
-        allowedJMAttrs.insert(SUMO_ATTR_JM_CROSSING_GAP);
-        allowedJMAttrs.insert(SUMO_ATTR_JM_DRIVE_AFTER_YELLOW_TIME);
-        allowedJMAttrs.insert(SUMO_ATTR_JM_DRIVE_AFTER_RED_TIME);
-        allowedJMAttrs.insert(SUMO_ATTR_JM_DRIVE_RED_SPEED);
-        allowedJMAttrs.insert(SUMO_ATTR_JM_IGNORE_KEEPCLEAR_TIME);
-        allowedJMAttrs.insert(SUMO_ATTR_JM_IGNORE_FOE_SPEED);
-        allowedJMAttrs.insert(SUMO_ATTR_JM_IGNORE_FOE_PROB);
-        allowedJMAttrs.insert(SUMO_ATTR_JM_IGNORE_JUNCTION_FOE_PROB);
-        allowedJMAttrs.insert(SUMO_ATTR_JM_SIGMA_MINOR);
-        allowedJMAttrs.insert(SUMO_ATTR_JM_STOPLINE_GAP);
-        allowedJMAttrs.insert(SUMO_ATTR_JM_TIMEGAP_MINOR);
-    }
-    for (const auto& it : allowedJMAttrs) {
+    for (const auto& it : SUMOVTypeParameter::AllowedJMAttrs) {
         if (attrs.hasAttribute(it)) {
             // first obtain  CFM attribute in string format
             bool ok = true;
diff -Nru sumo-1.17.0/src/utils/vehicle/SUMOVehicleParserHelper.h sumo-1.18.0/src/utils/vehicle/SUMOVehicleParserHelper.h
--- sumo-1.17.0/src/utils/vehicle/SUMOVehicleParserHelper.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/vehicle/SUMOVehicleParserHelper.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2008-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -203,6 +203,4 @@
     /// @brief allowed attrs for each known LC-model
     static LCAttrMap allowedLCModelAttrs;
 
-    /// @brief allowed attrs for the junction model
-    static std::set allowedJMAttrs;
 };
diff -Nru sumo-1.17.0/src/utils/vehicle/SUMOVTypeParameter.cpp sumo-1.18.0/src/utils/vehicle/SUMOVTypeParameter.cpp
--- sumo-1.17.0/src/utils/vehicle/SUMOVTypeParameter.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/vehicle/SUMOVTypeParameter.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -35,6 +35,24 @@
 #define TTT_UNSET SUMOTime_MIN
 
 // ===========================================================================
+// static value definitions
+// ===========================================================================
+std::set SUMOVTypeParameter::AllowedJMAttrs({
+    SUMO_ATTR_JM_CROSSING_GAP,
+    SUMO_ATTR_JM_DRIVE_AFTER_YELLOW_TIME,
+    SUMO_ATTR_JM_DRIVE_AFTER_RED_TIME,
+    SUMO_ATTR_JM_DRIVE_RED_SPEED,
+    SUMO_ATTR_JM_IGNORE_KEEPCLEAR_TIME,
+    SUMO_ATTR_JM_IGNORE_FOE_SPEED,
+    SUMO_ATTR_JM_IGNORE_FOE_PROB,
+    SUMO_ATTR_JM_IGNORE_JUNCTION_FOE_PROB,
+    SUMO_ATTR_JM_SIGMA_MINOR,
+    SUMO_ATTR_JM_STOPLINE_GAP,
+    SUMO_ATTR_JM_TIMEGAP_MINOR,
+});
+
+
+// ===========================================================================
 // member method definitions
 // ===========================================================================
 
@@ -72,7 +90,7 @@
             break;
         case SVC_BICYCLE:
             minGap = 0.5;
-            //minGapLat = 0.15;
+            minGapLat = 0.35;
             maxSpeed = 50. / 3.6;
             desiredMaxSpeed = DEFAULT_BICYCLE_SPEED;
             width = 0.65;
diff -Nru sumo-1.17.0/src/utils/vehicle/SUMOVTypeParameter.h sumo-1.18.0/src/utils/vehicle/SUMOVTypeParameter.h
--- sumo-1.17.0/src/utils/vehicle/SUMOVTypeParameter.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/vehicle/SUMOVTypeParameter.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -391,6 +391,9 @@
     /// @brief cached value of parameters which may restrict access to certain edges
     std::vector paramRestrictions;
 
+    /// @brief allowed attrs for the junction model
+    static std::set AllowedJMAttrs;
+
     /// @brief satisfy vType / router template requirements
     inline double getLength() const {
         return length;
diff -Nru sumo-1.17.0/src/utils/xml/CommonXMLStructure.cpp sumo-1.18.0/src/utils/xml/CommonXMLStructure.cpp
--- sumo-1.17.0/src/utils/xml/CommonXMLStructure.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/xml/CommonXMLStructure.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/xml/CommonXMLStructure.h sumo-1.18.0/src/utils/xml/CommonXMLStructure.h
--- sumo-1.17.0/src/utils/xml/CommonXMLStructure.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/xml/CommonXMLStructure.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/xml/GenericHandler.cpp sumo-1.18.0/src/utils/xml/GenericHandler.cpp
--- sumo-1.17.0/src/utils/xml/GenericHandler.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/xml/GenericHandler.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2002-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/xml/GenericHandler.h sumo-1.18.0/src/utils/xml/GenericHandler.h
--- sumo-1.17.0/src/utils/xml/GenericHandler.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/xml/GenericHandler.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2002-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/xml/GenericSAXHandler.cpp sumo-1.18.0/src/utils/xml/GenericSAXHandler.cpp
--- sumo-1.17.0/src/utils/xml/GenericSAXHandler.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/xml/GenericSAXHandler.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2002-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/xml/GenericSAXHandler.h sumo-1.18.0/src/utils/xml/GenericSAXHandler.h
--- sumo-1.17.0/src/utils/xml/GenericSAXHandler.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/xml/GenericSAXHandler.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2002-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/xml/IStreamInputSource.h sumo-1.18.0/src/utils/xml/IStreamInputSource.h
--- sumo-1.17.0/src/utils/xml/IStreamInputSource.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/xml/IStreamInputSource.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2002-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/xml/SAXWeightsHandler.cpp sumo-1.18.0/src/utils/xml/SAXWeightsHandler.cpp
--- sumo-1.17.0/src/utils/xml/SAXWeightsHandler.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/xml/SAXWeightsHandler.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2007-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/xml/SAXWeightsHandler.h sumo-1.18.0/src/utils/xml/SAXWeightsHandler.h
--- sumo-1.17.0/src/utils/xml/SAXWeightsHandler.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/xml/SAXWeightsHandler.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2007-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/xml/SUMOSAXAttributes.cpp sumo-1.18.0/src/utils/xml/SUMOSAXAttributes.cpp
--- sumo-1.17.0/src/utils/xml/SUMOSAXAttributes.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/xml/SUMOSAXAttributes.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2007-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/xml/SUMOSAXAttributes.h sumo-1.18.0/src/utils/xml/SUMOSAXAttributes.h
--- sumo-1.17.0/src/utils/xml/SUMOSAXAttributes.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/xml/SUMOSAXAttributes.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2007-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/xml/SUMOSAXAttributesImpl_Cached.cpp sumo-1.18.0/src/utils/xml/SUMOSAXAttributesImpl_Cached.cpp
--- sumo-1.17.0/src/utils/xml/SUMOSAXAttributesImpl_Cached.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/xml/SUMOSAXAttributesImpl_Cached.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2002-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/xml/SUMOSAXAttributesImpl_Cached.h sumo-1.18.0/src/utils/xml/SUMOSAXAttributesImpl_Cached.h
--- sumo-1.17.0/src/utils/xml/SUMOSAXAttributesImpl_Cached.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/xml/SUMOSAXAttributesImpl_Cached.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2007-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/xml/SUMOSAXAttributesImpl_Xerces.cpp sumo-1.18.0/src/utils/xml/SUMOSAXAttributesImpl_Xerces.cpp
--- sumo-1.17.0/src/utils/xml/SUMOSAXAttributesImpl_Xerces.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/xml/SUMOSAXAttributesImpl_Xerces.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2002-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/xml/SUMOSAXAttributesImpl_Xerces.h sumo-1.18.0/src/utils/xml/SUMOSAXAttributesImpl_Xerces.h
--- sumo-1.17.0/src/utils/xml/SUMOSAXAttributesImpl_Xerces.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/xml/SUMOSAXAttributesImpl_Xerces.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2007-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/xml/SUMOSAXHandler.cpp sumo-1.18.0/src/utils/xml/SUMOSAXHandler.cpp
--- sumo-1.17.0/src/utils/xml/SUMOSAXHandler.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/xml/SUMOSAXHandler.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2002-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/xml/SUMOSAXHandler.h sumo-1.18.0/src/utils/xml/SUMOSAXHandler.h
--- sumo-1.17.0/src/utils/xml/SUMOSAXHandler.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/xml/SUMOSAXHandler.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2002-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/xml/SUMOSAXReader.cpp sumo-1.18.0/src/utils/xml/SUMOSAXReader.cpp
--- sumo-1.17.0/src/utils/xml/SUMOSAXReader.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/xml/SUMOSAXReader.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/xml/SUMOSAXReader.h sumo-1.18.0/src/utils/xml/SUMOSAXReader.h
--- sumo-1.17.0/src/utils/xml/SUMOSAXReader.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/xml/SUMOSAXReader.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/xml/SUMOXMLDefinitions.cpp sumo-1.18.0/src/utils/xml/SUMOXMLDefinitions.cpp
--- sumo-1.17.0/src/utils/xml/SUMOXMLDefinitions.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/xml/SUMOXMLDefinitions.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2002-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -89,10 +89,12 @@
     { "routes",                         SUMO_TAG_ROUTES },
     { "trip",                           SUMO_TAG_TRIP },
     { "tripJunctions",                  GNE_TAG_TRIP_JUNCTIONS },
+    { "tripTAZs",                       GNE_TAG_TRIP_TAZS },
     { "vehicle",                        SUMO_TAG_VEHICLE },
     { "vehicleWithRoute",               GNE_TAG_VEHICLE_WITHROUTE },
     { "flow",                           SUMO_TAG_FLOW },
     { "flowJunctions",                  GNE_TAG_FLOW_JUNCTIONS },
+    { "flowTAZs",                       GNE_TAG_FLOW_TAZS },
     { "flowState",                      SUMO_TAG_FLOWSTATE },
     { "vType",                          SUMO_TAG_VTYPE },
     { "route",                          SUMO_TAG_ROUTE },
@@ -108,7 +110,6 @@
     { "condition",                      SUMO_TAG_CONDITION },
     { "assignment",                     SUMO_TAG_ASSIGNMENT },
     { "function",                       SUMO_TAG_FUNCTION },
-    { "tripTAZ",                        SUMO_TAG_TRIP_TAZ },
     { "edgeControl",                    SUMO_TAG_EDGECONTROL },
 
     { "edgeRelation",                   SUMO_TAG_EDGEREL },
@@ -124,11 +125,12 @@
     { "segment",                        SUMO_TAG_SEGMENT },
     { "delete",                         SUMO_TAG_DEL },
     { "stop",                           SUMO_TAG_STOP },
-    { "stopBusStop",                    SUMO_TAG_STOP_BUSSTOP },
-    { "stopContainerStop",              SUMO_TAG_STOP_CONTAINERSTOP },
-    { "stopChargingStation",            SUMO_TAG_STOP_CHARGINGSTATION },
-    { "stopParkingArea",                SUMO_TAG_STOP_PARKINGAREA },
-    { "stopLane",                       SUMO_TAG_STOP_LANE },
+    { "stopBusStop",                    GNE_TAG_STOP_BUSSTOP },
+    { "stopTrainStop",                  GNE_TAG_STOP_TRAINSTOP },
+    { "stopContainerStop",              GNE_TAG_STOP_CONTAINERSTOP },
+    { "stopChargingStation",            GNE_TAG_STOP_CHARGINGSTATION },
+    { "stopParkingArea",                GNE_TAG_STOP_PARKINGAREA },
+    { "stopLane",                       GNE_TAG_STOP_LANE },
     { "polygonType",                    SUMO_TAG_POLYTYPE },
     { "connection",                     SUMO_TAG_CONNECTION },
     { "conflict",                       SUMO_TAG_CONFLICT },
@@ -265,31 +267,36 @@
     { "waypoint",                       GNE_TAG_WAYPOINT },
     { "waypointLane",                   GNE_TAG_WAYPOINT_LANE },
     { "waypointBusStop",                GNE_TAG_WAYPOINT_BUSSTOP },
+    { "waypointTrainStop",              GNE_TAG_WAYPOINT_TRAINSTOP },
     { "waypointContainerStop",          GNE_TAG_WAYPOINT_CONTAINERSTOP },
     { "waypointChargingStation",        GNE_TAG_WAYPOINT_CHARGINGSTATION },
     { "waypointParkingArea",            GNE_TAG_WAYPOINT_PARKINGAREA },
     // GNE Person trips
-    { "personTrip: edge->edge",         GNE_TAG_PERSONTRIP_EDGE },
-    { "personTrip: edge->busStop",      GNE_TAG_PERSONTRIP_BUSSTOP },
+    { "personTrip: edge",         GNE_TAG_PERSONTRIP_EDGE },
+    { "personTrip: busStop",      GNE_TAG_PERSONTRIP_BUSSTOP },
+    { "personTrip: trainStop",    GNE_TAG_PERSONTRIP_TRAINSTOP },
     { "personTrip: junctions",          GNE_TAG_PERSONTRIP_JUNCTIONS },
     // GNE Walks
-    { "walk: edge->edge",               GNE_TAG_WALK_EDGE },
-    { "walk: edge->busStop",            GNE_TAG_WALK_BUSSTOP },
+    { "walk: edge",               GNE_TAG_WALK_EDGE },
+    { "walk: busStop",            GNE_TAG_WALK_BUSSTOP },
+    { "walk: trainStop",            GNE_TAG_WALK_TRAINSTOP },
     { "walk: edges",                    GNE_TAG_WALK_EDGES },
     { "walk: route",                    GNE_TAG_WALK_ROUTE },
     { "walk: junctions",                GNE_TAG_WALK_JUNCTIONS },
     // GNE Rides
-    { "ride: edge->edge",               GNE_TAG_RIDE_EDGE },
-    { "ride: edge->busStop",            GNE_TAG_RIDE_BUSSTOP },
+    { "ride: edge",               GNE_TAG_RIDE_EDGE },
+    { "ride: busStop",            GNE_TAG_RIDE_BUSSTOP },
+    { "ride: trainStop",          GNE_TAG_RIDE_TRAINSTOP },
     // GNE Person Stops
     { "stopPerson: busStop",            GNE_TAG_STOPPERSON_BUSSTOP },
+    { "stopPerson: trainStop",          GNE_TAG_STOPPERSON_TRAINSTOP },
     { "stopPerson: edge",               GNE_TAG_STOPPERSON_EDGE },
     // GNE Transports
-    { "transport: edge->edge",          GNE_TAG_TRANSPORT_EDGE },
-    { "transport: edge->containerStop", GNE_TAG_TRANSPORT_CONTAINERSTOP },
+    { "transport: edge",          GNE_TAG_TRANSPORT_EDGE },
+    { "transport: containerStop", GNE_TAG_TRANSPORT_CONTAINERSTOP },
     // GNE Tranships
-    { "tranship: edge->edge",           GNE_TAG_TRANSHIP_EDGE },
-    { "tranship: edge->containerStop",  GNE_TAG_TRANSHIP_CONTAINERSTOP },
+    { "tranship: edge",           GNE_TAG_TRANSHIP_EDGE },
+    { "tranship: containerStop",  GNE_TAG_TRANSHIP_CONTAINERSTOP },
     { "tranship: edges",                GNE_TAG_TRANSHIP_EDGES },
     // GNE Container Stops
     { "stopContainer: containerStop",   GNE_TAG_STOPCONTAINER_CONTAINERSTOP },
@@ -621,8 +628,10 @@
     { "jmSigmaMinor",           SUMO_ATTR_JM_SIGMA_MINOR },
     { "jmStoplineGap",          SUMO_ATTR_JM_STOPLINE_GAP },
     { "jmTimegapMinor",         SUMO_ATTR_JM_TIMEGAP_MINOR },
-    { "junctionModel.ignoreIDs", SUMO_ATTR_JM_IGNORE_IDS },
-    { "junctionModel.ignoreTypes", SUMO_ATTR_JM_IGNORE_TYPES },
+    { "junctionModel.ignoreIDs",    SUMO_ATTR_JM_IGNORE_IDS },
+    { "junctionModel.ignoreTypes",  SUMO_ATTR_JM_IGNORE_TYPES },
+    { "carFollowModel.ignoreIDs",   SUMO_ATTR_CF_IGNORE_IDS },
+    { "carFollowModel.ignoreTypes", SUMO_ATTR_CF_IGNORE_TYPES },
 
     { "last",                   SUMO_ATTR_LAST },
     { "cost",                   SUMO_ATTR_COST },
@@ -742,6 +751,7 @@
     { "show",                   SUMO_ATTR_SHOW_DETECTOR },
     // E3 detector
     { "openEntry",              SUMO_ATTR_OPEN_ENTRY },
+    { "expectArrival",          SUMO_ATTR_EXPECT_ARRIVAL },
 
     { "wautID",                 SUMO_ATTR_WAUT_ID },
     { "junctionID",             SUMO_ATTR_JUNCTION_ID },
@@ -961,15 +971,18 @@
     { "defaultVTypeModified",               GNE_ATTR_DEFAULT_VTYPE_MODIFIED },
     { "centerAfterCreation",                GNE_ATTR_CENTER_AFTER_CREATION },
     { "toBusStop",                          GNE_ATTR_TO_BUSSTOP },
+    { "toTrainStop",                        GNE_ATTR_TO_TRAINSTOP },
     { "toContainerStop",                    GNE_ATTR_TO_CONTAINERSTOP },
     { "opposite",                           GNE_ATTR_OPPOSITE },
     { "shiftLaneIndex",                     GNE_ATTR_SHIFTLANEINDEX },
     { "stopOffset",                         GNE_ATTR_STOPOFFSET },
     { "stopOException",                     GNE_ATTR_STOPOEXCEPTION },
-    { "VTypeDist.",                         GNE_ATTR_VTYPE_DISTRIBUTION },
+    { "typeDist.",                          GNE_ATTR_VTYPE_DISTRIBUTION },
+    { "typeDistProb.",                      GNE_ATTR_VTYPE_DISTRIBUTION_PROBABILITY },
     { "poisson",                            GNE_ATTR_POISSON },
     { "stopIndex",                          GNE_ATTR_STOPINDEX },
     { "pathStopIndex",                      GNE_ATTR_PATHSTOPINDEX },
+    { "additionalChildren",                 GNE_ATTR_ADDITIONALCHILDREN },
 
     { "carriageLength",     SUMO_ATTR_CARRIAGE_LENGTH },
     { "locomotiveLength",   SUMO_ATTR_LOCOMOTIVE_LENGTH },
@@ -1301,30 +1314,30 @@
 
 bool
 SUMOXMLDefinitions::isValidNetID(const std::string& value) {
-    return (value.size() > 0) && value.find_first_of(" \t\n\r|\\'\";,!<>&*?") == std::string::npos && value[0] != ':';
+    return (value.size() > 0) && value.find_first_of(" \t\n\r|\\'\";,<>&") == std::string::npos && value[0] != ':';
 }
 
 
 bool
 SUMOXMLDefinitions::isValidVehicleID(const std::string& value) {
-    return (value.size() > 0) && value.find_first_of(" \t\n\r|\\'\";,!<>&*?") == std::string::npos;
+    return (value.size() > 0) && value.find_first_of(" \t\n\r|\\'\";,<>&") == std::string::npos;
 }
 
 
 bool
 SUMOXMLDefinitions::isValidTypeID(const std::string& value) {
-    return (value.size() > 0) && value.find_first_of(" \t\n\r|\\'\";,<>&*?") == std::string::npos;
+    return (value.size() > 0) && value.find_first_of(" \t\n\r|\\'\";,<>&") == std::string::npos;
 }
 
 bool
 SUMOXMLDefinitions::isValidAdditionalID(const std::string& value) {
-    return (value.size() > 0) && value.find_first_of(" \t\n\r|\\'\";,!<>&*?") == std::string::npos;
+    return (value.size() > 0) && value.find_first_of(" \t\n\r|\\'\";,<>&") == std::string::npos;
 }
 
 bool
 SUMOXMLDefinitions::isValidDetectorID(const std::string& value) {
     // special case: ' ' allowed
-    return (value.size() > 0) && value.find_first_of("\t\n\r|\\'\";,!<>&*?") == std::string::npos;
+    return (value.size() > 0) && value.find_first_of("\t\n\r|\\'\";,<>&") == std::string::npos;
 }
 
 bool
diff -Nru sumo-1.17.0/src/utils/xml/SUMOXMLDefinitions.h sumo-1.18.0/src/utils/xml/SUMOXMLDefinitions.h
--- sumo-1.17.0/src/utils/xml/SUMOXMLDefinitions.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/xml/SUMOXMLDefinitions.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2002-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -143,23 +143,27 @@
     SUMO_TAG_ROUTES,
     /// @brief a single trip definition (used by router)
     SUMO_TAG_TRIP,
-    /// @brief a trip between junctions (used in netedit)
+    /// @brief a trip between junctions
     GNE_TAG_TRIP_JUNCTIONS,
+    /// @brief a single trip definition that uses TAZs
+    GNE_TAG_TRIP_TAZS,
     /// @brief description of a vehicle
     SUMO_TAG_VEHICLE,
-    /// @brief description of a vehicle with an embedded route (used in netedit)
+    /// @brief description of a vehicle with an embedded route
     GNE_TAG_VEHICLE_WITHROUTE,
     /// @brief a flow definition using from and to edges or a route
     SUMO_TAG_FLOW,
-    /// @brief a flow between junctions (used in netedit)
+    /// @brief a flow between junctions
     GNE_TAG_FLOW_JUNCTIONS,
+    /// @brief a flow between TAZs
+    GNE_TAG_FLOW_TAZS,
     /// @brief a flow state definition (used when saving and loading simulatino state)
     SUMO_TAG_FLOWSTATE,
     /// @brief description of a vehicle/person/container type
     SUMO_TAG_VTYPE,
     /// @brief begin/end of the description of a route
     SUMO_TAG_ROUTE,
-    /// @brief embedded route (used in netedit)
+    /// @brief embedded route
     GNE_TAG_ROUTE_EMBEDDED,
     /// @brief description of a logic request within the junction
     SUMO_TAG_REQUEST,
@@ -183,8 +187,6 @@
     SUMO_TAG_ASSIGNMENT,
     /// @brief a sequence of assignments evaluated in the context of passed arguments
     SUMO_TAG_FUNCTION,
-    /// @brief a single trip definition that uses TAZs (used in netedit)
-    SUMO_TAG_TRIP_TAZ,
     /// @brief the internal state for edge control
     SUMO_TAG_EDGECONTROL,
     /// @brief a relation between two edges
@@ -210,16 +212,18 @@
     SUMO_TAG_DEL,
     /// @brief stop for vehicles
     SUMO_TAG_STOP,
-    /// @brief stop placed over a lane (used in netedit)
-    SUMO_TAG_STOP_LANE,
-    /// @brief stop placed over a busStop (used in netedit)
-    SUMO_TAG_STOP_BUSSTOP,
-    /// @brief stop placed over a containerStop (used in netedit)
-    SUMO_TAG_STOP_CONTAINERSTOP,
-    /// @brief stop placed over a charging station (used in netedit)
-    SUMO_TAG_STOP_CHARGINGSTATION,
-    /// @brief stop placed over a parking area (used in netedit)
-    SUMO_TAG_STOP_PARKINGAREA,
+    /// @brief stop placed over a lane
+    GNE_TAG_STOP_LANE,
+    /// @brief stop placed over a busStop
+    GNE_TAG_STOP_BUSSTOP,
+    /// @brief stop placed over a trainStop
+    GNE_TAG_STOP_TRAINSTOP,
+    /// @brief stop placed over a containerStop
+    GNE_TAG_STOP_CONTAINERSTOP,
+    /// @brief stop placed over a charging station
+    GNE_TAG_STOP_CHARGINGSTATION,
+    /// @brief stop placed over a parking area
+    GNE_TAG_STOP_PARKINGAREA,
     /// @brief type of polygon
     SUMO_TAG_POLYTYPE,
     /// @brief connectioon between two lanes
@@ -421,37 +425,43 @@
     GNE_TAG_VSS_SYMBOL,
     /// @brief COF Symbol
     GNE_TAG_COF_SYMBOL,
-    /// @brief a flow definition using a route instead of a from-to edges route (used in netedit)
+    /// @brief a flow definition using a route instead of a from-to edges route
     GNE_TAG_FLOW_ROUTE,
-    /// @brief description of a vehicle with an embedded route (used in netedit)
+    /// @brief description of a vehicle with an embedded route
     GNE_TAG_FLOW_WITHROUTE,
-    // @brief person trips
-    GNE_TAG_PERSONTRIP_EDGE,
-    GNE_TAG_PERSONTRIP_BUSSTOP,
-    GNE_TAG_PERSONTRIP_JUNCTIONS,
-    /// @brief waypoint for vehicles (used in netedit)
+    /// @brief waypoint for vehicles
     GNE_TAG_WAYPOINT,
-    /// @brief waypoint placed over a lane (used in netedit)
+    /// @brief waypoint placed over a lane
     GNE_TAG_WAYPOINT_LANE,
-    /// @brief waypoint placed over a busStop (used in netedit)
+    /// @brief waypoint placed over a busStop
     GNE_TAG_WAYPOINT_BUSSTOP,
-    /// @brief waypoint placed over a containerStop (used in netedit)
+    /// @brief waypoint placed over a busStop
+    GNE_TAG_WAYPOINT_TRAINSTOP,
+    /// @brief waypoint placed over a containerStop
     GNE_TAG_WAYPOINT_CONTAINERSTOP,
-    /// @brief waypoint placed over a charging station (used in netedit)
+    /// @brief waypoint placed over a charging station
     GNE_TAG_WAYPOINT_CHARGINGSTATION,
-    /// @brief waypoint placed over a parking area (used in netedit)
+    /// @brief waypoint placed over a parking area
     GNE_TAG_WAYPOINT_PARKINGAREA,
+    // @brief person trips
+    GNE_TAG_PERSONTRIP_EDGE,
+    GNE_TAG_PERSONTRIP_BUSSTOP,
+    GNE_TAG_PERSONTRIP_TRAINSTOP,
+    GNE_TAG_PERSONTRIP_JUNCTIONS,
     // @brief walks
     GNE_TAG_WALK_EDGE,
     GNE_TAG_WALK_BUSSTOP,
+    GNE_TAG_WALK_TRAINSTOP,
     GNE_TAG_WALK_EDGES,
     GNE_TAG_WALK_ROUTE,
     GNE_TAG_WALK_JUNCTIONS,
     // @brief rides
     GNE_TAG_RIDE_EDGE,
     GNE_TAG_RIDE_BUSSTOP,
+    GNE_TAG_RIDE_TRAINSTOP,
     // @brief person stops
     GNE_TAG_STOPPERSON_BUSSTOP,
+    GNE_TAG_STOPPERSON_TRAINSTOP,
     GNE_TAG_STOPPERSON_EDGE,
     // @brief person trips
     GNE_TAG_TRANSPORT_EDGE,
@@ -928,6 +938,8 @@
     SUMO_ATTR_JM_TIMEGAP_MINOR,
     SUMO_ATTR_JM_IGNORE_IDS,
     SUMO_ATTR_JM_IGNORE_TYPES,
+    SUMO_ATTR_CF_IGNORE_IDS,
+    SUMO_ATTR_CF_IGNORE_TYPES,
     /// @}
 
     /// @name route alternatives / distribution attributes
@@ -1104,6 +1116,7 @@
     SUMO_ATTR_JAM_DIST_THRESHOLD,
     SUMO_ATTR_SHOW_DETECTOR,
     SUMO_ATTR_OPEN_ENTRY,
+    SUMO_ATTR_EXPECT_ARRIVAL,
     /// @}
 
     SUMO_ATTR_WAUT_ID,
@@ -1397,6 +1410,8 @@
     GNE_ATTR_CENTER_AFTER_CREATION,
     /// @brief to busStop (used by personPlans)
     GNE_ATTR_TO_BUSSTOP,
+    /// @brief to trainStop (used by personPlans)
+    GNE_ATTR_TO_TRAINSTOP,
     /// @brief to busStop (used by containerPlans)
     GNE_ATTR_TO_CONTAINERSTOP,
     /// @brief neighboring lane, simplified lane attr instead of child element
@@ -1409,12 +1424,16 @@
     GNE_ATTR_STOPOEXCEPTION,
     /// @brief vehicle type distribution
     GNE_ATTR_VTYPE_DISTRIBUTION,
+    /// @brief vehicle type distribution
+    GNE_ATTR_VTYPE_DISTRIBUTION_PROBABILITY,
     /// @brief poisson definition (used in flow)
     GNE_ATTR_POISSON,
     /// @brief stop index (position in the parent's children
     GNE_ATTR_STOPINDEX,
     /// @brief stop index (position in the parent's path)
     GNE_ATTR_PATHSTOPINDEX,
+    /// @brief check number of additional children (used in vTypeDistribution)
+    GNE_ATTR_ADDITIONALCHILDREN,
 
     // @}
 
diff -Nru sumo-1.17.0/src/utils/xml/XMLSubSys.cpp sumo-1.18.0/src/utils/xml/XMLSubSys.cpp
--- sumo-1.17.0/src/utils/xml/XMLSubSys.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/xml/XMLSubSys.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2002-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/src/utils/xml/XMLSubSys.h sumo-1.18.0/src/utils/xml/XMLSubSys.h
--- sumo-1.17.0/src/utils/xml/XMLSubSys.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/src/utils/xml/XMLSubSys.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2002-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/assign/bestIteration.py sumo-1.18.0/tools/assign/bestIteration.py
--- sumo-1.17.0/tools/assign/bestIteration.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/assign/bestIteration.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2008-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/assign/cadytsIterate.py sumo-1.18.0/tools/assign/cadytsIterate.py
--- sumo-1.17.0/tools/assign/cadytsIterate.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/assign/cadytsIterate.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2010-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/assign/costFunctionChecker.py sumo-1.18.0/tools/assign/costFunctionChecker.py
--- sumo-1.17.0/tools/assign/costFunctionChecker.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/assign/costFunctionChecker.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2009-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/assign/costMemory.py sumo-1.18.0/tools/assign/costMemory.py
--- sumo-1.17.0/tools/assign/costMemory.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/assign/costMemory.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/assign/duaIterate_analysis.py sumo-1.18.0/tools/assign/duaIterate_analysis.py
--- sumo-1.17.0/tools/assign/duaIterate_analysis.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/assign/duaIterate_analysis.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/assign/duaIterateMix.py sumo-1.18.0/tools/assign/duaIterateMix.py
--- sumo-1.17.0/tools/assign/duaIterateMix.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/assign/duaIterateMix.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2008-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/assign/duaIterate.py sumo-1.18.0/tools/assign/duaIterate.py
--- sumo-1.17.0/tools/assign/duaIterate.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/assign/duaIterate.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2008-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/assign/duaIterate_reroutingAnalysis.py sumo-1.18.0/tools/assign/duaIterate_reroutingAnalysis.py
--- sumo-1.17.0/tools/assign/duaIterate_reroutingAnalysis.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/assign/duaIterate_reroutingAnalysis.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/assign/one-shot.py sumo-1.18.0/tools/assign/one-shot.py
--- sumo-1.17.0/tools/assign/one-shot.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/assign/one-shot.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2008-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/averageTripStatistics.py sumo-1.18.0/tools/averageTripStatistics.py
--- sumo-1.17.0/tools/averageTripStatistics.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/averageTripStatistics.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2007-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/build/buildPyDoc.py sumo-1.18.0/tools/build/buildPyDoc.py
--- sumo-1.17.0/tools/build/buildPyDoc.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/build/buildPyDoc.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2011-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/build/build_wheels.sh sumo-1.18.0/tools/build/build_wheels.sh
--- sumo-1.17.0/tools/build/build_wheels.sh	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/build/build_wheels.sh	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2008-2022 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/build/checkAuthors.py sumo-1.18.0/tools/build/checkAuthors.py
--- sumo-1.17.0/tools/build/checkAuthors.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/build/checkAuthors.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2011-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/build/checkStyle.py sumo-1.18.0/tools/build/checkStyle.py
--- sumo-1.17.0/tools/build/checkStyle.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/build/checkStyle.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2010-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
@@ -63,7 +63,7 @@
 
 SEPARATOR = "/****************************************************************************/\n"
 EPL_HEADER = """/****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2019 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials
 // are made available under the terms of the Eclipse Public License v2.0
@@ -73,7 +73,7 @@
 /****************************************************************************/
 """
 EPL_GPL_HEADER = """/****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/build/dailyBuildMSVC.py sumo-1.18.0/tools/build/dailyBuildMSVC.py
--- sumo-1.17.0/tools/build/dailyBuildMSVC.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/build/dailyBuildMSVC.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2008-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/build/dailyNetedit.py sumo-1.18.0/tools/build/dailyNetedit.py
--- sumo-1.17.0/tools/build/dailyNetedit.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/build/dailyNetedit.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2008-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/build/dailyUpdateMakeGCC.sh sumo-1.18.0/tools/build/dailyUpdateMakeGCC.sh
--- sumo-1.17.0/tools/build/dailyUpdateMakeGCC.sh	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/build/dailyUpdateMakeGCC.sh	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2008-2022 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/build/filterDebugDLL.py sumo-1.18.0/tools/build/filterDebugDLL.py
--- sumo-1.17.0/tools/build/filterDebugDLL.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/build/filterDebugDLL.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2008-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/build/history.py sumo-1.18.0/tools/build/history.py
--- sumo-1.17.0/tools/build/history.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/build/history.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2011-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/build/i18n.py sumo-1.18.0/tools/build/i18n.py
--- sumo-1.17.0/tools/build/i18n.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/build/i18n.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2011-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
@@ -43,8 +43,10 @@
     return arg_parser.parse_args(args)
 
 
-def generate_po(sumo_home, path, languages, pot_file, gui_pot_file, fuzzy):
-    pots = {pot_file: open(pot_file + ".txt", "w"), gui_pot_file: open(gui_pot_file + ".txt", "w")}
+def generate_po(sumo_home, path, languages, pot_file, gui_pot_file, py_pot_file, fuzzy):
+    pots = {pot_file: open(pot_file + ".txt", "w"),
+            gui_pot_file: open(gui_pot_file + ".txt", "w"),
+            py_pot_file: open(py_pot_file + ".txt", "w")}
     for f in sorted(glob(sumo_home + "/src/*.cpp") +
                     glob(sumo_home + "/src/*/*.cpp") +
                     glob(sumo_home + "/src/*/*/*.cpp") +
@@ -52,16 +54,22 @@
                     glob(sumo_home + "/src/*.h") +
                     glob(sumo_home + "/src/*/*.h") +
                     glob(sumo_home + "/src/*/*/*.h") +
-                    glob(sumo_home + "/src/*/*/*/*.h")):
-        if "gui" in f[len(sumo_home):] or "netedit" in f[len(sumo_home):]:
+                    glob(sumo_home + "/src/*/*/*/*.h") +
+                    glob(sumo_home + "/tools/game/*.py")):
+        if f[-3:] == ".py":
+            print(f, file=pots[py_pot_file])
+        elif "gui" in f[len(sumo_home):] or "netedit" in f[len(sumo_home):]:
             print(f, file=pots[gui_pot_file])
         else:
             print(f, file=pots[pot_file])
     for pot, sources in pots.items():
         sources.close()
-        subprocess.check_call([path + "xgettext", "--files-from=" + sources.name, "--from-code=UTF-8",
-                               "--keyword=TL", "--keyword=TLC:1c,2", "--keyword=TLF", "--output=" + pot + ".new",
-                               "--package-name=sumo", "--msgid-bugs-address=sumo-dev@eclipse.org"])
+        arguments = [path + "xgettext", "--files-from=" + sources.name, "--from-code=UTF-8",
+                     "--keyword=TL", "--keyword=TLC:1c,2", "--keyword=TLF", "--output=" + pot + ".new",
+                     "--package-name=sumo", "--msgid-bugs-address=sumo-dev@eclipse.org"]
+        if pot == py_pot_file:
+            arguments.append("--language=Python")
+        subprocess.check_call(arguments)
         os.remove(sources.name)
         has_diff = True
         if os.path.exists(pot):
@@ -96,11 +104,12 @@
         options.lang = [os.path.basename(p)[:-8] for p in glob(options.sumo_home + "/data/po/*_sumo.po")]
     pot_file = options.sumo_home + "/data/po/sumo.pot"
     gui_pot_file = options.sumo_home + "/data/po/gui.pot"
+    py_pot_file = options.sumo_home + "/data/po/py.pot"
     if not options.mo_only:
-        generate_po(options.sumo_home, path, options.lang, pot_file, gui_pot_file, options.fuzzy)
+        generate_po(options.sumo_home, path, options.lang, pot_file, gui_pot_file, py_pot_file, options.fuzzy)
     for lang in options.lang:
         po_files = ["%s/data/po/%s_%s" % (options.sumo_home, lang, os.path.basename(pot)[:-1])
-                    for pot in (pot_file, gui_pot_file)]
+                    for pot in (pot_file, gui_pot_file, py_pot_file)]
         merged_po_file = "%s/data/po/%s.po" % (options.sumo_home, lang)
         subprocess.check_call([path + "msgcat"] + po_files + ["--output-file=" + merged_po_file])
         d = "%s/data/locale/%s/LC_MESSAGES" % (options.sumo_home, lang)
diff -Nru sumo-1.17.0/tools/build/pom.py sumo-1.18.0/tools/build/pom.py
--- sumo-1.17.0/tools/build/pom.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/build/pom.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2011-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/build/rebuildConfigDocsAndXsd.py sumo-1.18.0/tools/build/rebuildConfigDocsAndXsd.py
--- sumo-1.17.0/tools/build/rebuildConfigDocsAndXsd.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/build/rebuildConfigDocsAndXsd.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2008-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
@@ -11,7 +11,7 @@
 # https://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html
 # SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
 
-# @file    updateConfigDocsAndXsd.py
+# @file    rebuildConfigDocsAndXsd.py
 # @author  Michael Behrisch
 # @date    2012-01-26
 
@@ -91,11 +91,12 @@
     homeDir = os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
     if len(sys.argv) == 1:
         for app in ("activitygen", "dfrouter", "duarouter", "jtrrouter", "marouter",
-                    "od2trips", "polyconvert", "netgenerate", "netconvert", "sumo"):
+                    "od2trips", "polyconvert", "netgenerate", "netconvert",
+                    "sumo", "netedit"):
             cfg = subprocess.check_output([app, "--save-template", "stdout"], universal_newlines=True)
             docs = os.path.join(homeDir, "docs", "web", "docs", app + ".md")
             parseString(cfg, ConfigReader(open(docs).readlines(), docs))
-            subprocess.check_call([app, "--save-schema", 
+            subprocess.check_call([app, "--save-schema",
                                    os.path.join(homeDir, "data", "xsd", app + "Configuration.xsd")])
         subprocess.call(['netedit', '--attribute-help-output', os.path.join(homeDir,
                          "docs", "web", "docs", 'Netedit', 'attribute_help.md')])
diff -Nru sumo-1.17.0/tools/build/schemaCheck.py sumo-1.18.0/tools/build/schemaCheck.py
--- sumo-1.17.0/tools/build/schemaCheck.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/build/schemaCheck.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2009-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/build/setup-libsumo.py sumo-1.18.0/tools/build/setup-libsumo.py
--- sumo-1.17.0/tools/build/setup-libsumo.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/build/setup-libsumo.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/build/setup-libtraci.py sumo-1.18.0/tools/build/setup-libtraci.py
--- sumo-1.17.0/tools/build/setup-libtraci.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/build/setup-libtraci.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/build/setup-sumolib.py sumo-1.18.0/tools/build/setup-sumolib.py
--- sumo-1.17.0/tools/build/setup-sumolib.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/build/setup-sumolib.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
@@ -18,11 +18,9 @@
 
 
 from setuptools import setup, find_packages
-import os
 import version
 
 SUMO_VERSION = version.get_pep440_version()
-package_dir = os.path.abspath(os.path.join(os.path.dirname(__file__), '..'))
 
 setup(
     name='sumolib',
@@ -48,7 +46,8 @@
 
 ## Getting Started
 
-To use sumolib in your Python code, import the `sumolib` module. The following code snippet shows a basic example of how to load a network file and retrieve the coordinate of a node:
+To use sumolib in your Python code, import the `sumolib` module. The following code snippet shows a basic example
+of how to load a network file and retrieve the coordinate of a node:
 
 ```python
 import sumolib
@@ -62,12 +61,18 @@
 
 ## Documentation
 
-The sumolib documentation is available online at [https://sumo.dlr.de/docs/Tools/Sumolib.html](https://sumo.dlr.de/docs/Tools/Sumolib.html). For a list of available functions take a look at the [pydoc generated documentation](http://sumo.dlr.de/pydoc/sumolib.html) or simply browse the [source code here](https://github.com/eclipse/sumo/tree/main/tools/sumolib).
+The sumolib documentation is available online at
+[https://sumo.dlr.de/docs/Tools/Sumolib.html](https://sumo.dlr.de/docs/Tools/Sumolib.html). For a list of available
+functions take a look at the [pydoc generated documentation](http://sumo.dlr.de/pydoc/sumolib.html)
+or simply browse the [source code here](https://github.com/eclipse/sumo/tree/main/tools/sumolib).
 
 
 ## Contributing
 
-If you find a bug in sumolib or have a suggestion for a new feature, please report it on the SUMO issue tracker at [https://github.com/eclipse/sumo/issues](https://github.com/eclipse/sumo/issues). If you would like to contribute code to sumolib, please submit a pull request to the SUMO repository at [https://github.com/eclipse/sumo](https://github.com/eclipse/sumo).
+If you find a bug in sumolib or have a suggestion for a new feature, please report it on the SUMO issue tracker at
+[https://github.com/eclipse/sumo/issues](https://github.com/eclipse/sumo/issues). If you would like to contribute code
+to sumolib, please submit a pull request to the SUMO repository at
+[https://github.com/eclipse/sumo](https://github.com/eclipse/sumo).
 
 ## License
 
@@ -84,8 +89,7 @@
     ],
     keywords='traffic simulation traci sumo',
 
-    packages=find_packages(package_dir, include=["sumolib", "sumolib.*"]),
-    package_dir={'': package_dir},
+    packages=find_packages(include=["sumolib", "sumolib.*"]),
 
     # TODO: add extra dependencies for testing
     extras_require={
diff -Nru sumo-1.17.0/tools/build/setup-sumo.py sumo-1.18.0/tools/build/setup-sumo.py
--- sumo-1.17.0/tools/build/setup-sumo.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/build/setup-sumo.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2020-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/build/setup-traci.py sumo-1.18.0/tools/build/setup-traci.py
--- sumo-1.17.0/tools/build/setup-traci.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/build/setup-traci.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
@@ -18,11 +18,9 @@
 
 
 from setuptools import setup
-import os
 import version
 
 SUMO_VERSION = version.get_pep440_version()
-package_dir = os.path.abspath(os.path.join(os.path.dirname(__file__), '..'))
 
 setup(
     name='traci',
@@ -35,7 +33,9 @@
     description='The pure python version of the TraCI API to communicate with the traffic simulation Eclipse SUMO',
     long_description='''# TraCI - Traffic Control Interface
 
-TraCI (short for Traffic Control Interface) is an API that provides access to a SUMO traffic simulation, enabling controlling the behavior of multiple simulation objects during a live simulation. It allows for external scripts to interact with the simulation and its vehicles, pedestrians, and infrastructure.
+TraCI (short for Traffic Control Interface) is an API that provides access to a SUMO traffic simulation,
+enabling controlling the behavior of multiple simulation objects during a live simulation.
+It allows for external scripts to interact with the simulation and its vehicles, pedestrians, and infrastructure.
 
 ## Installation
 
@@ -47,7 +47,8 @@
 
 ## Getting Started
 
-To use TraCI in your Python code, import the `traci` module. The following code snippet shows a basic example of how to connect to a running SUMO simulation using TraCI:
+To use TraCI in your Python code, import the `traci` module. The following code snippet shows a basic example
+of how to connect to a running SUMO simulation using TraCI:
 
 ```python
 import traci
@@ -66,11 +67,15 @@
 traci.close()
 ```
 
-Once connected to the SUMO simulation, TraCI provides a range of functions that can be used to query and modify the state of the simulation. For example, you can use TraCI to control the behavior of individual vehicles, modify the traffic light phases, or query the current state of the simulation.
+Once connected to the SUMO simulation, TraCI provides a range of functions that can be used to query and modify
+the state of the simulation. For example, you can use TraCI to control the behavior of individual vehicles,
+modify the traffic light phases, or query the current state of the simulation.
 
 ## Documentation
 
-The TraCI documentation is available online at [http://sumo.dlr.de/docs/TraCI.html](http://sumo.dlr.de/docs/TraCI.html). The documentation provides detailed information on the TraCI API, including a list of available functions and their parameters.
+The TraCI documentation is available online at
+[http://sumo.dlr.de/docs/TraCI.html](http://sumo.dlr.de/docs/TraCI.html). The documentation provides detailed
+information on the TraCI API, including a list of available functions and their parameters.
 
 ## Examples
 
@@ -78,7 +83,10 @@
 
 ## Contributing
 
-If you find a bug in TraCI or have a suggestion for a new feature, please report it on the SUMO issue tracker at [https://github.com/eclipse/sumo/issues](https://github.com/eclipse/sumo/issues). If you would like to contribute code to TraCI, please submit a pull request to the SUMO repository at [https://github.com/eclipse/sumo](https://github.com/eclipse/sumo).
+If you find a bug in TraCI or have a suggestion for a new feature, please report it on the SUMO issue tracker at
+[https://github.com/eclipse/sumo/issues](https://github.com/eclipse/sumo/issues). If you would like to contribute
+code to TraCI, please submit a pull request to the SUMO repository at
+[https://github.com/eclipse/sumo](https://github.com/eclipse/sumo).
 
 ## License
 
@@ -96,7 +104,6 @@
     keywords='traffic simulation traci sumo',
 
     packages=["traci", "simpla"],
-    package_dir={'': package_dir},
 
     install_requires=['sumolib>='+SUMO_VERSION],
 )
diff -Nru sumo-1.17.0/tools/build/status.py sumo-1.18.0/tools/build/status.py
--- sumo-1.17.0/tools/build/status.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/build/status.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2008-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/build/sumo/__init__.py sumo-1.18.0/tools/build/sumo/__init__.py
--- sumo-1.17.0/tools/build/sumo/__init__.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/build/sumo/__init__.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2020-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/build/templates.py sumo-1.18.0/tools/build/templates.py
--- sumo-1.17.0/tools/build/templates.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/build/templates.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2015-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
@@ -88,15 +88,15 @@
 
     # net
     "net/abstractRail.py",
-    # "net/createRoundaboutConnections.py",   NO CONFIG
+    "net/createRoundaboutConnections.py",
     "net/net2geojson.py",
     "net/net2jpsgeometry.py",
     "net/net2kml.py",
     "net/net2poly.py",
-    # "net/netcheck.py",                      NO CONFIG
+    "net/netcheck.py",
     "net/netdiff.py",
     # "net/netduplicate.py",                  NO CONFIG
-    # "net/netmatch.py",                      NO CONFIG
+    "net/netmatch.py",
     "net/network_statistics.py",
     # "net/odConnectionsCheck.py",            NO CONFIG
     # "net/prepareVISUM.py",                  NO CONFIG
@@ -125,21 +125,20 @@
     "route/route2OD.py",
     # "route/route2poly.py",                  NO CONFIG
     # "route/route2sel.py",                   NO CONFIG
-    # "route/routecheck.py",                  NO CONFIG
-    # "route/routecompare.py",                NO CONFIG
+    "route/routecheck.py",
+    "route/routecompare.py",
     "route/routeStats.py",
     "route/scaleTimeLine.py",
-    # "route/sort_routes.py",                 NO CONFIG
-    # "route/splitRandom.py",                 NO CONFIG
-    # "route/splitRouteFiles.py",             NO CONFIG
-    # "route/tracegenerator.py",              NO CONFIG
+    "route/sort_routes.py",
+    "route/splitRandom.py",
+    "route/splitRouteFiles.py",
+    "route/tracegenerator.py",
     "route/tracemapper.py",
     # "route/vehicle2flow.py",                NO CONFIG
 
     # output
-    # "output/accelerations.py",                      NO CONFIG
-    # "output/aggregateBatteryOutput.py",             NO CONFIG
-    # "output/analyze_pedestrian_jam.py",             NO CONFIG
+    "output/aggregateBatteryOutput.py",
+    "output/analyze_pedestrian_jam.py",
     "output/analyze_teleports.py",
     "output/attributeStats.py",
     "output/attributeDiff.py",
@@ -176,7 +175,7 @@
     "output/walkFactor.py",
 
     # shapes
-    # "shapes/circlePolygon.py",      NO CONFIG
+    "shapes/circlePolygon.py",
     # "shapes/CSV2polyconvertXML.py", NO CONFIG
     # "shapes/poi_alongRoads.py",     NO CONFIG
     # "shapes/poi_at_stops.py",       NO CONFIG
@@ -184,7 +183,7 @@
 
     # tls
     # "tls/buildTransitions.py",      NO CONFIG
-    # "tls/createTlsCsv.py",          NO CONFIG
+    "tls/createTlsCsv.py",
     # "tls/tls_check.py",             NO CONFIG
     # "tls/tls_csv2SUMO.py",          NO CONFIG
     "tls/tls_csvSignalGroups.py",
@@ -204,19 +203,18 @@
     # "visualization/mpl_dump_timeline.py",           NO CONFIG
     # "visualization/mpl_dump_twoAgainst.py",         NO CONFIG
     # "visualization/mpl_tripinfos_twoAgainst.py",    NO CONFIG
-    # "visualization/plot_csv_bars.py",               NO CONFIG
-    # "visualization/plot_csv_pie.py",                NO CONFIG
-    # "visualization/plot_csv_timeline.py",           NO CONFIG
+    "visualization/plot_csv_bars.py",
+    "visualization/plot_csv_pie.py",
+    "visualization/plot_csv_timeline.py",
     "visualization/plot_net_dump.py",
-    # "visualization/plot_net_selection.py",          NO CONFIG
-    # "visualization/plot_net_speeds.py",             NO CONFIG
-    # "visualization/plot_net_trafficLights.py",      NO CONFIG
-    # "visualization/plot_summary.py",                NO CONFIG
-    # "visualization/plot_tripinfo_distributions.py", NO CONFIG
+    "visualization/plot_net_selection.py",
+    "visualization/plot_net_speeds.py",
+    "visualization/plot_net_trafficLights.py",
+    "visualization/plot_summary.py",
     "visualization/plotXMLAttributes.py",
 
     # xml
-    # "xml/addSchema.py",         NO CONFIG
+    # "xml/addSchema.py",         IGNORE
     # "xml/binary2plain.py",      NO CONFIG
     "xml/csv2xml.py",
     "xml/xml2csv.py",
@@ -229,14 +227,14 @@
     # other
     # "averageTripStatistics.py",       NO CONFIG
     "countEdgeUsage.py",
-    # "createVehTypeDistribution.py",   NO CONFIG
+    "createVehTypeDistribution.py",
     "edgesInDistricts.py",
     # "evacuateAreas.py",               NOT_SUITABLE
     "extractTest.py",
     "fcdReplay.py",
     "findAllRoutes.py",
     "generateBidiDistricts.py",
-    # "generateContinuousRerouters.py", NO CONFIG
+    "generateContinuousRerouters.py",
     "generateParkingAreaRerouters.py",
     "generateParkingAreas.py",
     # "generateParkingLots.py",         NO CONFIG
@@ -247,7 +245,7 @@
     "osmGet.py",
     # "osmWebWizard.py",                NOT_WORKING_YET
     "plot_trajectories.py",
-    # "ptlines2flows.py",               NO CONFIG
+    "ptlines2flows.py",
     "randomTrips.py",
     "routeSampler.py",
     "runSeeds.py",
@@ -301,7 +299,7 @@
 
 def formatBinTemplate(templateStr):
     """
-    @brief parse binary of a bin template (sumo, neconvert, etc.)
+    @brief parse binary of a bin template (sumo, netconvert, etc.)
     """
     # remove endlines in Windows
     templateStr = templateStr.replace("\\r", '')
@@ -350,7 +348,7 @@
         except CalledProcessError as e:
             sys.stderr.write("Error when generating template for " + app + ": '%s'" % e)
             return 'const std::string ' + app + 'Template = "";'
-        # join variable and formated template
+        # join variable and formatted template
         return 'const std::string ' + app + 'Template = "' + formatBinTemplate(template)
     # if binary wasn't found, then raise exception
     raise Exception(app + "template cannot be generated. " + app + " binary not found. "
@@ -373,7 +371,7 @@
             with open(os.devnull, "w") as null:
                 template = check_output([sys.executable, join(toolDir, toolPath), "--save-template", "stdout"],
                                         stderr=null, universal_newlines=True)
-            # join variable and formated template
+            # join variable and formatted template
             return templateTool + formatToolTemplate(template) + '),\n'
         except CalledProcessError as e:
             print("Error when generating tool template for %s: '%s'." % (toolName, e), file=sys.stderr)
diff -Nru sumo-1.17.0/tools/build/typemap.py sumo-1.18.0/tools/build/typemap.py
--- sumo-1.17.0/tools/build/typemap.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/build/typemap.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2015-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/build/updateDailyVersion.py sumo-1.18.0/tools/build/updateDailyVersion.py
--- sumo-1.17.0/tools/build/updateDailyVersion.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/build/updateDailyVersion.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2008-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/build/updateReleaseInfo.py sumo-1.18.0/tools/build/updateReleaseInfo.py
--- sumo-1.17.0/tools/build/updateReleaseInfo.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/build/updateReleaseInfo.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2008-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/build/version.py sumo-1.18.0/tools/build/version.py
--- sumo-1.17.0/tools/build/version.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/build/version.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2008-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/build/wix.py sumo-1.18.0/tools/build/wix.py
--- sumo-1.17.0/tools/build/wix.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/build/wix.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2011-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/commons/logger/DateTools.java sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/commons/logger/DateTools.java
--- sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/commons/logger/DateTools.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/commons/logger/DateTools.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2014-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/commons/logger/DLRLogger.java sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/commons/logger/DLRLogger.java
--- sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/commons/logger/DLRLogger.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/commons/logger/DLRLogger.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/commons/logger/FileLogger.java sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/commons/logger/FileLogger.java
--- sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/commons/logger/FileLogger.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/commons/logger/FileLogger.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2014-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/commons/logger/LogLevel.java sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/commons/logger/LogLevel.java
--- sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/commons/logger/LogLevel.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/commons/logger/LogLevel.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/commons/logger/MyString.java sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/commons/logger/MyString.java
--- sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/commons/logger/MyString.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/commons/logger/MyString.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/commons/logger/ToString.java sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/commons/logger/ToString.java
--- sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/commons/logger/ToString.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/commons/logger/ToString.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2014-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/commons/logger/WriteToDisk.java sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/commons/logger/WriteToDisk.java
--- sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/commons/logger/WriteToDisk.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/commons/logger/WriteToDisk.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/commons/tools/BytesTools.java sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/commons/tools/BytesTools.java
--- sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/commons/tools/BytesTools.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/commons/tools/BytesTools.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/commons/tools/DLRProperties.java sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/commons/tools/DLRProperties.java
--- sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/commons/tools/DLRProperties.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/commons/tools/DLRProperties.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/commons/tools/FileTools.java sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/commons/tools/FileTools.java
--- sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/commons/tools/FileTools.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/commons/tools/FileTools.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/commons/tools/MathTools.java sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/commons/tools/MathTools.java
--- sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/commons/tools/MathTools.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/commons/tools/MathTools.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/commons/tools/NiceTimeTool.java sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/commons/tools/NiceTimeTool.java
--- sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/commons/tools/NiceTimeTool.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/commons/tools/NiceTimeTool.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2018-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/commons/tools/StackTraceUtil.java sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/commons/tools/StackTraceUtil.java
--- sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/commons/tools/StackTraceUtil.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/commons/tools/StackTraceUtil.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/commons/tools/StringTools.java sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/commons/tools/StringTools.java
--- sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/commons/tools/StringTools.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/commons/tools/StringTools.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/commons/tools/TimeTools.java sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/commons/tools/TimeTools.java
--- sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/commons/tools/TimeTools.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/commons/tools/TimeTools.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/commons/utils/print/Color.java sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/commons/utils/print/Color.java
--- sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/commons/utils/print/Color.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/commons/utils/print/Color.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/commons/utils/print/ColorString.java sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/commons/utils/print/ColorString.java
--- sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/commons/utils/print/ColorString.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/commons/utils/print/ColorString.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/commons/utils/print/Effect.java sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/commons/utils/print/Effect.java
--- sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/commons/utils/print/Effect.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/commons/utils/print/Effect.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/Constants.java sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/Constants.java
--- sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/Constants.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/Constants.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/enums/LightColor.java sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/enums/LightColor.java
--- sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/enums/LightColor.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/enums/LightColor.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/exceptions/InvalidSignalGroupsNumberException.java sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/exceptions/InvalidSignalGroupsNumberException.java
--- sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/exceptions/InvalidSignalGroupsNumberException.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/exceptions/InvalidSignalGroupsNumberException.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/exceptions/LisaRESTfulServerNotFoundException.java sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/exceptions/LisaRESTfulServerNotFoundException.java
--- sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/exceptions/LisaRESTfulServerNotFoundException.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/exceptions/LisaRESTfulServerNotFoundException.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/exceptions/LisumException.java sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/exceptions/LisumException.java
--- sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/exceptions/LisumException.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/exceptions/LisumException.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/interfaces/CityInterface.java sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/interfaces/CityInterface.java
--- sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/interfaces/CityInterface.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/interfaces/CityInterface.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/interfaces/ControlUnitInterface.java sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/interfaces/ControlUnitInterface.java
--- sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/interfaces/ControlUnitInterface.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/interfaces/ControlUnitInterface.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/interfaces/DetectorInterface.java sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/interfaces/DetectorInterface.java
--- sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/interfaces/DetectorInterface.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/interfaces/DetectorInterface.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/interfaces/SignalGroupInterface.java sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/interfaces/SignalGroupInterface.java
--- sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/interfaces/SignalGroupInterface.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/interfaces/SignalGroupInterface.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/interfaces/SignalProgramInterface.java sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/interfaces/SignalProgramInterface.java
--- sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/interfaces/SignalProgramInterface.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/interfaces/SignalProgramInterface.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/interfaces/SimulationListener.java sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/interfaces/SimulationListener.java
--- sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/interfaces/SimulationListener.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/interfaces/SimulationListener.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/lisa/IstVektorType.java sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/lisa/IstVektorType.java
--- sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/lisa/IstVektorType.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/lisa/IstVektorType.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/lisa/LisaCommands.java sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/lisa/LisaCommands.java
--- sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/lisa/LisaCommands.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/lisa/LisaCommands.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/lisa/LisaConfigurationFiles.java sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/lisa/LisaConfigurationFiles.java
--- sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/lisa/LisaConfigurationFiles.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/lisa/LisaConfigurationFiles.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/lisa/LisaControlUnit.java sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/lisa/LisaControlUnit.java
--- sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/lisa/LisaControlUnit.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/lisa/LisaControlUnit.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/lisa/LisaControlUnits.java sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/lisa/LisaControlUnits.java
--- sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/lisa/LisaControlUnits.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/lisa/LisaControlUnits.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/lisa/LisaDetector.java sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/lisa/LisaDetector.java
--- sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/lisa/LisaDetector.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/lisa/LisaDetector.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/lisa/LisaDetectors.java sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/lisa/LisaDetectors.java
--- sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/lisa/LisaDetectors.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/lisa/LisaDetectors.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/lisa/Lisa.java sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/lisa/Lisa.java
--- sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/lisa/Lisa.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/lisa/Lisa.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/lisa/LisaSignalGroup.java sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/lisa/LisaSignalGroup.java
--- sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/lisa/LisaSignalGroup.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/lisa/LisaSignalGroup.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/lisa/LisaSignalGroups.java sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/lisa/LisaSignalGroups.java
--- sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/lisa/LisaSignalGroups.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/lisa/LisaSignalGroups.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/lisa/LisaSignalProgram.java sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/lisa/LisaSignalProgram.java
--- sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/lisa/LisaSignalProgram.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/lisa/LisaSignalProgram.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/lisa/LisaSignalPrograms.java sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/lisa/LisaSignalPrograms.java
--- sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/lisa/LisaSignalPrograms.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/lisa/LisaSignalPrograms.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/lisa/Message.java sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/lisa/Message.java
--- sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/lisa/Message.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/lisa/Message.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/lisa/Persistence.java sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/lisa/Persistence.java
--- sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/lisa/Persistence.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/lisa/Persistence.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/lisa/PutMessageResponse.java sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/lisa/PutMessageResponse.java
--- sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/lisa/PutMessageResponse.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/lisa/PutMessageResponse.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/lisa/Requests.java sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/lisa/Requests.java
--- sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/lisa/Requests.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/lisa/Requests.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/lisa/WunschVector.java sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/lisa/WunschVector.java
--- sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/lisa/WunschVector.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/lisa/WunschVector.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/Main.java sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/Main.java
--- sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/Main.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/Main.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/simulation/ConfigurationFile.java sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/simulation/ConfigurationFile.java
--- sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/simulation/ConfigurationFile.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/simulation/ConfigurationFile.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/simulation/LisumSimulation.java sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/simulation/LisumSimulation.java
--- sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/simulation/LisumSimulation.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/simulation/LisumSimulation.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/simulation/SimulationControlUnits.java sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/simulation/SimulationControlUnits.java
--- sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/simulation/SimulationControlUnits.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/simulation/SimulationControlUnits.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/simulation/SimulationDetectors.java sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/simulation/SimulationDetectors.java
--- sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/simulation/SimulationDetectors.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/simulation/SimulationDetectors.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/simulation/SimulationFiles.java sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/simulation/SimulationFiles.java
--- sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/simulation/SimulationFiles.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/simulation/SimulationFiles.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/simulation/VehicleTypes.java sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/simulation/VehicleTypes.java
--- sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/simulation/VehicleTypes.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/simulation/VehicleTypes.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/SplashScreen.java sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/SplashScreen.java
--- sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/SplashScreen.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/SplashScreen.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/sumo/SumoControlUnit.java sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/sumo/SumoControlUnit.java
--- sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/sumo/SumoControlUnit.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/sumo/SumoControlUnit.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/sumo/SumoControlUnits.java sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/sumo/SumoControlUnits.java
--- sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/sumo/SumoControlUnits.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/sumo/SumoControlUnits.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/sumo/SumoDetector.java sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/sumo/SumoDetector.java
--- sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/sumo/SumoDetector.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/sumo/SumoDetector.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/sumo/SumoDetectors.java sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/sumo/SumoDetectors.java
--- sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/sumo/SumoDetectors.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/sumo/SumoDetectors.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/sumo/Sumo.java sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/sumo/Sumo.java
--- sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/sumo/Sumo.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/lisum/sumo/Sumo.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/utils/xmladmin2/Attribute.java sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/utils/xmladmin2/Attribute.java
--- sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/utils/xmladmin2/Attribute.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/utils/xmladmin2/Attribute.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/utils/xmladmin2/AttributeNotFoundException.java sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/utils/xmladmin2/AttributeNotFoundException.java
--- sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/utils/xmladmin2/AttributeNotFoundException.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/utils/xmladmin2/AttributeNotFoundException.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2014-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/utils/xmladmin2/Attributes.java sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/utils/xmladmin2/Attributes.java
--- sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/utils/xmladmin2/Attributes.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/utils/xmladmin2/Attributes.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/utils/xmladmin2/KeyNode.java sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/utils/xmladmin2/KeyNode.java
--- sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/utils/xmladmin2/KeyNode.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/utils/xmladmin2/KeyNode.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/utils/xmladmin2/MalformedKeyOrNameException.java sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/utils/xmladmin2/MalformedKeyOrNameException.java
--- sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/utils/xmladmin2/MalformedKeyOrNameException.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/utils/xmladmin2/MalformedKeyOrNameException.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/utils/xmladmin2/Tools.java sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/utils/xmladmin2/Tools.java
--- sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/utils/xmladmin2/Tools.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/utils/xmladmin2/Tools.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2014-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/utils/xmladmin2/Value.java sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/utils/xmladmin2/Value.java
--- sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/utils/xmladmin2/Value.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/utils/xmladmin2/Value.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2014-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/utils/xmladmin2/XMLAdmin2.java sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/utils/xmladmin2/XMLAdmin2.java
--- sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/utils/xmladmin2/XMLAdmin2.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/utils/xmladmin2/XMLAdmin2.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/utils/xmladmin2/XMLNodeBase.java sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/utils/xmladmin2/XMLNodeBase.java
--- sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/utils/xmladmin2/XMLNodeBase.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/utils/xmladmin2/XMLNodeBase.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2014-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/utils/xmladmin2/XMLNode.java sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/utils/xmladmin2/XMLNode.java
--- sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/utils/xmladmin2/XMLNode.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/utils/xmladmin2/XMLNode.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2014-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/utils/xmladmin2/XMLNodeNotFoundException.java sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/utils/xmladmin2/XMLNodeNotFoundException.java
--- sumo-1.17.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/utils/xmladmin2/XMLNodeNotFoundException.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/lisum/lisum-core/src/main/java/de/dlr/ts/utils/xmladmin2/XMLNodeNotFoundException.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2014-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/commons/javafx/buttons/CustomButton.java sumo-1.18.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/commons/javafx/buttons/CustomButton.java
--- sumo-1.17.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/commons/javafx/buttons/CustomButton.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/commons/javafx/buttons/CustomButton.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2014-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/commons/javafx/buttons/CustomToggleButton.java sumo-1.18.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/commons/javafx/buttons/CustomToggleButton.java
--- sumo-1.17.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/commons/javafx/buttons/CustomToggleButton.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/commons/javafx/buttons/CustomToggleButton.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2014-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/commons/javafx/buttons/tools/FileChooserCombo.java sumo-1.18.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/commons/javafx/buttons/tools/FileChooserCombo.java
--- sumo-1.17.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/commons/javafx/buttons/tools/FileChooserCombo.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/commons/javafx/buttons/tools/FileChooserCombo.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/commons/javafx/buttonspanels/ButtonsPane.java sumo-1.18.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/commons/javafx/buttonspanels/ButtonsPane.java
--- sumo-1.17.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/commons/javafx/buttonspanels/ButtonsPane.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/commons/javafx/buttonspanels/ButtonsPane.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/commons/javafx/buttonspanels/OkApplyCancelButtonsPanel.java sumo-1.18.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/commons/javafx/buttonspanels/OkApplyCancelButtonsPanel.java
--- sumo-1.17.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/commons/javafx/buttonspanels/OkApplyCancelButtonsPanel.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/commons/javafx/buttonspanels/OkApplyCancelButtonsPanel.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/commons/javafx/buttonspanels/OkCancelButtonsPanel.java sumo-1.18.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/commons/javafx/buttonspanels/OkCancelButtonsPanel.java
--- sumo-1.17.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/commons/javafx/buttonspanels/OkCancelButtonsPanel.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/commons/javafx/buttonspanels/OkCancelButtonsPanel.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/commons/javafx/buttonspanels/OneButtonsPanel.java sumo-1.18.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/commons/javafx/buttonspanels/OneButtonsPanel.java
--- sumo-1.17.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/commons/javafx/buttonspanels/OneButtonsPanel.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/commons/javafx/buttonspanels/OneButtonsPanel.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/commons/javafx/mainwindow/bottom/BottomArea.java sumo-1.18.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/commons/javafx/mainwindow/bottom/BottomArea.java
--- sumo-1.17.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/commons/javafx/mainwindow/bottom/BottomArea.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/commons/javafx/mainwindow/bottom/BottomArea.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/commons/javafx/mainwindow/bottom/DebugScreen.java sumo-1.18.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/commons/javafx/mainwindow/bottom/DebugScreen.java
--- sumo-1.17.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/commons/javafx/mainwindow/bottom/DebugScreen.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/commons/javafx/mainwindow/bottom/DebugScreen.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/commons/javafx/mainwindow/bottom/StatusBar.java sumo-1.18.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/commons/javafx/mainwindow/bottom/StatusBar.java
--- sumo-1.17.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/commons/javafx/mainwindow/bottom/StatusBar.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/commons/javafx/mainwindow/bottom/StatusBar.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2014-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/commons/javafx/mainwindow/center/CenterArea.java sumo-1.18.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/commons/javafx/mainwindow/center/CenterArea.java
--- sumo-1.17.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/commons/javafx/mainwindow/center/CenterArea.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/commons/javafx/mainwindow/center/CenterArea.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/commons/javafx/mainwindow/Colors.java sumo-1.18.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/commons/javafx/mainwindow/Colors.java
--- sumo-1.17.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/commons/javafx/mainwindow/Colors.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/commons/javafx/mainwindow/Colors.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/commons/javafx/mainwindow/MainWindow.java sumo-1.18.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/commons/javafx/mainwindow/MainWindow.java
--- sumo-1.17.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/commons/javafx/mainwindow/MainWindow.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/commons/javafx/mainwindow/MainWindow.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2014-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/commons/javafx/mainwindow/right/RightArea.java sumo-1.18.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/commons/javafx/mainwindow/right/RightArea.java
--- sumo-1.17.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/commons/javafx/mainwindow/right/RightArea.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/commons/javafx/mainwindow/right/RightArea.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/commons/javafx/mainwindow/top/EditMenu.java sumo-1.18.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/commons/javafx/mainwindow/top/EditMenu.java
--- sumo-1.17.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/commons/javafx/mainwindow/top/EditMenu.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/commons/javafx/mainwindow/top/EditMenu.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/commons/javafx/mainwindow/top/FileMenu.java sumo-1.18.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/commons/javafx/mainwindow/top/FileMenu.java
--- sumo-1.17.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/commons/javafx/mainwindow/top/FileMenu.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/commons/javafx/mainwindow/top/FileMenu.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/commons/javafx/mainwindow/top/MainMenu.java sumo-1.18.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/commons/javafx/mainwindow/top/MainMenu.java
--- sumo-1.17.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/commons/javafx/mainwindow/top/MainMenu.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/commons/javafx/mainwindow/top/MainMenu.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2014-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/commons/javafx/mainwindow/top/MainToolBar.java sumo-1.18.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/commons/javafx/mainwindow/top/MainToolBar.java
--- sumo-1.17.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/commons/javafx/mainwindow/top/MainToolBar.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/commons/javafx/mainwindow/top/MainToolBar.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/commons/javafx/mainwindow/top/RecentFiles.java sumo-1.18.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/commons/javafx/mainwindow/top/RecentFiles.java
--- sumo-1.17.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/commons/javafx/mainwindow/top/RecentFiles.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/commons/javafx/mainwindow/top/RecentFiles.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/commons/javafx/mainwindow/top/TestToolBar.java sumo-1.18.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/commons/javafx/mainwindow/top/TestToolBar.java
--- sumo-1.17.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/commons/javafx/mainwindow/top/TestToolBar.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/commons/javafx/mainwindow/top/TestToolBar.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/commons/javafx/mainwindow/top/TopArea.java sumo-1.18.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/commons/javafx/mainwindow/top/TopArea.java
--- sumo-1.17.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/commons/javafx/mainwindow/top/TopArea.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/commons/javafx/mainwindow/top/TopArea.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/commons/javafx/messages/ConfirmationMessage.java sumo-1.18.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/commons/javafx/messages/ConfirmationMessage.java
--- sumo-1.17.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/commons/javafx/messages/ConfirmationMessage.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/commons/javafx/messages/ConfirmationMessage.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/commons/javafx/messages/ErrorMessage.java sumo-1.18.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/commons/javafx/messages/ErrorMessage.java
--- sumo-1.17.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/commons/javafx/messages/ErrorMessage.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/commons/javafx/messages/ErrorMessage.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/commons/javafx/messages/ExceptionMessage.java sumo-1.18.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/commons/javafx/messages/ExceptionMessage.java
--- sumo-1.17.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/commons/javafx/messages/ExceptionMessage.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/commons/javafx/messages/ExceptionMessage.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/commons/javafx/messages/InformationMessage.java sumo-1.18.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/commons/javafx/messages/InformationMessage.java
--- sumo-1.17.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/commons/javafx/messages/InformationMessage.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/commons/javafx/messages/InformationMessage.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/commons/javafx/messages/Message.java sumo-1.18.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/commons/javafx/messages/Message.java
--- sumo-1.17.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/commons/javafx/messages/Message.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/commons/javafx/messages/Message.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/commons/javafx/messages/OkApplyCancelMessage.java sumo-1.18.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/commons/javafx/messages/OkApplyCancelMessage.java
--- sumo-1.17.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/commons/javafx/messages/OkApplyCancelMessage.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/commons/javafx/messages/OkApplyCancelMessage.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2014-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/commons/javafx/misc/Tools.java sumo-1.18.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/commons/javafx/misc/Tools.java
--- sumo-1.17.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/commons/javafx/misc/Tools.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/commons/javafx/misc/Tools.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/commons/javafx/windows/AboutWindow.java sumo-1.18.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/commons/javafx/windows/AboutWindow.java
--- sumo-1.17.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/commons/javafx/windows/AboutWindow.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/commons/javafx/windows/AboutWindow.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/lisum/gui/Actions.java sumo-1.18.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/lisum/gui/Actions.java
--- sumo-1.17.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/lisum/gui/Actions.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/lisum/gui/Actions.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/lisum/gui/center/CenterAdmin.java sumo-1.18.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/lisum/gui/center/CenterAdmin.java
--- sumo-1.17.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/lisum/gui/center/CenterAdmin.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/lisum/gui/center/CenterAdmin.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/lisum/gui/debug/DebugConsole.java sumo-1.18.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/lisum/gui/debug/DebugConsole.java
--- sumo-1.17.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/lisum/gui/debug/DebugConsole.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/lisum/gui/debug/DebugConsole.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/lisum/gui/debug/TextAreaConsole.java sumo-1.18.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/lisum/gui/debug/TextAreaConsole.java
--- sumo-1.17.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/lisum/gui/debug/TextAreaConsole.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/lisum/gui/debug/TextAreaConsole.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/lisum/gui/GlobalConfig.java sumo-1.18.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/lisum/gui/GlobalConfig.java
--- sumo-1.17.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/lisum/gui/GlobalConfig.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/lisum/gui/GlobalConfig.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/lisum/gui/GUITools.java sumo-1.18.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/lisum/gui/GUITools.java
--- sumo-1.17.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/lisum/gui/GUITools.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/lisum/gui/GUITools.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/lisum/gui/Icons.java sumo-1.18.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/lisum/gui/Icons.java
--- sumo-1.17.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/lisum/gui/Icons.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/lisum/gui/Icons.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/lisum/gui/LogTest.java sumo-1.18.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/lisum/gui/LogTest.java
--- sumo-1.17.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/lisum/gui/LogTest.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/lisum/gui/LogTest.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/lisum/gui/LSPreLoader.java sumo-1.18.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/lisum/gui/LSPreLoader.java
--- sumo-1.17.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/lisum/gui/LSPreLoader.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/lisum/gui/LSPreLoader.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/lisum/gui/MainApp.java sumo-1.18.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/lisum/gui/MainApp.java
--- sumo-1.17.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/lisum/gui/MainApp.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/lisum/gui/MainApp.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/lisum/gui/MainAppWrapper.java sumo-1.18.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/lisum/gui/MainAppWrapper.java
--- sumo-1.17.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/lisum/gui/MainAppWrapper.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/lisum/gui/MainAppWrapper.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/lisum/gui/MainProgram.java sumo-1.18.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/lisum/gui/MainProgram.java
--- sumo-1.17.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/lisum/gui/MainProgram.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/lisum/gui/MainProgram.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/lisum/gui/menus/MenuAdmin.java sumo-1.18.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/lisum/gui/menus/MenuAdmin.java
--- sumo-1.17.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/lisum/gui/menus/MenuAdmin.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/lisum/gui/menus/MenuAdmin.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/lisum/gui/misc/LisumAboutWindow.java sumo-1.18.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/lisum/gui/misc/LisumAboutWindow.java
--- sumo-1.17.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/lisum/gui/misc/LisumAboutWindow.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/lisum/gui/misc/LisumAboutWindow.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/lisum/gui/misc/Splash.java sumo-1.18.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/lisum/gui/misc/Splash.java
--- sumo-1.17.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/lisum/gui/misc/Splash.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/lisum/gui/misc/Splash.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/lisum/gui/options/LisaControlUnitPreferencesBody.java sumo-1.18.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/lisum/gui/options/LisaControlUnitPreferencesBody.java
--- sumo-1.17.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/lisum/gui/options/LisaControlUnitPreferencesBody.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/lisum/gui/options/LisaControlUnitPreferencesBody.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/lisum/gui/options/LisaControlUnitPreferences.java sumo-1.18.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/lisum/gui/options/LisaControlUnitPreferences.java
--- sumo-1.17.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/lisum/gui/options/LisaControlUnitPreferences.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/lisum/gui/options/LisaControlUnitPreferences.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/lisum/gui/options/SystemPreferencesWindow.java sumo-1.18.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/lisum/gui/options/SystemPreferencesWindow.java
--- sumo-1.17.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/lisum/gui/options/SystemPreferencesWindow.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/lisum/gui/options/SystemPreferencesWindow.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/lisum/gui/options/WorkspaceWindow.java sumo-1.18.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/lisum/gui/options/WorkspaceWindow.java
--- sumo-1.17.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/lisum/gui/options/WorkspaceWindow.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/lisum/gui/options/WorkspaceWindow.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/lisum/gui/SuperMain.java sumo-1.18.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/lisum/gui/SuperMain.java
--- sumo-1.17.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/lisum/gui/SuperMain.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/lisum/gui/SuperMain.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/lisum/gui/SystemClipboard.java sumo-1.18.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/lisum/gui/SystemClipboard.java
--- sumo-1.17.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/lisum/gui/SystemClipboard.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/lisum/gui/SystemClipboard.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/lisum/gui/SystemProperties.java sumo-1.18.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/lisum/gui/SystemProperties.java
--- sumo-1.17.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/lisum/gui/SystemProperties.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/lisum/gui/SystemProperties.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/lisum/gui/toolbars/FileToolBar.java sumo-1.18.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/lisum/gui/toolbars/FileToolBar.java
--- sumo-1.17.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/lisum/gui/toolbars/FileToolBar.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/lisum/gui/toolbars/FileToolBar.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/lisum/gui/toolbars/SimulationToolBar.java sumo-1.18.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/lisum/gui/toolbars/SimulationToolBar.java
--- sumo-1.17.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/lisum/gui/toolbars/SimulationToolBar.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/lisum/gui/toolbars/SimulationToolBar.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/lisum/gui/toolbars/ToolBarInterface.java sumo-1.18.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/lisum/gui/toolbars/ToolBarInterface.java
--- sumo-1.17.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/lisum/gui/toolbars/ToolBarInterface.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/lisum/gui/toolbars/ToolBarInterface.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/lisum/gui/Tools.java sumo-1.18.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/lisum/gui/Tools.java
--- sumo-1.17.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/lisum/gui/Tools.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/lisum/lisum-gui/src/main/java/de/dlr/ts/lisum/gui/Tools.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/contributed/sumopy/agilepy/__init__.py sumo-1.18.0/tools/contributed/sumopy/agilepy/__init__.py
--- sumo-1.17.0/tools/contributed/sumopy/agilepy/__init__.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/sumopy/agilepy/__init__.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 # SUMOPy module
 # Copyright (C) 2012-2021 University of Bologna - DICAM
diff -Nru sumo-1.17.0/tools/contributed/sumopy/agilepy/lib_base/arrayman.py sumo-1.18.0/tools/contributed/sumopy/agilepy/lib_base/arrayman.py
--- sumo-1.17.0/tools/contributed/sumopy/agilepy/lib_base/arrayman.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/sumopy/agilepy/lib_base/arrayman.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 # SUMOPy module
 # Copyright (C) 2012-2021 University of Bologna - DICAM
diff -Nru sumo-1.17.0/tools/contributed/sumopy/agilepy/lib_base/classman.py sumo-1.18.0/tools/contributed/sumopy/agilepy/lib_base/classman.py
--- sumo-1.17.0/tools/contributed/sumopy/agilepy/lib_base/classman.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/sumopy/agilepy/lib_base/classman.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 # SUMOPy module
 # Copyright (C) 2012-2021 University of Bologna - DICAM
diff -Nru sumo-1.17.0/tools/contributed/sumopy/agilepy/lib_base/exports.py sumo-1.18.0/tools/contributed/sumopy/agilepy/lib_base/exports.py
--- sumo-1.17.0/tools/contributed/sumopy/agilepy/lib_base/exports.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/sumopy/agilepy/lib_base/exports.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 # SUMOPy module
 # Copyright (C) 2012-2021 University of Bologna - DICAM
diff -Nru sumo-1.17.0/tools/contributed/sumopy/agilepy/lib_base/geometry.py sumo-1.18.0/tools/contributed/sumopy/agilepy/lib_base/geometry.py
--- sumo-1.17.0/tools/contributed/sumopy/agilepy/lib_base/geometry.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/sumopy/agilepy/lib_base/geometry.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 # SUMOPy module
 # Copyright (C) 2012-2021 University of Bologna - DICAM
diff -Nru sumo-1.17.0/tools/contributed/sumopy/agilepy/lib_base/imports.py sumo-1.18.0/tools/contributed/sumopy/agilepy/lib_base/imports.py
--- sumo-1.17.0/tools/contributed/sumopy/agilepy/lib_base/imports.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/sumopy/agilepy/lib_base/imports.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 # SUMOPy module
 # Copyright (C) 2012-2021 University of Bologna - DICAM
diff -Nru sumo-1.17.0/tools/contributed/sumopy/agilepy/lib_base/__init__.py sumo-1.18.0/tools/contributed/sumopy/agilepy/lib_base/__init__.py
--- sumo-1.17.0/tools/contributed/sumopy/agilepy/lib_base/__init__.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/sumopy/agilepy/lib_base/__init__.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 # SUMOPy module
 # Copyright (C) 2012-2021 University of Bologna - DICAM
diff -Nru sumo-1.17.0/tools/contributed/sumopy/agilepy/lib_base/logger.py sumo-1.18.0/tools/contributed/sumopy/agilepy/lib_base/logger.py
--- sumo-1.17.0/tools/contributed/sumopy/agilepy/lib_base/logger.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/sumopy/agilepy/lib_base/logger.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 # SUMOPy module
 # Copyright (C) 2012-2021 University of Bologna - DICAM
diff -Nru sumo-1.17.0/tools/contributed/sumopy/agilepy/lib_base/misc.py sumo-1.18.0/tools/contributed/sumopy/agilepy/lib_base/misc.py
--- sumo-1.17.0/tools/contributed/sumopy/agilepy/lib_base/misc.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/sumopy/agilepy/lib_base/misc.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 # SUMOPy module
 # Copyright (C) 2012-2021 University of Bologna - DICAM
diff -Nru sumo-1.17.0/tools/contributed/sumopy/agilepy/lib_base/processes.py sumo-1.18.0/tools/contributed/sumopy/agilepy/lib_base/processes.py
--- sumo-1.17.0/tools/contributed/sumopy/agilepy/lib_base/processes.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/sumopy/agilepy/lib_base/processes.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 # SUMOPy module
 # Copyright (C) 2012-2021 University of Bologna - DICAM
diff -Nru sumo-1.17.0/tools/contributed/sumopy/agilepy/lib_base/test_classman_classes.py sumo-1.18.0/tools/contributed/sumopy/agilepy/lib_base/test_classman_classes.py
--- sumo-1.17.0/tools/contributed/sumopy/agilepy/lib_base/test_classman_classes.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/sumopy/agilepy/lib_base/test_classman_classes.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 # SUMOPy module
 # Copyright (C) 2012-2021 University of Bologna - DICAM
diff -Nru sumo-1.17.0/tools/contributed/sumopy/agilepy/lib_base/test_classman_misc.py sumo-1.18.0/tools/contributed/sumopy/agilepy/lib_base/test_classman_misc.py
--- sumo-1.17.0/tools/contributed/sumopy/agilepy/lib_base/test_classman_misc.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/sumopy/agilepy/lib_base/test_classman_misc.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 # SUMOPy module
 # Copyright (C) 2012-2021 University of Bologna - DICAM
diff -Nru sumo-1.17.0/tools/contributed/sumopy/agilepy/lib_base/test_classman_save.py sumo-1.18.0/tools/contributed/sumopy/agilepy/lib_base/test_classman_save.py
--- sumo-1.17.0/tools/contributed/sumopy/agilepy/lib_base/test_classman_save.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/sumopy/agilepy/lib_base/test_classman_save.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 # SUMOPy module
 # Copyright (C) 2012-2021 University of Bologna - DICAM
diff -Nru sumo-1.17.0/tools/contributed/sumopy/agilepy/lib_base/test_classman_tables.py sumo-1.18.0/tools/contributed/sumopy/agilepy/lib_base/test_classman_tables.py
--- sumo-1.17.0/tools/contributed/sumopy/agilepy/lib_base/test_classman_tables.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/sumopy/agilepy/lib_base/test_classman_tables.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 # SUMOPy module
 # Copyright (C) 2012-2021 University of Bologna - DICAM
diff -Nru sumo-1.17.0/tools/contributed/sumopy/agilepy/lib_base/xmlman.py sumo-1.18.0/tools/contributed/sumopy/agilepy/lib_base/xmlman.py
--- sumo-1.17.0/tools/contributed/sumopy/agilepy/lib_base/xmlman.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/sumopy/agilepy/lib_base/xmlman.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 # SUMOPy module
 # Copyright (C) 2012-2021 University of Bologna - DICAM
diff -Nru sumo-1.17.0/tools/contributed/sumopy/agilepy/lib_misc/docgen.py sumo-1.18.0/tools/contributed/sumopy/agilepy/lib_misc/docgen.py
--- sumo-1.17.0/tools/contributed/sumopy/agilepy/lib_misc/docgen.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/sumopy/agilepy/lib_misc/docgen.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 # SUMOPy module
 # Copyright (C) 2012-2021 University of Bologna - DICAM
diff -Nru sumo-1.17.0/tools/contributed/sumopy/agilepy/lib_misc/__init__.py sumo-1.18.0/tools/contributed/sumopy/agilepy/lib_misc/__init__.py
--- sumo-1.17.0/tools/contributed/sumopy/agilepy/lib_misc/__init__.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/sumopy/agilepy/lib_misc/__init__.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 # SUMOPy module
 # Copyright (C) 2012-2021 University of Bologna - DICAM
diff -Nru sumo-1.17.0/tools/contributed/sumopy/agilepy/lib_misc/matplotlibtools.py sumo-1.18.0/tools/contributed/sumopy/agilepy/lib_misc/matplotlibtools.py
--- sumo-1.17.0/tools/contributed/sumopy/agilepy/lib_misc/matplotlibtools.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/sumopy/agilepy/lib_misc/matplotlibtools.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 # SUMOPy module
 # Copyright (C) 2012-2021 University of Bologna - DICAM
diff -Nru sumo-1.17.0/tools/contributed/sumopy/agilepy/lib_misc/runner.py sumo-1.18.0/tools/contributed/sumopy/agilepy/lib_misc/runner.py
--- sumo-1.17.0/tools/contributed/sumopy/agilepy/lib_misc/runner.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/sumopy/agilepy/lib_misc/runner.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 # SUMOPy module
 # Copyright (C) 2012-2021 University of Bologna - DICAM
diff -Nru sumo-1.17.0/tools/contributed/sumopy/agilepy/lib_wx/__init__.py sumo-1.18.0/tools/contributed/sumopy/agilepy/lib_wx/__init__.py
--- sumo-1.17.0/tools/contributed/sumopy/agilepy/lib_wx/__init__.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/sumopy/agilepy/lib_wx/__init__.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 # SUMOPy module
 # Copyright (C) 2012-2021 University of Bologna - DICAM
diff -Nru sumo-1.17.0/tools/contributed/sumopy/agilepy/lib_wx/mainframe.py sumo-1.18.0/tools/contributed/sumopy/agilepy/lib_wx/mainframe.py
--- sumo-1.17.0/tools/contributed/sumopy/agilepy/lib_wx/mainframe.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/sumopy/agilepy/lib_wx/mainframe.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 # SUMOPy module
 # Copyright (C) 2012-2021 University of Bologna - DICAM
diff -Nru sumo-1.17.0/tools/contributed/sumopy/agilepy/lib_wx/modulegui.py sumo-1.18.0/tools/contributed/sumopy/agilepy/lib_wx/modulegui.py
--- sumo-1.17.0/tools/contributed/sumopy/agilepy/lib_wx/modulegui.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/sumopy/agilepy/lib_wx/modulegui.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 # SUMOPy module
 # Copyright (C) 2012-2021 University of Bologna - DICAM
diff -Nru sumo-1.17.0/tools/contributed/sumopy/agilepy/lib_wx/objbrowser.py sumo-1.18.0/tools/contributed/sumopy/agilepy/lib_wx/objbrowser.py
--- sumo-1.17.0/tools/contributed/sumopy/agilepy/lib_wx/objbrowser.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/sumopy/agilepy/lib_wx/objbrowser.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 # SUMOPy module
 # Copyright (C) 2012-2021 University of Bologna - DICAM
diff -Nru sumo-1.17.0/tools/contributed/sumopy/agilepy/lib_wx/objpanel.py sumo-1.18.0/tools/contributed/sumopy/agilepy/lib_wx/objpanel.py
--- sumo-1.17.0/tools/contributed/sumopy/agilepy/lib_wx/objpanel.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/sumopy/agilepy/lib_wx/objpanel.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 # SUMOPy module
 # Copyright (C) 2012-2021 University of Bologna - DICAM
diff -Nru sumo-1.17.0/tools/contributed/sumopy/agilepy/lib_wx/ogleditor.py sumo-1.18.0/tools/contributed/sumopy/agilepy/lib_wx/ogleditor.py
--- sumo-1.17.0/tools/contributed/sumopy/agilepy/lib_wx/ogleditor.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/sumopy/agilepy/lib_wx/ogleditor.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 # SUMOPy module
 # Copyright (C) 2012-2021 University of Bologna - DICAM
diff -Nru sumo-1.17.0/tools/contributed/sumopy/agilepy/lib_wx/processdialog.py sumo-1.18.0/tools/contributed/sumopy/agilepy/lib_wx/processdialog.py
--- sumo-1.17.0/tools/contributed/sumopy/agilepy/lib_wx/processdialog.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/sumopy/agilepy/lib_wx/processdialog.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 # SUMOPy module
 # Copyright (C) 2012-2021 University of Bologna - DICAM
diff -Nru sumo-1.17.0/tools/contributed/sumopy/agilepy/lib_wx/test_app.py sumo-1.18.0/tools/contributed/sumopy/agilepy/lib_wx/test_app.py
--- sumo-1.17.0/tools/contributed/sumopy/agilepy/lib_wx/test_app.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/sumopy/agilepy/lib_wx/test_app.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 # SUMOPy module
 # Copyright (C) 2012-2021 University of Bologna - DICAM
diff -Nru sumo-1.17.0/tools/contributed/sumopy/agilepy/lib_wx/test_glcanvas.py sumo-1.18.0/tools/contributed/sumopy/agilepy/lib_wx/test_glcanvas.py
--- sumo-1.17.0/tools/contributed/sumopy/agilepy/lib_wx/test_glcanvas.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/sumopy/agilepy/lib_wx/test_glcanvas.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 # SUMOPy module
 # Copyright (C) 2012-2021 University of Bologna - DICAM
diff -Nru sumo-1.17.0/tools/contributed/sumopy/agilepy/lib_wx/test_notebook.py sumo-1.18.0/tools/contributed/sumopy/agilepy/lib_wx/test_notebook.py
--- sumo-1.17.0/tools/contributed/sumopy/agilepy/lib_wx/test_notebook.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/sumopy/agilepy/lib_wx/test_notebook.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 # SUMOPy module
 # Copyright (C) 2012-2021 University of Bologna - DICAM
diff -Nru sumo-1.17.0/tools/contributed/sumopy/agilepy/lib_wx/toolbox.py sumo-1.18.0/tools/contributed/sumopy/agilepy/lib_wx/toolbox.py
--- sumo-1.17.0/tools/contributed/sumopy/agilepy/lib_wx/toolbox.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/sumopy/agilepy/lib_wx/toolbox.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 # SUMOPy module
 # Copyright (C) 2012-2021 University of Bologna - DICAM
diff -Nru sumo-1.17.0/tools/contributed/sumopy/agilepy/lib_wx/wxmisc.py sumo-1.18.0/tools/contributed/sumopy/agilepy/lib_wx/wxmisc.py
--- sumo-1.17.0/tools/contributed/sumopy/agilepy/lib_wx/wxmisc.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/sumopy/agilepy/lib_wx/wxmisc.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 # SUMOPy module
 # Copyright (C) 2012-2021 University of Bologna - DICAM
diff -Nru sumo-1.17.0/tools/contributed/sumopy/coremodules/demand/demandbase.py sumo-1.18.0/tools/contributed/sumopy/coremodules/demand/demandbase.py
--- sumo-1.17.0/tools/contributed/sumopy/coremodules/demand/demandbase.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/sumopy/coremodules/demand/demandbase.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 # SUMOPy module
 # Copyright (C) 2012-2021 University of Bologna - DICAM
diff -Nru sumo-1.17.0/tools/contributed/sumopy/coremodules/demand/demand.py sumo-1.18.0/tools/contributed/sumopy/coremodules/demand/demand.py
--- sumo-1.17.0/tools/contributed/sumopy/coremodules/demand/demand.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/sumopy/coremodules/demand/demand.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 # SUMOPy module
 # Copyright (C) 2012-2021 University of Bologna - DICAM
diff -Nru sumo-1.17.0/tools/contributed/sumopy/coremodules/demand/detectorflows.py sumo-1.18.0/tools/contributed/sumopy/coremodules/demand/detectorflows.py
--- sumo-1.17.0/tools/contributed/sumopy/coremodules/demand/detectorflows.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/sumopy/coremodules/demand/detectorflows.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 # SUMOPy module
 # Copyright (C) 2012-2021 University of Bologna - DICAM
diff -Nru sumo-1.17.0/tools/contributed/sumopy/coremodules/demand/detectorflows_wxgui.py sumo-1.18.0/tools/contributed/sumopy/coremodules/demand/detectorflows_wxgui.py
--- sumo-1.17.0/tools/contributed/sumopy/coremodules/demand/detectorflows_wxgui.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/sumopy/coremodules/demand/detectorflows_wxgui.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 # SUMOPy module
 # Copyright (C) 2012-2021 University of Bologna - DICAM
diff -Nru sumo-1.17.0/tools/contributed/sumopy/coremodules/demand/__init__.py sumo-1.18.0/tools/contributed/sumopy/coremodules/demand/__init__.py
--- sumo-1.17.0/tools/contributed/sumopy/coremodules/demand/__init__.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/sumopy/coremodules/demand/__init__.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 # SUMOPy module
 # Copyright (C) 2012-2021 University of Bologna - DICAM
diff -Nru sumo-1.17.0/tools/contributed/sumopy/coremodules/demand/origin_to_destination_mpl.py sumo-1.18.0/tools/contributed/sumopy/coremodules/demand/origin_to_destination_mpl.py
--- sumo-1.17.0/tools/contributed/sumopy/coremodules/demand/origin_to_destination_mpl.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/sumopy/coremodules/demand/origin_to_destination_mpl.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 # SUMOPy module
 # Copyright (C) 2012-2021 University of Bologna - DICAM
diff -Nru sumo-1.17.0/tools/contributed/sumopy/coremodules/demand/origin_to_destination.py sumo-1.18.0/tools/contributed/sumopy/coremodules/demand/origin_to_destination.py
--- sumo-1.17.0/tools/contributed/sumopy/coremodules/demand/origin_to_destination.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/sumopy/coremodules/demand/origin_to_destination.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 # SUMOPy module
 # Copyright (C) 2012-2021 University of Bologna - DICAM
diff -Nru sumo-1.17.0/tools/contributed/sumopy/coremodules/demand/origin_to_destination_wxgui.py sumo-1.18.0/tools/contributed/sumopy/coremodules/demand/origin_to_destination_wxgui.py
--- sumo-1.17.0/tools/contributed/sumopy/coremodules/demand/origin_to_destination_wxgui.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/sumopy/coremodules/demand/origin_to_destination_wxgui.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 # SUMOPy module
 # Copyright (C) 2012-2021 University of Bologna - DICAM
diff -Nru sumo-1.17.0/tools/contributed/sumopy/coremodules/demand/publictransportservices.py sumo-1.18.0/tools/contributed/sumopy/coremodules/demand/publictransportservices.py
--- sumo-1.17.0/tools/contributed/sumopy/coremodules/demand/publictransportservices.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/sumopy/coremodules/demand/publictransportservices.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 # SUMOPy module
 # Copyright (C) 2012-2021 University of Bologna - DICAM
diff -Nru sumo-1.17.0/tools/contributed/sumopy/coremodules/demand/publictransportservices_wxgui.py sumo-1.18.0/tools/contributed/sumopy/coremodules/demand/publictransportservices_wxgui.py
--- sumo-1.17.0/tools/contributed/sumopy/coremodules/demand/publictransportservices_wxgui.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/sumopy/coremodules/demand/publictransportservices_wxgui.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 # SUMOPy module
 # Copyright (C) 2012-2021 University of Bologna - DICAM
diff -Nru sumo-1.17.0/tools/contributed/sumopy/coremodules/demand/turnflows.py sumo-1.18.0/tools/contributed/sumopy/coremodules/demand/turnflows.py
--- sumo-1.17.0/tools/contributed/sumopy/coremodules/demand/turnflows.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/sumopy/coremodules/demand/turnflows.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 # SUMOPy module
 # Copyright (C) 2012-2021 University of Bologna - DICAM
diff -Nru sumo-1.17.0/tools/contributed/sumopy/coremodules/demand/turnflows_wxgui.py sumo-1.18.0/tools/contributed/sumopy/coremodules/demand/turnflows_wxgui.py
--- sumo-1.17.0/tools/contributed/sumopy/coremodules/demand/turnflows_wxgui.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/sumopy/coremodules/demand/turnflows_wxgui.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 # SUMOPy module
 # Copyright (C) 2012-2021 University of Bologna - DICAM
diff -Nru sumo-1.17.0/tools/contributed/sumopy/coremodules/demand/vehicles.py sumo-1.18.0/tools/contributed/sumopy/coremodules/demand/vehicles.py
--- sumo-1.17.0/tools/contributed/sumopy/coremodules/demand/vehicles.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/sumopy/coremodules/demand/vehicles.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 # SUMOPy module
 # Copyright (C) 2012-2021 University of Bologna - DICAM
diff -Nru sumo-1.17.0/tools/contributed/sumopy/coremodules/demand/virtualpop.py sumo-1.18.0/tools/contributed/sumopy/coremodules/demand/virtualpop.py
--- sumo-1.17.0/tools/contributed/sumopy/coremodules/demand/virtualpop.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/sumopy/coremodules/demand/virtualpop.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 # SUMOPy module
 # Copyright (C) 2012-2021 University of Bologna - DICAM
diff -Nru sumo-1.17.0/tools/contributed/sumopy/coremodules/demand/virtualpop_results_mpl.py sumo-1.18.0/tools/contributed/sumopy/coremodules/demand/virtualpop_results_mpl.py
--- sumo-1.17.0/tools/contributed/sumopy/coremodules/demand/virtualpop_results_mpl.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/sumopy/coremodules/demand/virtualpop_results_mpl.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 # SUMOPy module
 # Copyright (C) 2012-2021 University of Bologna - DICAM
diff -Nru sumo-1.17.0/tools/contributed/sumopy/coremodules/demand/virtualpop_results.py sumo-1.18.0/tools/contributed/sumopy/coremodules/demand/virtualpop_results.py
--- sumo-1.17.0/tools/contributed/sumopy/coremodules/demand/virtualpop_results.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/sumopy/coremodules/demand/virtualpop_results.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 # SUMOPy module
 # Copyright (C) 2012-2021 University of Bologna - DICAM
diff -Nru sumo-1.17.0/tools/contributed/sumopy/coremodules/demand/virtualpop_wxgui.py sumo-1.18.0/tools/contributed/sumopy/coremodules/demand/virtualpop_wxgui.py
--- sumo-1.17.0/tools/contributed/sumopy/coremodules/demand/virtualpop_wxgui.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/sumopy/coremodules/demand/virtualpop_wxgui.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 # SUMOPy module
 # Copyright (C) 2012-2021 University of Bologna - DICAM
diff -Nru sumo-1.17.0/tools/contributed/sumopy/coremodules/demand/wxgui.py sumo-1.18.0/tools/contributed/sumopy/coremodules/demand/wxgui.py
--- sumo-1.17.0/tools/contributed/sumopy/coremodules/demand/wxgui.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/sumopy/coremodules/demand/wxgui.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 # SUMOPy module
 # Copyright (C) 2012-2021 University of Bologna - DICAM
diff -Nru sumo-1.17.0/tools/contributed/sumopy/coremodules/__init__.py sumo-1.18.0/tools/contributed/sumopy/coremodules/__init__.py
--- sumo-1.17.0/tools/contributed/sumopy/coremodules/__init__.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/sumopy/coremodules/__init__.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 # SUMOPy module
 # Copyright (C) 2012-2021 University of Bologna - DICAM
diff -Nru sumo-1.17.0/tools/contributed/sumopy/coremodules/landuse/CREATE_ZONES.py sumo-1.18.0/tools/contributed/sumopy/coremodules/landuse/CREATE_ZONES.py
--- sumo-1.17.0/tools/contributed/sumopy/coremodules/landuse/CREATE_ZONES.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/sumopy/coremodules/landuse/CREATE_ZONES.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 # SUMOPy module
 # Copyright (C) 2012-2021 University of Bologna - DICAM
diff -Nru sumo-1.17.0/tools/contributed/sumopy/coremodules/landuse/__init__.py sumo-1.18.0/tools/contributed/sumopy/coremodules/landuse/__init__.py
--- sumo-1.17.0/tools/contributed/sumopy/coremodules/landuse/__init__.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/sumopy/coremodules/landuse/__init__.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 # SUMOPy module
 # Copyright (C) 2012-2021 University of Bologna - DICAM
diff -Nru sumo-1.17.0/tools/contributed/sumopy/coremodules/landuse/landuse.py sumo-1.18.0/tools/contributed/sumopy/coremodules/landuse/landuse.py
--- sumo-1.17.0/tools/contributed/sumopy/coremodules/landuse/landuse.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/sumopy/coremodules/landuse/landuse.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 # SUMOPy module
 # Copyright (C) 2012-2021 University of Bologna - DICAM
diff -Nru sumo-1.17.0/tools/contributed/sumopy/coremodules/landuse/maps.py sumo-1.18.0/tools/contributed/sumopy/coremodules/landuse/maps.py
--- sumo-1.17.0/tools/contributed/sumopy/coremodules/landuse/maps.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/sumopy/coremodules/landuse/maps.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 # SUMOPy module
 # Copyright (C) 2012-2021 University of Bologna - DICAM
diff -Nru sumo-1.17.0/tools/contributed/sumopy/coremodules/landuse/wxgui.py sumo-1.18.0/tools/contributed/sumopy/coremodules/landuse/wxgui.py
--- sumo-1.17.0/tools/contributed/sumopy/coremodules/landuse/wxgui.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/sumopy/coremodules/landuse/wxgui.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 # SUMOPy module
 # Copyright (C) 2012-2021 University of Bologna - DICAM
diff -Nru sumo-1.17.0/tools/contributed/sumopy/coremodules/misc/__init__.py sumo-1.18.0/tools/contributed/sumopy/coremodules/misc/__init__.py
--- sumo-1.17.0/tools/contributed/sumopy/coremodules/misc/__init__.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/sumopy/coremodules/misc/__init__.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 # SUMOPy module
 # Copyright (C) 2012-2021 University of Bologna - DICAM
diff -Nru sumo-1.17.0/tools/contributed/sumopy/coremodules/misc/matplottools.py sumo-1.18.0/tools/contributed/sumopy/coremodules/misc/matplottools.py
--- sumo-1.17.0/tools/contributed/sumopy/coremodules/misc/matplottools.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/sumopy/coremodules/misc/matplottools.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 # SUMOPy module
 # Copyright (C) 2012-2021 University of Bologna - DICAM
diff -Nru sumo-1.17.0/tools/contributed/sumopy/coremodules/misc/shapefile.py sumo-1.18.0/tools/contributed/sumopy/coremodules/misc/shapefile.py
--- sumo-1.17.0/tools/contributed/sumopy/coremodules/misc/shapefile.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/sumopy/coremodules/misc/shapefile.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 # SUMOPy module
 # Copyright (C) 2012-2021 University of Bologna - DICAM
diff -Nru sumo-1.17.0/tools/contributed/sumopy/coremodules/misc/shapeformat.py sumo-1.18.0/tools/contributed/sumopy/coremodules/misc/shapeformat.py
--- sumo-1.17.0/tools/contributed/sumopy/coremodules/misc/shapeformat.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/sumopy/coremodules/misc/shapeformat.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 # SUMOPy module
 # Copyright (C) 2012-2021 University of Bologna - DICAM
diff -Nru sumo-1.17.0/tools/contributed/sumopy/coremodules/modules_common.py sumo-1.18.0/tools/contributed/sumopy/coremodules/modules_common.py
--- sumo-1.17.0/tools/contributed/sumopy/coremodules/modules_common.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/sumopy/coremodules/modules_common.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 # SUMOPy module
 # Copyright (C) 2012-2021 University of Bologna - DICAM
diff -Nru sumo-1.17.0/tools/contributed/sumopy/coremodules/network/__init__.py sumo-1.18.0/tools/contributed/sumopy/coremodules/network/__init__.py
--- sumo-1.17.0/tools/contributed/sumopy/coremodules/network/__init__.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/sumopy/coremodules/network/__init__.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 # SUMOPy module
 # Copyright (C) 2012-2021 University of Bologna - DICAM
diff -Nru sumo-1.17.0/tools/contributed/sumopy/coremodules/network/netconvert.py sumo-1.18.0/tools/contributed/sumopy/coremodules/network/netconvert.py
--- sumo-1.17.0/tools/contributed/sumopy/coremodules/network/netconvert.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/sumopy/coremodules/network/netconvert.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 # SUMOPy module
 # Copyright (C) 2012-2021 University of Bologna - DICAM
diff -Nru sumo-1.17.0/tools/contributed/sumopy/coremodules/network/netgenerate.py sumo-1.18.0/tools/contributed/sumopy/coremodules/network/netgenerate.py
--- sumo-1.17.0/tools/contributed/sumopy/coremodules/network/netgenerate.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/sumopy/coremodules/network/netgenerate.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 # SUMOPy module
 # Copyright (C) 2012-2021 University of Bologna - DICAM
diff -Nru sumo-1.17.0/tools/contributed/sumopy/coremodules/network/network_editor.py sumo-1.18.0/tools/contributed/sumopy/coremodules/network/network_editor.py
--- sumo-1.17.0/tools/contributed/sumopy/coremodules/network/network_editor.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/sumopy/coremodules/network/network_editor.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 # SUMOPy module
 # Copyright (C) 2012-2021 University of Bologna - DICAM
diff -Nru sumo-1.17.0/tools/contributed/sumopy/coremodules/network/network.py sumo-1.18.0/tools/contributed/sumopy/coremodules/network/network.py
--- sumo-1.17.0/tools/contributed/sumopy/coremodules/network/network.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/sumopy/coremodules/network/network.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 # SUMOPy module
 # Copyright (C) 2012-2021 University of Bologna - DICAM
diff -Nru sumo-1.17.0/tools/contributed/sumopy/coremodules/network/networktools.py sumo-1.18.0/tools/contributed/sumopy/coremodules/network/networktools.py
--- sumo-1.17.0/tools/contributed/sumopy/coremodules/network/networktools.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/sumopy/coremodules/network/networktools.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 # SUMOPy module
 # Copyright (C) 2012-2021 University of Bologna - DICAM
diff -Nru sumo-1.17.0/tools/contributed/sumopy/coremodules/network/networkxtools.py sumo-1.18.0/tools/contributed/sumopy/coremodules/network/networkxtools.py
--- sumo-1.17.0/tools/contributed/sumopy/coremodules/network/networkxtools.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/sumopy/coremodules/network/networkxtools.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 # SUMOPy module
 # Copyright (C) 2012-2021 University of Bologna - DICAM
diff -Nru sumo-1.17.0/tools/contributed/sumopy/coremodules/network/osmnx_import.py sumo-1.18.0/tools/contributed/sumopy/coremodules/network/osmnx_import.py
--- sumo-1.17.0/tools/contributed/sumopy/coremodules/network/osmnx_import.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/sumopy/coremodules/network/osmnx_import.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 # SUMOPy module
 # Copyright (C) 2012-2021 University of Bologna - DICAM
diff -Nru sumo-1.17.0/tools/contributed/sumopy/coremodules/network/publictransportnet.py sumo-1.18.0/tools/contributed/sumopy/coremodules/network/publictransportnet.py
--- sumo-1.17.0/tools/contributed/sumopy/coremodules/network/publictransportnet.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/sumopy/coremodules/network/publictransportnet.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 # SUMOPy module
 # Copyright (C) 2012-2021 University of Bologna - DICAM
diff -Nru sumo-1.17.0/tools/contributed/sumopy/coremodules/network/publictransportnet_wxgui.py sumo-1.18.0/tools/contributed/sumopy/coremodules/network/publictransportnet_wxgui.py
--- sumo-1.17.0/tools/contributed/sumopy/coremodules/network/publictransportnet_wxgui.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/sumopy/coremodules/network/publictransportnet_wxgui.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 # SUMOPy module
 # Copyright (C) 2012-2021 University of Bologna - DICAM
diff -Nru sumo-1.17.0/tools/contributed/sumopy/coremodules/network/routing.py sumo-1.18.0/tools/contributed/sumopy/coremodules/network/routing.py
--- sumo-1.17.0/tools/contributed/sumopy/coremodules/network/routing.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/sumopy/coremodules/network/routing.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 # SUMOPy module
 # Copyright (C) 2012-2021 University of Bologna - DICAM
diff -Nru sumo-1.17.0/tools/contributed/sumopy/coremodules/network/wxgui.py sumo-1.18.0/tools/contributed/sumopy/coremodules/network/wxgui.py
--- sumo-1.17.0/tools/contributed/sumopy/coremodules/network/wxgui.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/sumopy/coremodules/network/wxgui.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 # SUMOPy module
 # Copyright (C) 2012-2021 University of Bologna - DICAM
diff -Nru sumo-1.17.0/tools/contributed/sumopy/coremodules/scenario/__init__.py sumo-1.18.0/tools/contributed/sumopy/coremodules/scenario/__init__.py
--- sumo-1.17.0/tools/contributed/sumopy/coremodules/scenario/__init__.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/sumopy/coremodules/scenario/__init__.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 # SUMOPy module
 # Copyright (C) 2012-2021 University of Bologna - DICAM
diff -Nru sumo-1.17.0/tools/contributed/sumopy/coremodules/scenario/scenario.py sumo-1.18.0/tools/contributed/sumopy/coremodules/scenario/scenario.py
--- sumo-1.17.0/tools/contributed/sumopy/coremodules/scenario/scenario.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/sumopy/coremodules/scenario/scenario.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 # SUMOPy module
 # Copyright (C) 2012-2021 University of Bologna - DICAM
diff -Nru sumo-1.17.0/tools/contributed/sumopy/coremodules/scenario/wxgui.py sumo-1.18.0/tools/contributed/sumopy/coremodules/scenario/wxgui.py
--- sumo-1.17.0/tools/contributed/sumopy/coremodules/scenario/wxgui.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/sumopy/coremodules/scenario/wxgui.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 # SUMOPy module
 # Copyright (C) 2012-2021 University of Bologna - DICAM
diff -Nru sumo-1.17.0/tools/contributed/sumopy/coremodules/simulation/__init__.py sumo-1.18.0/tools/contributed/sumopy/coremodules/simulation/__init__.py
--- sumo-1.17.0/tools/contributed/sumopy/coremodules/simulation/__init__.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/sumopy/coremodules/simulation/__init__.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 # SUMOPy module
 # Copyright (C) 2012-2021 University of Bologna - DICAM
diff -Nru sumo-1.17.0/tools/contributed/sumopy/coremodules/simulation/result_oglviewer.py sumo-1.18.0/tools/contributed/sumopy/coremodules/simulation/result_oglviewer.py
--- sumo-1.17.0/tools/contributed/sumopy/coremodules/simulation/result_oglviewer.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/sumopy/coremodules/simulation/result_oglviewer.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 # SUMOPy module
 # Copyright (C) 2012-2021 University of Bologna - DICAM
diff -Nru sumo-1.17.0/tools/contributed/sumopy/coremodules/simulation/results_mpl.py sumo-1.18.0/tools/contributed/sumopy/coremodules/simulation/results_mpl.py
--- sumo-1.17.0/tools/contributed/sumopy/coremodules/simulation/results_mpl.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/sumopy/coremodules/simulation/results_mpl.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 # SUMOPy module
 # Copyright (C) 2012-2021 University of Bologna - DICAM
diff -Nru sumo-1.17.0/tools/contributed/sumopy/coremodules/simulation/results.py sumo-1.18.0/tools/contributed/sumopy/coremodules/simulation/results.py
--- sumo-1.17.0/tools/contributed/sumopy/coremodules/simulation/results.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/sumopy/coremodules/simulation/results.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 # SUMOPy module
 # Copyright (C) 2012-2021 University of Bologna - DICAM
diff -Nru sumo-1.17.0/tools/contributed/sumopy/coremodules/simulation/simplaconfig.py sumo-1.18.0/tools/contributed/sumopy/coremodules/simulation/simplaconfig.py
--- sumo-1.17.0/tools/contributed/sumopy/coremodules/simulation/simplaconfig.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/sumopy/coremodules/simulation/simplaconfig.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 # SUMOPy module
 # Copyright (C) 2012-2021 University of Bologna - DICAM
diff -Nru sumo-1.17.0/tools/contributed/sumopy/coremodules/simulation/simulationbase.py sumo-1.18.0/tools/contributed/sumopy/coremodules/simulation/simulationbase.py
--- sumo-1.17.0/tools/contributed/sumopy/coremodules/simulation/simulationbase.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/sumopy/coremodules/simulation/simulationbase.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 # SUMOPy module
 # Copyright (C) 2012-2021 University of Bologna - DICAM
diff -Nru sumo-1.17.0/tools/contributed/sumopy/coremodules/simulation/simulation.py sumo-1.18.0/tools/contributed/sumopy/coremodules/simulation/simulation.py
--- sumo-1.17.0/tools/contributed/sumopy/coremodules/simulation/simulation.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/sumopy/coremodules/simulation/simulation.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 # SUMOPy module
 # Copyright (C) 2012-2021 University of Bologna - DICAM
diff -Nru sumo-1.17.0/tools/contributed/sumopy/coremodules/simulation/sumo.py sumo-1.18.0/tools/contributed/sumopy/coremodules/simulation/sumo.py
--- sumo-1.17.0/tools/contributed/sumopy/coremodules/simulation/sumo.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/sumopy/coremodules/simulation/sumo.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 # SUMOPy module
 # Copyright (C) 2012-2021 University of Bologna - DICAM
diff -Nru sumo-1.17.0/tools/contributed/sumopy/coremodules/simulation/sumo_virtualpop_iterate.py sumo-1.18.0/tools/contributed/sumopy/coremodules/simulation/sumo_virtualpop_iterate.py
--- sumo-1.17.0/tools/contributed/sumopy/coremodules/simulation/sumo_virtualpop_iterate.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/sumopy/coremodules/simulation/sumo_virtualpop_iterate.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 # SUMOPy module
 # Copyright (C) 2012-2021 University of Bologna - DICAM
diff -Nru sumo-1.17.0/tools/contributed/sumopy/coremodules/simulation/sumo_virtualpop.py sumo-1.18.0/tools/contributed/sumopy/coremodules/simulation/sumo_virtualpop.py
--- sumo-1.17.0/tools/contributed/sumopy/coremodules/simulation/sumo_virtualpop.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/sumopy/coremodules/simulation/sumo_virtualpop.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 # SUMOPy module
 # Copyright (C) 2012-2021 University of Bologna - DICAM
diff -Nru sumo-1.17.0/tools/contributed/sumopy/coremodules/simulation/taxi.py sumo-1.18.0/tools/contributed/sumopy/coremodules/simulation/taxi.py
--- sumo-1.17.0/tools/contributed/sumopy/coremodules/simulation/taxi.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/sumopy/coremodules/simulation/taxi.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 # SUMOPy module
 # Copyright (C) 2012-2021 University of Bologna - DICAM
diff -Nru sumo-1.17.0/tools/contributed/sumopy/coremodules/simulation/wxgui.py sumo-1.18.0/tools/contributed/sumopy/coremodules/simulation/wxgui.py
--- sumo-1.17.0/tools/contributed/sumopy/coremodules/simulation/wxgui.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/sumopy/coremodules/simulation/wxgui.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 # SUMOPy module
 # Copyright (C) 2012-2021 University of Bologna - DICAM
diff -Nru sumo-1.17.0/tools/contributed/sumopy/examples/scripts/sumopy_sim.py sumo-1.18.0/tools/contributed/sumopy/examples/scripts/sumopy_sim.py
--- sumo-1.17.0/tools/contributed/sumopy/examples/scripts/sumopy_sim.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/sumopy/examples/scripts/sumopy_sim.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 # SUMOPy module
 # Copyright (C) 2012-2021 University of Bologna - DICAM
diff -Nru sumo-1.17.0/tools/contributed/sumopy/__init__.py sumo-1.18.0/tools/contributed/sumopy/__init__.py
--- sumo-1.17.0/tools/contributed/sumopy/__init__.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/sumopy/__init__.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 # SUMOPy module
 # Copyright (C) 2012-2021 University of Bologna - DICAM
diff -Nru sumo-1.17.0/tools/contributed/sumopy/plugins/common/__init__.py sumo-1.18.0/tools/contributed/sumopy/plugins/common/__init__.py
--- sumo-1.17.0/tools/contributed/sumopy/plugins/common/__init__.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/sumopy/plugins/common/__init__.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 # SUMOPy module
 # Copyright (C) 2012-2021 University of Bologna - DICAM
diff -Nru sumo-1.17.0/tools/contributed/sumopy/plugins/common/wxgui.py sumo-1.18.0/tools/contributed/sumopy/plugins/common/wxgui.py
--- sumo-1.17.0/tools/contributed/sumopy/plugins/common/wxgui.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/sumopy/plugins/common/wxgui.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 # SUMOPy module
 # Copyright (C) 2012-2021 University of Bologna - DICAM
diff -Nru sumo-1.17.0/tools/contributed/sumopy/plugins/hcprt/hcprt.py sumo-1.18.0/tools/contributed/sumopy/plugins/hcprt/hcprt.py
--- sumo-1.17.0/tools/contributed/sumopy/plugins/hcprt/hcprt.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/sumopy/plugins/hcprt/hcprt.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 # SUMOPy module
 # Copyright (C) 2012-2021 University of Bologna - DICAM
diff -Nru sumo-1.17.0/tools/contributed/sumopy/plugins/hcprt/__init__.py sumo-1.18.0/tools/contributed/sumopy/plugins/hcprt/__init__.py
--- sumo-1.17.0/tools/contributed/sumopy/plugins/hcprt/__init__.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/sumopy/plugins/hcprt/__init__.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 # SUMOPy module
 # Copyright (C) 2012-2021 University of Bologna - DICAM
diff -Nru sumo-1.17.0/tools/contributed/sumopy/plugins/hcprt/results_mpl.py sumo-1.18.0/tools/contributed/sumopy/plugins/hcprt/results_mpl.py
--- sumo-1.17.0/tools/contributed/sumopy/plugins/hcprt/results_mpl.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/sumopy/plugins/hcprt/results_mpl.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 # SUMOPy module
 # Copyright (C) 2012-2021 University of Bologna - DICAM
diff -Nru sumo-1.17.0/tools/contributed/sumopy/plugins/hcprt/wxgui.py sumo-1.18.0/tools/contributed/sumopy/plugins/hcprt/wxgui.py
--- sumo-1.17.0/tools/contributed/sumopy/plugins/hcprt/wxgui.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/sumopy/plugins/hcprt/wxgui.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 # SUMOPy module
 # Copyright (C) 2012-2021 University of Bologna - DICAM
diff -Nru sumo-1.17.0/tools/contributed/sumopy/plugins/__init__.py sumo-1.18.0/tools/contributed/sumopy/plugins/__init__.py
--- sumo-1.17.0/tools/contributed/sumopy/plugins/__init__.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/sumopy/plugins/__init__.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 # SUMOPy module
 # Copyright (C) 2012-2021 University of Bologna - DICAM
diff -Nru sumo-1.17.0/tools/contributed/sumopy/plugins/mapmatching/__init__.py sumo-1.18.0/tools/contributed/sumopy/plugins/mapmatching/__init__.py
--- sumo-1.17.0/tools/contributed/sumopy/plugins/mapmatching/__init__.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/sumopy/plugins/mapmatching/__init__.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 # SUMOPy module
 # Copyright (C) 2012-2021 University of Bologna - DICAM
diff -Nru sumo-1.17.0/tools/contributed/sumopy/plugins/mapmatching/mapmatching.py sumo-1.18.0/tools/contributed/sumopy/plugins/mapmatching/mapmatching.py
--- sumo-1.17.0/tools/contributed/sumopy/plugins/mapmatching/mapmatching.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/sumopy/plugins/mapmatching/mapmatching.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 # SUMOPy module
 # Copyright (C) 2012-2021 University of Bologna - DICAM
diff -Nru sumo-1.17.0/tools/contributed/sumopy/plugins/mapmatching/results_mpl.py sumo-1.18.0/tools/contributed/sumopy/plugins/mapmatching/results_mpl.py
--- sumo-1.17.0/tools/contributed/sumopy/plugins/mapmatching/results_mpl.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/sumopy/plugins/mapmatching/results_mpl.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 # SUMOPy module
 # Copyright (C) 2012-2021 University of Bologna - DICAM
diff -Nru sumo-1.17.0/tools/contributed/sumopy/plugins/mapmatching/wxgui.py sumo-1.18.0/tools/contributed/sumopy/plugins/mapmatching/wxgui.py
--- sumo-1.17.0/tools/contributed/sumopy/plugins/mapmatching/wxgui.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/sumopy/plugins/mapmatching/wxgui.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 # SUMOPy module
 # Copyright (C) 2012-2021 University of Bologna - DICAM
diff -Nru sumo-1.17.0/tools/contributed/sumopy/plugins/prt/__init__.py sumo-1.18.0/tools/contributed/sumopy/plugins/prt/__init__.py
--- sumo-1.17.0/tools/contributed/sumopy/plugins/prt/__init__.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/sumopy/plugins/prt/__init__.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 # SUMOPy module
 # Copyright (C) 2012-2021 University of Bologna - DICAM
diff -Nru sumo-1.17.0/tools/contributed/sumopy/plugins/prt/prt.py sumo-1.18.0/tools/contributed/sumopy/plugins/prt/prt.py
--- sumo-1.17.0/tools/contributed/sumopy/plugins/prt/prt.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/sumopy/plugins/prt/prt.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 # SUMOPy module
 # Copyright (C) 2012-2021 University of Bologna - DICAM
diff -Nru sumo-1.17.0/tools/contributed/sumopy/plugins/prt/results_mpl.py sumo-1.18.0/tools/contributed/sumopy/plugins/prt/results_mpl.py
--- sumo-1.17.0/tools/contributed/sumopy/plugins/prt/results_mpl.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/sumopy/plugins/prt/results_mpl.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 # SUMOPy module
 # Copyright (C) 2012-2021 University of Bologna - DICAM
diff -Nru sumo-1.17.0/tools/contributed/sumopy/plugins/prt/wxgui.py sumo-1.18.0/tools/contributed/sumopy/plugins/prt/wxgui.py
--- sumo-1.17.0/tools/contributed/sumopy/plugins/prt/wxgui.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/sumopy/plugins/prt/wxgui.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 # SUMOPy module
 # Copyright (C) 2012-2021 University of Bologna - DICAM
diff -Nru sumo-1.17.0/tools/contributed/sumopy/sumopy_gui.py sumo-1.18.0/tools/contributed/sumopy/sumopy_gui.py
--- sumo-1.17.0/tools/contributed/sumopy/sumopy_gui.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/sumopy/sumopy_gui.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python2
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 # SUMOPy module
 # Copyright (C) 2012-2021 University of Bologna - DICAM
diff -Nru sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/cmd/Edge.java sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/cmd/Edge.java
--- sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/cmd/Edge.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/cmd/Edge.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 // TraaS module
 // Copyright (C) 2016-2017 Dresden University of Technology
diff -Nru sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/cmd/Gui.java sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/cmd/Gui.java
--- sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/cmd/Gui.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/cmd/Gui.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 // TraaS module
 // Copyright (C) 2016-2017 Dresden University of Technology
diff -Nru sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/cmd/Inductionloop.java sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/cmd/Inductionloop.java
--- sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/cmd/Inductionloop.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/cmd/Inductionloop.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 // TraaS module
 // Copyright (C) 2016-2017 Dresden University of Technology
diff -Nru sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/cmd/Junction.java sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/cmd/Junction.java
--- sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/cmd/Junction.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/cmd/Junction.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 // TraaS module
 // Copyright (C) 2016-2017 Dresden University of Technology
diff -Nru sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/cmd/Lanearea.java sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/cmd/Lanearea.java
--- sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/cmd/Lanearea.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/cmd/Lanearea.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 // TraaS module
 // Copyright (C) 2016-2017 Dresden University of Technology
diff -Nru sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/cmd/Lane.java sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/cmd/Lane.java
--- sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/cmd/Lane.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/cmd/Lane.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 // TraaS module
 // Copyright (C) 2016-2017 Dresden University of Technology
diff -Nru sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/cmd/Multientryexit.java sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/cmd/Multientryexit.java
--- sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/cmd/Multientryexit.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/cmd/Multientryexit.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 // TraaS module
 // Copyright (C) 2016-2017 Dresden University of Technology
diff -Nru sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/cmd/Person.java sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/cmd/Person.java
--- sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/cmd/Person.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/cmd/Person.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 // TraaS module
 // Copyright (C) 2016-2017 Dresden University of Technology
diff -Nru sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/cmd/Poi.java sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/cmd/Poi.java
--- sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/cmd/Poi.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/cmd/Poi.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 // TraaS module
 // Copyright (C) 2016-2017 Dresden University of Technology
diff -Nru sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/cmd/Polygon.java sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/cmd/Polygon.java
--- sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/cmd/Polygon.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/cmd/Polygon.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 // TraaS module
 // Copyright (C) 2016-2017 Dresden University of Technology
diff -Nru sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/cmd/Route.java sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/cmd/Route.java
--- sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/cmd/Route.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/cmd/Route.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 // TraaS module
 // Copyright (C) 2016-2017 Dresden University of Technology
diff -Nru sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/cmd/Simulation.java sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/cmd/Simulation.java
--- sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/cmd/Simulation.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/cmd/Simulation.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 // TraaS module
 // Copyright (C) 2016-2017 Dresden University of Technology
diff -Nru sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/cmd/Trafficlight.java sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/cmd/Trafficlight.java
--- sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/cmd/Trafficlight.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/cmd/Trafficlight.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 // TraaS module
 // Copyright (C) 2016-2017 Dresden University of Technology
diff -Nru sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/cmd/Vehicle.java sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/cmd/Vehicle.java
--- sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/cmd/Vehicle.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/cmd/Vehicle.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 // TraaS module
 // Copyright (C) 2016-2017 Dresden University of Technology
diff -Nru sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/cmd/Vehicletype.java sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/cmd/Vehicletype.java
--- sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/cmd/Vehicletype.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/cmd/Vehicletype.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 // TraaS module
 // Copyright (C) 2016-2017 Dresden University of Technology
diff -Nru sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/config/Constants.java sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/config/Constants.java
--- sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/config/Constants.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/config/Constants.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2009-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
@@ -13,7 +13,7 @@
 /****************************************************************************/
 /// @file    Constants.java
 /// @author  generated by "rebuildConstants.py"
-/// @date    2023-04-13 10:01:10.121108
+/// @date    2023-06-09 11:55:37.565651
 ///
 // This script contains TraCI constant definitions from /src/libsumo/TraCIConstants.h.
 /****************************************************************************/
@@ -889,7 +889,7 @@
     // list of allowed vehicle classes for lane changes (get&set: lanes)
     public static final int LANE_CHANGES = 0x3c;
 
-    // list of foe lanes (get: lanes)
+    // list of foe lanes (get: lane, vehicle)
     public static final int VAR_FOES = 0x37;
 
     // slope (get: edge, lane, vehicle, person)
@@ -919,7 +919,7 @@
     // position (3D) (get: vehicle, poi, set: poi)
     public static final int VAR_POSITION3D = 0x39;
 
-    // angle (get: vehicle, poi, gui; set: poi, gui)
+    // angle (get: vehicle, edge, lane, poi, gui; set: poi, gui)
     public static final int VAR_ANGLE = 0x43;
 
     // length (get: vehicle types, lanes, lane area detector, set: lanes)
@@ -1124,6 +1124,9 @@
     // boarding time (get: vehicle type, vehicle, person)
     public static final int VAR_BOARDING_DURATION = 0x2f;
 
+    // impatience (get,set: vehicle type, vehicle, person)
+    public static final int VAR_IMPATIENCE = 0x26;
+
     public static final int VAR_BUS_STOP_ID_LIST = 0x9f;
 
     // number of persons waiting at a defined bus stop (get: simulation)
@@ -1309,7 +1312,6 @@
     // retrieves abstract parameter and returns (key, value) tuple
     public static final int VAR_PARAMETER_WITH_KEY = 0x3e;
 
-
     // add an instance (poi, polygon, vehicle, person, route, gui)
     public static final int ADD = 0x80;
 
diff -Nru sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/objects/SumoBestLanes.java sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/objects/SumoBestLanes.java
--- sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/objects/SumoBestLanes.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/objects/SumoBestLanes.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 // TraaS module
 // Copyright (C) 2016-2017 Dresden University of Technology
diff -Nru sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/objects/SumoBoundingBox.java sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/objects/SumoBoundingBox.java
--- sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/objects/SumoBoundingBox.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/objects/SumoBoundingBox.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 // TraaS module
 // Copyright (C) 2016-2017 Dresden University of Technology
diff -Nru sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/objects/SumoColor.java sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/objects/SumoColor.java
--- sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/objects/SumoColor.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/objects/SumoColor.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 // TraaS module
 // Copyright (C) 2016-2017 Dresden University of Technology
diff -Nru sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/objects/SumoGeometry.java sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/objects/SumoGeometry.java
--- sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/objects/SumoGeometry.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/objects/SumoGeometry.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 // TraaS module
 // Copyright (C) 2016-2017 Dresden University of Technology
diff -Nru sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/objects/SumoLeader.java sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/objects/SumoLeader.java
--- sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/objects/SumoLeader.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/objects/SumoLeader.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 // TraaS module
 // Copyright (C) 2016-2017 Dresden University of Technology
diff -Nru sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/objects/SumoLink.java sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/objects/SumoLink.java
--- sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/objects/SumoLink.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/objects/SumoLink.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 // TraaS module
 // Copyright (C) 2016-2017 Dresden University of Technology
diff -Nru sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/objects/SumoLinkList.java sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/objects/SumoLinkList.java
--- sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/objects/SumoLinkList.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/objects/SumoLinkList.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 // TraaS module
 // Copyright (C) 2016-2017 Dresden University of Technology
diff -Nru sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/objects/SumoNextTLS.java sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/objects/SumoNextTLS.java
--- sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/objects/SumoNextTLS.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/objects/SumoNextTLS.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 // TraaS module
 // Copyright (C) 2016-2017 Dresden University of Technology
diff -Nru sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/objects/SumoObject.java sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/objects/SumoObject.java
--- sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/objects/SumoObject.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/objects/SumoObject.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 // TraaS module
 // Copyright (C) 2016-2017 Dresden University of Technology
diff -Nru sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/objects/SumoPosition2D.java sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/objects/SumoPosition2D.java
--- sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/objects/SumoPosition2D.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/objects/SumoPosition2D.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 // TraaS module
 // Copyright (C) 2016-2017 Dresden University of Technology
diff -Nru sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/objects/SumoPosition3D.java sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/objects/SumoPosition3D.java
--- sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/objects/SumoPosition3D.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/objects/SumoPosition3D.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 // TraaS module
 // Copyright (C) 2016-2017 Dresden University of Technology
diff -Nru sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/objects/SumoPrimitive.java sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/objects/SumoPrimitive.java
--- sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/objects/SumoPrimitive.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/objects/SumoPrimitive.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 // TraaS module
 // Copyright (C) 2016-2017 Dresden University of Technology
diff -Nru sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/objects/SumoRoadPosition.java sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/objects/SumoRoadPosition.java
--- sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/objects/SumoRoadPosition.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/objects/SumoRoadPosition.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 // TraaS module
 // Copyright (C) 2016-2019 Dresden University of Technology
diff -Nru sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/objects/SumoStage.java sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/objects/SumoStage.java
--- sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/objects/SumoStage.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/objects/SumoStage.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 // TraaS module
 // Copyright (C) 2016-2019 Dresden University of Technology
diff -Nru sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/objects/SumoStopFlags.java sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/objects/SumoStopFlags.java
--- sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/objects/SumoStopFlags.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/objects/SumoStopFlags.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 // TraaS module
 // Copyright (C) 2016-2017 Dresden University of Technology
diff -Nru sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/objects/SumoStringList.java sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/objects/SumoStringList.java
--- sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/objects/SumoStringList.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/objects/SumoStringList.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 // TraaS module
 // Copyright (C) 2016-2017 Dresden University of Technology
diff -Nru sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/objects/SumoTLSController.java sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/objects/SumoTLSController.java
--- sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/objects/SumoTLSController.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/objects/SumoTLSController.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 // TraaS module
 // Copyright (C) 2016-2017 Dresden University of Technology
diff -Nru sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/objects/SumoTLSPhase.java sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/objects/SumoTLSPhase.java
--- sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/objects/SumoTLSPhase.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/objects/SumoTLSPhase.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 // TraaS module
 // Copyright (C) 2016-2017 Dresden University of Technology
diff -Nru sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/objects/SumoTLSProgram.java sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/objects/SumoTLSProgram.java
--- sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/objects/SumoTLSProgram.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/objects/SumoTLSProgram.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 // TraaS module
 // Copyright (C) 2016-2017 Dresden University of Technology
diff -Nru sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/objects/SumoTrafficLightType.java sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/objects/SumoTrafficLightType.java
--- sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/objects/SumoTrafficLightType.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/objects/SumoTrafficLightType.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 // TraaS module
 // Copyright (C) 2016-2017 Dresden University of Technology
diff -Nru sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/objects/SumoVehicleData.java sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/objects/SumoVehicleData.java
--- sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/objects/SumoVehicleData.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/objects/SumoVehicleData.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 // TraaS module
 // Copyright (C) 2016-2017 Dresden University of Technology
diff -Nru sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/objects/SumoVehicleSignal.java sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/objects/SumoVehicleSignal.java
--- sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/objects/SumoVehicleSignal.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/objects/SumoVehicleSignal.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 // TraaS module
 // Copyright (C) 2016-2017 Dresden University of Technology
diff -Nru sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/objects/SumoVehicleSignalState.java sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/objects/SumoVehicleSignalState.java
--- sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/objects/SumoVehicleSignalState.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/objects/SumoVehicleSignalState.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 // TraaS module
 // Copyright (C) 2016-2017 Dresden University of Technology
diff -Nru sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/subscription/ContextSubscription.java sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/subscription/ContextSubscription.java
--- sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/subscription/ContextSubscription.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/subscription/ContextSubscription.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 // TraaS module
 // Copyright (C) 2016-2017 Dresden University of Technology
diff -Nru sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/subscription/ResponseType.java sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/subscription/ResponseType.java
--- sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/subscription/ResponseType.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/subscription/ResponseType.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 // TraaS module
 // Copyright (C) 2016-2017 Dresden University of Technology
diff -Nru sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/subscription/SubscribtionVariable.java sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/subscription/SubscribtionVariable.java
--- sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/subscription/SubscribtionVariable.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/subscription/SubscribtionVariable.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 // TraaS module
 // Copyright (C) 2016-2017 Dresden University of Technology
diff -Nru sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/subscription/SubscriptionContext.java sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/subscription/SubscriptionContext.java
--- sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/subscription/SubscriptionContext.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/subscription/SubscriptionContext.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 // TraaS module
 // Copyright (C) 2016-2017 Dresden University of Technology
diff -Nru sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/subscription/Subscription.java sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/subscription/Subscription.java
--- sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/subscription/Subscription.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/subscription/Subscription.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 // TraaS module
 // Copyright (C) 2016-2017 Dresden University of Technology
diff -Nru sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/subscription/SubscriptionObject.java sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/subscription/SubscriptionObject.java
--- sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/subscription/SubscriptionObject.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/subscription/SubscriptionObject.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 // TraaS module
 // Copyright (C) 2016-2017 Dresden University of Technology
diff -Nru sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/subscription/SumoDomain.java sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/subscription/SumoDomain.java
--- sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/subscription/SumoDomain.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/subscription/SumoDomain.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 // TraaS module
 // Copyright (C) 2016-2017 Dresden University of Technology
diff -Nru sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/subscription/VariableSubscription.java sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/subscription/VariableSubscription.java
--- sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/subscription/VariableSubscription.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/subscription/VariableSubscription.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 // TraaS module
 // Copyright (C) 2016-2017 Dresden University of Technology
diff -Nru sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/util/CommandProcessor.java sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/util/CommandProcessor.java
--- sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/util/CommandProcessor.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/util/CommandProcessor.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 // TraaS module
 // Copyright (C) 2016-2017 Dresden University of Technology
diff -Nru sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/util/Observable.java sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/util/Observable.java
--- sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/util/Observable.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/util/Observable.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 // TraaS module
 // Copyright (C) 2016-2017 Dresden University of Technology
diff -Nru sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/util/Observer.java sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/util/Observer.java
--- sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/util/Observer.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/util/Observer.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 // TraaS module
 // Copyright (C) 2016-2017 Dresden University of Technology
diff -Nru sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/util/Query.java sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/util/Query.java
--- sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/util/Query.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/util/Query.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 // TraaS module
 // Copyright (C) 2016-2017 Dresden University of Technology
diff -Nru sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/util/StringList.java sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/util/StringList.java
--- sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/util/StringList.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/util/StringList.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 // TraaS module
 // Copyright (C) 2016-2017 Dresden University of Technology
diff -Nru sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/util/SumoCommand.java sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/util/SumoCommand.java
--- sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/util/SumoCommand.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/sumo/util/SumoCommand.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 // TraaS module
 // Copyright (C) 2016-2017 Dresden University of Technology
diff -Nru sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/ws/container/SumoBestLanes.java sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/ws/container/SumoBestLanes.java
--- sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/ws/container/SumoBestLanes.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/ws/container/SumoBestLanes.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 // TraaS module
 // Copyright (C) 2016-2017 Dresden University of Technology
diff -Nru sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/ws/container/SumoBoundingBox.java sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/ws/container/SumoBoundingBox.java
--- sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/ws/container/SumoBoundingBox.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/ws/container/SumoBoundingBox.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 // TraaS module
 // Copyright (C) 2016-2017 Dresden University of Technology
diff -Nru sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/ws/container/SumoColor.java sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/ws/container/SumoColor.java
--- sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/ws/container/SumoColor.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/ws/container/SumoColor.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 // TraaS module
 // Copyright (C) 2016-2017 Dresden University of Technology
diff -Nru sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/ws/container/SumoGeometry.java sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/ws/container/SumoGeometry.java
--- sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/ws/container/SumoGeometry.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/ws/container/SumoGeometry.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 // TraaS module
 // Copyright (C) 2016-2017 Dresden University of Technology
diff -Nru sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/ws/container/SumoLeader.java sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/ws/container/SumoLeader.java
--- sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/ws/container/SumoLeader.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/ws/container/SumoLeader.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 // TraaS module
 // Copyright (C) 2016-2017 Dresden University of Technology
diff -Nru sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/ws/container/SumoLink.java sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/ws/container/SumoLink.java
--- sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/ws/container/SumoLink.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/ws/container/SumoLink.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 // TraaS module
 // Copyright (C) 2016-2017 Dresden University of Technology
diff -Nru sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/ws/container/SumoNextTLS.java sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/ws/container/SumoNextTLS.java
--- sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/ws/container/SumoNextTLS.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/ws/container/SumoNextTLS.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 // TraaS module
 // Copyright (C) 2016-2017 Dresden University of Technology
diff -Nru sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/ws/container/SumoPosition2D.java sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/ws/container/SumoPosition2D.java
--- sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/ws/container/SumoPosition2D.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/ws/container/SumoPosition2D.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 // TraaS module
 // Copyright (C) 2016-2017 Dresden University of Technology
diff -Nru sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/ws/container/SumoPosition3D.java sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/ws/container/SumoPosition3D.java
--- sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/ws/container/SumoPosition3D.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/ws/container/SumoPosition3D.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 // TraaS module
 // Copyright (C) 2016-2017 Dresden University of Technology
diff -Nru sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/ws/container/SumoRoadPosition.java sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/ws/container/SumoRoadPosition.java
--- sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/ws/container/SumoRoadPosition.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/ws/container/SumoRoadPosition.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 // TraaS module
 // Copyright (C) 2016-2019 Dresden University of Technology
diff -Nru sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/ws/container/SumoStage.java sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/ws/container/SumoStage.java
--- sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/ws/container/SumoStage.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/ws/container/SumoStage.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 // TraaS module
 // Copyright (C) 2016-2019 Dresden University of Technology
diff -Nru sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/ws/container/SumoStopFlags.java sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/ws/container/SumoStopFlags.java
--- sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/ws/container/SumoStopFlags.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/ws/container/SumoStopFlags.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 // TraaS module
 // Copyright (C) 2016-2017 Dresden University of Technology
diff -Nru sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/ws/container/SumoTLSController.java sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/ws/container/SumoTLSController.java
--- sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/ws/container/SumoTLSController.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/ws/container/SumoTLSController.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 // TraaS module
 // Copyright (C) 2016-2017 Dresden University of Technology
diff -Nru sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/ws/container/SumoTLSPhase.java sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/ws/container/SumoTLSPhase.java
--- sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/ws/container/SumoTLSPhase.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/ws/container/SumoTLSPhase.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 // TraaS module
 // Copyright (C) 2016-2017 Dresden University of Technology
diff -Nru sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/ws/container/SumoTLSProgram.java sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/ws/container/SumoTLSProgram.java
--- sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/ws/container/SumoTLSProgram.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/ws/container/SumoTLSProgram.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 // TraaS module
 // Copyright (C) 2016-2017 Dresden University of Technology
diff -Nru sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/ws/container/SumoTrafficLightType.java sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/ws/container/SumoTrafficLightType.java
--- sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/ws/container/SumoTrafficLightType.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/ws/container/SumoTrafficLightType.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 // TraaS module
 // Copyright (C) 2016-2017 Dresden University of Technology
diff -Nru sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/ws/container/SumoVehicleData.java sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/ws/container/SumoVehicleData.java
--- sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/ws/container/SumoVehicleData.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/ws/container/SumoVehicleData.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 // TraaS module
 // Copyright (C) 2016-2017 Dresden University of Technology
diff -Nru sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/ws/container/SumoVehicleSignal.java sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/ws/container/SumoVehicleSignal.java
--- sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/ws/container/SumoVehicleSignal.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/ws/container/SumoVehicleSignal.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 // TraaS module
 // Copyright (C) 2016-2017 Dresden University of Technology
diff -Nru sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/ws/container/SumoVehicleSignalState.java sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/ws/container/SumoVehicleSignalState.java
--- sumo-1.17.0/tools/contributed/traas/src/main/java/de/tudresden/ws/container/SumoVehicleSignalState.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/traas/src/main/java/de/tudresden/ws/container/SumoVehicleSignalState.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 // TraaS module
 // Copyright (C) 2016-2017 Dresden University of Technology
diff -Nru sumo-1.17.0/tools/contributed/traas/src/main/java/de/uniluebeck/itm/tcpip/Storage.java sumo-1.18.0/tools/contributed/traas/src/main/java/de/uniluebeck/itm/tcpip/Storage.java
--- sumo-1.17.0/tools/contributed/traas/src/main/java/de/uniluebeck/itm/tcpip/Storage.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/traas/src/main/java/de/uniluebeck/itm/tcpip/Storage.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/contributed/traas/src/main/java/it/polito/appeal/traci/CloseQuery.java sumo-1.18.0/tools/contributed/traas/src/main/java/it/polito/appeal/traci/CloseQuery.java
--- sumo-1.17.0/tools/contributed/traas/src/main/java/it/polito/appeal/traci/CloseQuery.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/traas/src/main/java/it/polito/appeal/traci/CloseQuery.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 // TraCI4J module
 // Copyright (C) 2011 ApPeAL Group, Politecnico di Torino
diff -Nru sumo-1.17.0/tools/contributed/traas/src/main/java/it/polito/appeal/traci/protocol/Command.java sumo-1.18.0/tools/contributed/traas/src/main/java/it/polito/appeal/traci/protocol/Command.java
--- sumo-1.17.0/tools/contributed/traas/src/main/java/it/polito/appeal/traci/protocol/Command.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/traas/src/main/java/it/polito/appeal/traci/protocol/Command.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 // TraCI4J module
 // Copyright (C) 2011 ApPeAL Group, Politecnico di Torino
diff -Nru sumo-1.17.0/tools/contributed/traas/src/main/java/it/polito/appeal/traci/protocol/RequestMessage.java sumo-1.18.0/tools/contributed/traas/src/main/java/it/polito/appeal/traci/protocol/RequestMessage.java
--- sumo-1.17.0/tools/contributed/traas/src/main/java/it/polito/appeal/traci/protocol/RequestMessage.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/traas/src/main/java/it/polito/appeal/traci/protocol/RequestMessage.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 // TraCI4J module
 // Copyright (C) 2011 ApPeAL Group, Politecnico di Torino
diff -Nru sumo-1.17.0/tools/contributed/traas/src/main/java/it/polito/appeal/traci/protocol/ResponseContainer.java sumo-1.18.0/tools/contributed/traas/src/main/java/it/polito/appeal/traci/protocol/ResponseContainer.java
--- sumo-1.17.0/tools/contributed/traas/src/main/java/it/polito/appeal/traci/protocol/ResponseContainer.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/traas/src/main/java/it/polito/appeal/traci/protocol/ResponseContainer.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 // TraCI4J module
 // Copyright (C) 2011 ApPeAL Group, Politecnico di Torino
diff -Nru sumo-1.17.0/tools/contributed/traas/src/main/java/it/polito/appeal/traci/protocol/ResponseMessage.java sumo-1.18.0/tools/contributed/traas/src/main/java/it/polito/appeal/traci/protocol/ResponseMessage.java
--- sumo-1.17.0/tools/contributed/traas/src/main/java/it/polito/appeal/traci/protocol/ResponseMessage.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/traas/src/main/java/it/polito/appeal/traci/protocol/ResponseMessage.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 // TraCI4J module
 // Copyright (C) 2011 ApPeAL Group, Politecnico di Torino
diff -Nru sumo-1.17.0/tools/contributed/traas/src/main/java/it/polito/appeal/traci/protocol/StatusResponse.java sumo-1.18.0/tools/contributed/traas/src/main/java/it/polito/appeal/traci/protocol/StatusResponse.java
--- sumo-1.17.0/tools/contributed/traas/src/main/java/it/polito/appeal/traci/protocol/StatusResponse.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/traas/src/main/java/it/polito/appeal/traci/protocol/StatusResponse.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 // TraCI4J module
 // Copyright (C) 2011 ApPeAL Group, Politecnico di Torino
diff -Nru sumo-1.17.0/tools/contributed/traas/src/main/java/it/polito/appeal/traci/SumoTraciConnection.java sumo-1.18.0/tools/contributed/traas/src/main/java/it/polito/appeal/traci/SumoTraciConnection.java
--- sumo-1.17.0/tools/contributed/traas/src/main/java/it/polito/appeal/traci/SumoTraciConnection.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/traas/src/main/java/it/polito/appeal/traci/SumoTraciConnection.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 // TraCI4J module
 // Copyright (C) 2011 ApPeAL Group, Politecnico di Torino
diff -Nru sumo-1.17.0/tools/contributed/traas/src/main/java/it/polito/appeal/traci/TraCIException.java sumo-1.18.0/tools/contributed/traas/src/main/java/it/polito/appeal/traci/TraCIException.java
--- sumo-1.17.0/tools/contributed/traas/src/main/java/it/polito/appeal/traci/TraCIException.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/traas/src/main/java/it/polito/appeal/traci/TraCIException.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 // TraCI4J module
 // Copyright (C) 2011 ApPeAL Group, Politecnico di Torino
diff -Nru sumo-1.17.0/tools/contributed/traas/src/test/java/de/tudresden/sumo/test/SimpleTest.java sumo-1.18.0/tools/contributed/traas/src/test/java/de/tudresden/sumo/test/SimpleTest.java
--- sumo-1.17.0/tools/contributed/traas/src/test/java/de/tudresden/sumo/test/SimpleTest.java	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/contributed/traas/src/test/java/de/tudresden/sumo/test/SimpleTest.java	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 // TraaS module
 // Copyright (C) 2013-2017 Dresden University of Technology
diff -Nru sumo-1.17.0/tools/countEdgeUsage.py sumo-1.18.0/tools/countEdgeUsage.py
--- sumo-1.17.0/tools/countEdgeUsage.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/countEdgeUsage.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2008-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/createVehTypeDistribution.py sumo-1.18.0/tools/createVehTypeDistribution.py
--- sumo-1.17.0/tools/createVehTypeDistribution.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/createVehTypeDistribution.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2010-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
@@ -48,26 +48,23 @@
 
 
 def get_options(args=None):
-    argParser = ArgumentParser()
-    argParser.add_argument(
-        "configFile", help="file path of the config file which defines the car-following parameter distributions")
-    argParser.add_argument(
-        "-o", "--output-file", dest="outputFile", default="vTypeDistributions.add.xml", help="file path of the " +
-        "output file (if the file already exists, the script tries to insert the distribution node into it)")
-    argParser.add_argument(
-        "-n", "--name", dest="vehDistName", default="vehDist", help="alphanumerical ID used for the created " +
-        "vehicle type distribution")
-    argParser.add_argument(
-        "-s", "--size", type=int, default=100, dest="vehicleCount", help="number of vTypes in the distribution")
-    argParser.add_argument(
-        "-d", "--decimal-places", type=int, default=3, dest="decimalPlaces", help="number of decimal places for " +
-        "numeric attribute values")
-    argParser.add_argument(
-        "--resampling", type=int, default=100, dest="nrSamplingAttempts", help="number of attempts to resample a " +
-        "value until it lies in the specified bounds")
-    argParser.add_argument("--seed", type=int, help="random seed", default=42)
+    ap = ArgumentParser()
+    ap.add_argument("configFile", category="input",
+                    help="file path of the config file which defines the car-following parameter distributions")
+    ap.add_argument("-o", "--output-file", category="output", dest="outputFile", default="vTypeDistributions.add.xml",
+                    help=("file path of the output file" +
+                          "(if the file already exists, the script tries to insert the distribution node into it)"))
+    ap.add_argument("-n", "--name", dest="vehDistName", default="vehDist",
+                    help="alphanumerical ID used for the created vehicle type distribution")
+    ap.add_argument("-s", "--size", type=int, default=100, dest="vehicleCount",
+                    help="number of vTypes in the distribution")
+    ap.add_argument("-d", "--decimal-places", type=int, default=3, dest="decimalPlaces",
+                    help="number of decimal places for numeric attribute values")
+    ap.add_argument("--resampling", type=int, default=100, dest="nrSamplingAttempts",
+                    help="number of attempts to resample a value until it lies in the specified bounds")
+    ap.add_argument("--seed", type=int, help="random seed", default=42)
 
-    options = argParser.parse_args(args)
+    options = ap.parse_args(args)
     return options
 
 
diff -Nru sumo-1.17.0/tools/detector/aggregateFlows.py sumo-1.18.0/tools/detector/aggregateFlows.py
--- sumo-1.17.0/tools/detector/aggregateFlows.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/detector/aggregateFlows.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2007-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
@@ -67,10 +67,10 @@
                 int(flowDef[1]), int(flowDef[2]), float(flowDef[3]), float(flowDef[4]))
 
 
-parser = sumolib.options.ArgumentParser(usage="usage: %prog [options] [flow.txt|flows.zip]+")
+parser = sumolib.options.ArgumentParser(usage="usage: %(prog)s [options] [flow.txt|flows.zip]+")
 parser.add_option("-d", "--det-file", dest="detfile", category="input", type=parser.file,
                   help="read detectors of interest from FILE", metavar="FILE")
-parser.add_option("flow-files", dest="flowFiles", category="input", nargs="+", type=parser.file,
+parser.add_option("flowFiles", category="input", nargs="+", type=parser.file,
                   help="one or more flow input files", metavar="FILE")
 options = parser.parse_args()
 
diff -Nru sumo-1.17.0/tools/detector/detector.py sumo-1.18.0/tools/detector/detector.py
--- sumo-1.17.0/tools/detector/detector.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/detector/detector.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2007-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/detector/edgeDataFromFlow.py sumo-1.18.0/tools/detector/edgeDataFromFlow.py
--- sumo-1.17.0/tools/detector/edgeDataFromFlow.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/detector/edgeDataFromFlow.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2007-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/detector/filterFlows.py sumo-1.18.0/tools/detector/filterFlows.py
--- sumo-1.17.0/tools/detector/filterFlows.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/detector/filterFlows.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2013-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
@@ -25,7 +25,7 @@
 sys.path.append(os.path.join(SUMO_HOME, 'tools'))
 from sumolib.options import ArgumentParser  # noqa
 
-parser = ArgumentParser(usage="usage: %prog [options]")
+parser = ArgumentParser(usage="usage: %(prog)s [options]")
 parser.add_argument("-f", "--flows", type=parser.file, category="input", metavar="FILE",
                     help="read detector flows from FILE(s) (mandatory)")
 parser.add_argument("-o", "--output", type=parser.file, category="output", help="filtered file", metavar="FILE")
diff -Nru sumo-1.17.0/tools/detector/flowFromEdgeData.py sumo-1.18.0/tools/detector/flowFromEdgeData.py
--- sumo-1.17.0/tools/detector/flowFromEdgeData.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/detector/flowFromEdgeData.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2007-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/detector/flowFromRoutes.py sumo-1.18.0/tools/detector/flowFromRoutes.py
--- sumo-1.17.0/tools/detector/flowFromRoutes.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/detector/flowFromRoutes.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2007-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/detector/flowrouter.py sumo-1.18.0/tools/detector/flowrouter.py
--- sumo-1.17.0/tools/detector/flowrouter.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/detector/flowrouter.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2007-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/detector/mapDetectors.py sumo-1.18.0/tools/detector/mapDetectors.py
--- sumo-1.17.0/tools/detector/mapDetectors.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/detector/mapDetectors.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2013-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/detector/plotFlows.py sumo-1.18.0/tools/detector/plotFlows.py
--- sumo-1.17.0/tools/detector/plotFlows.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/detector/plotFlows.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2007-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/detector/routeUsage.py sumo-1.18.0/tools/detector/routeUsage.py
--- sumo-1.17.0/tools/detector/routeUsage.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/detector/routeUsage.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2007-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
@@ -33,7 +33,7 @@
 
 
 def get_options():
-    USAGE = """Usage %prog  []"""
+    USAGE = """Usage %(prog)s  []"""
     parser = sumolib.options.ArgumentParser(usage=USAGE)
     parser.add_argument("-v", "--verbose", action="store_true",
                         default=False, help="Give more output")
@@ -43,9 +43,9 @@
                         help="Output route ids that are used less than the threshold value to file")
     parser.add_argument("-r", "--flow-restrictions", dest="restrictionfile", category="output", type=parser.file,
                         help="Output route ids that are used more often than the threshold value given in file")
-    parser.add_argument("emitters", dest="emitters", type=parser.file,
+    parser.add_argument("emitters", type=parser.file,
                         help="file path to emitter file", metavar="FILE")
-    parser.add_argument("routes", dest="routes", nargs="?", type=parser.file,
+    parser.add_argument("routes", nargs="?", type=parser.file,
                         help="file path to route file", metavar="FILE")
     options = parser.parse_args()
 
diff -Nru sumo-1.17.0/tools/detector/validate.py sumo-1.18.0/tools/detector/validate.py
--- sumo-1.17.0/tools/detector/validate.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/detector/validate.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2013-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
@@ -30,7 +30,7 @@
 sys.path.append(os.path.join(os.environ["SUMO_HOME"], 'tools'))
 import sumolib  # noqa
 
-parser = sumolib.options.ArgumentParser(usage="usage: %prog [options] ")
+parser = sumolib.options.ArgumentParser(usage="usage: %(prog)s [options] ")
 parser.add_argument(
     "-d", "--detectorfile", type=parser.file, help="read detector list from file")
 parser.add_argument(
@@ -39,7 +39,7 @@
                     help="aggregation interval in minutes (default: %default)")
 parser.add_argument("-l", "--legacy", action="store_true", default=False,
                     help="legacy style, input file is whitespace separated, detector_definition")
-parser.add_argument("input-flows", dest="inputFlows", category="input", nargs=1, type=parser.file,
+parser.add_argument("inputFlows", category="input", nargs=1, type=parser.file,
                     help="csv file with flow input", metavar="FILE")
 options = parser.parse_args()
 
diff -Nru sumo-1.17.0/tools/devel/checkTests.py sumo-1.18.0/tools/devel/checkTests.py
--- sumo-1.17.0/tools/devel/checkTests.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/devel/checkTests.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2010-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/devel/debug2sel.py sumo-1.18.0/tools/devel/debug2sel.py
--- sumo-1.17.0/tools/devel/debug2sel.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/devel/debug2sel.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2010-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/devel/debug2shapes.py sumo-1.18.0/tools/devel/debug2shapes.py
--- sumo-1.17.0/tools/devel/debug2shapes.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/devel/debug2shapes.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2010-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/devel/rebuild_cscope.sh sumo-1.18.0/tools/devel/rebuild_cscope.sh
--- sumo-1.17.0/tools/devel/rebuild_cscope.sh	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/devel/rebuild_cscope.sh	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2008-2022 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/devel/timing.py sumo-1.18.0/tools/devel/timing.py
--- sumo-1.17.0/tools/devel/timing.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/devel/timing.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2011-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/district/aggregateAndSplitMatrices.py sumo-1.18.0/tools/district/aggregateAndSplitMatrices.py
--- sumo-1.17.0/tools/district/aggregateAndSplitMatrices.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/district/aggregateAndSplitMatrices.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2008-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/district/countConnectionsInDistricts.py sumo-1.18.0/tools/district/countConnectionsInDistricts.py
--- sumo-1.17.0/tools/district/countConnectionsInDistricts.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/district/countConnectionsInDistricts.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2007-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/district/districtMapper.py sumo-1.18.0/tools/district/districtMapper.py
--- sumo-1.17.0/tools/district/districtMapper.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/district/districtMapper.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2007-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/district/filterDistricts.py sumo-1.18.0/tools/district/filterDistricts.py
--- sumo-1.17.0/tools/district/filterDistricts.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/district/filterDistricts.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2007-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/district/gridDistricts.py sumo-1.18.0/tools/district/gridDistricts.py
--- sumo-1.17.0/tools/district/gridDistricts.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/district/gridDistricts.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2007-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
@@ -89,8 +89,8 @@
         xIndex = int((x - xmin + w2) / w)
         yIndex = int((y - ymin + w2) / w)
         ii = (xIndex, yIndex)
-        x2 = xIndex * w
-        y2 = yIndex * w
+        x2 = xmin + xIndex * w
+        y2 = ymin + yIndex * w
         if ii not in odpairs:
             odpairs[ii] = TAZ("%s_%s" % (xIndex, yIndex),
                               [(x2 - w2, y2 - w2),
diff -Nru sumo-1.17.0/tools/district/stationDistricts.py sumo-1.18.0/tools/district/stationDistricts.py
--- sumo-1.17.0/tools/district/stationDistricts.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/district/stationDistricts.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2007-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/drt/darpSolvers.py sumo-1.18.0/tools/drt/darpSolvers.py
--- sumo-1.17.0/tools/drt/darpSolvers.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/drt/darpSolvers.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2007-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/drt/drtOnline.py sumo-1.18.0/tools/drt/drtOnline.py
--- sumo-1.17.0/tools/drt/drtOnline.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/drt/drtOnline.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2007-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/drt/drtOrtools.py sumo-1.18.0/tools/drt/drtOrtools.py
--- sumo-1.17.0/tools/drt/drtOrtools.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/drt/drtOrtools.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2021-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
@@ -50,11 +50,11 @@
     TIME = 2
 
 
-def dispatch(reservations, fleet, time_limit, cost_type, drf, end, fix_allocation, verbose):
+def dispatch(reservations, fleet, time_limit, cost_type, drf, end, fix_allocation, solution_requests, verbose):
     """Dispatch using ortools."""
     if verbose:
         print('Start creating the model.')
-    data = create_data_model(reservations, fleet, cost_type, drf, end, fix_allocation, verbose)
+    data = create_data_model(reservations, fleet, cost_type, drf, end, fix_allocation, solution_requests, verbose)
     if verbose:
         print('Start solving the problem.')
     solution_ortools = ortools_pdp.main(data, time_limit, verbose)
@@ -64,7 +64,7 @@
     return solution_requests
 
 
-def create_data_model(reservations, fleet, cost_type, drf, end, fix_allocation, verbose):
+def create_data_model(reservations, fleet, cost_type, drf, end, fix_allocation, solution_requests, verbose):
     """Creates the data for the problem."""
     n_vehicles = len(fleet)
     # use only reservations that haven't been picked up yet; reservation.state!=8 (not picked up)
@@ -95,8 +95,10 @@
         if verbose:
             print('Reservation %s ends at edge %s' % (reservation.id, to_edge))
     for reservation in dp_reservations:
-        if reservation.state == 1 | reservation.state == 2:
+        if reservation.state == 1 or reservation.state == 2:
             setattr(reservation, 'is_new', True)
+        else:
+            setattr(reservation, 'is_new', False)
     for reservation in do_reservations:
         to_edge = reservation.toEdge
         edges.append(to_edge)
@@ -126,11 +128,21 @@
 
     # add "direct route cost" to the requests:
     for res in reservations:
+        if hasattr(res, 'direct_route_cost'):
+            continue
         if hasattr(res, 'from_node'):
             setattr(res, 'direct_route_cost', cost_matrix[res.from_node][res.to_node])
+            if verbose:
+                print('Reservation %s has direct route costs %s' % (res.id, res.direct_route_cost))
         else:
             # TODO: use 'historical data' from dict in get_cost_matrix instead
-            direct_route_cost = traci.simulation.findRoute(res.fromEdge, res.toEdge, vType=type_vehicle)
+            route = traci.simulation.findRoute(res.fromEdge, res.toEdge, vType=type_vehicle)
+            if cost_type == CostType.TIME:
+                direct_route_cost = route.traveltime
+            elif cost_type == CostType.DISTANCE:
+                direct_route_cost = route.length
+            else:
+                raise ValueError("Cannot set given cost ('%s')." % (cost_type))
             setattr(res, 'direct_route_cost', direct_route_cost)
 
     # add "current route cost" to the already picked up reservations:
@@ -185,6 +197,8 @@
     data['drf'] = drf
     data['time_windows'] = time_windows
     data['fix_allocation'] = fix_allocation
+    data['max_time'] = end
+    data['initial_routes'] = solution_requests
     return data
 
 
@@ -308,10 +322,10 @@
 
     solution_requests = {}
     for key in solution_ortools:  # key is the vehicle number (0,1,...)
-        solution = [[], []]  # request order and costs
+        solution = [[], [], []]  # request order, costs, node order
         for i_route in solution_ortools[key][0][1:-1]:  # take only the routes ([0]) without the start node ([1:-1])
             if i_route in route2request:
-                solution[0].append(route2request[i_route])  # add node to route
+                solution[0].append(route2request[i_route])  # add request id to route
                 res = [res for res in reservations if res.id == route2request[i_route]][0]  # get the reservation
                 setattr(res, 'vehicle_index', key)
             else:
@@ -319,6 +333,7 @@
                     print('!solution ignored: %s' % (i_route))
                 continue
             solution[1] = solution_ortools[key][1]  # costs
+            solution[2].append(i_route)  # node
             solution_requests[key] = solution
     return solution_requests
 
@@ -345,7 +360,18 @@
     timestep = traci.simulation.getTime()
     if not end:
         end = get_max_time()
+
+    if verbose:
+        print('Simulation parameters:')
+        print('  end: %s' % end)
+        print('  interval: %s' % interval)
+        print('  time_limit: %s' % time_limit)
+        print('  cost_type: %s' % cost_type)
+        print('  drf: %s' % drf)
+        print('  fix_allocation: %s' % fix_allocation)
+
     reservations_all = list()
+    solution_requests = None
     while running:
 
         traci.simulationStep(timestep)
@@ -400,11 +426,12 @@
         else:
             reservations_all = current_reservations
 
+        # if reservations_all:  # used for debugging
         if reservations_not_assigned:
             if verbose:
                 print("Solve CPDP")
             solution_requests = dispatch(reservations_all, fleet, time_limit,
-                                         cost_type, drf, end, fix_allocation, verbose)
+                                         cost_type, drf, int(end), fix_allocation, solution_requests, verbose)
             if solution_requests is not None:
                 for index_vehicle in solution_requests:  # for each vehicle
                     id_vehicle = fleet[index_vehicle]
diff -Nru sumo-1.17.0/tools/drt/ortools_pdp.py sumo-1.18.0/tools/drt/ortools_pdp.py
--- sumo-1.17.0/tools/drt/ortools_pdp.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/drt/ortools_pdp.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2021-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
@@ -35,7 +35,7 @@
     vehicle (vehicle id: [0, ..., n_veh-1]) including the
     route (list of nodes) and costs."""
     if verbose:
-        print('Objective: ', solution.ObjectiveValue())
+        print('Objective: %s' % solution.ObjectiveValue())
     time_dimension = routing.GetDimensionOrDie('Time')
     solution_dict = {}
     total_cost = 0
@@ -110,7 +110,10 @@
         True,  # start cumul to zero
         dimension_name)
     distance_dimension = routing.GetDimensionOrDie(dimension_name)
-    distance_dimension.SetGlobalSpanCostCoefficient(100)
+    # the following tries to reduce the route costs of the vehicle with maximum costs
+    # distance_dimension.SetGlobalSpanCostCoefficient(0)
+    # the following tries to reduce the sum of all route costs
+    # distance_dimension.SetSpanCostCoefficientForAllVehicles(0)
     return distance_dimension
 
 
@@ -120,6 +123,8 @@
     for request in data['pickups_deliveries']:
         pickup_index = manager.NodeToIndex(request.from_node)
         delivery_index = manager.NodeToIndex(request.to_node)
+        if verbose:
+            print('pickup/dropoff nodes: %s/%s' % (request.from_node, request.to_node))
         routing.AddPickupAndDelivery(pickup_index, delivery_index)  # helps the solver
         # use same veh for pickup and dropoff
         solver.Add(routing.VehicleVar(pickup_index) == routing.VehicleVar(delivery_index))
@@ -128,7 +133,9 @@
             distance_dimension.CumulVar(delivery_index))  # define order: first pickup then dropoff
         if hasattr(request, 'is_new') and request.is_new:  # is that a new request?
             # allows to reject the order but gives penalty
-            routing.AddDisjunction([pickup_index, delivery_index], 100000, 2)
+            if verbose:
+                print('allow to reject new reservation %s' % (request.id))
+            routing.AddDisjunction([pickup_index, delivery_index], 10000, 2)
 
 
 def add_direct_route_factor_constraint(data, routing, manager, solver, distance_dimension, verbose):
@@ -145,15 +152,32 @@
                 solver.IntConst(round(direct_route_cost * data['drf'])))  # direct route cost times direct route factor
             route_cost = distance_dimension.CumulVar(delivery_index) - distance_dimension.CumulVar(pickup_index)
             direct_route_cost_drf = solver.IntConst(round(direct_route_cost * data['drf']))
+            if verbose:
+                print('reservation %s with direct route cost %s * drf %s = max cost %s' % (
+                    request.id, direct_route_cost, data['drf'], direct_route_cost_drf.Value()))
         # if possible, let the route costs of the dropoffs less than the drf allows,
-        # else minimize the route costs (in case the costs become larger than expected)
+        # else minimize the route costs (in case the costs became larger than expected)
         for request in data['dropoffs']:  # TODO: not sure that it works, test needed!
+            direct_route_cost = request.direct_route_cost
             direct_route_cost_drf = solver.IntConst(round(direct_route_cost * data['drf']))
             delivery_index = manager.NodeToIndex(request.to_node)
             route_cost = (distance_dimension.CumulVar(delivery_index) +  # cost from veh start to dropoff node
                           solver.IntConst(round(request.current_route_cost)))  # cost from pickup to veh start
-            # objective_to_minimize = solver.Minimize(solver.Max(route_cost, direct_route_cost_drf), 10)
-            routing.AddVariableMinimizedByFinalizer(solver.Max(route_cost, direct_route_cost_drf).Var())
+            # max_cost = solver.Max(route_cost, direct_route_cost_drf)
+            # objective_to_minimize = solver.Minimize(max_cost, 10)
+            # objective_to_minimize.EnterSearch()
+            # solver.Add(max_cost <= objective_to_minimize)
+            # routing.AddVariableMinimizedByFinalizer(max_cost.Var())
+            # solver.Add(
+            #    route_cost <=  # route cost
+            #    direct_route_cost_drf  # direct route cost times direct route factor
+            # )
+            # routing_dimension = routing.GetDimensionOrDie('Costs')
+            distance_dimension.SetCumulVarSoftUpperBound(delivery_index, round(
+                direct_route_cost * data['drf'] - request.current_route_cost), 10)
+            if verbose:
+                print('reservation %s with max cost %s, already used costs %s, possible route costs %s' %
+                      (request.id, direct_route_cost_drf.Value(), request.current_route_cost, route_cost))
 
 
 def add_dropoff_constraint(data, routing, manager, verbose):
@@ -172,7 +196,8 @@
     #        routing.SetAllowedVehiclesForIndex([veh_index],index)
     for res in data['dropoffs']:
         if verbose:
-            print('reservation %s in veh %s (%s)' % (res.id, res.vehicle, res.vehicle_index))
+            print('reservation %s in veh %s(%s), droppoff node: %s' %
+                  (res.id, res.vehicle, res.vehicle_index, res.to_node))
         index = manager.NodeToIndex(res.to_node)
         routing.SetAllowedVehiclesForIndex([res.vehicle_index], index)
 
@@ -206,15 +231,6 @@
         'Capacity')
 
 
-def set_first_solution_heuristic(time_limit_seconds, verbose):
-    if verbose:
-        print(' Set solution heuristic...')
-    search_parameters = pywrapcp.DefaultRoutingSearchParameters()
-    search_parameters.first_solution_strategy = (routing_enums_pb2.FirstSolutionStrategy.PATH_MOST_CONSTRAINED_ARC)
-    search_parameters.time_limit.FromSeconds(time_limit_seconds)
-    return search_parameters
-
-
 def add_time_windows_constraint(data, routing, manager, verbose):
     if verbose:
         print(' Add time windows constraints...')
@@ -228,12 +244,11 @@
 
     time_callback_index = routing.RegisterTransitCallback(time_callback)
     # routing.SetArcCostEvaluatorOfAllVehicles(time_callback_index)
-    matrix_times = int(np.sum(data['time_matrix']))
     dimension_name = 'Time'
     routing.AddDimension(
         time_callback_index,
-        matrix_times,  # allow waiting time
-        matrix_times,  # maximum time per vehicle
+        int(data['max_time']),  # allow waiting time
+        int(data['max_time']),  # maximum time per vehicle
         False,  # Don't force start cumul to zero.
         dimension_name)
     time_dimension = routing.GetDimensionOrDie(dimension_name)
@@ -244,6 +259,8 @@
         if location_idx == 0:
             continue
         index = manager.NodeToIndex(location_idx)
+        if verbose:
+            print('window for node %s: [%s, %s]' % (location_idx, time_window[0], time_window[1]))
         time_dimension.CumulVar(index).SetRange(time_window[0], time_window[1])  # TODO: check if set, else ignore it
     # TODO: check if the followwing is needed
     # # Add time window constraints for each vehicle start node.
@@ -260,6 +277,69 @@
     #         time_dimension.CumulVar(routing.End(i)))
 
 
+def solve_from_initial_solution(routing, manager, search_parameters, data, verbose):
+    solution_requests = data['initial_routes']
+    # get inital solution
+    inital_solution = []
+    if solution_requests is not None:
+        for index_vehicle in solution_requests:
+            # use request ids ([0]) here and align with current status of the requests
+            request_order = solution_requests[index_vehicle][0].copy()
+            for request_id in set(solution_requests[index_vehicle][0]):
+                # 0: done
+                # 1: only drop-off left
+                # 2: pick-up and drop-off left
+                old_status = solution_requests[index_vehicle][0].count(request_id)
+                new_status = 0
+                if request_id in [req.id for req in data['pickups_deliveries']]:
+                    new_status = 2
+                elif request_id in [req.id for req in data['dropoffs']]:
+                    new_status = 1
+                if new_status == 0:
+                    # remove complete request
+                    request_order = [req for req in request_order if req != request_id]
+                if old_status == 2 and new_status == 1:
+                    # remove first occurance of the request
+                    request_order.remove(request_id)
+            # translate new requests order (ids) to nodes order
+            # (e.g. [0,1,2,1,2] -> [0.to_node, 1.from_node, 2.from_node, 1.to_node, 2.to_node])
+            request_id_set = set(request_order)  # e.g. [0,1,2]
+            # first occurance from behind (will be "to_node")
+            reverserd_request_order = request_order.copy()
+            reverserd_request_order.reverse()  # e.g. [2,1,2,1,0]
+            first_occurance_from_behind = [reverserd_request_order.index(id) for id in request_id_set]  # e.g. [0,1,4]
+            all_requests = data['pickups_deliveries'].copy()
+            all_requests.extend(data['dropoffs'].copy())
+            nodes_order = []
+            for index, req_id in enumerate(reverserd_request_order):
+                req = [r for r in all_requests if r.id == req_id][0]
+                if index in first_occurance_from_behind:
+                    nodes_order.insert(0, manager.NodeToIndex(req.to_node))
+                else:
+                    nodes_order.insert(0, manager.NodeToIndex(req.from_node))
+            # nodes_order = solution_requests[index_vehicle][2]  # [2] for nodes
+            inital_solution.append(nodes_order)
+    routing.CloseModelWithParameters(search_parameters)
+    if verbose:
+        print('Initial solution:')
+        for index_vehicle, index_list in enumerate(inital_solution):
+            print('veh %s: %s' % (index_vehicle, [manager.IndexToNode(index) for index in index_list]))
+    initial_solution = routing.ReadAssignmentFromRoutes(inital_solution, True)
+    solution = routing.SolveFromAssignmentWithParameters(initial_solution, search_parameters)
+    return solution
+
+
+def set_first_solution_heuristic(time_limit_seconds, verbose):
+    if verbose:
+        print(' Set solution heuristic...')
+    search_parameters = pywrapcp.DefaultRoutingSearchParameters()
+    search_parameters.first_solution_strategy = routing_enums_pb2.FirstSolutionStrategy.PATH_MOST_CONSTRAINED_ARC
+    # search_parameters.first_solution_strategy = routing_enums_pb2.FirstSolutionStrategy.PATH_CHEAPEST_ARC
+    # search_parameters.local_search_metaheuristic = routing_enums_pb2.LocalSearchMetaheuristic.GUIDED_LOCAL_SEARCH
+    search_parameters.time_limit.FromSeconds(time_limit_seconds)
+    return search_parameters
+
+
 def main(data, time_limit_seconds=10, verbose=False):
     """Entry point of the program."""
     # Create the routing index manager.
@@ -295,6 +375,7 @@
 
     # Add time window constraints.
     add_time_windows_constraint(data, routing, manager, verbose)
+
     print('## Done')
     # Setting first solution heuristic.
     search_parameters = set_first_solution_heuristic(time_limit_seconds, verbose)
@@ -302,7 +383,12 @@
     # Solve the problem.
     if verbose:
         print('Start solving the problem.')
-    solution = routing.SolveWithParameters(search_parameters)
+    if data['initial_routes']:
+        # TODO: change ids of the nodes, due to already picked up or droped off requests after last solution!
+        solution = solve_from_initial_solution(routing, manager, search_parameters, data, verbose)
+    else:
+        solution = routing.SolveWithParameters(search_parameters)
+#    solution = routing.SolveWithParameters(search_parameters)
 
     if solution:
         return get_solution(data, manager, routing, solution, verbose)
diff -Nru sumo-1.17.0/tools/edgesInDistricts.py sumo-1.18.0/tools/edgesInDistricts.py
--- sumo-1.17.0/tools/edgesInDistricts.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/edgesInDistricts.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2007-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/emissions/findMinDiffModel.py sumo-1.18.0/tools/emissions/findMinDiffModel.py
--- sumo-1.17.0/tools/emissions/findMinDiffModel.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/emissions/findMinDiffModel.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/emissions/hbefaCoeffs.py sumo-1.18.0/tools/emissions/hbefaCoeffs.py
--- sumo-1.17.0/tools/emissions/hbefaCoeffs.py	1970-01-01 00:00:00.000000000 +0000
+++ sumo-1.18.0/tools/emissions/hbefaCoeffs.py	2023-06-28 20:02:17.000000000 +0000
@@ -0,0 +1,42 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
+# Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# https://www.eclipse.org/legal/epl-2.0/
+# This Source Code 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
+
+# @file    hbefaCoeffs.py
+# @author  Michael Behrisch
+# @date    2023-06-06
+
+"""
+This script converts the CSV from the coefficient fit to a C++ table.
+"""
+from __future__ import print_function
+
+import sys
+import collections
+import csv
+
+params = collections.defaultdict(dict)
+for line in csv.DictReader(open(sys.argv[1])):
+    factor = 1000.
+    if line["e"] == "FC_MJ":
+        factor /= 3.6  # MJ to Wh
+    params[line["Subsegment"]][line["e"]] = [factor * float(x) for x in (line['E0'], line['V'], line['A'], line['V2'], line['V3'], line['AV'], line['AV2'])]  # noqa
+for segment, data in params.items():
+    data["PM + PM (non-exhaust)"] = [a + b for a, b in zip(data["PM"], data["PM (non-exhaust)"])]
+    if data["FC"] != 7 * [0]:
+        data["FC_MJ"] = 7 * [0]
+    s = segment.replace("<=", "le").replace(">=", "ge").replace("<", "lt").replace(">", "gt")
+    print("    {\n        // %s" % s.translate(str.maketrans(" ,'/*", "____s")))
+    for e in ("CO2(total)", "CO", "HC", "FC", "NOx", "PM + PM (non-exhaust)", "FC_MJ"):
+        print("        { %.3e, %.3e, %.3e, %.3e, %.3e, %.3e, %.3e }, // %s" % tuple(data[e] + [e]))
+    print("    },")
diff -Nru sumo-1.17.0/tools/emissions/nefz.py sumo-1.18.0/tools/emissions/nefz.py
--- sumo-1.17.0/tools/emissions/nefz.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/emissions/nefz.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/evacuateAreas.py sumo-1.18.0/tools/evacuateAreas.py
--- sumo-1.17.0/tools/evacuateAreas.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/evacuateAreas.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2009-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/extractTest.py sumo-1.18.0/tools/extractTest.py
--- sumo-1.17.0/tools/extractTest.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/extractTest.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2009-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
@@ -129,7 +129,8 @@
         if not os.path.exists(os.path.dirname(options.python_script)):
             os.makedirs(os.path.dirname(options.python_script))
         pyBatch = open(options.python_script, 'w')
-        pyBatch.write('''import subprocess, sys, os
+        pyBatch.write('''#!/usr/bin/env python
+import subprocess, sys, os
 from os.path import abspath, dirname, join
 THIS_DIR = abspath(dirname(__file__))
 SUMO_HOME = os.environ.get("SUMO_HOME", dirname(dirname(THIS_DIR)))
@@ -328,8 +329,9 @@
                           (testPath, " ".join(appOptions)))
                 cmd = [ao if " " not in ao else "'%s'" % ao for ao in appOptions]
                 with open(nameBase + ".sh", "w") as sh:
+                    sh.write("#!/bin/bash\n")
                     sh.write(" ".join(cmd))
-                os.chmod(nameBase + ".sh", os.stat(nameBase + ".sh").st_mode | stat.S_IXUSR)
+                os.chmod(sh.name, os.stat(sh.name).st_mode | stat.S_IXUSR)
                 cmd = [o.replace("$SUMO_HOME", "%SUMO_HOME%") if " " not in o else '"%s"' % o for o in appOptions]
                 with open(nameBase + ".bat", "w") as bat:
                     bat.write(" ".join(cmd))
@@ -341,6 +343,8 @@
     if p.wait() != 0:
         print("Error: '%s' failed for '%s'!" % (" ".join(getattr(p, "args", [str(p.pid)])), d))
         sys.exit(1)\n""")
+        pyBatch.close()
+        os.chmod(pyBatch.name, os.stat(pyBatch.name).st_mode | stat.S_IXUSR)
 
 
 if __name__ == "__main__":
diff -Nru sumo-1.17.0/tools/fcdReplay.py sumo-1.18.0/tools/fcdReplay.py
--- sumo-1.17.0/tools/fcdReplay.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/fcdReplay.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2008-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/findAllRoutes.py sumo-1.18.0/tools/findAllRoutes.py
--- sumo-1.17.0/tools/findAllRoutes.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/findAllRoutes.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2010-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/game/DRT/randomRides.py sumo-1.18.0/tools/game/DRT/randomRides.py
--- sumo-1.17.0/tools/game/DRT/randomRides.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/game/DRT/randomRides.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2010-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/game/hiking.py sumo-1.18.0/tools/game/hiking.py
--- sumo-1.17.0/tools/game/hiking.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/game/hiking.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
-# -*- coding: utf8 -*-
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# -*- coding: utf-8 -*-
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2010-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/game/minwait.py sumo-1.18.0/tools/game/minwait.py
--- sumo-1.17.0/tools/game/minwait.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/game/minwait.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
-# -*- coding: utf8 -*-
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# -*- coding: utf-8 -*-
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2010-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/game/racing.py sumo-1.18.0/tools/game/racing.py
--- sumo-1.17.0/tools/game/racing.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/game/racing.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
-# -*- coding: utf8 -*-
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# -*- coding: utf-8 -*-
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2010-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/game/runner.py sumo-1.18.0/tools/game/runner.py
--- sumo-1.17.0/tools/game/runner.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/game/runner.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
-# -*- coding: utf8 -*-
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# -*- coding: utf-8 -*-
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2010-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
@@ -15,6 +15,7 @@
 # @file    runner.py
 # @author  Michael Behrisch
 # @author  Jakob Erdmann
+# @author  Mirko Barthauer
 # @date    2010-01-30
 
 """
@@ -42,7 +43,7 @@
                            os.path.join(os.path.dirname(os.path.abspath(__file__)), '..', '..'))
 sys.path.append(os.path.join(SUMO_HOME, 'tools'))
 import sumolib  # noqa
-
+from sumolib.translation import addLanguageOption, setLanguage, TL  # noqa
 
 _UPLOAD = False if "noupload" in sys.argv else True
 _SCOREFILE = "scores.pkl"
@@ -54,57 +55,42 @@
 _DEBUG = True if "debug" in sys.argv else False
 _SCORES = 30
 BASE = os.path.dirname(sys.argv[0])
+_LANGUAGE_CAPTIONS = {}
+
 
-_LANGUAGE_EN = {'title': 'Interactive Traffic Light',
-                'fkk_in': 'Research intersection Ingolstadt',
-                'cross': 'Simple Junction',
-                'cross_demo': 'Simple Junction (Demo)',
-                'square': 'Four Junctions',
-                'grid6': 'Six Junctions',
-                'kuehne': 'Prof. Kühne',
-                'bs3d': '3D Junction Virtual World',
-                'bs3Dosm': '3D Junction OpenStreetMap',
-                'highway': 'Highway Ramp',
-                'ramp': 'Combined Highway On and Off Ramp',
-                'corridor': 'Corridor',
-                'A10KW': 'Highway Ramp A10',
-                'DRT': 'Demand Responsive Transport (new)',
-                'DRT2': 'DRT - Advanced (new)',
-                'DRT_demo': 'DRT - Demo',
-                'high': 'Highscore',
-                'reset': 'Reset Highscore',
-                'lang': 'Deutsch',
-                'quit': 'Quit',
-                'Highscore': 'Highscore',
-                'Congratulations': 'Congratulations!',
-                'your score': 'Your Score',
-                'Continue': 'Continue',
-                }
-_LANGUAGE_DE = {'title': 'Interaktives Ampelspiel',
-                'fkk_in': 'Forschungskreuzung Ingolstadt',
-                'cross': 'Einfache Kreuzung',
-                'cross_demo': 'Einfache Kreuzung (Demo)',
-                'square': 'Vier Kreuzungen',
-                'grid6': 'Sechs Kreuzungen',
-                'kuehne': 'Prof. Kühne',
-                'bs3d': '3D Forschungskreuzung Virtuelle Welt',
-                'bs3Dosm': '3D Forschungskreuzung OpenStreetMap',
-                'highway': 'Autobahnauffahrt',
-                'ramp': 'Kombinierte Autobahnauf- und -abfahrt',
-                'A10KW': 'A10 KW',
-                'DRT': 'Bedarfsbus (neu)',
-                'DRT2': 'Bedarfsbus für Fortgeschrittene (neu)',
-                'DRT_demo': 'Bedarfsbus - Demo',
-                'corridor': 'Strecke',
-                'high': 'Bestenliste',
-                'reset': 'Bestenliste zurücksetzen',
-                'lang': 'Englisch',
-                'quit': 'Beenden',
-                'Highscore': 'Bestenliste',
-                'Congratulations': 'Gratulation!',
-                'your score': 'Deine Punkte',
-                'Continue': 'Weiter',
-                }
+def updateLocalMessages():
+    global _LANGUAGE_CAPTIONS
+    _LANGUAGE_CAPTIONS = {'title': TL('Interactive Traffic Light'),
+                          'fkk_in': TL('Research intersection Ingolstadt'),
+                          'cross': TL('Simple Junction'),
+                          'cross_demo': TL('Simple Junction (Demo)'),
+                          'square': TL('Four Junctions'),
+                          'grid6': TL('Six Junctions'),
+                          'kuehne': TL('Prof. Kühne'),
+                          'bs3d': TL('3D Junction Virtual World'),
+                          'bs3Dosm': TL('3D Junction OpenStreetMap'),
+                          'highway': TL('Highway Ramp'),
+                          'ramp': TL('Combined Highway On and Off Ramp'),
+                          'corridor': TL('Corridor'),
+                          'A10KW': TL('Highway Ramp A10'),
+                          'DRT': TL('Demand Responsive Transport (new)'),
+                          'DRT2': TL('DRT - Advanced (new)'),
+                          'DRT_demo': TL('DRT - Demo'),
+                          'high': TL('Highscore'),
+                          'reset': TL('Reset Highscore'),
+                          'german': TL('German'),
+                          'english': TL('English'),
+                          'italian': TL('Italian'),
+                          'spanish': TL('Spanish'),
+                          'french': TL('French'),
+                          'chinese (simplified)': TL('Chinese (simplified)'),
+                          'chinese (traditional)': TL('Chinese (traditional)'),
+                          'quit': TL("Quit"),
+                          'Highscore': TL("Highscore"),
+                          'Congratulations': TL("Congratulations!"),
+                          'your score': TL('Your Score'),
+                          'Continue': TL('Continue'),
+                          }
 
 
 def printDebug(*args):
@@ -116,9 +102,9 @@
 
 
 if _UPLOAD:
-    printDebug("import httplib...")
+    printDebug("import http.client...")
     try:
-        import httplib  # noqa
+        import http.client as httplib  # noqa
         printDebug("SUCCESS")
     except ImportError:
         printDebug("FAILED - disabling upload...")
@@ -301,7 +287,7 @@
 
 class StartDialog(Tkinter.Frame):
 
-    def __init__(self, parent, lang):
+    def __init__(self, parent, lang, langCode):
         Tkinter.Frame.__init__(self, parent)
         # variables for changing language
         self.parent = parent
@@ -320,11 +306,10 @@
         # there is one column for every config, +2 more columns for control
         # buttons
         configs = sorted(glob.glob(os.path.join(BASE, "*.sumocfg")))
-        numButtons = len(configs) + 3
+        numButtons = len(configs) + 2
         # button dimensions
         bWidth_start = 30
         bWidth_high = 10
-        bWidth_control = 41
 
         self.gametime = 0
         self.ret = 0
@@ -354,19 +339,34 @@
             button.grid(row=row, column=COL_HIGH)
 
         # control buttons
-        button = Tkinter.Button(self, width=bWidth_control, command=self.clear)
+        button = Tkinter.Button(self, width=bWidth_start, command=self.clear)
         self.addButton(button, 'reset')
-        button.grid(row=numButtons - 3, column=COL_START, columnspan=2)
+        button.grid(row=numButtons - 2, column=COL_START, columnspan=1)
 
-        button = Tkinter.Button(
-            self, width=bWidth_control, command=sys.exit)
-        self.addButton(button, 'quit')
-        button.grid(row=numButtons - 1, column=COL_START, columnspan=2)
+        # language selection
+        self.langChoices = {
+            "de": 'german',
+            "en": 'english',
+            "es": 'spanish',
+            "it": 'italian',
+            "fr": 'french',
+            "zh": 'chinese (simplified)',
+            "zh-Hant": 'chinese (traditional)',
+        }
+        self._langCode = langCode
+        self.langDrop = Tkinter.Listbox(self, height=3, selectmode=Tkinter.SINGLE, width=bWidth_high)
+        self.langDrop.bind('<>', self.change_language)
+        self.scrollbar = Tkinter.Scrollbar(self, orient=Tkinter.VERTICAL)
+        self.scrollbar.config(command=self.langDrop.yview)
+        self.langDrop.config(yscrollcommand=self.scrollbar.set)
+        self.updateLanguageMenu()
+        self.langDrop.grid(row=numButtons - 2, column=COL_HIGH, rowspan=3, sticky="nsew")
+        self.scrollbar.grid(row=numButtons - 2, column=COL_SUMOLOGO, rowspan=3, sticky="nsw")
 
         button = Tkinter.Button(
-            self, width=bWidth_control, command=lambda: self.change_language())
-        self.addButton(button, 'lang')
-        button.grid(row=numButtons - 2, column=COL_START, columnspan=2)
+            self, width=bWidth_start, command=sys.exit)
+        self.addButton(button, 'quit')
+        button.grid(row=numButtons, column=COL_START, columnspan=1)
 
         self.grid()
         # The following three commands are needed so the window pops
@@ -375,17 +375,39 @@
         self.parent.update()
         self.parent.deiconify()
 
-    def addButton(self, button, text):
+    def updateLanguageMenu(self):
+        self.langDrop.delete(0, Tkinter.END)
+        langChoices = [self._language_text.get(longName, longName) for longName in self.langChoices.values()]
+        scrollPos = self.scrollbar.get()
+        self.langDrop.insert(0, *langChoices)
+        self.langDrop.activate(list(self.langChoices.keys()).index(self._langCode))
+        self.langDrop.yview_moveto(scrollPos[0])
+
+    def addButton(self, button, text, key=None):
         button["text"] = self._language_text.get(text, text)
-        self.buttons.append((text, button))
+        if key is None:
+            key = text
+        self.buttons.append((key, button))
+
+    def change_language(self, *args):
+        selection = self.langDrop.curselection()
+        if len(selection) == 0:
+            return
+        chosenLang = self.langDrop.get(selection[0])
+        for code, longName in self.langChoices.items():
+            if self._language_text[longName] == chosenLang:
+                self._langCode = code
+                break
+        setLanguage(self._langCode)
+        updateLocalMessages()
+        self._language_text = _LANGUAGE_CAPTIONS
 
-    def change_language(self):
-        if self._language_text == _LANGUAGE_DE:
-            self._language_text = _LANGUAGE_EN
-        else:
-            self._language_text = _LANGUAGE_DE
-        for text, button in self.buttons:
-            button["text"] = self._language_text[text]
+        # update language menu
+        self.updateLanguageMenu()
+
+        for key, button in self.buttons:
+            button["text"] = self._language_text[key]
+        self.parent.title(self._language_text['title'])
 
     def category_name(self, cfg):
         return os.path.basename(cfg)[:-8]
@@ -404,7 +426,7 @@
         self.gametime = parseEndTime(cfg)
         self.ret = subprocess.call(
             [sumolib.checkBinary("sumo-gui", BASE), "-S", "-G", "-Q", "-c", cfg, '-l', 'log',
-                '--output-prefix', "%s." % self.category,
+                '--output-prefix', "%s." % self.category, '--language', self._langCode,
                 '--duration-log.statistics', '--statistic-output', 'stats.xml',
                 '--tripinfo-output.write-unfinished'], stderr=sys.stderr)
 
@@ -545,7 +567,11 @@
     optParser.add_option("-s", "--stereo", metavar="OSG_STEREO_MODE",
                          help=("Defines the stereo mode to use for 3D output; unique prefix of %s" % (
                                ", ".join(stereoModes))))
+    optParser.add_option("add", nargs="*", help="additional flags: {debug|noupload}")
+    addLanguageOption(optParser)
     options = optParser.parse_args()
+    setLanguage(options.language)
+    updateLocalMessages()
 
     if options.stereo:
         for m in stereoModes:
@@ -554,7 +580,6 @@
                 os.environ["OSG_STEREO"] = "ON"
                 break
 
-    lang = _LANGUAGE_EN
     if "OSG_FILE_PATH" in os.environ:
         os.environ["OSG_FILE_PATH"] += os.pathsep + \
             os.path.join(os.environ.get("SUMO_HOME", ""), "data", "3D")
@@ -566,7 +591,7 @@
     IMAGE.dlrLogo = Tkinter.PhotoImage(file='dlr.gif')
     IMAGE.sumoLogo = Tkinter.PhotoImage(file='sumo_logo.gif')
     IMAGE.qrCode = Tkinter.PhotoImage(file='qr_sumo.dlr.de.gif')
-    StartDialog(root, lang)
+    StartDialog(root, _LANGUAGE_CAPTIONS, options.language)
     root.mainloop()
 
 
diff -Nru sumo-1.17.0/tools/game/setup.py sumo-1.18.0/tools/game/setup.py
--- sumo-1.17.0/tools/game/setup.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/game/setup.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2008-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/generateBidiDistricts.py sumo-1.18.0/tools/generateBidiDistricts.py
--- sumo-1.17.0/tools/generateBidiDistricts.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/generateBidiDistricts.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/generateContinuousRerouters.py sumo-1.18.0/tools/generateContinuousRerouters.py
--- sumo-1.17.0/tools/generateContinuousRerouters.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/generateContinuousRerouters.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2010-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
@@ -23,7 +23,6 @@
 from __future__ import absolute_import
 import os
 import sys
-import optparse
 from collections import defaultdict
 
 if 'SUMO_HOME' in os.environ:
@@ -34,24 +33,20 @@
 
 
 def get_options(args=None):
-    parser = optparse.OptionParser()
-    parser.add_option("-n", "--net-file", dest="netfile",
-                      help="define the net file (mandatory)")
-    parser.add_option("-o", "--output-file", dest="outfile", default="rerouters.xml",
-                      help="define the output rerouter filename")
-    parser.add_option("-T", "--turn-defaults", dest="turnDefaults", default="30,50,20",
-                      help="Use STR[] as default turn probabilities [right,straight,left[,turn]]")
-    parser.add_option("-l", "--long-routes", action="store_true", dest="longRoutes", default=False,
-                      help="place rerouters further upstream (after the previous decision point) to increase " +
-                           "overlap of routes when rerouting and thereby improve anticipation of intersections")
-    parser.add_option("--vclass",
-                      help="only create routes which permit the given vehicle class")
-    parser.add_option("-b", "--begin",  default=0, help="begin time")
-    parser.add_option("-e", "--end",  default=3600, help="end time (default 3600)")
-    (options, args) = parser.parse_args(args=args)
-    if not options.netfile:
-        parser.print_help()
-        sys.exit(1)
+    ap = sumolib.options.ArgumentParser()
+    ap.add_option("-n", "--net-file", dest="netfile", required=True, category="input", type=ap.net_file,
+                  help="define the net file (mandatory)")
+    ap.add_option("-o", "--output-file", dest="outfile", default="rerouters.xml", category="output", type=ap.file,
+                  help="define the output rerouter filename")
+    ap.add_option("-T", "--turn-defaults", dest="turnDefaults", default="30,50,20",
+                  help="Use STR[] as default turn probabilities [right,straight,left[,turn]]")
+    ap.add_option("-l", "--long-routes", action="store_true", dest="longRoutes", default=False,
+                  help="place rerouters further upstream (after the previous decision point) to increase " +
+                       "overlap of routes when rerouting and thereby improve anticipation of intersections")
+    ap.add_option("--vclass", help="only create routes which permit the given vehicle class")
+    ap.add_option("-b", "--begin",  default=0, help="begin time")
+    ap.add_option("-e", "--end",  default=3600, help="end time (default 3600)")
+    options = ap.parse_args(args=args)
 
     options.turnDefaults = list(map(float, options.turnDefaults.split(',')))
     if len(options.turnDefaults) not in [3, 4]:
diff -Nru sumo-1.17.0/tools/generateParkingAreaRerouters.py sumo-1.18.0/tools/generateParkingAreaRerouters.py
--- sumo-1.17.0/tools/generateParkingAreaRerouters.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/generateParkingAreaRerouters.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2010-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
@@ -48,10 +48,10 @@
         prog='generateParkingAreaRerouters.py', usage='%(prog)s [options]',
         description='Generate parking area rerouters from the parking area definition.')
     parser.add_argument(
-        '-a', '--parking-areas', type=str, category="input", dest='parking_area_definition', required=True,
+        '-a', '--parking-areas', type=parser.additional_file, category="input", dest='paFiles', required=True,
         help='SUMO parkingArea definition.')
     parser.add_argument(
-        '-n', '--sumo-net', type=str, category="input", dest='sumo_net_definition', required=True,
+        '-n', '--sumo-net', type=parser.net_file, category="input", dest='sumo_net_definition', required=True,
         help='SUMO network definition.')
     parser.add_argument(
         '--max-number-alternatives', type=int, category="processing", dest='num_alternatives', default=10,
@@ -86,7 +86,7 @@
         '--processes', type=int, category="processing", dest='processes', default=1,
         help='Number of processes spawned to compute the distance between parking areas.')
     parser.add_argument(
-        '-o', '--output', type=str, category="output", dest='output', required=True,
+        '-o', '--output', type=parser.additional_file, category="output", dest='output', required=True,
         help='Name for the output file.')
     parser.add_argument(
         '--tqdm', dest='with_tqdm', category="processing", action='store_true',
@@ -140,7 +140,7 @@
 
         print('Loading SUMO network: {}'.format(options.sumo_net_definition))
         self._sumo_net = sumolib.net.readNet(options.sumo_net_definition, withInternal=True)
-        for pafile in options.parking_area_definition.split(','):
+        for pafile in options.paFiles.split(','):
             print('Loading parking file: {}'.format(pafile))
             self._load_parking_areas_from_file(pafile)
 
diff -Nru sumo-1.17.0/tools/generateParkingAreas.py sumo-1.18.0/tools/generateParkingAreas.py
--- sumo-1.17.0/tools/generateParkingAreas.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/generateParkingAreas.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2010-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
@@ -25,7 +25,6 @@
 if 'SUMO_HOME' in os.environ:
     sys.path.append(os.path.join(os.environ['SUMO_HOME'], 'tools'))
 import sumolib  # noqa
-from sumolib.miscutils import uMax  # noqa
 
 
 def get_options(args=None):
@@ -46,7 +45,7 @@
                            default=False, help="Randomize roadsideCapacity")
     optParser.add_argument("--min", category="processing", type=int, default=0,
                            help="Minimum capacity for parkingAreas")
-    optParser.add_argument("--max", category="processing", type=int, default=uMax,
+    optParser.add_argument("--max", category="processing", type=int, default=int(1e9),
                            help="Maximum capacity for parkingAreas")
     optParser.add_argument("--edge-type.keep", category="processing", dest="edgeTypeKeep",
                            help="Optional list of edge types to keep exclusively")
@@ -54,6 +53,8 @@
                            help="Optional list of edge types to exclude")
     optParser.add_argument("--keep-all", category="processing", action="store_true", default=False, dest="keepAll",
                            help="whether to keep parkingAreas with 0 capacity")
+    optParser.add_argument("--lefthand", category="processing", action="store_true", default=False, dest="lefthand",
+                           help="whether to place parkingareas on the left of the road")
     optParser.add_argument("-a", "--angle", category="processing", type=float,
                            help="parking area angle")
     optParser.add_argument("--prefix", category="processing", default="pa", help="prefix for the parkingArea ids")
@@ -91,7 +92,10 @@
                 continue
             if options.edgeTypeRemove and edge.getType() in options.edgeTypeRemove:
                 continue
-            for lane in edge.getLanes():
+            lanes = edge.getLanes()
+            if options.lefthand:
+                lanes = reversed(lanes)
+            for lane in lanes:
                 if lane.allows(options.vclass):
                     if random.random() < options.probability:
                         capacity = lane.getLength() / options.length
@@ -102,9 +106,10 @@
                             angle = '' if options.angle is None else ' angle="%s"' % options.angle
                             length = '' if options.spaceLength <= 0 else ' length="%s"' % options.spaceLength
                             width = '' if options.width is None else ' width="%s"' % options.width
-                            outf.write('    \n' % (
+                            lefthand = '' if not options.lefthand else ' lefthand="true"'
+                            outf.write('    \n' % (
                                 options.prefix, edge.getID(), lane.getID(),
-                                capacity, length, width, angle))
+                                capacity, length, width, angle, lefthand))
                     break
         outf.write("\n")
 
diff -Nru sumo-1.17.0/tools/generateParkingLots.py sumo-1.18.0/tools/generateParkingLots.py
--- sumo-1.17.0/tools/generateParkingLots.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/generateParkingLots.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2010-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/generateRailSignalConstraints.py sumo-1.18.0/tools/generateRailSignalConstraints.py
--- sumo-1.17.0/tools/generateRailSignalConstraints.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/generateRailSignalConstraints.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
@@ -95,10 +95,10 @@
 
 Given two vehicles A and B which stop at the same location, if A arrives at the
 stop later than B, but A also leaves earlier than B, then B is "overtaken" by A.
-All subsquent stops of B are marked as invalid and will not
+All subsequent stops of B are marked as invalid and will not
 participate in constraint generation. If the stop where overtaking took place
 doesn't have a 'started' value (which implies that the original schedule is
-inconsistent), then this stop is also mared as invalid.
+inconsistent), then this stop is also marked as invalid.
 
 If two vehicles have a 'parking'-stop with the same 'until' time at the same
 location, their stops will also be marked as invalid since the simulation cannot
@@ -106,7 +106,7 @@
 
 Another kind of inconsistency is indicated by 'ended' times that lie ahead of
 the 'until' time of the respective stop by a significant margin (--.
-This situation may corrrespond to the actions of
+This situation may correspond to the actions of
 a real-life dispatcher. In such a case, the must not be constraint any further
 since it is no longer running according to the schedule.
 
@@ -349,7 +349,7 @@
 
 
 def getBidiSequence(options, net, edge):
-    """find continuous sequene of bidi edges upstream and downstream of the given edge within the given range.
+    """find continuous sequence of bidi edges upstream and downstream of the given edge within the given range.
        The search in each direction is aborted when encountering a switch"""
     result = []
     if edge.getBidi() is None:
@@ -417,7 +417,7 @@
     begin = parseTime(options.begin)
     for vehicle in sumolib.xml.parse(options.routeFile, 'vehicle', heterogeneous=True):
         depart = parseTime(vehicle.depart)
-        if depart < begin:
+        if depart is not None and depart < begin:
             continue
         departTimes[vehicle.id] = depart
         numRoutes += 1
@@ -703,8 +703,8 @@
 
             # the stop where overtaking was detected can still be used for
             # signal switching but subsequent stops cannot (as they might
-            # involve a mix of scheduled timeing (arrival/until) and actual
-            # timings (started/ende)
+            # involve a mix of scheduled timing (arrival/until) and actual
+            # timings (started/ended)
             if overtaken > 1:
                 # print("invalid veh=%s stop=%s arrival=%s until=%s" %
                 #        (stop.vehID, stop.busStop,
@@ -1443,12 +1443,14 @@
         for edgesBefore in sorted(approaches.keys()):
             stops = approaches[edgesBefore]
             oRoutes = set()
-            stopBidi = getBidiID(net, edgesBefore[-1])
+            stopEdgeBidi = getBidiID(net, edgesBefore[-1])
             for edge in edgesBefore:
                 if edge in usedBidi:
                     bidi = getBidiID(net, edge)
                     for route in edge2Route[bidi]:
-                        if stopBidi not in route:
+                        # insertion on the stopEdgeBidi may also define a bidi
+                        # conflict (i.e. with a foe vehicle that has delayed insertion w.r.t it's schedule)
+                        if stopEdgeBidi not in route[1:]:
                             oRoutes.add(route)
             if oRoutes:
                 # print(edgesBefore, stop, oRoutes)
@@ -1471,11 +1473,18 @@
                             # since the route could be looped we must find all points of divergence
                             sI2b = -1  # stop index of previous divergence
                             prevEdge = None
+                            needInitialDivergence = False
                             for sI2, (edgesBefore2, stop2) in enumerate(stopRoute2):
+                                if sI2 == 0:
+                                    # this is an insertion related conflict and we don't want to find a signal
+                                    #  before the insertion edge
+                                    continue
                                 if sI2 < sI2b:
                                     continue
                                 for e in edgesBefore2:
                                     if e in bidiBefore:
+                                        if needInitialDivergence:
+                                            continue
                                         # if the opposite train enters the conflict section with a reversal
                                         # this doesn't provide for a useful entry signal
                                         # (we still call findDivergence to advance sI2b)
@@ -1500,10 +1509,15 @@
                                                 print("edge:%s" % e)
 
                                         break
+                                    else:
+                                        needInitialDivergence = False
                                     prevEdge = e
                                 if sI2b is None:
                                     # no divergence found
                                     break
+                                # after finding a conflict, we first need to find a new divergence
+                                # as starting point for the next bidi conflict
+                                needInitialDivergence = True
 
                     for conflict in collectBidiConflicts(options, net, vehicleStopRoutes, stop,
                                                          stopRoute, edgesBefore, arrivals):
@@ -1607,7 +1621,7 @@
 
                 # bidi conflicts can profit from additional comments/params
                 busStop2 = [("busStop2", pStop.busStop)]
-                # record stops preceeding the conflict section for ego and foe vehicle
+                # record stops preceding the conflict section for ego and foe vehicle
                 if sIb > 0:
                     busStop2.append(("priorStop", stopRoute[sIb - 1][1].busStop))
                 if sI2 > 0:
@@ -1668,7 +1682,7 @@
 
 def getEdges(stopRoute, index, startEdge, forward, noIndex=False):
     """return all edges along the route starting at the given stop index and startEdge
-       either going forward or backard
+       either going forward or backward
        if noIndex is set only the edges are yielded
        otherwise the current stop index is yielded as well
        """
diff -Nru sumo-1.17.0/tools/generateRerouters.py sumo-1.18.0/tools/generateRerouters.py
--- sumo-1.17.0/tools/generateRerouters.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/generateRerouters.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2010-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
@@ -31,11 +31,11 @@
 
 def get_options(args=None):
     op = sumolib.options.ArgumentParser(description="Generate rerouter definition for closed edges",)
-    op.add_option("-n", "--net-file", category="input", dest="netfile",
-                  help="define the net file (mandatory)")
-    op.add_option("-o", "--output-file", category="output", dest="outfile", default="rerouters.xml",
-                  help="define the output rerouter filename")
-    op.add_option("-x", "--closed-edges", category="input", dest="closedEdges",
+    op.add_option("-n", "--net-file", category="input", dest="netfile", type=op.net_file,
+                  help="define the net file (mandatory)", required=True)
+    op.add_option("-o", "--output-file", category="output", dest="outfile", type=op.additional_file,
+                  help="define the output rerouter filename", default="rerouters.xml")
+    op.add_option("-x", "--closed-edges", category="input", dest="closedEdges", type=op.edge_list,
                   help="provide a comma-separated list of edges to close")
     op.add_option("-i", "--id-prefix", category="processing", dest="idPrefix", default="rr",
                   help="id prefix for generated rerouters")
diff -Nru sumo-1.17.0/tools/import/citybrain/citybrain_flow.py sumo-1.18.0/tools/import/citybrain/citybrain_flow.py
--- sumo-1.17.0/tools/import/citybrain/citybrain_flow.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/import/citybrain/citybrain_flow.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2010-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/import/citybrain/citybrain_infostep.py sumo-1.18.0/tools/import/citybrain/citybrain_infostep.py
--- sumo-1.17.0/tools/import/citybrain/citybrain_infostep.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/import/citybrain/citybrain_infostep.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2010-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/import/citybrain/citybrain_road.py sumo-1.18.0/tools/import/citybrain/citybrain_road.py
--- sumo-1.17.0/tools/import/citybrain/citybrain_road.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/import/citybrain/citybrain_road.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2010-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/import/gtfs/gtfs2fcd.py sumo-1.18.0/tools/import/gtfs/gtfs2fcd.py
--- sumo-1.17.0/tools/import/gtfs/gtfs2fcd.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/import/gtfs/gtfs2fcd.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2010-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
@@ -36,29 +36,32 @@
 
 
 def add_options():
-    argParser = sumolib.options.ArgumentParser()
-    argParser.add_argument("-r", "--region", default="gtfs",
-                           help="define the region to process")
-    argParser.add_argument("--gtfs", help="define gtfs zip file to load (mandatory)", fix_path=True)
-    argParser.add_argument("--date", help="define the day to import, format: 'YYYYMMDD'")
-    argParser.add_argument("--fcd", help="directory to write / read the generated FCD files to / from")
-    argParser.add_argument("--gpsdat", help="directory to write / read the generated gpsdat files to / from")
-    argParser.add_argument("--modes", help="comma separated list of modes to import (%s)" %
-                           (", ".join(gtfs2osm.OSM2SUMO_MODES.keys())))
-    argParser.add_argument("--vtype-output", default="vtypes.xml",
-                           help="file to write the generated vehicle types to")
-    argParser.add_argument("-v", "--verbose", action="store_true", default=False, help="tell me what you are doing")
-    argParser.add_argument("-b", "--begin", default=0,
-                           type=int, help="Defines the begin time to export")
-    argParser.add_argument("-e", "--end", default=86400,
-                           type=int, help="Defines the end time for the export")
-    argParser.add_argument("--bbox", help="define the bounding box to filter the gtfs data, format: W,S,E,N")
-    return argParser
+    op = sumolib.options.ArgumentParser(
+        description="converts GTFS data into separate fcd traces for every distinct trip")
+    op.add_argument("-r", "--region", default="gtfs", category="input",
+                    help="define the region to process")
+    op.add_argument("--gtfs", category="input", required=True, type=op.data_file,
+                    help="define gtfs zip file to load (mandatory)")
+    op.add_argument("--date", category="input", required=True, help="define the day to import, format: 'YYYYMMDD'")
+    op.add_argument("--fcd", category="input", type=op.data_file,
+                    help="directory to write / read the generated FCD files to / from")
+    op.add_argument("--gpsdat", category="input", type=op.data_file,
+                    help="directory to write / read the generated gpsdat files to / from")
+    op.add_argument("--modes", category="input", help="comma separated list of modes to import (%s)" %
+                    (", ".join(gtfs2osm.OSM2SUMO_MODES.keys())))
+    op.add_argument("--vtype-output", default="vtypes.xml", category="output", type=op.file,
+                    help="file to write the generated vehicle types to")
+    op.add_argument("-v", "--verbose", action="store_true", default=False,
+                    category="processing", help="tell me what you are doing")
+    op.add_argument("-b", "--begin", default=0, category="time", type=op.time,
+                    help="Defines the begin time to export")
+    op.add_argument("-e", "--end", default=86400, category="time", type=op.time,
+                    help="Defines the end time for the export")
+    op.add_argument("--bbox", category="input", help="define the bounding box to filter the gtfs data, format: W,S,E,N")
+    return op
 
 
 def check_options(options):
-    if options.gtfs is None or options.date is None:
-        sys.exit("Please give a GTFS file using --gtfs FILE and a date using --date YYYYMMDD.")
     if options.fcd is None:
         options.fcd = os.path.join('fcd', options.region)
     if options.gpsdat is None:
diff -Nru sumo-1.17.0/tools/import/gtfs/gtfs2osm.py sumo-1.18.0/tools/import/gtfs/gtfs2osm.py
--- sumo-1.17.0/tools/import/gtfs/gtfs2osm.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/import/gtfs/gtfs2osm.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2010-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
@@ -469,7 +469,7 @@
                   "edge_id"] = edge
 
 
-def getBestLane(net, lon, lat, radius, stop_length, edge_set, pt_class, last_pos=-1):
+def getBestLane(net, lon, lat, radius, stop_length, center, edge_set, pt_class, last_pos=-1):
     # get edges near stop location
     x, y = net.convertLonLat2XY(lon, lat)
     edges = [e for e in net.getNeighboringEdges(x, y, radius, includeJunctions=False) if e[0].getID() in edge_set]
@@ -479,7 +479,7 @@
             if lane.allows(pt_class):
                 pos = lane.getClosestLanePosAndDist((x, y))[0]
                 if pos > last_pos or edge.getID() != edge_set[0]:
-                    start = max(0, pos - stop_length)
+                    start = max(0, pos - (stop_length / 2. if center else stop_length))
                     end = min(start + stop_length, lane.getLength())
                     return lane.getID(), start, end
     return None
@@ -591,7 +591,8 @@
             else:
                 # check if the wrong edge was adopted
                 edge_inter = set(map_routes[row.shape_id][1]) & map_stops[stop][6]
-                best = getBestLane(net, row.stop_lon, row.stop_lat, radius, stop_length, edge_inter, pt_class)
+                best = getBestLane(net, row.stop_lon, row.stop_lat, radius,
+                                   stop_length, options.center_stops, edge_inter, pt_class)
                 if best is None:
                     continue
                 # update the lane id, start and end and add shape
@@ -609,7 +610,8 @@
         # if stop not mapped
         if not stop_mapped:
             edge_inter = set(map_routes[row.shape_id][1])
-            best = getBestLane(net, row.stop_lon, row.stop_lat, radius, stop_length, edge_inter, pt_class)
+            best = getBestLane(net, row.stop_lon, row.stop_lat, radius,
+                               stop_length, options.center_stops, edge_inter, pt_class)
             if best is not None:
                 lane_id, start, end = best
                 access = getAccess(net, row.stop_lon, row.stop_lat, 100, lane_id)
@@ -666,7 +668,7 @@
 
     with sumolib.openz(options.route_output, mode='w') as output_file:
         sumolib.xml.writeHeader(output_file, root="routes")
-        numDays = options.end // 86401
+        numDays = int(options.end) // 86401
         start_time = pd.to_timedelta(time.strftime('%H:%M:%S', time.gmtime(options.begin)))
         shapes_written = set()
 
diff -Nru sumo-1.17.0/tools/import/gtfs/gtfs2pt.py sumo-1.18.0/tools/import/gtfs/gtfs2pt.py
--- sumo-1.17.0/tools/import/gtfs/gtfs2pt.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/import/gtfs/gtfs2pt.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2010-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
@@ -45,56 +45,62 @@
 def get_options(args=None):
     ap = gtfs2fcd.add_options()
     # ----------------------- general options ---------------------------------
-    ap.add_argument("-n", "--network", fix_path=True, required=True,
+    ap.add_argument("-n", "--network", category="input", required=True, type=ap.net_file,
                     help="sumo network to use")
-    ap.add_argument("--route-output",
+    ap.add_argument("--route-output", category="output", type=ap.route_file,
                     help="file to write the generated public transport vehicles to")
-    ap.add_argument("--additional-output",
+    ap.add_argument("--additional-output", category="output", type=ap.additional_file,
                     help="file to write the generated public transport stops and routes to")
-    ap.add_argument("--duration", default=10,
+    ap.add_argument("--duration", default=10, category="input",
                     type=int, help="minimum time to wait on a stop")
-    ap.add_argument("--bus-stop-length", default=13, type=float,
+    ap.add_argument("--bus-stop-length", default=13, category="input", type=float,
                     help="length for a bus stop")
-    ap.add_argument("--train-stop-length", default=110, type=float,
+    ap.add_argument("--train-stop-length", default=110, category="input", type=float,
                     help="length for a train stop")
-    ap.add_argument("--tram-stop-length", default=60, type=float,
+    ap.add_argument("--tram-stop-length", default=60, category="input", type=float,
                     help="length for a tram stop")
-    ap.add_argument("--sort", action="store_true", default=False,
+    ap.add_argument("--center-stops", action="store_true", default=False, category="processing",
+                    help="use stop position as center not as front")
+    ap.add_argument("--skip-access", action="store_true", default=False, category="processing",
+                    help="do not create access links")
+    ap.add_argument("--sort", action="store_true", default=False, category="processing",
                     help="sorting the output-file")
+    ap.add_argument("--stops", category="input", type=ap.file, help="file with predefined stop positions to use")
 
     # ----------------------- fcd options -------------------------------------
-    ap.add_argument("--network-split",
+    ap.add_argument("--network-split", category="input",
                     help="directory to write generated networks to")
-    # ap.add_argument("--network-split.vclass", action="store_true", default=False,
-    #                        help="use the allowed vclass instead of the edge type to split the network")
-    ap.add_argument("--warn-unmapped", action="store_true", default=False,
+    ap.add_argument("--network-split-vclass", action="store_true", default=False, category="processing",
+                    help="use the allowed vclass instead of the edge type to split the network")
+    ap.add_argument("--warn-unmapped", action="store_true", default=False, category="processing",
                     help="warn about unmapped routes")
-    ap.add_argument("--mapperlib", default="lib/fcd-process-chain-2.2.2.jar",
+    ap.add_argument("--mapperlib", default="lib/fcd-process-chain-2.2.2.jar", category="input",
                     help="mapping library to use")
-    ap.add_argument("--map-output",
+    ap.add_argument("--map-output", category="output",
                     help="directory to write the generated mapping files to")
-    ap.add_argument("--map-output-config", default="conf/output_configuration_template.xml",
-                    help="output configuration template for the mapper library")
-    ap.add_argument("--map-input-config", default="conf/input_configuration_template.xml",
-                    help="input configuration template for the mapper library")
-    ap.add_argument("--map-parameter", default="conf/parameters_template.xml",
+    ap.add_argument("--map-output-config", default="conf/output_configuration_template.xml", category="output",
+                    type=ap.file, help="output configuration template for the mapper library")
+    ap.add_argument("--map-input-config", default="conf/input_configuration_template.xml", category="input",
+                    type=ap.file, help="input configuration template for the mapper library")
+    ap.add_argument("--map-parameter", default="conf/parameters_template.xml", category="input", type=ap.file,
                     help="parameter template for the mapper library")
-    ap.add_argument("--poly-output", help="file to write the generated polygon files to")
-    ap.add_argument("--fill-gaps", default=5000, type=float,
+    ap.add_argument("--poly-output", category="output", type=ap.file,
+                    help="file to write the generated polygon files to")
+    ap.add_argument("--fill-gaps", default=5000, type=float, category="input",
                     help="maximum distance between stops")
-    ap.add_argument("--skip-fcd", action="store_true", default=False,
+    ap.add_argument("--skip-fcd", action="store_true", default=False, category="processing",
                     help="skip generating fcd data")
-    ap.add_argument("--skip-map", action="store_true", default=False,
+    ap.add_argument("--skip-map", action="store_true", default=False, category="processing",
                     help="skip network mapping")
 
     # ----------------------- osm options -------------------------------------
-    ap.add_argument("--osm-routes", help="osm routes file")
-    ap.add_argument("--warning-output",
+    ap.add_argument("--osm-routes", category="input", type=ap.route_file, help="osm routes file")
+    ap.add_argument("--warning-output", category="output", type=ap.file,
                     help="file to write the unmapped elements from gtfs")
-    ap.add_argument("--dua-repair-output",
+    ap.add_argument("--dua-repair-output", category="output", type=ap.file,
                     help="file to write the osm routes with errors")
-    ap.add_argument("--repair", help="repair osm routes", action='store_true')
-    ap.add_argument("--min-stops", default=1, type=int,
+    ap.add_argument("--repair", help="repair osm routes", action='store_true', category="processing")
+    ap.add_argument("--min-stops", default=1, type=int, category="input",
                     help="minimum number of stops a public transport line must have to be imported")
 
     options = ap.parse_args(args)
@@ -131,24 +137,31 @@
         subprocess.call(netcCall + ["-s", options.network, "-o", numIdNet,
                                     "--discard-params", "origId,origFrom,origTo"])
     edgeMap = {}
+    invEdgeMap = {}
     seenTypes = set()
     for e in sumolib.net.readNet(numIdNet).getEdges():
-        edgeMap[e.getID()] = e.getLanes()[0].getParam("origId", e.getID())
+        origId = e.getLanes()[0].getParam("origId", e.getID())
+        edgeMap[e.getID()] = origId
+        invEdgeMap[origId] = e.getID()
         seenTypes.add(e.getType())
     typedNets = {}
     for inp in sorted(glob.glob(os.path.join(options.fcd, "*.fcd.xml"))):
         mode = os.path.basename(inp)[:-8]
         if not options.modes or mode in options.modes.split(","):
             netPrefix = os.path.join(options.network_split, mode)
-            edgeFilter = ["--keep-edges.by-type", mode] if mode in seenTypes else None
-            if "rail" in mode or mode == "subway":
-                if "railway." + mode in seenTypes:
-                    edgeFilter = ["--keep-edges.by-type", "railway." + mode]
-            elif mode == "train":
-                if "railway.rail" in seenTypes or "railway.light_rail" in seenTypes:
-                    edgeFilter = ["--keep-edges.by-type", "railway.rail,railway.light_rail"]
-            elif mode in ("tram", "bus"):
-                edgeFilter = ["--keep-edges.by-vclass", mode]
+            if options.network_split_vclass:
+                vclass = gtfs2osm.OSM2SUMO_MODES.get(mode)
+                edgeFilter = ["--keep-edges.by-vclass", vclass] if vclass else None
+            else:
+                edgeFilter = ["--keep-edges.by-type", mode] if mode in seenTypes else None
+                if "rail" in mode or mode == "subway":
+                    if "railway." + mode in seenTypes:
+                        edgeFilter = ["--keep-edges.by-type", "railway." + mode]
+                elif mode == "train":
+                    if "railway.rail" in seenTypes or "railway.light_rail" in seenTypes:
+                        edgeFilter = ["--keep-edges.by-type", "railway.rail,railway.light_rail"]
+                elif mode in ("tram", "bus"):
+                    edgeFilter = ["--keep-edges.by-vclass", mode]
             if edgeFilter:
                 if (os.path.exists(netPrefix + ".net.xml") and
                         os.path.getmtime(netPrefix + ".net.xml") > os.path.getmtime(numIdNet)):
@@ -162,7 +175,7 @@
                         subprocess.call(netcCall + ["-s", netPrefix + ".net.xml", "-o", "NUL", "--dismiss-vclasses"
                                                     "--dlr-navteq-output", netPrefix])
                 typedNets[mode] = (inp, netPrefix)
-    return edgeMap, typedNets
+    return edgeMap, invEdgeMap, typedNets
 
 
 def mapFCD(options, typedNets):
@@ -185,7 +198,7 @@
         subprocess.call(call, shell=True)
 
 
-def traceMap(options, typedNets, radius=100):
+def traceMap(options, typedNets, fixedStops, invEdgeMap, radius=100):
     routes = collections.OrderedDict()
     for mode in sorted(typedNets.keys()):
         if options.verbose:
@@ -202,7 +215,12 @@
             minX, minY, maxX, maxY = sumolib.geomhelper.addToBoundingBox(trace)
             if (minX < netBox[1][0] + radius and minY < netBox[1][1] + radius and
                     maxX > netBox[0][0] - radius and maxY > netBox[0][1] - radius):
-                mappedRoute = sumolib.route.mapTrace(trace, net, radius, fillGaps=options.fill_gaps)
+                vias = {}
+                for idx in range(len(trace)):
+                    fixed = fixedStops.get("%s.%s" % (tid, idx))
+                    if fixed:
+                        vias[idx] = invEdgeMap[fixed.lane[:fixed.lane.rfind("_")]]
+                mappedRoute = sumolib.route.mapTrace(trace, net, radius, fillGaps=options.fill_gaps, vias=vias)
                 if mappedRoute:
                     routes[tid] = [e.getID() for e in mappedRoute]
         if options.verbose:
@@ -226,9 +244,9 @@
         outf.write('\n')
 
 
-def map_stops(options, net, routes, rout, edgeMap):
+def map_stops(options, net, routes, rout, edgeMap, fixedStops):
     stops = collections.defaultdict(list)
-    stopDef = set()
+    stopEnds = collections.defaultdict(list)
     rid = None
     for inp in sorted(glob.glob(os.path.join(options.fcd, "*.fcd.xml"))):
         mode = os.path.basename(inp)[:-8]
@@ -243,7 +261,8 @@
         fixed = {}
         for veh in sumolib.xml.parse_fast(inp, "vehicle", ("id", "x", "y", "until", "name",
                                                            "fareZone", "fareSymbol", "startFare")):
-            addAttrs = ' friendlyPos="true" name="%s"' % veh.attr_name
+            stopName = veh.attr_name
+            addAttrs = ' friendlyPos="true" name="%s"' % stopName
             params = ""
             if veh.fareZone:
                 params = "".join(['        \n' %
@@ -253,6 +272,9 @@
                 lastIndex = 0
                 lastPos = -1
                 rid = veh.id
+                stopIndex = 0
+            else:
+                stopIndex += 1
             if rid not in routes:
                 if options.warn_unmapped and rid not in seen:
                     print("Warning! Not mapped", rid, file=sys.stderr)
@@ -284,20 +306,30 @@
                 stopLength = options.tram_stop_length
             else:
                 stopLength = options.train_stop_length
-            result = gtfs2osm.getBestLane(net, veh.x, veh.y, 200, stopLength,
-                                          route[lastIndex:], gtfs2osm.OSM2SUMO_MODES[mode], lastPos)
-            if result is None:
-                if options.warn_unmapped:
-                    print("Warning! No stop for %s." % str(veh), file=sys.stderr)
-                continue
-            laneID, start, end = result
+            stop = "%s.%s" % (rid, stopIndex)
+            if stop in fixedStops:
+                s = fixedStops[stop]
+                laneID, start, end = s.lane, float(s.startPos), float(s.endPos)
+            else:
+                result = gtfs2osm.getBestLane(net, veh.x, veh.y, 200, stopLength, options.center_stops,
+                                              route[lastIndex:], gtfs2osm.OSM2SUMO_MODES[mode], lastPos)
+                if result is None:
+                    if options.warn_unmapped:
+                        print("Warning! No stop for %s." % str(veh), file=sys.stderr)
+                    continue
+                laneID, start, end = result
             edgeID = laneID.rsplit("_", 1)[0]
             lastIndex = route.index(edgeID, lastIndex)
             lastPos = end
-            stop = "%s:%.2f" % (edgeID, end)
-            if stop not in stopDef:
-                stopDef.add(stop)
-                access = gtfs2osm.getAccess(net, veh.x, veh.y, 100, laneID)
+            keep = True
+            for otherStop, otherStart, otherEnd in stopEnds[laneID]:
+                if (otherEnd > start and otherEnd <= end) or (end > otherStart and end <= otherEnd):
+                    keep = False
+                    stop = otherStop
+                    break
+            if keep:
+                stopEnds[laneID].append((stop, start, end))
+                access = None if options.skip_access else gtfs2osm.getAccess(net, veh.x, veh.y, 100, laneID)
                 if not access and not params:
                     addAttrs += "/"
                 typ = "busStop" if mode == "bus" else "trainStop"
@@ -307,12 +339,12 @@
                     for a in sorted(access):
                         rout.write(a)
                     rout.write(u'    \n' % typ)
-            stops[rid].append((stop, int(veh.until)))
+            stops[rid].append((stop, int(veh.until), stopName))
     return stops
 
 
 def filter_trips(options, routes, stops, outf, begin, end):
-    numDays = end // 86400
+    numDays = int(end) // 86400
     if end % 86400 != 0:
         numDays += 1
     if options.sort:
@@ -352,6 +384,10 @@
         options.bbox = net.convertXY2LonLat(*bboxXY[0]) + net.convertXY2LonLat(*bboxXY[1])
     else:
         options.bbox = [float(coord) for coord in options.bbox.split(",")]
+    fixedStops = {}
+    if options.stops:
+        for stop in sumolib.xml.parse(options.stops, ("busStop", "trainStop")):
+            fixedStops[stop.id] = stop
     if options.osm_routes:
         # Import PT from GTFS and OSM routes
         gtfsZip = zipfile.ZipFile(sumolib.openz(options.gtfs, mode="rb", tryGZip=False))
@@ -384,7 +420,7 @@
                 options.gpsdat = None
             if not gtfs2fcd.main(options):
                 return
-        edgeMap, typedNets = splitNet(options)
+        edgeMap, invEdgeMap, typedNets = splitNet(options)
         if os.path.exists(options.mapperlib):
             if not options.skip_map:
                 mapFCD(options, typedNets)
@@ -399,13 +435,13 @@
                 return
             if options.mapperlib != "tracemapper":
                 print("Warning! No mapping library found, falling back to tracemapper.", file=sys.stderr)
-            routes = traceMap(options, typedNets)
+            routes = traceMap(options, typedNets, fixedStops, invEdgeMap)
 
         if options.poly_output:
             generate_polygons(net, routes, options.poly_output)
         with sumolib.openz(options.additional_output, mode='w') as aout:
             sumolib.xml.writeHeader(aout, os.path.basename(__file__), "additional", options=options)
-            stops = map_stops(options, net, routes, aout, edgeMap)
+            stops = map_stops(options, net, routes, aout, edgeMap, fixedStops)
             aout.write(u'\n')
         with sumolib.openz(options.route_output, mode='w') as rout:
             sumolib.xml.writeHeader(rout, os.path.basename(__file__), "routes", options=options)
@@ -416,8 +452,8 @@
                     for stop in stops[vehID]:
                         if offset is None:
                             offset = stop[1]
-                        rout.write(u'        \n' %
-                                   (stop[0], options.duration, stop[1] - offset))
+                        rout.write(u'         \n' %
+                                   (stop[0], options.duration, stop[1] - offset, stop[2]))
                     rout.write(u'    \n')
                 else:
                     print("Warning! Empty route", vehID, file=sys.stderr)
diff -Nru sumo-1.17.0/tools/import/matsim/matsim_importPlans.py sumo-1.18.0/tools/import/matsim/matsim_importPlans.py
--- sumo-1.17.0/tools/import/matsim/matsim_importPlans.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/import/matsim/matsim_importPlans.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2010-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
@@ -36,30 +36,29 @@
 
 
 def get_options(args=None):
-    argParser = sumolib.options.ArgumentParser()
-    argParser.add_argument("-p", "--plan-file", help="MATSim plan file (mandatory)")
-    argParser.add_argument("-o", "--output-file", help="SUMO output route file (mandatory)")
-    argParser.add_argument("-n", "--net-file", help="SUMO net file (mandatory for --repair or --remove-loops)")
-    argParser.add_argument("--vehicles-only", action="store_true",
-                           default=False, help="Import only vehicles instead of persons")
-    argParser.add_argument("--repair", action="store_true",
-                           default=False, help="Repair routes after import (needs a SUMO net)")
-    argParser.add_argument("--remove-loops", action="store_true",
-                           default=False, help="Remove loops in routes after import (needs a SUMO net)")
-    argParser.add_argument("--default-start", metavar="TIME", default="0:0:0",
-                           help="default start time for the first activity")
-    argParser.add_argument("--default-end", metavar="TIME", default="24:0:0",
-                           help="default end time for the last activity")
-    argParser.add_argument("-v", "--verbose", action="store_true",
-                           default=False, help="tell me what you are doing")
-    options = argParser.parse_args(args)
-
-    if not options.plan_file or not options.output_file:
-        argParser.print_help()
-        sys.exit()
+    op = sumolib.options.ArgumentParser()
+    op.add_argument("-p", "--plan-file", category="input", required=True,
+                    type=op.data_file, help="MATSim plan file (mandatory)")
+    op.add_argument("-o", "--output-file", category="input", required=True,
+                    type=op.route_file, help="SUMO output route file (mandatory)")
+    op.add_argument("-n", "--net-file", category="input", type=op.net_file,
+                    help="SUMO net file (mandatory for --repair or --remove-loops)")
+    op.add_argument("--vehicles-only", action="store_true", category="processing",
+                    default=False, help="Import only vehicles instead of persons")
+    op.add_argument("--repair", action="store_true", category="processing",
+                    default=False, help="Repair routes after import (needs a SUMO net)")
+    op.add_argument("--remove-loops", action="store_true", category="processing",
+                    default=False, help="Remove loops in routes after import (needs a SUMO net)")
+    op.add_argument("--default-start", metavar="TIME", default="0:0:0", category="time",
+                    help="default start time for the first activity")
+    op.add_argument("--default-end", metavar="TIME", default="24:0:0", category="time",
+                    help="default end time for the last activity")
+    op.add_argument("-v", "--verbose", action="store_true", category="processing",
+                    default=False, help="tell me what you are doing")
+    options = op.parse_args(args)
 
     if not options.net_file and (options.repair or options.remove_loops):
-        argParser.print_help()
+        op.print_help()
         sys.exit()
 
     return options
@@ -159,5 +158,4 @@
 
 
 if __name__ == "__main__":
-    options = get_options()
-    main(options)
+    main(get_options())
diff -Nru sumo-1.17.0/tools/import/opendrive/signal_POIs_from_xodr.py sumo-1.18.0/tools/import/opendrive/signal_POIs_from_xodr.py
--- sumo-1.17.0/tools/import/opendrive/signal_POIs_from_xodr.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/import/opendrive/signal_POIs_from_xodr.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2014-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
@@ -29,9 +29,13 @@
 """
 
 import os
+import sys
 import numpy as np
 # import pandas as pd         # want to drop that dep
 import lxml.etree as lET
+if 'SUMO_HOME' in os.environ:
+    sys.path.append(os.path.join(os.environ['SUMO_HOME'], 'tools'))
+import sumolib  # noqa
 
 # polygon & POI
 # http://www.sumo.dlr.de/userdoc/Simulation/Shapes.html
@@ -144,16 +148,13 @@
 
 
 if __name__ == "__main__":
-
-    import argparse
-
-    parser = argparse.ArgumentParser()
-    parser.add_argument("xodr_file", type=str,
-                        help="file path of open drive file")
-    parser.add_argument("net_file", type=str,
-                        help="file path of net file")
-    # parser.add_argument("workLog", type=str, help="work log file")
-    args = parser.parse_args()
+    op = sumolib.options.ArgumentParser()
+    op.add_argument("xodr_file", category="input", required=True,
+                    help="file path of open drive file")
+    op.add_argument("net_file", category="input", required=True,
+                    help="file path of net file")
+    # op.add_argument("workLog", type=str, help="work log file")
+    args = op.parse_args()
 
     net_Fp = args.net_file  # td_Dp+'/sumo/net.net.xml'
     xodr_Fp = args.xodr_file  # td_Dp+'/OpenDrive/scen_T01.02.xodr'
diff -Nru sumo-1.17.0/tools/import/osm/osmTaxiStop.py sumo-1.18.0/tools/import/osm/osmTaxiStop.py
--- sumo-1.17.0/tools/import/osm/osmTaxiStop.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/import/osm/osmTaxiStop.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2020-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
@@ -22,7 +22,8 @@
 import sys
 import random
 import argparse
-sys.path.append(os.path.join(os.environ["SUMO_HOME"], "tools"))
+if 'SUMO_HOME' in os.environ:
+    sys.path.append(os.path.join(os.environ["SUMO_HOME"], "tools"))
 import sumolib  # noqa
 import osmBuild  # noqa
 
@@ -31,19 +32,24 @@
 
 
 def parseArgs(args=None):
-    argParser = sumolib.options.ArgumentParser(formatter_class=argparse.ArgumentDefaultsHelpFormatter)
-    argParser.add_argument("-s", "--osm-file", help="read OSM file from FILE (mandatory)", metavar="FILE")
-    argParser.add_argument("-n", "--net-file", help="read SUMO net from FILE", metavar="FILE")
-    argParser.add_argument("-o", "--output-file", help="write stopping places to the output FILE", metavar="FILE",
-                           default="stopping_places.add.xml")
-    argParser.add_argument("-f", "--fleet-file", help="write taxi fleet to the output FILE", metavar="FILE")
-    argParser.add_argument("--fleet-size", type=float, metavar="NUM",
-                           help="relative (0 < NUM < 1) or absolute number of vehicles (NUM >= 1) to generate")
-    argParser.add_argument("-t", "--type", help="stopping place type", default="chargingStation")
-    argParser.add_argument("-r", "--radius", type=float, help="radius for edge finding", default=20.)
-    argParser.add_argument("-l", "--length", type=float, help="(minimum) length of the stopping place", default=20.)
-    argParser.add_argument("--vclass", help="which vehicle class should be allowed", default="passenger")
-    return argParser.parse_args(args)
+    op = sumolib.options.ArgumentParser(formatter_class=argparse.ArgumentDefaultsHelpFormatter)
+    op.add_argument("-s", "--osm-file", category="input", required=True, type=op.file,
+                    help="read OSM file from FILE (mandatory)", metavar="FILE")
+    op.add_argument("-n", "--net-file", category="input", type=op.net_file,
+                    help="read SUMO net from FILE", metavar="FILE")
+    op.add_argument("-o", "--output-file", category="output", required=True, type=op.file,
+                    help="write stopping places to the output FILE", metavar="FILE",
+                    default="stopping_places.add.xml")
+    op.add_argument("-f", "--fleet-file", category="output", type=op.file,
+                    help="write taxi fleet to the output FILE", metavar="FILE")
+    op.add_argument("--fleet-size", type=float, metavar="NUM", category="input",
+                    help="relative (0 < NUM < 1) or absolute number of vehicles (NUM >= 1) to generate")
+    op.add_argument("-t", "--type", category="input", help="stopping place type", default="chargingStation")
+    op.add_argument("-r", "--radius", category="input", type=float, help="radius for edge finding", default=20.)
+    op.add_argument("-l", "--length", category="input", type=float,
+                    help="(minimum) length of the stopping place", default=20.)
+    op.add_argument("--vclass", category="input", help="which vehicle class should be allowed", default="passenger")
+    return op.parse_args(args)
 
 
 def main(options):
diff -Nru sumo-1.17.0/tools/import/transportationTestProblems.py sumo-1.18.0/tools/import/transportationTestProblems.py
--- sumo-1.17.0/tools/import/transportationTestProblems.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/import/transportationTestProblems.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2014-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/import/vissim/convert_detectors2SUMO.py sumo-1.18.0/tools/import/vissim/convert_detectors2SUMO.py
--- sumo-1.17.0/tools/import/vissim/convert_detectors2SUMO.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/import/vissim/convert_detectors2SUMO.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2009-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
@@ -24,19 +24,15 @@
 from __future__ import absolute_import
 from __future__ import print_function
 
-import argparse
+import os
+import sys
 from xml.dom import minidom
 from xml.dom.minidom import Document
 
-# want the sumolib tools
-import sys
-import os
 import numpy as np
-THIS_PATH = os.path.abspath(__file__)
-addpath = os.path.abspath(THIS_PATH + '/../../../sumolib')
-if addpath not in sys.path:
-    sys.path.append(addpath)
-import geomhelper  # noqa
+if 'SUMO_HOME' in os.environ:
+    sys.path.append(os.path.join(os.environ['SUMO_HOME'], 'tools'))
+import sumolib  # noqa
 
 
 def dict_from_node_attributes(node):
@@ -115,7 +111,7 @@
         shape = []
         for point in polyline:
             shape.append(point.split(","))
-        edge_offset = geomhelper.polygonOffsetWithMinimumDistanceToPoint(
+        edge_offset = sumolib.geomhelper.polygonOffsetWithMinimumDistanceToPoint(
             sumo_loop_coords,
             [[float(coord) for coord in point] for point in shape])
         ind_loop.setAttribute("pos", str(edge_offset))
@@ -142,7 +138,7 @@
                 shape = []
                 for point in polyline:
                     shape.append(point.split(","))
-                start_offset = geomhelper.polygonOffsetWithMinimumDistanceToPoint(
+                start_offset = sumolib.geomhelper.polygonOffsetWithMinimumDistanceToPoint(
                     sumo_point,
                     [[float(coord) for coord in point] for point in shape])
                 det_entry.setAttribute("lane", lane["id"])
@@ -164,7 +160,7 @@
                 shape = []
                 for point in polyline:
                     shape.append(point.split(","))
-                end_offset = geomhelper.polygonOffsetWithMinimumDistanceToPoint(
+                end_offset = sumolib.geomhelper.polygonOffsetWithMinimumDistanceToPoint(
                     sumo_point,
                     [[float(coord) for coord in point] for point in shape])
                 det_exit.setAttribute("lane", lane["id"])
@@ -301,15 +297,14 @@
 
 # MAIN
 if __name__ == '__main__':
-    parser = argparse.ArgumentParser(
-        description='detector conversion utility (VISSIM.inpx to SUMO)')
-    parser.add_argument('--vissim-input', '-V', type=str,
-                        help='VISSIM inpx file path')
-    parser.add_argument('--output-file', '-o', type=str,
-                        help='output file name')
-    parser.add_argument('--SUMO-net', '-S', type=str,
-                        help='SUMO net file path')
-    args = parser.parse_args()
+    op = sumolib.options.ArgumentParser(description='detector conversion utility (VISSIM.inpx to SUMO)')
+    op.add_argument('--vissim-input', '-V', type=str, category="input", required=True, type=op.file,
+                    help='VISSIM inpx file path')
+    op.add_argument('--output-file', '-o', type=str, category="output", required=True, type=op.file,
+                    help='output file name')
+    op.add_argument('--SUMO-net', '-S', type=str, category="input", required=True, type=op.net_file,
+                    help='SUMO net file path')
+    args = op.parse_args()
     print("\n", args, "\n")
     print('\n---\n\n* loading VISSIM net:\n\t', args.vissim_input)
     sumo_doc = minidom.parse(args.SUMO_net)
diff -Nru sumo-1.17.0/tools/import/vissim/convert_vissimXML_flows_statRoutes.py sumo-1.18.0/tools/import/vissim/convert_vissimXML_flows_statRoutes.py
--- sumo-1.17.0/tools/import/vissim/convert_vissimXML_flows_statRoutes.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/import/vissim/convert_vissimXML_flows_statRoutes.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2015-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
@@ -32,10 +32,14 @@
 from __future__ import absolute_import
 from __future__ import print_function
 
-import argparse
+import os
+import sys
 from xml.dom import minidom
-import numpy as np
 from xml.dom.minidom import Document
+import numpy as np
+if 'SUMO_HOME' in os.environ:
+    sys.path.append(os.path.join(os.environ['SUMO_HOME'], 'tools'))
+import sumolib  # noqa
 
 
 def _dict_from_node_attributes(node):
@@ -479,17 +483,17 @@
 
 # MAIN
 if __name__ == '__main__':
-    parser = argparse.ArgumentParser(
+    op = sumolib.options.ArgumentParser(
         description='road network conversion utility for static route flows'
         ' (VISSIM.inpx to SUMO); generates SUMO routes definition file from'
         ' given inpx and derived (by netconvert) SUMO net.')
-    parser.add_argument('--output-file', '-o', default='routes.rou.xml',
-                        help='output file name (default: %(default)s)')
-    parser.add_argument('--vissim-file', '-V', dest="vissim_file", required=True,
-                        help='VISSIM inpx file path')
-    parser.add_argument('--sumo-net-file', '-n', dest="sumo_net_file", required=True,
-                        help='SUMO net file path')
-    args = parser.parse_args()
+    op.add_argument('--output-file', '-o', default='routes.rou.xml', category="output", type=op.route_file,
+                    help='output file name (default: %(default)s)')
+    op.add_argument('--vissim-file', '-V', dest="vissim_file", category="input", required=True, type=op.file,
+                    help='VISSIM inpx file path')
+    op.add_argument('--sumo-net-file', '-n', dest="sumo_net_file", category="input", required=True, type=op.net_file,
+                    help='SUMO net file path')
+    args = op.parse_args()
     # print("\n", args, "\n")
 
     #
diff -Nru sumo-1.17.0/tools/import/vissim/tls_vissimXML2SUMOnet_update.py sumo-1.18.0/tools/import/vissim/tls_vissimXML2SUMOnet_update.py
--- sumo-1.17.0/tools/import/vissim/tls_vissimXML2SUMOnet_update.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/import/vissim/tls_vissimXML2SUMOnet_update.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2009-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
@@ -27,11 +27,14 @@
 from __future__ import absolute_import
 
 import os
-import argparse
+import sys
 from xml.dom import minidom
 from copy import deepcopy
 
 import numpy as np
+if 'SUMO_HOME' in os.environ:
+    sys.path.append(os.path.join(os.environ['SUMO_HOME'], 'tools'))
+import sumolib  # noqa
 
 
 def dict_from_node_attributes(node):
@@ -521,16 +524,18 @@
 
 # MAIN
 if __name__ == '__main__':
-    parser = argparse.ArgumentParser(
+    op = sumolib.options.ArgumentParser(
         description='TLS conversion utility (VISSIM.inpx to SUMO)')
-    parser.add_argument('--vissim-input',
-                        '-V', type=str,
-                        help='VISSIM inpx file path')
-    parser.add_argument('--SUMO-net', '-S', type=str,
-                        help='SUMO net file path')
-    parser.add_argument('--output-file', '-o', type=str,
-                        help='output file name')
-    args = parser.parse_args()
+    op.add_argument('--vissim-input', '-V',
+                    type=str, category="input", required=True, type=op.file,
+                    help='VISSIM inpx file path')
+    op.add_argument('--SUMO-net', '-S',
+                    category="input", required=True, type=op.net_file,
+                    help='SUMO net file path')
+    op.add_argument('--output-file', '-o',
+                    category="output", required=True, type=op.file,
+                    help='output file name')
+    args = op.parse_args()
     print("\n", args, "\n")
     print('\n---\n\n* loading VISSIM net:\n\t', args.vissim_input)
     xmldoc = minidom.parse(args.vissim_input)
diff -Nru sumo-1.17.0/tools/import/vissim/vissim2poly.py sumo-1.18.0/tools/import/vissim/vissim2poly.py
--- sumo-1.17.0/tools/import/vissim/vissim2poly.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/import/vissim/vissim2poly.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2009-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
@@ -24,15 +24,24 @@
 sys.path.append(os.path.join(os.environ['SUMO_HOME'], 'tools'))
 import sumolib  # noqa
 
+# MAIN
+if __name__ == '__main__':
+    op = sumolib.options.ArgumentParser()
+    op.add_option("vissimNet", category="input", type=op.file,
+                  help="provide the vissim file path")
+    op.add_option("outputFile", category="output", type=op.file,
+                  help="provide the output file path")
+    args = op.parse_args()
 
-vissimfile, outfile = sys.argv[1:]
-with open(outfile, 'w') as outf:
-    outf.write('\n')
-    for link in sumolib.xml.parse(vissimfile, 'link'):
-        if link.geometry is None or link.geometry[0].linkPolyPts is None:
-            print("no polypoints for link %s" % link.no)
-        points = [(p.x, p.y, p.z) for p in link.geometry[0].linkPolyPts[0].linkPolyPoint]
-        shape = ' '.join([','.join(filter(None, xyz)) for xyz in points])
-        outf.write('    \n' % (
-            link.no, shape))
-    outf.write('\n')
+    vissimfile = args.vissimNet
+    outfile = args.outputFile
+    with open(outfile, 'w') as outf:
+        outf.write('\n')
+        for link in sumolib.xml.parse(vissimfile, 'link'):
+            if link.geometry is None or link.geometry[0].linkPolyPts is None:
+                print("no polypoints for link %s" % link.no)
+            points = [(p.x, p.y, p.z) for p in link.geometry[0].linkPolyPts[0].linkPolyPoint]
+            shape = ' '.join([','.join(filter(None, xyz)) for xyz in points])
+            outf.write('    \n' % (
+                link.no, shape))
+        outf.write('\n')
diff -Nru sumo-1.17.0/tools/import/vissim/vissim_parseBusStops.py sumo-1.18.0/tools/import/vissim/vissim_parseBusStops.py
--- sumo-1.17.0/tools/import/vissim/vissim_parseBusStops.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/import/vissim/vissim_parseBusStops.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2009-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
@@ -28,7 +28,11 @@
 """
 from __future__ import absolute_import
 from __future__ import print_function
+import os
 import sys
+if 'SUMO_HOME' in os.environ:
+    sys.path.append(os.path.join(os.environ['SUMO_HOME'], 'tools'))
+import sumolib  # noqa
 
 edgemap = {}
 edgemap["203"] = "203[0]"
@@ -98,94 +102,98 @@
             return 0
 
 
-if len(sys.argv) < 3:
-    print("Usage: " + sys.argv[0] + "  ")
-    sys.exit()
-
-print("Parsing Vissim input...")
-fd = open(sys.argv[1])
-haveStop = False
-haveRoute = False
-currentItem = ""
-stopsL = []
-routesL = []
-for line in fd:
-    # process bus stops ("HALTESTELLE")
-    if line.find("HALTESTELLE") == 0:
+# MAIN
+if __name__ == '__main__':
+    op = sumolib.options.ArgumentParser()
+    op.add_option("vissimNet", category="input", type=op.file,
+                  help="provide the vissim file path")
+    op.add_option("outputPrefix", category="input",
+                  help="provide the output prefix")
+    args = op.parse_args()
+
+    print("Parsing Vissim input...")
+    fd = open(args.vissimNet)
+    haveStop = False
+    haveRoute = False
+    currentItem = ""
+    stopsL = []
+    routesL = []
+    for line in fd:
+        # process bus stops ("HALTESTELLE")
+        if line.find("HALTESTELLE") == 0:
+            if haveStop:
+                stopsL.append(" ".join(currentItem.split()))
+            haveStop = True
+            currentItem = ""
+        elif line[0] != ' ':
+            if haveStop:
+                stopsL.append(" ".join(currentItem.split()))
+            haveStop = False
         if haveStop:
-            stopsL.append(" ".join(currentItem.split()))
-        haveStop = True
-        currentItem = ""
-    elif line[0] != ' ':
-        if haveStop:
-            stopsL.append(" ".join(currentItem.split()))
-        haveStop = False
-    if haveStop:
-        currentItem = currentItem + line
-    # process bus routes ("LINIE")
-    if line.find(" LINIE") == 0:
-        if haveRoute:
-            routesL.append(" ".join(currentItem.split()))
-        haveRoute = True
-        currentItem = ""
-    elif len(line) > 2 and line[0] != ' ' and line[1] != ' ':
+            currentItem = currentItem + line
+        # process bus routes ("LINIE")
+        if line.find(" LINIE") == 0:
+            if haveRoute:
+                routesL.append(" ".join(currentItem.split()))
+            haveRoute = True
+            currentItem = ""
+        elif len(line) > 2 and line[0] != ' ' and line[1] != ' ':
+            if haveRoute:
+                routesL.append(" ".join(currentItem.split()))
+            haveRoute = False
         if haveRoute:
-            routesL.append(" ".join(currentItem.split()))
-        haveRoute = False
-    if haveRoute:
-        currentItem = currentItem + line
-
-# build stops map
-sm = {}
-for bs in stopsL:
-    (id, name, strecke, spur, von, bis) = parseBusStop(bs)
-    sm[id] = (id, name, strecke, spur, von, bis)
-
-
-# process bus routes
-#  build departure times
-emissions = []
-for br in routesL:
-    (pid, name, startKante, ziel, zeiten, stops) = parseBusRoute(br, sm)
-    edges = []
-    edges.append(startKante)
-    for s in stops:
-        if sm[s][2] not in edges:
-            edges.append(sm[s][2])
-    if ziel not in edges:
-        edges.append(ziel)
-    for i in range(0, len(edges)):
-        if edges[i] in edgemap:
-            edges[i] = edgemap[edges[i]]
-    for t in zeiten:
-        id = str(pid) + "_" + str(t)
-        emissions.append((int(t), id, edges, stops))
-
-# sort emissions
-print("Sorting routes...")
-emissions.sort(sorter(0))
-# write routes
-print("Writing bus routes...")
-fdo = open(sys.argv[2] + "_busses.rou.xml", "w")
-fdo.write("\n")
-for emission in emissions:
-    if len(emission[2]) < 2:
-        continue
-    fdo.write('    ' + " ".join(emission[2]) + '\n')
-    for s in emission[3]:
-        fdo.write(
-            '        \n')
-    fdo.write('    \n')
-fdo.write("\n")
-
-# process bus stops
-print("Writing bus stops...")
-fdo = open(sys.argv[2] + "_stops.add.xml", "w")
-fdo.write("\n")
-for bs in stopsL:
-    (id, name, strecke, spur, von, bis) = parseBusStop(bs)
-    fdo.write('    \n')
-fdo.write("\n")
-fdo.close()
+            currentItem = currentItem + line
+
+    # build stops map
+    sm = {}
+    for bs in stopsL:
+        (id, name, strecke, spur, von, bis) = parseBusStop(bs)
+        sm[id] = (id, name, strecke, spur, von, bis)
+
+    # process bus routes
+    #  build departure times
+    emissions = []
+    for br in routesL:
+        (pid, name, startKante, ziel, zeiten, stops) = parseBusRoute(br, sm)
+        edges = []
+        edges.append(startKante)
+        for s in stops:
+            if sm[s][2] not in edges:
+                edges.append(sm[s][2])
+        if ziel not in edges:
+            edges.append(ziel)
+        for i in range(0, len(edges)):
+            if edges[i] in edgemap:
+                edges[i] = edgemap[edges[i]]
+        for t in zeiten:
+            id = str(pid) + "_" + str(t)
+            emissions.append((int(t), id, edges, stops))
+
+    # sort emissions
+    print("Sorting routes...")
+    emissions.sort(sorter(0))
+    # write routes
+    print("Writing bus routes...")
+    fdo = open(args.outputPrefix + "_busses.rou.xml", "w")
+    fdo.write("\n")
+    for emission in emissions:
+        if len(emission[2]) < 2:
+            continue
+        fdo.write('    ' + " ".join(emission[2]) + '\n')
+        for s in emission[3]:
+            fdo.write(
+                '        \n')
+        fdo.write('    \n')
+    fdo.write("\n")
+
+    # process bus stops
+    print("Writing bus stops...")
+    fdo = open(args.outputPrefix + "_stops.add.xml", "w")
+    fdo.write("\n")
+    for bs in stopsL:
+        (id, name, strecke, spur, von, bis) = parseBusStop(bs)
+        fdo.write('    \n')
+    fdo.write("\n")
+    fdo.close()
diff -Nru sumo-1.17.0/tools/import/vissim/vissim_parseRoutes.py sumo-1.18.0/tools/import/vissim/vissim_parseRoutes.py
--- sumo-1.17.0/tools/import/vissim/vissim_parseRoutes.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/import/vissim/vissim_parseRoutes.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2009-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
@@ -126,117 +126,120 @@
             return 0
 
 
-op = sumolib.options.ArgumentParser(description="parse routes from a VISSIM network")
-op.add_option("vissimNet", type=op.file, help="the VISSIM network file")
-op.add_option("-o", "--output", default="out", help="output filename prefix")
-op.add_option("-e", "--edgemap", help="mapping of edge names for renamed edges (orig1:renamed1,orig2:renamed2,...)")
-op.add_option("-s", "--seed", type=int, default=42, help="random seed")
-options = op.parse_args()
-
-random.seed(options.seed)
-edgemap = {}
-if options.edgemap:
-    for entry in options.edgemap.split(","):
-        orig, renamed = entry.split(":")
-        edgemap[orig] = renamed
-print("Parsing Vissim input...")
-fd = codecs.open(sys.argv[1], encoding='latin1')
-routeDecisions = []
-haveRouteDecision = False
-currentRouteDecision = ""
-inflows = []
-haveInFlow = False
-currentInFlow = ""
-for line in fd:
-    # put all route decision ("ROUTENENTSCHEIDUNG") to a list (routeDecisions)
-    if line.find("ROUTENENTSCHEIDUNG") == 0:
+# MAIN
+if __name__ == '__main__':
+    op = sumolib.options.ArgumentParser(description="parse routes from a VISSIM network")
+    op.add_option("vissimNet", category="input", type=op.file, help="the VISSIM network file")
+    op.add_option("-o", "--output", default="out", category="output", help="output filename prefix")
+    op.add_option("-e", "--edgemap", category="input", type=op.edge_list,
+                  help="mapping of edge names for renamed edges (orig1:renamed1,orig2:renamed2,...)")
+    op.add_option("-s", "--seed", type=int, default=42, category="input", help="random seed")
+    options = op.parse_args()
+
+    random.seed(options.seed)
+    edgemap = {}
+    if options.edgemap:
+        for entry in options.edgemap.split(","):
+            orig, renamed = entry.split(":")
+            edgemap[orig] = renamed
+    print("Parsing Vissim input...")
+    fd = codecs.open(options.vissimNet, encoding='latin1')
+    routeDecisions = []
+    haveRouteDecision = False
+    currentRouteDecision = ""
+    inflows = []
+    haveInFlow = False
+    currentInFlow = ""
+    for line in fd:
+        # put all route decision ("ROUTENENTSCHEIDUNG") to a list (routeDecisions)
+        if line.find("ROUTENENTSCHEIDUNG") == 0:
+            if haveRouteDecision:
+                routeDecisions.append(" ".join(currentRouteDecision.split()))
+            haveRouteDecision = True
+            currentRouteDecision = ""
+        elif line[0] != ' ':
+            if haveRouteDecision:
+                routeDecisions.append(" ".join(currentRouteDecision.split()))
+            haveRouteDecision = False
         if haveRouteDecision:
-            routeDecisions.append(" ".join(currentRouteDecision.split()))
-        haveRouteDecision = True
-        currentRouteDecision = ""
-    elif line[0] != ' ':
-        if haveRouteDecision:
-            routeDecisions.append(" ".join(currentRouteDecision.split()))
-        haveRouteDecision = False
-    if haveRouteDecision:
-        currentRouteDecision = currentRouteDecision + line
-    # put all inflows ("ZUFLUSS") to a list (inflows)
-    if line.find("ZUFLUSS") == 0:
-        if haveInFlow:
-            inflows.append(" ".join(currentInFlow.split()))
-        haveInFlow = True
-        currentInFlow = ""
-    elif line[0] != ' ':
+            currentRouteDecision = currentRouteDecision + line
+        # put all inflows ("ZUFLUSS") to a list (inflows)
+        if line.find("ZUFLUSS") == 0:
+            if haveInFlow:
+                inflows.append(" ".join(currentInFlow.split()))
+            haveInFlow = True
+            currentInFlow = ""
+        elif line[0] != ' ':
+            if haveInFlow:
+                inflows.append(" ".join(currentInFlow.split()))
+            haveInFlow = False
         if haveInFlow:
-            inflows.append(" ".join(currentInFlow.split()))
-        haveInFlow = False
-    if haveInFlow:
-        currentInFlow = currentInFlow + line
-fd.close()
-
-# process inflows
-print("Writing flows...")
-fdo = open(options.output + ".flows.xml", "w")
-sumolib.writeXMLHeader(fdo, "$Id$", "routes", options=options)
-flow_sn = 0
-for inflow in inflows:
-    (name, strecke, q, von, bis) = parseInFlow(inflow, str(flow_sn))
-    fdo.write('    \n')
-    flow_sn = flow_sn + 1
-fdo.write("\n")
-fdo.close()
-
-# process combinations
-#  parse route decision
-print("Building routes...")
-edges2check = {}
-edgesSumFlows = {}
-for rd in routeDecisions:
-    (strecke, sumAnteil, von, bis, routes) = parseRouteDecision(rd)
-    if strecke not in edges2check:
-        edgesSumFlows[strecke] = sumAnteil
-        edges2check[strecke] = (von, bis, routes)
-# compute emissions with routes
-emissions = []
-flow_sn = 0
-for inflow in inflows:
-    (name, strecke, q, von, bis) = parseInFlow(inflow, str(flow_sn))
-    flow_sn = flow_sn + 1
-    if strecke in edges2check:
-        routes = edges2check[strecke]
-        for vi in range(0, int(q)):
-            t = von + float(bis - von) / float(q) * float(vi)
-            fi = random.random() * edgesSumFlows[strecke]
-            edges = []
-            ri = 0
-            rid = ""
-            while len(edges) == 0 and ri < len(routes[2]) and fi >= 0:
-                fi = fi - routes[2][ri][1]
-                if fi < 0:
-                    edges = routes[2][ri][2]
-                    rid = routes[2][ri][0]
-                ri = ri + 1
-            id = str(name.replace(" ", "_")) + "_" + str(rid) + "_" + str(vi)
-            if strecke in edgemap:
-                if edgemap[strecke] not in edges:
-                    edges.insert(0, edgemap[strecke])
-            else:
-                if strecke not in edges:
-                    edges.insert(0, strecke)
-            emissions.append((int(t), id, edges))
-# sort emissions
-print("Sorting routes...")
-emissions.sort(key=sorter(0))
-
-# save emissions
-print("Writing routes...")
-fdo = open(options.output + ".rou.xml", "w")
-sumolib.writeXMLHeader(fdo, "$Id$", "routes", options=options)
-for emission in emissions:
-    if len(emission[2]) < 2:
-        continue
-    fdo.write('    \n')
-fdo.write("\n")
-fdo.close()
+            currentInFlow = currentInFlow + line
+    fd.close()
+
+    # process inflows
+    print("Writing flows...")
+    fdo = open(options.output + ".flows.xml", "w")
+    sumolib.writeXMLHeader(fdo, "$Id$", "routes", options=options)
+    flow_sn = 0
+    for inflow in inflows:
+        (name, strecke, q, von, bis) = parseInFlow(inflow, str(flow_sn))
+        fdo.write('    \n')
+        flow_sn = flow_sn + 1
+    fdo.write("\n")
+    fdo.close()
+
+    # process combinations
+    #  parse route decision
+    print("Building routes...")
+    edges2check = {}
+    edgesSumFlows = {}
+    for rd in routeDecisions:
+        (strecke, sumAnteil, von, bis, routes) = parseRouteDecision(rd)
+        if strecke not in edges2check:
+            edgesSumFlows[strecke] = sumAnteil
+            edges2check[strecke] = (von, bis, routes)
+    # compute emissions with routes
+    emissions = []
+    flow_sn = 0
+    for inflow in inflows:
+        (name, strecke, q, von, bis) = parseInFlow(inflow, str(flow_sn))
+        flow_sn = flow_sn + 1
+        if strecke in edges2check:
+            routes = edges2check[strecke]
+            for vi in range(0, int(q)):
+                t = von + float(bis - von) / float(q) * float(vi)
+                fi = random.random() * edgesSumFlows[strecke]
+                edges = []
+                ri = 0
+                rid = ""
+                while len(edges) == 0 and ri < len(routes[2]) and fi >= 0:
+                    fi = fi - routes[2][ri][1]
+                    if fi < 0:
+                        edges = routes[2][ri][2]
+                        rid = routes[2][ri][0]
+                    ri = ri + 1
+                id = str(name.replace(" ", "_")) + "_" + str(rid) + "_" + str(vi)
+                if strecke in edgemap:
+                    if edgemap[strecke] not in edges:
+                        edges.insert(0, edgemap[strecke])
+                else:
+                    if strecke not in edges:
+                        edges.insert(0, strecke)
+                emissions.append((int(t), id, edges))
+    # sort emissions
+    print("Sorting routes...")
+    emissions.sort(key=sorter(0))
+
+    # save emissions
+    print("Writing routes...")
+    fdo = open(options.output + ".rou.xml", "w")
+    sumolib.writeXMLHeader(fdo, "$Id$", "routes", options=options)
+    for emission in emissions:
+        if len(emission[2]) < 2:
+            continue
+        fdo.write('    \n')
+    fdo.write("\n")
+    fdo.close()
diff -Nru sumo-1.17.0/tools/import/visum/visum_convertEdgeTypes.py sumo-1.18.0/tools/import/visum/visum_convertEdgeTypes.py
--- sumo-1.17.0/tools/import/visum/visum_convertEdgeTypes.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/import/visum/visum_convertEdgeTypes.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2009-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
@@ -29,37 +29,38 @@
 if 'SUMO_HOME' in os.environ:
     sys.path.append(os.path.join(os.environ['SUMO_HOME'], 'tools'))
 import sumolib  # noqa
-
-op = sumolib.options.ArgumentParser(description="Convert VISUM edge type defintions into sumo edge type")
-op.add_option("visumNet", type=op.file, help="the VISUM network file")
-op.add_option("output", type=op.file, help="the output xml file")
-options = op.parse_args()
-
-print("Reading VISUM...")
-fd = sumolib.miscutils.openz(options.visumNet, encoding='latin1')
-fdo = sumolib.miscutils.openz(options.output, 'w', encoding='utf8')
-sumolib.writeXMLHeader(fdo, "$Id$", "types", options=options)
-parsingTypes = False
-attributes = []
-for line in fd:
-    if parsingTypes:
-        if line[0] == '*' or line[0] == '$' or line.find(";") < 0:
-            parsingTypes = False
-            continue
-
-        values = line.strip().split(";")
-        map = {}
-        for i in range(0, len(attributes)):
-            map[attributes[i]] = values[i]
-        fdo.write('   \n')
-
-    if line.find("$STRECKENTYP") == 0:
-        parsingTypes = True
-        attributes = line[len("$STRECKENTYP:"):].lower().split(";")
-fdo.write("\n")
-fdo.close()
-fd.close()
+# MAIN
+if __name__ == '__main__':
+    op = sumolib.options.ArgumentParser(description="Convert VISUM edge type defintions into sumo edge type")
+    op.add_option("visumNet", category="input", type=op.file, help="the VISUM network file")
+    op.add_option("output", category="output", type=op.file, help="the output xml file")
+    options = op.parse_args()
+
+    print("Reading VISUM...")
+    fd = sumolib.miscutils.openz(options.visumNet, encoding='latin1')
+    fdo = sumolib.miscutils.openz(options.output, 'w', encoding='utf8')
+    sumolib.writeXMLHeader(fdo, "$Id$", "types", options=options)
+    parsingTypes = False
+    attributes = []
+    for line in fd:
+        if parsingTypes:
+            if line[0] == '*' or line[0] == '$' or line.find(";") < 0:
+                parsingTypes = False
+                continue
+
+            values = line.strip().split(";")
+            map = {}
+            for i in range(0, len(attributes)):
+                map[attributes[i]] = values[i]
+            fdo.write('   \n')
+
+        if line.find("$STRECKENTYP") == 0:
+            parsingTypes = True
+            attributes = line[len("$STRECKENTYP:"):].lower().split(";")
+    fdo.write("\n")
+    fdo.close()
+    fd.close()
diff -Nru sumo-1.17.0/tools/import/visum/visum_convertRoutes.py sumo-1.18.0/tools/import/visum/visum_convertRoutes.py
--- sumo-1.17.0/tools/import/visum/visum_convertRoutes.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/import/visum/visum_convertRoutes.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2009-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
@@ -22,8 +22,8 @@
 import os
 import sys
 import random
-from optparse import OptionParser
-sys.path.append(os.path.join(os.path.dirname(__file__), '..', '..'))
+if "SUMO_HOME" in os.environ:
+    sys.path.append(os.path.join(os.environ['SUMO_HOME'], 'tools'))
 import sumolib  # noqa
 
 
@@ -94,51 +94,45 @@
 
 
 # initialise
-optParser = OptionParser()
-optParser.add_option("-n", "--net-file", dest="netfile",
-                     help="SUMO net file to work with", type="string")
-optParser.add_option("-r", "--visum-routes", dest="routes",
-                     help="The VISUM-routes files to parse", type="string")
-optParser.add_option("-o", "--output",
-                     help="Name of the file to write", type="string")
-optParser.add_option("-b", "--begin",
-                     help="The begin time of the routes to generate", type="int", default=0)
-optParser.add_option("-e", "--end",
-                     help="The end time (+1) of the routes to generate", type="int", default=3600)
-optParser.add_option("-p", "--prefix",
-                     help="ID prefix to use", type="string")
-optParser.add_option("-t", "--type",
-                     help="The type to use for vehicles", type="string")
-optParser.add_option("-u", "--uniform",
-                     help="Whether departures shall be distributed uniform in each interval", action="store_true",
-                     default=False)
-optParser.add_option("-l", "--timeline",
-                     help="Percentages over a day", type="string")
-optParser.add_option("-a", "--tabs", action="store_true",
-                     default=False, help="tab separated route file")
-optParser.add_option("-v", "--verbose", action="store_true",
-                     default=False, help="tell me what you are doing")
-optParser.add_option("-2", "--net2",
-                     help="immediately match routes to a second network", metavar="FILE")
-optParser.add_option("-s", "--step", default="10",
-                     type="float", help="distance between successive trace points")
-optParser.add_option("-d", "--delta", default="1",
-                     type="float", help="maximum distance between edge and trace points when matching " +
-                                        " to the second net")
-optParser.add_option("-i", "--distribution", action="store_true",
-                     default=False, help="write route distributions only")
-optParser.add_option("-c", "--cutoff",
-                     help="Keep only one route when less than CUTOFF vehicles drive the OD", type="int",
-                     default=0)
+op = sumolib.options.ArgumentParser()
+op.add_option("-n", "--net-file", dest="netfile", category="input", required=True, type=op.net_file,
+              help="SUMO net file to work with")
+op.add_option("-r", "--visum-routes", dest="routes", category="input", required=True, type=op.file,
+              help="The VISUM-routes files to parse")
+op.add_option("-o", "--output", category="output", type=op.file, required=True,
+              help="Name of the file to write")
+op.add_option("-b", "--begin", category="time", type=op.time,
+              help="The begin time of the routes to generate", default=0)
+op.add_option("-e", "--end", category="time", type=op.time,
+              help="The end time (+1) of the routes to generate", default=3600)
+op.add_option("-p", "--prefix", category="input",
+              help="ID prefix to use")
+op.add_option("-t", "--type", category="input",
+              help="The type to use for vehicles")
+op.add_option("-u", "--uniform",
+              help="Whether departures shall be distributed uniform in each interval", action="store_true",
+              default=False)
+op.add_option("-l", "--timeline", category="input",
+              help="Percentages over a day")
+op.add_option("-a", "--tabs", action="store_true",
+              default=False, help="tab separated route file")
+op.add_option("-v", "--verbose", action="store_true",
+              default=False, help="tell me what you are doing")
+op.add_option("-2", "--net2", category="input", type=op.net_file,
+              help="immediately match routes to a second network", metavar="FILE")
+op.add_option("-s", "--step", default=10, category="input",
+              type=float, help="distance between successive trace points")
+op.add_option("-d", "--delta", default=1, category="input",
+              type=float, help="maximum distance between edge and trace points when matching " +
+              " to the second net")
+op.add_option("-i", "--distribution", action="store_true",
+              default=False, help="write route distributions only")
+op.add_option("--cutoff", category="input",
+              help="Keep only one route when less than CUTOFF vehicles drive the OD", type=int,
+              default=0)
 
-optParser.set_usage(
-    '\nvisum_convertRoutes.py -n visum.net.xml -r visum_routes.att -o visum.rou.xml')
 # parse options
-(options, args) = optParser.parse_args()
-if not options.netfile or not options.routes or not options.output:
-    print("Missing arguments")
-    optParser.print_help()
-    exit()
+options = op.parse_args()
 
 if options.verbose:
     print("Reading net...")
@@ -273,8 +267,8 @@
 if options.verbose:
     print("Generating vehicles...")
 emissions = []
-begin = options.begin
-end = options.end
+begin = int(options.begin)
+end = int(options.end)
 
 if not timeline:
     for r in routes:
diff -Nru sumo-1.17.0/tools/import/visum/visum_convertTurnPercentages.py sumo-1.18.0/tools/import/visum/visum_convertTurnPercentages.py
--- sumo-1.17.0/tools/import/visum/visum_convertTurnPercentages.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/import/visum/visum_convertTurnPercentages.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2009-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
@@ -29,90 +29,96 @@
 sys.path.append(os.path.join(os.path.dirname(__file__), '..', '..'))
 import sumolib  # noqa
 
-if len(sys.argv) < 4:
-    print("Usage: " + sys.argv[0] + "   ")
-    sys.exit()
-print("Reading net...")
-net = sumolib.net.readNet(sys.argv[1])
-
-# initialise edges and nodes map
-emap = {}
-nmap = {}
-for e in net._edges:
-    emap[e._id] = {}
-    if e._from._id not in nmap:
-        nmap[e._from._id] = {}
-    for o in e._outgoing:
-        emap[e._id][o._id] = 0
-        if o._to._id not in nmap[e._from._id]:
-            nmap[e._from._id][o._to._id] = (e._id, o._id)
-
-
-# fill with read values
-print("Reading turning percentages...")
-parse = False
-found = 0
-foundN = 0
-missing = 0
-missingN = 0
-attributes = []
-fd = open(sys.argv[2])
-for line in fd:
-    if line.find("$") == 0 or line.find("*") == 0 or line.find(";") < 0:
-        parse = False
-
-    if parse:
-        values = line.strip().split(";")
-        amap = {}
-        for i in range(0, len(attributes)):
-            amap[attributes[i]] = values[i]
-        fromnode = amap["fromnodeno"]
-        tonode = amap["tonodeno"]
-        vianode = amap["vianodeno"]
-        number = float(amap["volvehprt(ah)"])
-        if fromnode not in nmap:
-            if number != 0:
-                print("Missing from-node '" + fromnode + "'; skipping")
-            missing = missing + 1
-            missingN = missingN + number
-            continue
-        if tonode not in nmap[fromnode]:
-            if number != 0:
-                print("No connection between from-node '" + fromnode +
-                      "' and to-node '" + tonode + "'; skipping")
-            missing = missing + 1
-            missingN = missingN + number
-            continue
-        (fromedge, toedge) = nmap[fromnode][tonode]
-        emap[fromedge][toedge] = number
-        found = found + 1
-        foundN = foundN + number
-
-    if line.find("$TURN:") == 0:
-        attributes = line[6:].strip().lower().split(";")
-        parse = True
-fd.close()
-print(" " + str(found) + " connections found (" + str(foundN) + " vehs)")
-print(" " + str(missing) + " connections missing (" + str(missingN) + " vehs)")
-
-
-# write as read by jtrrouter
-print("Writing jtrrouter turning percentages...")
-fd = open(sys.argv[3], "w")
-fd.write('\n')
-fd.write('    \n')
-for i in emap:
-    fd.write('        \n')
-    sum = 0
-    for o in emap[i]:
-        sum = sum + emap[i][o]
-    for o in emap[i]:
-        if sum != 0:
-            no = emap[i][o] / sum
-        else:
-            no = 0
-        fd.write('            \n')
-    fd.write('        \n')
-fd.write('    \n')
-fd.write('\n')
+# MAIN
+if __name__ == '__main__':
+    op = sumolib.options.ArgumentParser()
+    op.add_option("sumoNet", category="input", type=op.net_file,
+                  help="provide the SUMO net file including the path")
+    op.add_option("vissumTurnings", category="input", type=op.file,
+                  help="provide the file containing vissum turnings")
+    op.add_option("output", category="output", type=op.file,
+                  help="provide the output file name including the path")
+    args = op.parse_args()
+
+    print("Reading net...")
+    net = sumolib.net.readNet(args.sumoNet)
+
+    # initialise edges and nodes map
+    emap = {}
+    nmap = {}
+    for e in net._edges:
+        emap[e._id] = {}
+        if e._from._id not in nmap:
+            nmap[e._from._id] = {}
+        for o in e._outgoing:
+            emap[e._id][o._id] = 0
+            if o._to._id not in nmap[e._from._id]:
+                nmap[e._from._id][o._to._id] = (e._id, o._id)
+
+    # fill with read values
+    print("Reading turning percentages...")
+    parse = False
+    found = 0
+    foundN = 0
+    missing = 0
+    missingN = 0
+    attributes = []
+    fd = open(args.vissumTurnings)
+    for line in fd:
+        if line.find("$") == 0 or line.find("*") == 0 or line.find(";") < 0:
+            parse = False
+
+        if parse:
+            values = line.strip().split(";")
+            amap = {}
+            for i in range(0, len(attributes)):
+                amap[attributes[i]] = values[i]
+            fromnode = amap["fromnodeno"]
+            tonode = amap["tonodeno"]
+            vianode = amap["vianodeno"]
+            number = float(amap["volvehprt(ah)"])
+            if fromnode not in nmap:
+                if number != 0:
+                    print("Missing from-node '" + fromnode + "'; skipping")
+                missing = missing + 1
+                missingN = missingN + number
+                continue
+            if tonode not in nmap[fromnode]:
+                if number != 0:
+                    print("No connection between from-node '" + fromnode +
+                          "' and to-node '" + tonode + "'; skipping")
+                missing = missing + 1
+                missingN = missingN + number
+                continue
+            (fromedge, toedge) = nmap[fromnode][tonode]
+            emap[fromedge][toedge] = number
+            found = found + 1
+            foundN = foundN + number
+
+        if line.find("$TURN:") == 0:
+            attributes = line[6:].strip().lower().split(";")
+            parse = True
+    fd.close()
+    print(" " + str(found) + " connections found (" + str(foundN) + " vehs)")
+    print(" " + str(missing) + " connections missing (" + str(missingN) + " vehs)")
+
+    # write as read by jtrrouter
+    print("Writing jtrrouter turning percentages...")
+    fd = open(args.output, "w")
+    fd.write('\n')
+    fd.write('    \n')
+    for i in emap:
+        fd.write('        \n')
+        sum = 0
+        for o in emap[i]:
+            sum = sum + emap[i][o]
+        for o in emap[i]:
+            if sum != 0:
+                no = emap[i][o] / sum
+            else:
+                no = 0
+            fd.write('            \n')
+        fd.write('        \n')
+    fd.write('    \n')
+    fd.write('\n')
diff -Nru sumo-1.17.0/tools/import/visum/visum_parseZaehlstelle.py sumo-1.18.0/tools/import/visum/visum_parseZaehlstelle.py
--- sumo-1.17.0/tools/import/visum/visum_parseZaehlstelle.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/import/visum/visum_parseZaehlstelle.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2008-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
@@ -30,15 +30,23 @@
 sys.path.append(os.path.join(os.path.dirname(__file__), '..', '..'))
 import sumolib  # noqa
 
-if len(sys.argv) < 3:
-    print("Usage: " + sys.argv[0] + "   ")
-    sys.exit()
+# MAIN
+if __name__ == '__main__':
+    op = sumolib.options.ArgumentParser()
+    op.add_option("sumoNet", category="input", type=op.file,
+                  help="provide the SUMO net file including the path")
+    op.add_option("vissumNet", category="input", type=op.file,
+                  help="provide the vissum net file including the path")
+    op.add_option("output", category="output", type=op.file,
+                  help="provide the output file name including the path")
+    args = op.parse_args()
+
 print("Reading net...")
-net = sumolib.net.readNet(sys.argv[1])
+net = sumolib.net.readNet(args.sumoNet)
 
 print("Reading VISUM...")
-fd = open(sys.argv[2])
-fdo = open(sys.argv[3], "w")
+fd = open(args.vissumNet)
+fdo = open(args.output, "w")
 fdo.write("\n")
 parsingCounts = False
 lastKnown = ""
diff -Nru sumo-1.17.0/tools/jtcrouter.py sumo-1.18.0/tools/jtcrouter.py
--- sumo-1.17.0/tools/jtcrouter.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/jtcrouter.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/lib/rmsd.py sumo-1.18.0/tools/lib/rmsd.py
--- sumo-1.17.0/tools/lib/rmsd.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/lib/rmsd.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2008-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/lib/testUtil.py sumo-1.18.0/tools/lib/testUtil.py
--- sumo-1.17.0/tools/lib/testUtil.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/lib/testUtil.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2010-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/libsumo/__init__.py sumo-1.18.0/tools/libsumo/__init__.py
--- sumo-1.17.0/tools/libsumo/__init__.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/libsumo/__init__.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2018-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
@@ -158,12 +158,7 @@
 
 def simulationStep(step=0):
     _libsumo_step(step)
-    result = []
-    for domain in DOMAINS:
-        result += [(k, v) for k, v in domain.getAllSubscriptionResults().items()]
-        result += [(k, v) for k, v in domain.getAllContextSubscriptionResults().items()]
     _stepManager.manageStepListeners(step)
-    return result
 
 
 simulation.step = simulationStep
diff -Nru sumo-1.17.0/tools/libtraci/__init__.py sumo-1.18.0/tools/libtraci/__init__.py
--- sumo-1.17.0/tools/libtraci/__init__.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/libtraci/__init__.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2018-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
@@ -38,8 +38,8 @@
     gui,
     inductionloop,  # noqa
     junction,  # noqa
-    lanearea,  # noqa
     lane,  # noqa
+    lanearea,  # noqa
     meandata,  # noqa
     multientryexit,  # noqa
     overheadwire,  # noqa
@@ -150,18 +150,14 @@
 getVersion = simulation.getVersion
 executeMove = simulation.executeMove
 setOrder = simulation.setOrder
+switch = simulation.switchConnection
 
 _libtraci_step = simulation.step
 
 
 def simulationStep(step=0):
     _libtraci_step(step)
-    result = []
-    for domain in DOMAINS:
-        result += [(k, v) for k, v in domain.getAllSubscriptionResults().items()]
-        result += [(k, v) for k, v in domain.getAllContextSubscriptionResults().items()]
     _stepManager.manageStepListeners(step)
-    return result
 
 
 simulation.step = simulationStep
diff -Nru sumo-1.17.0/tools/net/abstractRail.py sumo-1.18.0/tools/net/abstractRail.py
--- sumo-1.17.0/tools/net/abstractRail.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/net/abstractRail.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2007-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
@@ -18,7 +18,7 @@
 """
 Convert a geodetical rail network in a abstract (schematic) rail network.
 If the network is segmented (stationDistricts.py), the resulting network will be
-a hybrid of multple schematic pieces being oriented in a roughly geodetical manner
+a hybrid of multiple schematic pieces being oriented in a roughly geodetical manner
 """
 from __future__ import absolute_import
 from __future__ import print_function
@@ -54,52 +54,43 @@
 
 def get_options():
     ap = ArgumentParser()
-    ap.add_option("-v", "--verbose", action="store_true", default=False,
-                  help="tell me what you are doing")
-    ap.add_option("-n", "--net-file", dest="netfile", required=True, type=ap.net_file,
-                  help="the network to read lane and edge permissions")
-    ap.add_option("-s", "--stop-file", dest="stopfile", required=True, type=ap.additional_file,
-                  help="the additional file with stops")
-    ap.add_option("-a", "--region-file", dest="regionfile", type=ap.additional_file,
-                  help="Load network regions from additional file (as taz elements)")
-    ap.add_option("-o", "--output-prefix", dest="prefix", required=True, type=ap.file,
-                  help="output prefix for patch files")
-    ap.add_option("--split", action="store_true", default=False,
-                  help="automatically create a region file from the loaded stops,"
-                  + " automatically split the network if needed")
-    ap.add_option("--filter-regions", dest="filterRegions",
-                  help="filter regions by name or id")
-    ap.add_option("--keep-all", action="store_true", dest="keepAll", default=False,
-                  help="keep original regions outside the filtered regions")
-    ap.add_option("--horizontal", action="store_true", dest="horizontal", default=False,
-                  help="output shapes roughly aligned along the horizontal")
-    ap.add_option("--track-offset", type=float, default=20, dest="trackOffset",
-                  help="default distance between parallel tracks")
-    ap.add_option("--track-length", type=float, default=20, dest="trackLength",
-                  help="maximum length of track pieces")
-    ap.add_option("--time-limit", type=float, dest="timeLimit",
-                  help="time limit per region")
-    ap.add_option("--max-iter", type=int, dest="maxIter",
-                  help="maximum number of solver iterations per region")
-    ap.add_option("--skip-large", type=int, dest="skipLarge",
-                  help="skip regions require more than the given number of constraints")
-    ap.add_option("--skip-yopt", action="store_true", dest="skipYOpt", default=False,
-                  help="do not optimize the track offsets")
-    ap.add_option("--skip-building", action="store_true", dest="skipBuilding", default=False,
-                  help="do not call netconvert with the patch files")
-    ap.add_option("--extra-verbose", action="store_true", default=False, dest="verbose2",
-                  help="tell me more about what you are doing")
+    ap.add_argument("-v", "--verbose", action="store_true", default=False,
+                    help="tell me what you are doing")
+    ap.add_argument("-n", "--net-file", category="input", dest="netfile", required=True, type=ap.net_file,
+                    help="the network to read lane and edge permissions")
+    ap.add_argument("-s", "--stop-file", category="input", dest="stopfile", required=True, type=ap.additional_file,
+                    help="the additional file with stops")
+    ap.add_argument("-a", "--region-file", category="input", dest="regionfile", type=ap.additional_file,
+                    help="Load network regions from additional file (as taz elements)")
+    ap.add_argument("-o", "--output-prefix", category="output", dest="prefix", required=True, type=ap.file,
+                    help="output prefix for patch files")
+    ap.add_argument("--split", action="store_true", default=False,
+                    help="automatically create a region file from the loaded stops,"
+                    + " automatically split the network if needed")
+    ap.add_argument("--filter-regions", dest="filterRegions",
+                    help="filter regions by name or id")
+    ap.add_argument("--keep-all", action="store_true", dest="keepAll", default=False,
+                    help="keep original regions outside the filtered regions")
+    ap.add_argument("--horizontal", action="store_true", dest="horizontal", default=False,
+                    help="output shapes roughly aligned along the horizontal")
+    ap.add_argument("--track-offset", type=float, default=20, dest="trackOffset",
+                    help="default distance between parallel tracks")
+    ap.add_argument("--track-length", type=float, default=20, dest="trackLength",
+                    help="maximum length of track pieces")
+    ap.add_argument("--time-limit", type=float, dest="timeLimit",
+                    help="time limit per region")
+    ap.add_argument("--max-iter", type=int, dest="maxIter",
+                    help="maximum number of solver iterations per region")
+    ap.add_argument("--skip-large", type=int, dest="skipLarge",
+                    help="skip regions require more than the given number of constraints")
+    ap.add_argument("--skip-yopt", action="store_true", dest="skipYOpt", default=False,
+                    help="do not optimize the track offsets")
+    ap.add_argument("--skip-building", action="store_true", dest="skipBuilding", default=False,
+                    help="do not call netconvert with the patch files")
+    ap.add_argument("--extra-verbose", action="store_true", default=False, dest="verbose2",
+                    help="tell me more about what you are doing")
     options = ap.parse_args()
 
-    if not options.netfile:
-        ap.print_help()
-        ap.exit("Error! setting net-file is mandatory")
-    if not options.stopfile:
-        ap.print_help()
-        ap.exit("Error! setting stop-file is mandatory")
-    if not options.prefix:
-        ap.print_help()
-        ap.exit("Error! setting output is mandatory")
     if options.regionfile and options.split:
         ap.print_help()
         ap.exit("Error! Only one of the options --split or --region-file may be given")
@@ -143,7 +134,7 @@
         edgeShapes[edge.getID()] = edge.getShape(True)
 
 
-def findMainline(options, net, edges):
+def findMainline(options, name, net, edges):
     """use platforms to determine mainline orientation"""
     knownEdges = set([e.getID() for e in edges])
 
@@ -158,6 +149,13 @@
         endCoord = gh.positionAtShapeOffset(edge.getShape(), float(stop.endPos))
         angles.append((gh.angleTo2D(begCoord, endCoord), (begCoord, endCoord)))
 
+    if not angles:
+        print("Warning: No stops loaded for region '%s'. Using median edge angle instead" % name, file=sys.stderr)
+        for edge in edges:
+            begCoord = edge.getShape()[0]
+            endCoord = edge.getShape()[-1]
+            angles.append((gh.angleTo2D(begCoord, endCoord), (begCoord, endCoord)))
+
     angles.sort()
     mainLine = angles[int(len(angles) / 2)][1]
 
@@ -285,7 +283,7 @@
                 orderings.append((node.getID(), ordering))
                 prevOrdering = ordering
                 if options.verbose2:
-                    print(x, list(map(lambda x: x.getID(), ordering)))
+                    print(x, list(map(lambda vn: vn.getID(), ordering)))
             else:
                 sameOrdering.append((prevOrdering, ordering))
                 if options.verbose2:
@@ -295,9 +293,10 @@
     nodeYValues = optimizeTrackOrder(options, edges, nodes, orderings, nodeCoords)
 
     # step 4: apply yValues to virtual nodes that were skipped
-    for prevOrdering, ordering in sameOrdering:
-        for n1, n2 in zip(prevOrdering, ordering):
-            nodeYValues[n2] = nodeYValues[n1]
+    if nodeYValues:
+        for prevOrdering, ordering in sameOrdering:
+            for n1, n2 in zip(prevOrdering, ordering):
+                nodeYValues[n2] = nodeYValues[n1]
 
     if options.verbose2:
         for k, v in nodeYValues.items():
@@ -576,7 +575,7 @@
         if options.verbose:
             print("Processing region '%s' with %s edges" % (name, len(edges)))
         initShapes(edges, nodeCoords, edgeShapes)
-        mainLine = findMainline(options, net, edges)
+        mainLine = findMainline(options, name, net, edges)
         rotateByMainLine(mainLine, edges, nodeCoords, edgeShapes, False)
         if not options.skipYOpt:
             nodeYValues = computeTrackOrdering(options, mainLine, edges, nodeCoords, edgeShapes)
diff -Nru sumo-1.17.0/tools/net/createRoundaboutConnections.py sumo-1.18.0/tools/net/createRoundaboutConnections.py
--- sumo-1.17.0/tools/net/createRoundaboutConnections.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/net/createRoundaboutConnections.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2010-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
@@ -51,10 +51,20 @@
     fd.write("\n")
 
 
-if len(sys.argv) < 2:
-    print("Usage: " + sys.argv[0] + " ")
-    sys.exit()
-print("Reading net...")
-net = sumolib.net.readNet(sys.argv[1])
-print("Writing connections...")
-writeConnections(net)
+if __name__ == "__main__":
+    op = sumolib.options.ArgumentParser(
+        description='Create connections in roundabout')
+
+    op.add_argument("-n", "--net-file", category="input", type=op.net_file, dest="net", required=True,
+                    help='Input file name')
+
+    try:
+        options = op.parse_args()
+    except (NotImplementedError, ValueError) as e:
+        print(e, file=sys.stderr)
+        sys.exit(1)
+
+    print("Reading net...")
+    net = sumolib.net.readNet(options.net)
+    print("Writing connections...")
+    writeConnections(net)
diff -Nru sumo-1.17.0/tools/net/generateStationEdges.py sumo-1.18.0/tools/net/generateStationEdges.py
--- sumo-1.17.0/tools/net/generateStationEdges.py	1970-01-01 00:00:00.000000000 +0000
+++ sumo-1.18.0/tools/net/generateStationEdges.py	2023-06-28 20:02:17.000000000 +0000
@@ -0,0 +1,77 @@
+#!/usr/bin/env python
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
+# Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# https://www.eclipse.org/legal/epl-2.0/
+# This Source Code 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
+
+# @file    generateStationEdges.py
+# @author  Jakob Erdmann
+# @date    2018-08-07
+
+"""
+Generate pedestrian edges for every public transport stop to serve as access
+edge in otherwise pure railway networks
+"""
+from __future__ import absolute_import
+from __future__ import print_function
+import sys
+import os
+
+if 'SUMO_HOME' in os.environ:
+    sys.path.append(os.path.join(os.environ['SUMO_HOME'], 'tools'))
+import sumolib  # noqa
+from sumolib.options import ArgumentParser  # noqa
+
+
+def parse_args():
+    USAGE = "%(prog)s -n  -s  -o  [options]"
+    ap = ArgumentParser(usage=USAGE)
+    ap.add_option("-n", "--net-file", category="input", dest="netfile", required=True, type=ap.net_file,
+                  help="input network file")
+    ap.add_option("-s", "--stop-file", category="input", dest="stopfile", required=True, type=ap.additional_file,
+                  help="input network file")
+    ap.add_option("-o", "--output-prefix", category="output", dest="outfile", required=True, type=ap.file,
+                  help="prefix of output files")
+    ap.add_option("-l", "--length", type=float, default=10.,
+                  help="length of generated solitary edges")
+    ap.add_option("-w", "--width", type=float, default=8.,
+                  help="width of generated solitary edges")
+    # optParser.add_option("-d", "--cluster-dist", type=float, default=500., help="length of generated edges")
+    options = ap.parse_args()
+    return options
+
+
+def main(options):
+    net = sumolib.net.readNet(options.netfile, withConnections=False, withFoes=False)
+    l2 = options.length / 2
+    with open(options.outfile + ".edg.xml", 'w') as out_e:
+        with open(options.outfile + ".nod.xml", 'w') as out_n:
+            sumolib.writeXMLHeader(out_e, "$Id$")  # noqa
+            sumolib.writeXMLHeader(out_n, "$Id$")  # noqa
+            out_e.write('\n')
+            out_n.write('\n')
+            for stop in sumolib.xml.parse(options.stopfile, 'busStop', heterogeneous=True):
+                edge_id = stop.id + "_access"
+                x, y = sumolib.geomhelper.positionAtShapeOffset(
+                    net.getLane(stop.lane).getShape(),
+                    (float(stop.startPos) + float(stop.endPos)) / 2)
+                from_id = edge_id + '_from'
+                to_id = edge_id + '_to'
+                out_n.write('    \n' % (from_id, x - l2, y))
+                out_n.write('    \n' % (to_id, x + l2, y))
+                out_e.write('    \n' % (
+                    edge_id, from_id, to_id, options.width))
+            out_e.write('\n')
+            out_n.write('\n')
+
+
+if __name__ == "__main__":
+    options = parse_args()
+    main(options)
diff -Nru sumo-1.17.0/tools/net/net2geojson.py sumo-1.18.0/tools/net/net2geojson.py
--- sumo-1.17.0/tools/net/net2geojson.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/net/net2geojson.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2007-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
@@ -31,27 +31,38 @@
 
 
 def parse_args():
-    USAGE = "Usage: " + sys.argv[0] + " -n  "
-    argParser = sumolib.options.ArgumentParser(usage=USAGE)
-    argParser.add_argument("-n", "--net-file", dest="netFile", required=True,
-                           help="The .net.xml file to convert")
-    argParser.add_argument("-d", "--edgedata-file", dest="edgeData", help="Optional edgeData to include in the output")
-    argParser.add_argument("-p", "--ptline-file", dest="ptlines",
-                           help="Optional ptline information to include in the output")
-    argParser.add_argument("-o", "--output-file", dest="outFile", help="The geojson output file name")
-    argParser.add_argument("-l", "--lanes", action="store_true", default=False,
-                           help="Export lane geometries instead of edge geometries")
-    argParser.add_argument("--junctions", action="store_true", default=False,
-                           help="Export junction geometries")
-    argParser.add_argument("-i", "--internal", action="store_true", default=False,
-                           help="Export internal geometries")
-    argParser.add_argument("-j", "--junction-coordinates", dest="junctionCoords", action="store_true", default=False,
-                           help="Append junction coordinates to edge shapes")
-    argParser.add_argument("-b", "--boundary", dest="boundary", action="store_true", default=False,
-                           help="Export boundary shapes instead of center-lines")
-    argParser.add_argument("--edgedata-timeline", action="store_true", default=False, dest="edgedataTimeline",
-                           help="exports all time intervals (by default only the first is exported)")
-    return argParser.parse_args()
+    op = sumolib.options.ArgumentParser(description="net to geojson",
+                                        usage="Usage: " + sys.argv[0] + " -n  ")
+    # input
+    op.add_argument("-n", "--net-file", category="input", dest="netFile", required=True, type=op.net_file,
+                    help="The .net.xml file to convert")
+    op.add_argument("-d", "--edgedata-file", category="input", dest="edgeData", type=op.edgedata_file,
+                    help="Optional edgeData to include in the output")
+    op.add_argument("-p", "--ptline-file", category="input", dest="ptlines", type=op.file,
+                    help="Optional ptline information to include in the output")
+    # output
+    op.add_argument("-o", "--output-file", dest="outFile", category="output", required=True, type=op.file,
+                    help="The geojson output file name")
+    # processing
+    op.add_argument("-l", "--lanes", action="store_true", default=False,
+                    help="Export lane geometries instead of edge geometries")
+    op.add_argument("--junctions", action="store_true", default=False,
+                    help="Export junction geometries")
+    op.add_argument("-i", "--internal", action="store_true", default=False,
+                    help="Export internal geometries")
+    op.add_argument("-j", "--junction-coordinates", dest="junctionCoords", action="store_true", default=False,
+                    help="Append junction coordinates to edge shapes")
+    op.add_argument("-b", "--boundary", dest="boundary", action="store_true", default=False,
+                    help="Export boundary shapes instead of center-lines")
+    op.add_argument("--edgedata-timeline", action="store_true", default=False, dest="edgedataTimeline",
+                    help="exports all time intervals (by default only the first is exported)")
+
+    try:
+        options = op.parse_args()
+    except (NotImplementedError, ValueError) as e:
+        print(e, file=sys.stderr)
+        sys.exit(1)
+    return options
 
 
 def shape2json(net, geometry, isBoundary):
diff -Nru sumo-1.17.0/tools/net/net2jpsgeometry.py sumo-1.18.0/tools/net/net2jpsgeometry.py
--- sumo-1.17.0/tools/net/net2jpsgeometry.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/net/net2jpsgeometry.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2007-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/net/net2kml.py sumo-1.18.0/tools/net/net2kml.py
--- sumo-1.17.0/tools/net/net2kml.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/net/net2kml.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2007-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
@@ -30,20 +30,23 @@
 
 def parse_args():
     USAGE = "Usage: " + sys.argv[0] + " -n  "
-    argParser = sumolib.options.ArgumentParser(usage=USAGE)
-    argParser.add_argument("-n", "--net-file", dest="netFile", help="The .net.xml file to convert")
-    argParser.add_argument("-o", "--output-file", dest="outFile", help="The KML output file name")
-    argParser.add_argument("-l", "--lanes", action="store_true", default=False,
-                           help="Export lane geometries instead of edge geometries")
-    argParser.add_argument("-i", "--internal", action="store_true", default=False,
-                           help="Export internal geometries")
-    argParser.add_argument("--color", default="0f0000ff", help="Color for normal edges")
-    argParser.add_argument("--internal-color", dest="iColor", default="5f0000ff", help="Color for internal edges")
+    ap = sumolib.options.ArgumentParser(usage=USAGE)
+    ap.add_argument("-n", "--net-file", category="input", type=ap.net_file,
+                    dest="netFile", help="The .net.xml file to convert")
+    ap.add_argument("-o", "--output-file", category="output", type=ap.file,
+                    dest="outFile", help="The KML output file name")
+    ap.add_argument("-l", "--lanes", action="store_true", default=False,
+                    help="Export lane geometries instead of edge geometries")
+    ap.add_argument("-i", "--internal", action="store_true", default=False,
+                    help="Export internal geometries")
+    ap.add_argument("--color", category="input", default="0f0000ff", help="Color for normal edges")
+    ap.add_argument("--internal-color", category="input", dest="iColor",
+                    default="5f0000ff", help="Color for internal edges")
 
-    options = argParser.parse_args()
+    options = ap.parse_args()
     if not options.netFile:
         print("Missing arguments")
-        argParser.print_help()
+        ap.print_help()
         exit()
     return options
 
diff -Nru sumo-1.17.0/tools/net/net2poly.py sumo-1.18.0/tools/net/net2poly.py
--- sumo-1.17.0/tools/net/net2poly.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/net/net2poly.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2007-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/net/netcheck.py sumo-1.18.0/tools/net/netcheck.py
--- sumo-1.17.0/tools/net/netcheck.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/net/netcheck.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2007-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
@@ -28,38 +28,35 @@
 from __future__ import print_function
 import os
 import sys
-from optparse import OptionParser
-sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+THIS_DIR = os.path.dirname(os.path.abspath(__file__))
+sys.path.append(os.path.join(THIS_DIR, '..'))
+from sumolib.options import ArgumentParser  # noqa
 import sumolib.net  # noqa
 
 
 def parse_args():
-    USAGE = "Usage: " + sys.argv[0] + "  "
-    optParser = OptionParser()
-    optParser.add_option("-s", "--source",
-                         default=False, help="List edges reachable from the source")
-    optParser.add_option("-d", "--destination",
-                         default=False, help="List edges which can reach the destination")
-    optParser.add_option("-o", "--selection-output",
-                         help="Write output to file(s) as a loadable selection")
-    optParser.add_option("--ignore-connections", action="store_true",
-                         default=False,
-                         help="Assume full connectivity at each node when computing all connected components")
-    optParser.add_option("-l", "--vclass", help="Include only edges allowing VCLASS")
-    optParser.add_option("-c", "--component-output",
-                         default=None, help="Write components of disconnected network to file - not compatible " +
-                                            "with --source or --destination options")
-    optParser.add_option("-r", "--results-output",
-                         default=None, help="Write results summary of disconnected network to file - not compatible " +
-                         "with --source or --destination options")
-    optParser.add_option("-t", "--print-types", action="store_true",
-                         default=False,
-                         help="Print edge types used in the component")
-
-    options, args = optParser.parse_args()
-    if len(args) != 1:
-        sys.exit(USAGE)
-    options.net = args[0]
+    op = ArgumentParser()
+    op.add_argument("net", category="input", type=op.net_file,
+                    help="The network file to be checked")
+    op.add_argument("-s", "--source", category="input", default=False, type=op.edge_list,
+                    help="List edges reachable from the source")
+    op.add_argument("-d", "--destination", category="input", type=op.edge, default=False,
+                    help="List edges which can reach the destination")
+    op.add_argument("-o", "--selection-output", category="output", type=op.file,
+                    help="Write output to file(s) as a loadable selection")
+    op.add_argument("--ignore-connections", action="store_true", default=False,
+                    help="Assume full connectivity at each node when computing all connected components")
+    op.add_argument("-l", "--vclass", help="Include only edges allowing vClass")
+    op.add_argument("--component-output", type=op.file, default=None,
+                    help=("Write components of disconnected network to file - not compatible " +
+                          "with --source or --destination options"))
+    op.add_argument("-r", "--results-output", type=op.file, default=None,
+                    help=("Write results summary of disconnected network to file - not compatible " +
+                          "with --source or --destination options"))
+    op.add_argument("-t", "--print-types", action="store_true", default=False,
+                    help="Print edge types used in the component")
+
+    options = op.parse_args()
     return options
 
 
@@ -123,7 +120,6 @@
 
 if __name__ == "__main__":
     options = parse_args()
-
     net = sumolib.net.readNet(options.net,
                               withInternal=(options.vclass == "pedestrian"),
                               withPedestrianConnections=(options.vclass == "pedestrian"))
@@ -146,7 +142,7 @@
         output_str_list = []
         dist_str_list = []
 
-        # Iterate through components to output and summarise
+        # Iterate through components to output and summarize
         for idx, comp in enumerate(sorted(components, key=lambda c: next(iter(c)))):
             if options.selection_output:
                 with open("{}comp{}.txt".format(options.selection_output, idx), 'w') as f:
diff -Nru sumo-1.17.0/tools/net/netdiff.py sumo-1.18.0/tools/net/netdiff.py
--- sumo-1.17.0/tools/net/netdiff.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/net/netdiff.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2011-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
@@ -44,9 +44,12 @@
 
 def parse_args():
     optParser = ArgumentParser()
-    optParser.add_argument("source", help="original network")
-    optParser.add_argument("dest", help="modified network")
-    optParser.add_argument("outprefix", help="prefix for the diff files")
+    optParser.add_option("source", category="input", type=optParser.net_file,
+                         help="original network")
+    optParser.add_option("dest", category="input", type=optParser.net_file,
+                         help="modified network")
+    optParser.add_option("outprefix", category="output", type=optParser.file,
+                         help="prefix for the diff files")
     optParser.add_option("-v", "--verbose", action="store_true",
                          default=False, help="Give more output")
     optParser.add_option("-p", "--use-prefix", action="store_true",
@@ -61,11 +64,11 @@
     optParser.add_option("--path", dest="path", help="Path to binaries")
     optParser.add_option("--remove-plain", action="store_true",
                          help="avoid saving plain xml files of source and destination networks")
-    optParser.add_option("-l", "--write-selections", action="store_true", default=False,
+    optParser.add_option("-l", "--write-selections", category="output", action="store_true", default=False,
                          help="Write selection files for created, deleted and changed elements")
-    optParser.add_option("-s", "--write-shapes", action="store_true", default=False,
+    optParser.add_option("-s", "--write-shapes", category="output", action="store_true", default=False,
                          help="Write shape files for created, deleted and changed elements")
-    optParser.add_option("-g", "--plain-geo", action="store_true", default=False,
+    optParser.add_option("-g", "--plain-geo", category="output", action="store_true", default=False,
                          help="Write geo coordinates instead of network coordinates")
     options = optParser.parse_args()
     if options.use_prefix and options.direct:
diff -Nru sumo-1.17.0/tools/net/netduplicate.py sumo-1.18.0/tools/net/netduplicate.py
--- sumo-1.17.0/tools/net/netduplicate.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/net/netduplicate.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2013-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/net/netmatch.py sumo-1.18.0/tools/net/netmatch.py
--- sumo-1.17.0/tools/net/netmatch.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/net/netmatch.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2009-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
@@ -27,30 +27,30 @@
 from sumolib.geomhelper import distance  # noqa
 
 
-argParser = sumolib.options.ArgumentParser()
-argParser.add_argument("-v", "--verbose", action="store_true", dest="verbose",
-                       default=False, category="processing", help="tell me what you are doing")
-argParser.add_argument("-1", "--net1", dest="net1", required=True, category="input", type=argParser.net_file,
-                       help="first SUMO network to use (mandatory)", metavar="FILE")
-argParser.add_argument("-2", "--net2", dest="net2", required=True, category="input", type=argParser.net_file,
-                       help="second SUMO network to use (mandatory)", metavar="FILE")
-# argParser.add_argument("-t", "--trips", dest="trips",
-#                    category="input", type=argParser.route_file, help="Trips to remap (mandatory)", metavar="FILE")
-# argParser.add_argument("-a", "--nodes1", dest="nodes1",
-#                     category="input", type=argParser.file, help="The first matching nodes", metavar="NODELIST")
-# argParser.add_argument("-b", "--nodes2", dest="nodes2",
-#                     category="input", type=argParser.file, help="The second matching nodes", metavar="NODELIST")
-# argParser.add_argument("-d", "--dump", dest="dump",
-#                     category="output", type=argParser.file, help="dump file to use", metavar="FILE")
-argParser.add_argument("-d", "--delta", default=1,
-                       type=float, category="processing", help="maximum distance between end points")
-argParser.add_argument("-o", "--output", dest="output", required=True,
-                       category="output", type=argParser.file, help="(base) name for the output", metavar="FILE")
-argParser.add_argument("--edges1", category="output", type=argParser.file,
-                       help="matched edges in net 1", metavar="FILE")
-argParser.add_argument("--edges2", category="output", type=argParser.file,
-                       help="matched edges in net 2", metavar="FILE")
-options = argParser.parse_args()
+ap = sumolib.options.ArgumentParser()
+ap.add_argument("-v", "--verbose", action="store_true", dest="verbose",
+                default=False, help="tell me what you are doing")
+ap.add_argument("-1", "--net1", dest="net1", required=True, category="input", type=ap.net_file,
+                help="first SUMO network to use (mandatory)", metavar="FILE")
+ap.add_argument("-2", "--net2", dest="net2", required=True, category="input", type=ap.net_file,
+                help="second SUMO network to use (mandatory)", metavar="FILE")
+# ap.add_argument("-t", "--trips", dest="trips",
+#                    category="input", type=ap.route_file, help="Trips to remap (mandatory)", metavar="FILE")
+# ap.add_argument("-a", "--nodes1", dest="nodes1",
+#                     category="input", type=ap.file, help="The first matching nodes", metavar="NODELIST")
+# ap.add_argument("-b", "--nodes2", dest="nodes2",
+#                     category="input", type=ap.file, help="The second matching nodes", metavar="NODELIST")
+# ap.add_argument("-d", "--dump", dest="dump",
+#                     category="output", type=ap.file, help="dump file to use", metavar="FILE")
+ap.add_argument("-d", "--delta", default=1,
+                type=float, help="maximum distance between end points")
+ap.add_argument("-o", "--output", dest="output", required=True,
+                category="output", type=ap.file, help="(base) name for the output", metavar="FILE")
+ap.add_argument("--edges1", category="output", type=ap.file,
+                help="matched edges in net 1", metavar="FILE")
+ap.add_argument("--edges2", category="output", type=ap.file,
+                help="matched edges in net 2", metavar="FILE")
+options = ap.parse_args()
 
 
 # read networks
diff -Nru sumo-1.17.0/tools/net/network_statistics.py sumo-1.18.0/tools/net/network_statistics.py
--- sumo-1.17.0/tools/net/network_statistics.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/net/network_statistics.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2009-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/net/odConnectionsCheck.py sumo-1.18.0/tools/net/odConnectionsCheck.py
--- sumo-1.17.0/tools/net/odConnectionsCheck.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/net/odConnectionsCheck.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2007-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/net/prepareVISUM.py sumo-1.18.0/tools/net/prepareVISUM.py
--- sumo-1.17.0/tools/net/prepareVISUM.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/net/prepareVISUM.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2008-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/net/reduceLanes.py sumo-1.18.0/tools/net/reduceLanes.py
--- sumo-1.17.0/tools/net/reduceLanes.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/net/reduceLanes.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2016-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
@@ -34,21 +34,23 @@
 
 
 def parse_args():
-    argParser = sumolib.options.ArgumentParser()
-    argParser.add_argument("-n", "--network", required=True, help="sumo network to use")
-    argParser.add_argument("-o", "--output-file", default="reduced.edg.xml", help="The output edge patch file name")
-    argParser.add_argument("--too-short-output", help="The output for edges which were ignored because of length")
-    argParser.add_argument("--roundabout-output",
-                           help="The output for edges which were ignored because of roundabouts")
-    argParser.add_argument("--min-length", type=float, default=60.,
-                           help="the minimum edge length to process")
-    argParser.add_argument("--min-lane-number", type=int, default=1,
-                           help="the minimum number of lanes to process")
-    argParser.add_argument("--junction-distance", type=float, default=20.,
-                           help="where to perform the edge split near the junction")
-    argParser.add_argument("--max-priority", type=int, default=13,
-                           help="the maximum priority")
-    return argParser.parse_args()
+    ap = sumolib.options.ArgumentParser()
+    ap.add_argument("-n", "--network", category="input", type=ap.net_file, required=True, help="sumo network to use")
+    ap.add_argument("-o", "--output-file", category="output", type=ap.edgedata_file,
+                    default="reduced.edg.xml", help="The output edge patch file name")
+    ap.add_argument("--too-short-output", category="output", type=ap.edgedata_file,
+                    help="The output for edges which were ignored because of length")
+    ap.add_argument("--roundabout-output", category="output", type=ap.edgedata_file,
+                    help="The output for edges which were ignored because of roundabouts")
+    ap.add_argument("--min-length", type=float, default=60.,
+                    help="the minimum edge length to process")
+    ap.add_argument("--min-lane-number", type=int, default=1,
+                    help="the minimum number of lanes to process")
+    ap.add_argument("--junction-distance", type=float, default=20.,
+                    help="where to perform the edge split near the junction")
+    ap.add_argument("--max-priority", type=int, default=13,
+                    help="the maximum priority")
+    return ap.parse_args()
 
 
 if __name__ == "__main__":
diff -Nru sumo-1.17.0/tools/net/reprojectpolys.py sumo-1.18.0/tools/net/reprojectpolys.py
--- sumo-1.17.0/tools/net/reprojectpolys.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/net/reprojectpolys.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2008-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/net/split_at_stops.py sumo-1.18.0/tools/net/split_at_stops.py
--- sumo-1.17.0/tools/net/split_at_stops.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/net/split_at_stops.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2011-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
@@ -31,16 +31,21 @@
 
 
 def get_options(args=None):
-    argParser = sumolib.options.ArgumentParser()
-    argParser.add_argument("stopfile", nargs="+", help="stop files to process")
-    argParser.add_argument("-n", "--network", help="validate positions against this network")
-    argParser.add_argument("-r", "--routes", help="route file to adapt")
-    argParser.add_argument("--split-output", default="splits.edg.xml", help="split file to generate")
-    argParser.add_argument("-o", "--output", default="net.net.xml", help="net file to generate")
-    argParser.add_argument("--stop-output", default="stops.add.xml", help="stop file to generate")
-    argParser.add_argument("--route-output", default="routes.rou.xml", help="route file to generate")
-    argParser.add_argument("--stop-type", default="trainStop", help="which stop types to use")
-    return argParser.parse_args(args)
+    ap = sumolib.options.ArgumentParser()
+    ap.add_argument("stopfile", nargs="+", help="stop files to process")
+    ap.add_argument("-n", "--network", category="input", type=ap.net_file,
+                    help="validate positions against this network")
+    ap.add_argument("-r", "--routes", category="input", type=ap.route_file, help="route file to adapt")
+    ap.add_argument("--split-output", category="output", type=ap.edgedata_file,
+                    default="splits.edg.xml", help="split file to generate")
+    ap.add_argument("-o", "--output", category="output", type=ap.net_file,
+                    default="net.net.xml", help="net file to generate")
+    ap.add_argument("--stop-output", category="output", type=ap.additional_file,
+                    default="stops.add.xml", help="stop file to generate")
+    ap.add_argument("--route-output", category="output", type=ap.route_file,
+                    default="routes.rou.xml", help="route file to generate")
+    ap.add_argument("--stop-type", default="trainStop", help="which stop types to use")
+    return ap.parse_args(args)
 
 
 def check_replace(replace_edges, e, offset):
diff -Nru sumo-1.17.0/tools/net/visum_mapDistricts.py sumo-1.18.0/tools/net/visum_mapDistricts.py
--- sumo-1.17.0/tools/net/visum_mapDistricts.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/net/visum_mapDistricts.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2008-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/net/xmlconnections_mapEdges.py sumo-1.18.0/tools/net/xmlconnections_mapEdges.py
--- sumo-1.17.0/tools/net/xmlconnections_mapEdges.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/net/xmlconnections_mapEdges.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2009-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/net/xmledges_applyOffset.py sumo-1.18.0/tools/net/xmledges_applyOffset.py
--- sumo-1.17.0/tools/net/xmledges_applyOffset.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/net/xmledges_applyOffset.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2009-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/net/xmlnodes_applyOffset.py sumo-1.18.0/tools/net/xmlnodes_applyOffset.py
--- sumo-1.17.0/tools/net/xmlnodes_applyOffset.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/net/xmlnodes_applyOffset.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2009-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/osmBuild.py sumo-1.18.0/tools/osmBuild.py
--- sumo-1.17.0/tools/osmBuild.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/osmBuild.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2009-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/osmGet.py sumo-1.18.0/tools/osmGet.py
--- sumo-1.17.0/tools/osmGet.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/osmGet.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2009-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/osmWebWizard.py sumo-1.18.0/tools/osmWebWizard.py
--- sumo-1.17.0/tools/osmWebWizard.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/osmWebWizard.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2014-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/output/accelerations.py sumo-1.18.0/tools/output/accelerations.py
--- sumo-1.17.0/tools/output/accelerations.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/output/accelerations.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,42 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
-# Copyright (C) 2008-2023 German Aerospace Center (DLR) and others.
-# This program and the accompanying materials are made available under the
-# terms of the Eclipse Public License 2.0 which is available at
-# https://www.eclipse.org/legal/epl-2.0/
-# This Source Code 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
-
-# @file    accelerations.py
-# @author  Jakob Erdmann
-# @date    2012-11-20
-
-from __future__ import absolute_import
-from __future__ import print_function
-import os
-import sys
-sys.path.append(os.path.join(os.path.dirname(sys.argv[0]), '..'))
-from sumolib.output import parse_fast  # noqa
-from sumolib.miscutils import Statistics  # noqa
-
-
-def accelStats(netstate):
-    lastSpeed = {}
-    stats = Statistics("Accelerations", histogram=True, printMin=True, scale=0.2)
-    for vehicle in parse_fast(netstate, 'vehicle', ['id', 'speed']):
-        speed = float(vehicle.speed)
-        prevSpeed = lastSpeed.get(vehicle.id, speed)
-        stats.add(speed - prevSpeed, (vehicle.id, vehicle.speed))
-        lastSpeed[vehicle.id] = speed
-    print(stats)
-
-
-if __name__ == "__main__":
-    if len(sys.argv) != 2:
-        sys.exit("call %s " % sys.argv[0])
-    accelStats(sys.argv[1])
diff -Nru sumo-1.17.0/tools/output/aggregateBatteryOutput.py sumo-1.18.0/tools/output/aggregateBatteryOutput.py
--- sumo-1.17.0/tools/output/aggregateBatteryOutput.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/output/aggregateBatteryOutput.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2008-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
@@ -18,9 +18,9 @@
 
 import os
 import sys
-import getopt
 from collections import OrderedDict
-sys.path += [os.path.join(os.environ["SUMO_HOME"], "tools")]
+if "SUMO_HOME" in os.environ:
+    sys.path += [os.path.join(os.environ["SUMO_HOME"], "tools")]
 import sumolib  # noqa
 
 
@@ -46,7 +46,7 @@
     return result
 
 
-def writeTimeSteps(result):
+def writeTimeSteps(result, outputFile):
     with open(outputFile, "w") as f:
         sumolib.xml.writeHeader(f)
         f.write("\n")
@@ -137,32 +137,16 @@
     return result
 
 
-"""
-@brief main
-"""
-
-# parse input
-opts, args = getopt.getopt(sys.argv[1:], "i:o:t:v:", ["input=", "output=", "time="])
-
-# check arguments
-if len(opts) == 0:
-    print('usage: aggregateBatteryOutput.py -i  '
-          '-o  -t ')
-    sys.exit()
-
-# parse arguments
-for opt, arg in opts:
-    if opt in ("-i", "--input"):
-        inputFile = arg
-    elif opt in ("-o", "--output"):
-        outputFile = arg
-    elif opt in ("-t", "--time"):
-        timeToSplit = int(arg)
+def main():
+    op = sumolib.options.ArgumentParser()
+    op.add_argument("-i", "--input", type=op.file, category="input", help="battery input file")
+    op.add_argument("-o", "--output", type=op.file, category="output", help="battery merged output file")
+    op.add_argument("-t", "--time", type=op.time, help="time to merge")
+    opts = op.parse_args()
+    matrix = parseTimeSteps(opts.input)
+    matrix = processMatrix(matrix, int(opts.time))
+    writeTimeSteps(matrix, opts.output)
 
-# create matrix with timeSteps
-matrix = parseTimeSteps(inputFile)
 
-matrix = processMatrix(matrix, timeToSplit)
-
-# write matrix
-writeTimeSteps(matrix)
+if __name__ == "__main__":
+    main()
diff -Nru sumo-1.17.0/tools/output/analyze_pedestrian_jam.py sumo-1.18.0/tools/output/analyze_pedestrian_jam.py
--- sumo-1.17.0/tools/output/analyze_pedestrian_jam.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/output/analyze_pedestrian_jam.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
@@ -18,25 +18,26 @@
 
 from __future__ import absolute_import
 from __future__ import print_function
+from __future__ import division
+import os
 import sys
 import re
 from collections import defaultdict
-import optparse
+if "SUMO_HOME" in os.environ:
+    sys.path += [os.path.join(os.environ["SUMO_HOME"], "tools")]
+import sumolib  # noqa
 
 
 def get_options(args=None):
-    usage = "usage: %prog [options] logfile"
-    optParser = optparse.OptionParser(usage=usage)
-    optParser.add_option("-a", "--aggregation", type="int", default=3600, help="define the time aggregation in seconds")
-    optParser.add_option("-p", "--gnuplot-output", dest="plotfile", help="define the gnuplot output file")
-    optParser.add_option("-e", "--edgedata-output", dest="edgedata", help="define the edgedata output file")
-
-    (options, args) = optParser.parse_args(args=args)
-
-    if len(args) != 1:
-        print(usage)
-        sys.exit(1)
-    options.logfile = args[0]
+    op = sumolib.options.ArgumentParser()
+    op.add_argument("logfile", type=op.file, category="input", help="log file")
+    op.add_option("-a", "--aggregation", type=op.time, default=3600,
+                  help="define the time aggregation in seconds")
+    op.add_option("-p", "--gnuplot-output", type=op.file, dest="plotfile", category="output",
+                  help="define the gnuplot output file")
+    op.add_option("-e", "--edgedata-output", type=op.file, dest="edgedata", category="output",
+                  help="define the edgedata output file")
+    options = op.parse_args()
 
     if options.plotfile is None:
         options.plotfile = options.logfile + '.plot'
@@ -55,28 +56,29 @@
     jamCounts = defaultdict(lambda: 0)
     # counts per step
     jamStepCounts = defaultdict(lambda: 0)
-    for index, line in enumerate(open(logfile)):
-        try:
-            if "is jammed on edge" in line:
-                match = reEdge.search(line)
-                edge = match.group(1)
-                timeMatch = reTime.search(line)
-                if timeMatch:
-                    time = int(timeMatch.group(1))
-                else:
-                    timeMatch = reHRTime.search(line)
-                    time = (24 * 3600 * int(timeMatch.group(1))
-                            + 3600 * int(timeMatch.group(2))
-                            + 60 * int(timeMatch.group(3))
-                            + int(timeMatch.group(4)))
-                jamCounts[edge] += 1
-                jamStepCounts[time / aggregate] += 1
-        except Exception:
-            print(sys.exc_info())
-            sys.exit("error when parsing line '%s'" % line)
-        if index % 1000 == 0:
-            sys.stdout.write(".")
-            sys.stdout.flush()
+    with open(logfile) as log:
+        for index, line in enumerate(log):
+            try:
+                if "is jammed on edge" in line:
+                    match = reEdge.search(line)
+                    edge = match.group(1)
+                    timeMatch = reTime.search(line)
+                    if timeMatch:
+                        time = int(timeMatch.group(1))
+                    else:
+                        timeMatch = reHRTime.search(line)
+                        time = (24 * 3600 * int(timeMatch.group(1))
+                                + 3600 * int(timeMatch.group(2))
+                                + 60 * int(timeMatch.group(3))
+                                + int(timeMatch.group(4)))
+                    jamCounts[edge] += 1
+                    jamStepCounts[time // aggregate] += 1
+            except Exception:
+                print(sys.exc_info())
+                sys.exit("error when parsing line '%s'" % line)
+            if index % 1000 == 0:
+                sys.stdout.write(".")
+                sys.stdout.flush()
     print()
     print("read %s lines" % index)
 
@@ -90,7 +92,7 @@
 
 
 def main(options):
-    jamCounts, jamStepCounts = parse_log(options.logfile, aggregate=options.aggregation)
+    jamCounts, jamStepCounts = parse_log(options.logfile, aggregate=int(options.aggregation))
     print_counts(jamCounts, 'waiting')
     # generate plot
     if len(jamStepCounts) > 0:
diff -Nru sumo-1.17.0/tools/output/analyze_teleports.py sumo-1.18.0/tools/output/analyze_teleports.py
--- sumo-1.17.0/tools/output/analyze_teleports.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/output/analyze_teleports.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
@@ -19,6 +19,7 @@
 
 from __future__ import absolute_import
 from __future__ import print_function
+from __future__ import division
 import os
 import sys
 import re
@@ -29,7 +30,7 @@
 
 def parse_args():
     optParser = ArgumentParser()
-    optParser.add_argument("logfile", help="log file")
+    optParser.add_argument("logfile", type=optParser.file, category="input", help="log file")
     return optParser.parse_args()
 
 
@@ -45,38 +46,39 @@
     # counts per step
     waitingStepCounts = defaultdict(lambda: 0)
     collisionStepCounts = defaultdict(lambda: 0)
-    for index, line in enumerate(open(logfile)):
-        try:
-            if "Warning: Teleporting vehicle" in line:
-                # figure out whether its micro or meso
-                match = reFrom.search(line)
-                if match is None:
-                    edge = reFromMeso.search(line).group(1)
-                else:
-                    edge = match.group(1)
-                    if edges:
-                        edge = edge[:-2]
-                timeMatch = reTime.search(line)
-                if timeMatch:
-                    time = int(timeMatch.group(1))
-                else:
-                    timeMatch = reHRTime.search(line)
-                    time = (24 * 3600 * int(timeMatch.group(1))
-                            + 3600 * int(timeMatch.group(2))
-                            + 60 * int(timeMatch.group(3))
-                            + int(timeMatch.group(4)))
-                if "collision" in line:
-                    collisionCounts[edge] += 1
-                    collisionStepCounts[time / aggregate] += 1
-                else:
-                    waitingCounts[edge] += 1
-                    waitingStepCounts[time / aggregate] += 1
-        except Exception:
-            print(sys.exc_info())
-            sys.exit("error when parsing line '%s'" % line)
-        if index % 1000 == 0:
-            sys.stdout.write(".")
-            sys.stdout.flush()
+    with open(logfile) as log:
+        for index, line in enumerate(log):
+            try:
+                if "Warning: Teleporting vehicle" in line:
+                    # figure out whether its micro or meso
+                    match = reFrom.search(line)
+                    if match is None:
+                        edge = reFromMeso.search(line).group(1)
+                    else:
+                        edge = match.group(1)
+                        if edges:
+                            edge = edge[:-2]
+                    timeMatch = reTime.search(line)
+                    if timeMatch:
+                        time = int(timeMatch.group(1))
+                    else:
+                        timeMatch = reHRTime.search(line)
+                        time = (24 * 3600 * int(timeMatch.group(1))
+                                + 3600 * int(timeMatch.group(2))
+                                + 60 * int(timeMatch.group(3))
+                                + int(timeMatch.group(4)))
+                    if "collision" in line:
+                        collisionCounts[edge] += 1
+                        collisionStepCounts[time // aggregate] += 1
+                    else:
+                        waitingCounts[edge] += 1
+                        waitingStepCounts[time // aggregate] += 1
+            except Exception:
+                print(sys.exc_info())
+                sys.exit("error when parsing line '%s'" % line)
+            if index % 1000 == 0:
+                sys.stdout.write(".")
+                sys.stdout.flush()
     print()
     print("read %s lines" % index)
 
@@ -96,8 +98,8 @@
     print_counts(collisionCounts, 'collisions')
     # generate plot
     if len(waitingStepCounts) + len(collisionStepCounts) > 0:
-        min_step = min(waitingStepCounts.keys() + collisionStepCounts.keys())
-        max_step = max(waitingStepCounts.keys() + collisionStepCounts.keys())
+        min_step = min(list(waitingStepCounts.keys()) + list(collisionStepCounts.keys()))
+        max_step = max(list(waitingStepCounts.keys()) + list(collisionStepCounts.keys()))
         plotfile = logfile + '.plot'
         with open(plotfile, 'w') as f:
             f.write(("# plot '%s' using 1:2 with lines title 'waiting', '%s' using 1:3 with lines title " +
diff -Nru sumo-1.17.0/tools/output/attributeCompare.py sumo-1.18.0/tools/output/attributeCompare.py
--- sumo-1.17.0/tools/output/attributeCompare.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/output/attributeCompare.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2014-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/output/attributeDiff.py sumo-1.18.0/tools/output/attributeDiff.py
--- sumo-1.17.0/tools/output/attributeDiff.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/output/attributeDiff.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2014-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/output/attributeStats.py sumo-1.18.0/tools/output/attributeStats.py
--- sumo-1.17.0/tools/output/attributeStats.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/output/attributeStats.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2014-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/output/computeCoordination.py sumo-1.18.0/tools/output/computeCoordination.py
--- sumo-1.17.0/tools/output/computeCoordination.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/output/computeCoordination.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2007-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/output/computePassengerCounts.py sumo-1.18.0/tools/output/computePassengerCounts.py
--- sumo-1.17.0/tools/output/computePassengerCounts.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/output/computePassengerCounts.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2010-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/output/computeStoppingPlaceUsage.py sumo-1.18.0/tools/output/computeStoppingPlaceUsage.py
--- sumo-1.17.0/tools/output/computeStoppingPlaceUsage.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/output/computeStoppingPlaceUsage.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2010-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/output/countLaneChanges.py sumo-1.18.0/tools/output/countLaneChanges.py
--- sumo-1.17.0/tools/output/countLaneChanges.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/output/countLaneChanges.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2014-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/output/edgeDataDiff.py sumo-1.18.0/tools/output/edgeDataDiff.py
--- sumo-1.17.0/tools/output/edgeDataDiff.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/output/edgeDataDiff.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/output/edgeDataStatistics.py sumo-1.18.0/tools/output/edgeDataStatistics.py
--- sumo-1.17.0/tools/output/edgeDataStatistics.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/output/edgeDataStatistics.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/output/fcdDiff.py sumo-1.18.0/tools/output/fcdDiff.py
--- sumo-1.17.0/tools/output/fcdDiff.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/output/fcdDiff.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/output/generateITetrisIntersectionMetrics.py sumo-1.18.0/tools/output/generateITetrisIntersectionMetrics.py
--- sumo-1.17.0/tools/output/generateITetrisIntersectionMetrics.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/output/generateITetrisIntersectionMetrics.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2009-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/output/generateITetrisNetworkMetrics.py sumo-1.18.0/tools/output/generateITetrisNetworkMetrics.py
--- sumo-1.17.0/tools/output/generateITetrisNetworkMetrics.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/output/generateITetrisNetworkMetrics.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2009-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/output/generateMeanDataDefinitions.py sumo-1.18.0/tools/output/generateMeanDataDefinitions.py
--- sumo-1.17.0/tools/output/generateMeanDataDefinitions.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/output/generateMeanDataDefinitions.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2008-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/output/generateTLSE1Detectors.py sumo-1.18.0/tools/output/generateTLSE1Detectors.py
--- sumo-1.17.0/tools/output/generateTLSE1Detectors.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/output/generateTLSE1Detectors.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2009-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/output/generateTLSE2Detectors.py sumo-1.18.0/tools/output/generateTLSE2Detectors.py
--- sumo-1.17.0/tools/output/generateTLSE2Detectors.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/output/generateTLSE2Detectors.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2009-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/output/generateTLSE3Detectors.py sumo-1.18.0/tools/output/generateTLSE3Detectors.py
--- sumo-1.17.0/tools/output/generateTLSE3Detectors.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/output/generateTLSE3Detectors.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2009-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/output/netdumpdiff.py sumo-1.18.0/tools/output/netdumpdiff.py
--- sumo-1.17.0/tools/output/netdumpdiff.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/output/netdumpdiff.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2008-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/output/netdumpmean.py sumo-1.18.0/tools/output/netdumpmean.py
--- sumo-1.17.0/tools/output/netdumpmean.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/output/netdumpmean.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2008-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/output/parkingSearchTraffic.py sumo-1.18.0/tools/output/parkingSearchTraffic.py
--- sumo-1.17.0/tools/output/parkingSearchTraffic.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/output/parkingSearchTraffic.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2008-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/output/scheduleStats.py sumo-1.18.0/tools/output/scheduleStats.py
--- sumo-1.17.0/tools/output/scheduleStats.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/output/scheduleStats.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
@@ -47,6 +47,10 @@
     'as': ('arrival delay',
            lambda r, s: s.add(r['sim_started'] - (r['arrival'] if isnan(r['started']) else r['started']), key(r))),
     's': ('stop delay', lambda r, s: s.add(r['until'] - r['arrival'] - (r['sim_ended'] - r['sim_started']), key(r))),
+    't': ('traveltime schedule delta', lambda r, s: s.add(r['traveltime'] - (r['sim_traveltime'])
+          if not isnan(r['traveltime']) and not isnan(r['sim_traveltime']) else 0, key(r))),
+    'T': ('traveltime recording delta', lambda r, s: s.add(r['traveltime_actual'] - (r['sim_traveltime'])
+          if not isnan(r['traveltime_actual']) and not isnan(r['sim_traveltime']) else 0, key(r))),
 }
 
 GROUPSTATS = {
@@ -130,16 +134,21 @@
         'until',    # route-input
         'started',  # route-input
         'ended',    # route-input
+        'traveltime',  # route-input (as scheduled)
+        'traveltime_actual',  # route-input
     ]
 
     columns2 = columns[:3] + [
         'sim_started',  # stop-output
         'sim_ended',    # stop-input
+        'sim_traveltime',  # stop-input
     ]
 
     stops = []
     tripIds = dict()  # vehID -> lastTripId
     priorStops = dict()  # vehID -> lastStopID
+    priorUntil = dict()  # vehID -> lastStopUntil
+    priorEnded = dict()  # vehID -> lastStopEnded
     for vehicle in parse(options.routeFile, ['vehicle', 'trip'],
                          heterogeneous=True, attr_conversions=ATTR_CONVERSIONS):
         if vehicle.stop is not None:
@@ -149,20 +158,30 @@
                 tripIds[vehID] = tripId
                 stopID = getStopID(stop)
                 priorStop = priorStops.get(vehID)
+                arrival = stop.getAttributeSecure("arrival", nan)
+                until = stop.getAttributeSecure("until", nan)
+                started = stop.getAttributeSecure("started", nan)
+                ended = stop.getAttributeSecure("ended", nan)
+                traveltime = nan
+                if not isnan(priorUntil.get(vehID, nan)) and not isnan(arrival):
+                    traveltime = arrival - priorUntil[vehID]
+                traveltime_actual = nan
+                if not isnan(priorEnded.get(vehID, nan)) and not isnan(started):
+                    traveltime_actual = started - priorEnded[vehID]
+
                 priorStops[vehID] = stopID
+                priorUntil[vehID] = until
+                priorEnded[vehID] = ended
 
-                stops.append((vehID, tripId, stopID, priorStop,
-                              stop.getAttributeSecure("arrival", nan),
-                              stop.getAttributeSecure("until", nan),
-                              stop.getAttributeSecure("started", nan),
-                              stop.getAttributeSecure("ended", nan),
-                              ))
+                stops.append((vehID, tripId, stopID, priorStop, arrival, until,
+                              started, ended, traveltime, traveltime_actual))
 
     print("Parsed %s stops" % len(stops))
 
     simStops = []
     tripIds = dict()  # vehID -> lastTripId
     priorStops = dict()  # vehID -> lastStopID
+    priorEnded = dict()  # vehID -> lastStopUntil
     for stop in parse(options.stopFile, "stopinfo", heterogeneous=True,
                       attr_conversions=ATTR_CONVERSIONS):
         vehID = stop.id
@@ -170,11 +189,16 @@
         tripIds[vehID] = tripId
         stopID = getStopID(stop)
         priorStop = priorStops.get(vehID)
+        started = stop.getAttributeSecure("started", nan)
+        ended = stop.getAttributeSecure("ended", nan)
+        sim_traveltime = nan
+        if not isnan(priorEnded.get(vehID, nan)) and not isnan(started):
+            sim_traveltime = started - priorEnded[vehID]
         priorStops[vehID] = stopID
+        priorEnded[vehID] = ended
 
         simStops.append((vehID, tripId, stopID,  # priorStop,
-                         stop.getAttributeSecure("started", nan),
-                         stop.getAttributeSecure("ended", nan)))
+                         started, ended, sim_traveltime))
 
     print("Parsed %s stopinfos" % len(simStops))
 
diff -Nru sumo-1.17.0/tools/output/statisticsElements.py sumo-1.18.0/tools/output/statisticsElements.py
--- sumo-1.17.0/tools/output/statisticsElements.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/output/statisticsElements.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2008-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/output/stopOrder.py sumo-1.18.0/tools/output/stopOrder.py
--- sumo-1.17.0/tools/output/stopOrder.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/output/stopOrder.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/output/tables.py sumo-1.18.0/tools/output/tables.py
--- sumo-1.17.0/tools/output/tables.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/output/tables.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2008-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/output/timingStats.py sumo-1.18.0/tools/output/timingStats.py
--- sumo-1.17.0/tools/output/timingStats.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/output/timingStats.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2008-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/output/tripinfoByTAZ.py sumo-1.18.0/tools/output/tripinfoByTAZ.py
--- sumo-1.17.0/tools/output/tripinfoByTAZ.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/output/tripinfoByTAZ.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/output/tripinfoByType.py sumo-1.18.0/tools/output/tripinfoByType.py
--- sumo-1.17.0/tools/output/tripinfoByType.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/output/tripinfoByType.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/output/tripinfoDiff.py sumo-1.18.0/tools/output/tripinfoDiff.py
--- sumo-1.17.0/tools/output/tripinfoDiff.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/output/tripinfoDiff.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/output/tripStatistics.py sumo-1.18.0/tools/output/tripStatistics.py
--- sumo-1.17.0/tools/output/tripStatistics.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/output/tripStatistics.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2007-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/output/vehLanes.py sumo-1.18.0/tools/output/vehLanes.py
--- sumo-1.17.0/tools/output/vehLanes.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/output/vehLanes.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2008-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/output/vehroute2amitranOD.py sumo-1.18.0/tools/output/vehroute2amitranOD.py
--- sumo-1.17.0/tools/output/vehroute2amitranOD.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/output/vehroute2amitranOD.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2014-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/output/vehrouteCountValidation.py sumo-1.18.0/tools/output/vehrouteCountValidation.py
--- sumo-1.17.0/tools/output/vehrouteCountValidation.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/output/vehrouteCountValidation.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
@@ -43,10 +43,14 @@
                         help="Input route file (vehroute-output)")
     parser.add_argument("-t", "--turn-files", dest="turnFiles",
                         help="Input turn-count file")
+    parser.add_argument("-T", "--turn-ratio-files", category="input", dest="turnRatioFiles", type=parser.file_list,
+                        help="Input turn-ratio file")
     parser.add_argument("-d", "--edgedata-files", dest="edgeDataFiles",
                         help="Input edgeData file (for counts)")
-    parser.add_argument("-O", "--od-files", dest="odFiles",
-                        help="Input edgeRelation file for origin-destination counts")
+    parser.add_argument("-O", "--od-files", category="input", dest="odFiles", type=parser.file_list,
+                        help="Input edgeRelation and tazRelation files for origin-destination counts")
+    parser.add_argument("--taz-files", category="input", dest="tazFiles", type=parser.file_list,
+                        help="Input TAZ (district) definitions for interpreting tazRelation files")
     parser.add_argument("--edgedata-attribute", dest="edgeDataAttr", default="entered",
                         help="Read edgeData counts from the given attribute")
     parser.add_argument("--arrival-attribute", dest="arrivalAttr",
@@ -55,7 +59,7 @@
                         help="Read departure counts from the given edgeData file attribute")
     parser.add_argument("--turn-attribute", dest="turnAttr", default="count",
                         help="Read turning counts from the given attribute")
-    parser.add_argument("--turn-ratio-attribute", dest="turnRatioAttr",
+    parser.add_argument("--turn-ratio-attribute", dest="turnRatioAttr", default="probability",
                         help="Read turning ratios from the given attribute")
     parser.add_argument("--turn-ratio-total", dest="turnRatioTotal", type=float, default=1,
                         help="Set value for normalizing turning ratios (default 1)")
@@ -83,12 +87,15 @@
 
     options = parser.parse_args(args=args)
     if (options.routeFiles is None or
-            (options.turnFiles is None and options.edgeDataFiles is None and options.odFiles is None)):
-        parser.print_help()
+            (options.turnFiles is None
+             and options.turnRatioFiles is None
+             and options.edgeDataFiles is None
+             and options.odFiles is None)):
         sys.exit()
 
     options.routeFiles = options.routeFiles.split(',')
     options.turnFiles = options.turnFiles.split(',') if options.turnFiles is not None else []
+    options.turnRatioFiles = options.turnRatioFiles.split(',') if options.turnRatioFiles is not None else []
     options.edgeDataFiles = options.edgeDataFiles.split(',') if options.edgeDataFiles is not None else []
     options.odFiles = options.odFiles.split(',') if options.odFiles is not None else []
 
diff -Nru sumo-1.17.0/tools/output/vehrouteDiff.py sumo-1.18.0/tools/output/vehrouteDiff.py
--- sumo-1.17.0/tools/output/vehrouteDiff.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/output/vehrouteDiff.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/output/walkFactor.py sumo-1.18.0/tools/output/walkFactor.py
--- sumo-1.17.0/tools/output/walkFactor.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/output/walkFactor.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/plot_trajectories.py sumo-1.18.0/tools/plot_trajectories.py
--- sumo-1.17.0/tools/plot_trajectories.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/plot_trajectories.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2007-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
@@ -94,9 +94,9 @@
 
     # keep old presets from before integration of common options
     options.nolegend = not options.legend
-    options.blind = not options.show
-    if options.output is None:
-        options.output = "plot.png"
+    if options.show:
+        sys.stderr.write("Option --show is now set by default and will be removed in the future." +
+                         "Use --blind to disable the plot window\n")
 
     if options.filterRoute is not None:
         options.filterRoute = options.filterRoute.split(',')
diff -Nru sumo-1.17.0/tools/ptlines2flows.py sumo-1.18.0/tools/ptlines2flows.py
--- sumo-1.17.0/tools/ptlines2flows.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/ptlines2flows.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2010-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
@@ -24,72 +24,71 @@
 import collections
 import random
 
-from optparse import OptionParser
-
 import sumolib
 from sumolib.xml import quoteattr
+from sumolib.options import ArgumentParser
 
 
 def get_options(args=None):
-    optParser = OptionParser()
-    optParser.add_option("-n", "--net-file", dest="netfile", help="network file")
-    optParser.add_option("-l", "--ptlines-file", dest="ptlines", help="public transit lines file")
-    optParser.add_option("-s", "--ptstops-file", dest="ptstops", help="public transit stops file")
-    optParser.add_option("-o", "--output-file", dest="outfile", default="flows.rou.xml", help="output flows file")
-    optParser.add_option("-i", "--stopinfos-file", dest="stopinfos",
-                         default="stopinfos.xml", help="file from '--stop-output'")
-    optParser.add_option(
-        "-r", "--routes-file", dest="routes", default="vehroutes.xml", help="file from '--vehroute-output'")
-    optParser.add_option("-t", "--trips-file", dest="trips", default="trips.trips.xml", help="output trips file")
-    optParser.add_option("-p", "--period", type=float, default=600,
-                         help="the default service period (in seconds) to use if none is specified in the ptlines file")
-    optParser.add_option("--period-aerialway", type=float, default=60, dest="periodAerialway",
-                         help="the default service period (in seconds) to use for aerialways "
-                              "if none is specified in the ptlines file")
-    optParser.add_option("-b", "--begin", type=float, default=0, help="start time")
-    optParser.add_option("-e", "--end", type=float, default=3600, help="end time")
-    optParser.add_option("--min-stops", type=int, default=2,
-                         help="only import lines with at least this number of stops")
-    optParser.add_option("-f", "--flow-attributes", dest="flowattrs",
-                         default="", help="additional flow attributes")
-    optParser.add_option("--use-osm-routes", default=False, action="store_true",
-                         dest='osmRoutes', help="use osm routes")
-    optParser.add_option("--extend-to-fringe", default=False, action="store_true", dest='extendFringe',
-                         help="let routes of incomplete lines start/end at the network border "
-                              "if the route edges are known")
-    optParser.add_option("--random-begin", default=False, action="store_true",
-                         dest='randomBegin', help="randomize begin times within period")
-    optParser.add_option("--seed", type="int", help="random seed")
-    optParser.add_option("--ignore-errors", default=False, action="store_true",
-                         dest='ignoreErrors', help="ignore problems with the input data")
-    optParser.add_option("--no-vtypes", default=False, action="store_true",
-                         dest='novtypes', help="do not write vtypes for generated flows")
-    optParser.add_option("--types", help="only export the given list of types (using OSM nomenclature)")
-    optParser.add_option("--bus.parking", default=False, action="store_true",
-                         dest='busparking', help="let busses clear the road while stopping")
-    optParser.add_option("--vtype-prefix", default="", dest='vtypeprefix', help="prefix for vtype ids")
-    optParser.add_option("-d", "--stop-duration", default=20, type="float", dest='stopduration',
-                         help="Configure the minimum stopping duration")
-    optParser.add_option("--stop-duration-slack", default=10, type="float", dest='stopdurationSlack',
-                         help="Stopping time reserve in the schedule")
-    optParser.add_option("--speedfactor.bus", default=0.95, type="float", dest='speedFactorBus',
-                         help="Assumed bus relative travel speed")
-    optParser.add_option("--speedfactor.tram", default=1.0, type="float", dest='speedFactorTram',
-                         help="Assumed tram relative travel speed")
-    optParser.add_option("-H", "--human-readable-time", dest="hrtime", default=False,
-                         action="store_true", help="write times as h:m:s")
-    optParser.add_option("--night", action="store_true", default=False, help="Export night service lines")
-    optParser.add_option("-v", "--verbose", action="store_true", default=False, help="tell me what you are doing")
-    (options, args) = optParser.parse_args(args=args)
+    ap = ArgumentParser()
+    ap.add_option("-n", "--net-file", dest="netfile", category="input", required=True,
+                  help="network file")
+    ap.add_option("-l", "--ptlines-file", dest="ptlines", category="input", required=True,
+                  help="public transit lines file")
+    ap.add_option("-s", "--ptstops-file", dest="ptstops", category="input", required=True,
+                  help="public transit stops file")
+    ap.add_option("-o", "--output-file", dest="outfile", category="output", default="flows.rou.xml",
+                  help="output flows file")
+    ap.add_option("-i", "--stopinfos-file", dest="stopinfos", category="output", default="stopinfos.xml",
+                  help="file from '--stop-output'")
+    ap.add_option("-r", "--routes-file", dest="routes", category="output", default="vehroutes.xml",
+                  help="file from '--vehroute-output'")
+    ap.add_option("-t", "--trips-file", dest="trips", default="trips.trips.xml", help="output trips file")
+    ap.add_option("-p", "--period", type=float, default=600,
+                  help="the default service period (in seconds) to use if none is specified in the ptlines file")
+    ap.add_option("--period-aerialway", type=float, default=60, dest="periodAerialway",
+                  help=("the default service period (in seconds) to use for aerialways "
+                        "if none is specified in the ptlines file"))
+    ap.add_option("-b", "--begin", type=float, default=0, help="start time")
+    ap.add_option("-e", "--end", type=float, default=3600, help="end time")
+    ap.add_option("--min-stops", type=int, default=2, help="only import lines with at least this number of stops")
+    ap.add_option("-f", "--flow-attributes", dest="flowattrs", default="", help="additional flow attributes")
+    ap.add_option("--use-osm-routes", default=False, action="store_true", dest='osmRoutes', help="use osm routes")
+    ap.add_option("--extend-to-fringe", default=False, action="store_true", dest='extendFringe',
+                  help="let routes of incomplete lines start/end at the network border if the route edges are known")
+    ap.add_option("--random-begin", default=False, action="store_true", dest='randomBegin',
+                  help="randomize begin times within period")
+    ap.add_option("--seed", type=int, help="random seed")
+    ap.add_option("--ignore-errors", default=False, action="store_true", dest='ignoreErrors',
+                  help="ignore problems with the input data")
+    ap.add_option("--no-vtypes", default=False, action="store_true", dest='novtypes',
+                  help="do not write vtypes for generated flows")
+    ap.add_option("--types", help="only export the given list of types (using OSM nomenclature)")
+    ap.add_option("--bus.parking", default=False, action="store_true", dest='busparking',
+                  help="let busses clear the road while stopping")
+    ap.add_option("--vtype-prefix", default="", dest='vtypeprefix', help="prefix for vtype ids")
+    ap.add_option("-d", "--stop-duration", default=20, type=float, dest='stopduration',
+                  help="Configure the minimum stopping duration")
+    ap.add_option("--stop-duration-slack", default=10, type=float, dest='stopdurationSlack',
+                  help="Stopping time reserve in the schedule")
+    ap.add_option("--speedfactor.bus", default=0.95, type=float, dest='speedFactorBus',
+                  help="Assumed bus relative travel speed")
+    ap.add_option("--speedfactor.tram", default=1.0, type=float, dest='speedFactorTram',
+                  help="Assumed tram relative travel speed")
+    ap.add_option("-H", "--human-readable-time", dest="hrtime", default=False, action="store_true",
+                  help="write times as h:m:s")
+    ap.add_option("--night", action="store_true", default=False, help="Export night service lines")
+    ap.add_option("-v", "--verbose", action="store_true", default=False, help="tell me what you are doing")
+    options = ap.parse_args(args=args)
 
     if options.netfile is None or options.ptlines is None or options.ptstops is None:
         sys.stderr.write("Error: net-file, ptlines-file and ptstops-file must be set\n")
-        optParser.print_help()
+        ap.print_help()
         sys.exit(1)
 
     if options.begin >= options.end:
         sys.stderr.write("Error: end time must be larger than begin time\n")
-        optParser.print_help()
+        ap.print_help()
         sys.exit(1)
 
     if options.types is not None:
@@ -152,7 +151,7 @@
     with codecs.open(options.trips, 'w', encoding="UTF8") as fouttrips:
         sumolib.writeXMLHeader(
             fouttrips, "$Id: ptlines2flows.py v1_3_1+0313-ccb31df3eb jakob.erdmann@dlr.de 2019-09-02 13:26:32 +0200 $",
-            "routes")
+            "routes", options=options)
         writeTypes(fouttrips, options.vtypeprefix, options)
 
         departTimes = [options.begin for line in sumolib.output.parse_fast(options.ptlines, 'ptLine', ['id'])]
@@ -320,7 +319,7 @@
     with codecs.open(options.outfile, 'w', encoding="UTF8") as foutflows:
         flows = []
         actualDepart = {}  # departure may be delayed when the edge is not yet empty
-        sumolib.writeXMLHeader(foutflows, root="routes")
+        sumolib.writeXMLHeader(foutflows, root="routes", options=options)
         if not options.novtypes:
             writeTypes(foutflows, options.vtypeprefix, None)
         collections.defaultdict(int)
diff -Nru sumo-1.17.0/tools/purgatory/0103to0110.py sumo-1.18.0/tools/purgatory/0103to0110.py
--- sumo-1.17.0/tools/purgatory/0103to0110.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/purgatory/0103to0110.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2009-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/purgatory/0123to0130.py sumo-1.18.0/tools/purgatory/0123to0130.py
--- sumo-1.17.0/tools/purgatory/0123to0130.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/purgatory/0123to0130.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2009-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/purgatory/accelerations.py sumo-1.18.0/tools/purgatory/accelerations.py
--- sumo-1.17.0/tools/purgatory/accelerations.py	1970-01-01 00:00:00.000000000 +0000
+++ sumo-1.18.0/tools/purgatory/accelerations.py	2023-06-28 20:02:17.000000000 +0000
@@ -0,0 +1,42 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
+# Copyright (C) 2008-2023 German Aerospace Center (DLR) and others.
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# https://www.eclipse.org/legal/epl-2.0/
+# This Source Code 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
+
+# @file    accelerations.py
+# @author  Jakob Erdmann
+# @date    2012-11-20
+
+from __future__ import absolute_import
+from __future__ import print_function
+import os
+import sys
+sys.path.append(os.path.join(os.path.dirname(sys.argv[0]), '..'))
+from sumolib.output import parse_fast  # noqa
+from sumolib.miscutils import Statistics  # noqa
+
+
+def accelStats(netstate):
+    lastSpeed = {}
+    stats = Statistics("Accelerations", histogram=True, printMin=True, scale=0.2)
+    for vehicle in parse_fast(netstate, 'vehicle', ['id', 'speed']):
+        speed = float(vehicle.speed)
+        prevSpeed = lastSpeed.get(vehicle.id, speed)
+        stats.add(speed - prevSpeed, (vehicle.id, vehicle.speed))
+        lastSpeed[vehicle.id] = speed
+    print(stats)
+
+
+if __name__ == "__main__":
+    if len(sys.argv) != 2:
+        sys.exit("call %s " % sys.argv[0])
+    accelStats(sys.argv[1])
diff -Nru sumo-1.17.0/tools/purgatory/Assignment.py sumo-1.18.0/tools/purgatory/Assignment.py
--- sumo-1.17.0/tools/purgatory/Assignment.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/purgatory/Assignment.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2008-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/purgatory/assign.py sumo-1.18.0/tools/purgatory/assign.py
--- sumo-1.17.0/tools/purgatory/assign.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/purgatory/assign.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2007-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/purgatory/batch0103to0110.py sumo-1.18.0/tools/purgatory/batch0103to0110.py
--- sumo-1.17.0/tools/purgatory/batch0103to0110.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/purgatory/batch0103to0110.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2009-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/purgatory/binary2plain.py sumo-1.18.0/tools/purgatory/binary2plain.py
--- sumo-1.17.0/tools/purgatory/binary2plain.py	1970-01-01 00:00:00.000000000 +0000
+++ sumo-1.18.0/tools/purgatory/binary2plain.py	2023-06-28 20:02:17.000000000 +0000
@@ -0,0 +1,207 @@
+#!/usr/bin/env python
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
+# Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# https://www.eclipse.org/legal/epl-2.0/
+# This Source Code 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
+
+# @file    binary2plain.py
+# @author  Michael Behrisch
+# @date    2012-03-11
+
+from __future__ import absolute_import
+from __future__ import print_function
+import sys
+import struct
+
+BYTE = 0
+INTEGER = 1
+FLOAT = 2
+STRING = 3
+LIST = 4
+XML_TAG_START = 5
+XML_TAG_END = 6
+XML_ATTRIBUTE = 7
+EDGE = 8
+LANE = 9
+POSITION_2D = 10
+POSITION_3D = 11
+BOUNDARY = 12
+COLOR = 13
+NODE_TYPE = 14
+EDGE_FUNCTION = 15
+ROUTE = 16
+SCALED2INT = 17
+SCALED2INT_POSITION_2D = 18
+SCALED2INT_POSITION_3D = 19
+
+
+def read(content, format):
+    return struct.unpack(format, content.read(struct.calcsize(format)))
+
+
+def readByte(content):
+    return read(content, "B")[0]
+
+
+def readInt(content, withType=False):
+    if withType:
+        valType = readByte(content)
+        assert(valType == INTEGER)
+    return read(content, "i")[0]
+
+
+def readDouble(content):
+    return read(content, "d")[0]
+
+
+def readString(content):
+    length = readInt(content)
+    return read(content, "%ss" % length)[0]
+
+
+def readStringList(content):
+    n = readInt(content)
+    list = []
+    for _ in range(n):
+        read(content, "B")  # type
+        list.append(readString(content))
+    return list
+
+
+def readIntListList(content):
+    n = readInt(content)
+    list = []
+    for _ in range(n):
+        read(content, "B")  # type
+        n1 = readInt(content)
+        list.append([readInt(content, True) for __ in range(n1)])
+    return list
+
+
+def readRoute(content):
+    n = readInt(content)
+    list = []
+    first = readInt(content)
+    if first < 0:
+        bits = -first
+        numFields = 8 * 4 / bits
+        mask = (1 << bits) - 1
+        edge = readInt(content)
+        list.append(edges[edge])
+        n -= 1
+        field = numFields
+        while n > 0:
+            if field == numFields:
+                data = readInt(content)
+                field = 0
+            followIndex = (data >> ((numFields - field - 1) * bits)) & mask
+            edge = followers[edge][followIndex]
+            list.append(edges[edge])
+            field += 1
+            n -= 1
+    else:
+        list.append(edges[first])
+        n -= 1
+        while n > 0:
+            list.append(edges[readInt(content)])
+            n -= 1
+    return list
+
+
+def typedValueStr(content):
+    valType = readByte(content)
+    if valType == BYTE:
+        return str(readByte(content))
+    elif valType == INTEGER:
+        return str(readInt(content))
+    elif valType == FLOAT:
+        return '%.2f' % readDouble(content)
+    elif valType == STRING:
+        return readString(content)
+    elif valType == LIST:
+        return " ".join([typedValueStr(content) for _ in range(readInt(content))])
+    elif valType == EDGE:
+        return edges[readInt(content)]
+    elif valType == LANE:
+        return '%s_%s' % (edges[readInt(content)], readByte(content))
+    elif valType == POSITION_2D:
+        return '%.2f,%.2f' % (readDouble(content), readDouble(content))
+    elif valType == POSITION_3D:
+        return '%.2f,%.2f,%.2f' % (readDouble(content), readDouble(content), readDouble(content))
+    elif valType == BOUNDARY:
+        return '%.2f,%.2f,%.2f,%.2f' % (readDouble(content), readDouble(content),
+                                        readDouble(content), readDouble(content))
+    elif valType == COLOR:
+        val = read(content, "BBBB")
+        return '%.2f,%.2f,%.2f' % (val[0] / 255., val[1] / 255., val[2] / 255.)
+    elif valType == NODE_TYPE:
+        return nodeTypes[readByte(content)]
+    elif valType == EDGE_FUNCTION:
+        return edgeTypes[readByte(content)]
+    elif valType == ROUTE:
+        return " ".join(readRoute(content))
+    elif valType == SCALED2INT:
+        return '%.2f' % (readInt(content) / 100.)
+    elif valType == SCALED2INT_POSITION_2D:
+        return '%.2f,%.2f' % (readInt(content) / 100., readInt(content) / 100.)
+    elif valType == SCALED2INT_POSITION_3D:
+        return '%.2f,%.2f,%.2f' % (readInt(content) / 100., readInt(content) / 100., readInt(content) / 100.)
+
+
+out = sys.stdout
+content = open(sys.argv[1], 'rb')
+_, version, _ = read(content, "BBB")  # type, sbx version, type
+readString(content)  # sumo version
+read(content, "B")  # type
+elements = readStringList(content)
+read(content, "B")  # type
+attributes = readStringList(content)
+read(content, "B")  # type
+nodeTypes = readStringList(content)
+read(content, "B")  # type
+edgeTypes = readStringList(content)
+read(content, "B")  # type
+edges = readStringList(content)
+read(content, "B")  # type
+followers = readIntListList(content)
+stack = []
+startOpen = False
+while True:
+    typ = readByte(content)
+    if typ == XML_TAG_START:
+        if startOpen:
+            out.write(">\n")
+        out.write("    " * len(stack))
+        tag = readByte(content)
+        if version > 1:
+            tag += 256 * readByte(content)
+        stack.append(tag)
+        out.write("<" + elements[tag])
+        startOpen = True
+    elif typ == XML_TAG_END:
+        if startOpen:
+            out.write("/>\n")
+            stack.pop()
+            startOpen = False
+        else:
+            out.write("    " * (len(stack) - 1))
+            out.write("\n" % elements[stack.pop()])
+        if version == 1:
+            readByte(content)
+        if len(stack) == 0:
+            break
+    elif typ == XML_ATTRIBUTE:
+        attr = readByte(content)
+        if version > 1:
+            attr += 256 * readByte(content)
+        out.write(' %s="%s"' %
+                  (attributes[attr], typedValueStr(content)))
+    else:
+        print("Unknown type %s" % typ, file=sys.stderr)
diff -Nru sumo-1.17.0/tools/purgatory/dijkstra.py sumo-1.18.0/tools/purgatory/dijkstra.py
--- sumo-1.17.0/tools/purgatory/dijkstra.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/purgatory/dijkstra.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2007-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/purgatory/districts2poly.py sumo-1.18.0/tools/purgatory/districts2poly.py
--- sumo-1.17.0/tools/purgatory/districts2poly.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/purgatory/districts2poly.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/purgatory/elements.py sumo-1.18.0/tools/purgatory/elements.py
--- sumo-1.17.0/tools/purgatory/elements.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/purgatory/elements.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2007-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/purgatory/generateStationEdges.py sumo-1.18.0/tools/purgatory/generateStationEdges.py
--- sumo-1.17.0/tools/purgatory/generateStationEdges.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/purgatory/generateStationEdges.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,72 +0,0 @@
-#!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
-# Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
-# This program and the accompanying materials are made available under the
-# terms of the Eclipse Public License 2.0 which is available at
-# https://www.eclipse.org/legal/epl-2.0/
-# This Source Code 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
-
-# @file    generateStationEdges.py
-# @author  Jakob Erdmann
-# @date    2018-08-07
-
-"""
-Generate pedestrian edges for every public transport stop to serve as access
-edge in otherwise pure railway networks
-"""
-from __future__ import absolute_import
-import sys
-from optparse import OptionParser
-
-import sumolib  # noqa
-
-
-def parse_args():
-    USAGE = "Usage: " + sys.argv[0] + "   [options]"
-    optParser = OptionParser()
-    optParser.add_option("-o", "--outfile", help="prefix of output file")
-    optParser.add_option("-l", "--length", type=float, default=10., help="length of generated solitary edges")
-    optParser.add_option("-w", "--width", type=float, default=8., help="width of generated solitary edges")
-    # optParser.add_option("-d", "--cluster-dist", type=float, default=500., help="length of generated edges")
-    options, args = optParser.parse_args()
-    try:
-        options.netfile, options.stopfile = args
-    except Exception:
-        sys.exit(USAGE)
-    if options.outfile is None:
-        options.outfile = options.stopfile[:-4] + ".access"
-    return options
-
-
-def main(options):
-    net = sumolib.net.readNet(options.netfile, withConnections=False, withFoes=False)
-    l2 = options.length / 2
-    with open(options.outfile + ".edg.xml", 'w') as out_e:
-        with open(options.outfile + ".nod.xml", 'w') as out_n:
-            sumolib.writeXMLHeader(out_e, "$Id$")  # noqa
-            sumolib.writeXMLHeader(out_n, "$Id$")  # noqa
-            out_e.write('\n')
-            out_n.write('\n')
-            for stop in sumolib.xml.parse(options.stopfile, 'busStop', heterogeneous=True):
-                edge_id = stop.id + "_access"
-                x, y = sumolib.geomhelper.positionAtShapeOffset(
-                    net.getLane(stop.lane).getShape(),
-                    (float(stop.startPos) + float(stop.endPos)) / 2)
-                from_id = edge_id + '_from'
-                to_id = edge_id + '_to'
-                out_n.write('    \n' % (from_id, x - l2, y))
-                out_n.write('    \n' % (to_id, x + l2, y))
-                out_e.write('    \n' % (
-                    edge_id, from_id, to_id, options.width))
-            out_e.write('\n')
-            out_n.write('\n')
-
-
-if __name__ == "__main__":
-    options = parse_args()
-    main(options)
diff -Nru sumo-1.17.0/tools/purgatory/inputs.py sumo-1.18.0/tools/purgatory/inputs.py
--- sumo-1.17.0/tools/purgatory/inputs.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/purgatory/inputs.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2007-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/purgatory/launcher.py sumo-1.18.0/tools/purgatory/launcher.py
--- sumo-1.17.0/tools/purgatory/launcher.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/purgatory/launcher.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf8 -*-
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2010-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/purgatory/netextract.py sumo-1.18.0/tools/purgatory/netextract.py
--- sumo-1.17.0/tools/purgatory/netextract.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/purgatory/netextract.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2008-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/purgatory/netstats.py sumo-1.18.0/tools/purgatory/netstats.py
--- sumo-1.17.0/tools/purgatory/netstats.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/purgatory/netstats.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2009-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/purgatory/network.py sumo-1.18.0/tools/purgatory/network.py
--- sumo-1.17.0/tools/purgatory/network.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/purgatory/network.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2007-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/purgatory/osmPopulationExtractor.py sumo-1.18.0/tools/purgatory/osmPopulationExtractor.py
--- sumo-1.17.0/tools/purgatory/osmPopulationExtractor.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/purgatory/osmPopulationExtractor.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2013-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/purgatory/outputs.py sumo-1.18.0/tools/purgatory/outputs.py
--- sumo-1.17.0/tools/purgatory/outputs.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/purgatory/outputs.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2007-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/purgatory/patchNetFiles.py sumo-1.18.0/tools/purgatory/patchNetFiles.py
--- sumo-1.17.0/tools/purgatory/patchNetFiles.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/purgatory/patchNetFiles.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2008-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/purgatory/pedestrianFlow.py sumo-1.18.0/tools/purgatory/pedestrianFlow.py
--- sumo-1.17.0/tools/purgatory/pedestrianFlow.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/purgatory/pedestrianFlow.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2014-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/purgatory/plot_tripinfo_distributions.py sumo-1.18.0/tools/purgatory/plot_tripinfo_distributions.py
--- sumo-1.17.0/tools/purgatory/plot_tripinfo_distributions.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/purgatory/plot_tripinfo_distributions.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2013-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/purgatory/plotXMLAttr.py sumo-1.18.0/tools/purgatory/plotXMLAttr.py
--- sumo-1.17.0/tools/purgatory/plotXMLAttr.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/purgatory/plotXMLAttr.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/purgatory/pois2inductionLoops.py sumo-1.18.0/tools/purgatory/pois2inductionLoops.py
--- sumo-1.17.0/tools/purgatory/pois2inductionLoops.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/purgatory/pois2inductionLoops.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2010-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/purgatory/route2trips.py sumo-1.18.0/tools/purgatory/route2trips.py
--- sumo-1.17.0/tools/purgatory/route2trips.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/purgatory/route2trips.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2008-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/purgatory/routeChoices.py sumo-1.18.0/tools/purgatory/routeChoices.py
--- sumo-1.17.0/tools/purgatory/routeChoices.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/purgatory/routeChoices.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2007-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/purgatory/routes_Join.py sumo-1.18.0/tools/purgatory/routes_Join.py
--- sumo-1.17.0/tools/purgatory/routes_Join.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/purgatory/routes_Join.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2009-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/randomTrips.py sumo-1.18.0/tools/randomTrips.py
--- sumo-1.17.0/tools/randomTrips.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/randomTrips.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2010-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
@@ -47,125 +47,129 @@
 def get_options(args=None):
     op = sumolib.options.ArgumentParser(description="Generate trips between random locations",
                                         allowed_programs=['duarouter'])
+    # input
     op.add_argument("-n", "--net-file", category="input", dest="netfile", required=True, type=op.net_file,
                     help="define the net file (mandatory)")
     op.add_argument("-a", "--additional-files", category="input", dest="additional", type=op.additional_file,
                     help="define additional files to be loaded by the router")
-    op.add_argument("-o", "--output-trip-file", category="output", dest="tripfile", default="trips.trips.xml",
-                    type=op.route_file, help="define the output trip filename")
+    op.add_argument("--weights-prefix", category="input", dest="weightsprefix", type=op.file,
+                    help="loads probabilities for being source, destination and via-edge from the files named " +
+                    "'prefix'.src.xml, 'prefix'.dst.xml and 'prefix'.via.xml")
+    # output
+    op.add_argument("-o", "--output-trip-file", category="output", dest="tripfile", type=op.route_file,
+                    default="trips.trips.xml",
+                    help="define the output trip filename")
     op.add_argument("-r", "--route-file", category="output", dest="routefile", type=op.route_file,
                     help="generates route file with duarouter")
-    op.add_argument("--vtype-output", category="output", dest="vtypeout",
+    op.add_argument("--vtype-output", category="output", dest="vtypeout", type=op.file,
                     help="Store generated vehicle types in a separate file")
-    op.add_argument("--weights-prefix", category="processing", dest="weightsprefix", type=op.file,
-                    help="loads probabilities for being source, destination and via-edge from the files named " +
-                    "'prefix'.src.xml, 'prefix'.dst.xml and 'prefix'.via.xml")
-    op.add_argument("--weights-output-prefix", category="processing", dest="weights_outprefix",
+    op.add_argument("--weights-output-prefix", category="output", dest="weights_outprefix", type=op.file,
                     help="generates weights files for visualisation")
-    op.add_argument("--pedestrians", category="processing", action="store_true", default=False,
+    # persons
+    op.add_argument("--pedestrians", category="persons", action="store_true", default=False,
                     help="create a person file with pedestrian trips instead of vehicle trips")
-    op.add_argument("--persontrips", category="processing", action="store_true", default=False,
-                    help="create a person file with person trips instead of vehicle trips")
-    op.add_argument("--personrides", category="processing",
+    op.add_argument("--personrides", category="persons",
                     help="create a person file with rides using STR as lines attribute")
-    op.add_argument("--persontrip.transfer.car-walk", category="processing", dest="carWalkMode",
+    op.add_argument("--persontrips", category="persons", action="store_true", default=False,
+                    help="create a person file with person trips instead of vehicle trips")
+    op.add_argument("--persontrip.transfer.car-walk", category="persons", dest="carWalkMode",
                     help="Where are mode changes from car to walking allowed " +
                     "(possible values: 'ptStops', 'allJunctions' and combinations)")
-    op.add_argument("--persontrip.walkfactor", category="processing", dest="walkfactor", metavar="FLOAT", type=float,
+    op.add_argument("--persontrip.walkfactor", category="persons", dest="walkfactor", metavar="FLOAT", type=float,
                     help="Use FLOAT as a factor on pedestrian maximum speed during intermodal routing")
-    op.add_argument("--persontrip.walk-opposite-factor", category="processing", dest="walkoppositefactor",
+    op.add_argument("--persontrip.walk-opposite-factor", category="persons", dest="walkoppositefactor",
                     metavar="FLOAT", type=float,
                     help="Use FLOAT as a factor on pedestrian maximum speed against vehicle traffic direction")
-    op.add_argument("--prefix", category="processing", dest="tripprefix", default="",
+    op.add_argument("--from-stops", category="persons", dest="fromStops",
+                    help="Create trips that start at stopping places of the indicated type(s). i.e. 'busStop'")
+    op.add_argument("--to-stops", category="persons", dest="toStops",
+                    help="Create trips that end at stopping places of the indicated type(s). i.e. 'busStop'")
+    # attributes
+    op.add_argument("--prefix", category="attributes", dest="tripprefix", default="",
                     help="prefix for the trip ids")
-    op.add_argument("-t", "--trip-attributes", category="processing", dest="tripattrs", default="",
+    op.add_argument("-t", "--trip-attributes", category="attributes", dest="tripattrs", default="",
                     help="additional trip attributes. When generating pedestrians, attributes for " +
                     "'person' and 'walk' are supported.")
-    op.add_argument("--fringe-start-attributes", category="processing", dest="fringeattrs", default="",
+    op.add_argument("--fringe-start-attributes", category="attributes", dest="fringeattrs", default="",
                     help="additional trip attributes when starting on a fringe.")
-    op.add_argument("-b", "--begin", category="time", default=0, type=op.time,
-                    help="begin time")
-    op.add_argument("-e", "--end", category="time", default=3600, type=op.time,
-                    help="end time (default 3600)")
-    op.add_argument("--random-depart", category="time", action="store_true", dest="randomDepart", default=False,
-                    help="Distribute departures randomly between begin and end")
-    op.add_argument("-s", "--seed", category="seed", default=42, type=int,
-                    help="random seed")
-    op.add_argument("--random", category="seed", action="store_true", default=False,
-                    help="use a random seed to initialize the random number generator")
-    op.add_argument("-l", "--length", category="processing", action="store_true", default=False,
+    op.add_argument("--vehicle-class",
+                    help="The vehicle class assigned to the generated trips (adds a standard vType definition " +
+                    "to the output file).")
+    op.add_argument("--random-departpos", category="attributes", dest="randomDepartPos", action="store_true",
+                    default=False, help="Randomly choose a position on the starting edge of the trip")
+    op.add_argument("--random-arrivalpos", category="attributes", dest="randomArrivalPos", action="store_true",
+                    default=False, help="Randomly choose a position on the ending edge of the trip")
+    op.add_argument("--junction-taz", category="attributes", dest="junctionTaz", action="store_true", default=False,
+                    help="Write trips with fromJunction and toJunction")
+    # weights
+    op.add_argument("-l", "--length", category="weights", action="store_true", default=False,
                     help="weight edge probability by length")
-    op.add_argument("-L", "--lanes", category="processing", action="store_true", default=False,
+    op.add_argument("-L", "--lanes", category="weights", action="store_true", default=False,
                     help="weight edge probability by number of lanes")
-    op.add_argument("--edge-param", category="processing", dest="edgeParam",
+    op.add_argument("--edge-param", category="weights", dest="edgeParam",
                     help="use the given edge parameter as factor for edge")
-    op.add_argument("--speed-exponent", category="processing", dest="speed_exponent", metavar="FLOAT", type=float,
+    op.add_argument("--speed-exponent", category="weights", dest="speed_exponent", metavar="FLOAT", type=float,
                     default=0.0, help="weight edge probability by speed^'FLOAT' (default 0)")
-    op.add_argument("--fringe-speed-exponent", category="processing", dest="fringe_speed_exponent", metavar="FLOAT",
+    op.add_argument("--fringe-speed-exponent", category="weights", dest="fringe_speed_exponent", metavar="FLOAT",
                     help="weight fringe edge probability by speed^'FLOAT' (default: speed exponent)")
-    op.add_argument("--angle", category="processing", dest="angle", default=90.0, type=float,
+    op.add_argument("--angle", category="weights", dest="angle", default=90.0, type=float,
                     help="weight edge probability by angle [0-360] relative to the network center")
-    op.add_argument("--angle-factor", category="processing", dest="angle_weight", default=1.0, type=float,
+    op.add_argument("--angle-factor", category="weights", dest="angle_weight", default=1.0, type=float,
                     help="maximum weight factor for angle")
-    op.add_argument("--random-factor", category="processing", dest="randomFactor", default=1.0, type=float,
+    op.add_argument("--random-factor", category="weights", dest="randomFactor", default=1.0, type=float,
                     help="edge weights are dynamically disturbed by a random factor drawn uniformly from [1,FLOAT]")
-    op.add_argument("--fringe-factor", category="processing", dest="fringe_factor", default="1.0",
+    op.add_argument("--fringe-factor", category="weights", dest="fringe_factor", default="1.0",
                     help="multiply weight of fringe edges by 'FLOAT' (default 1)" +
                     " or set value 'max' to force all traffic to start/end at the fringe.")
-    op.add_argument("--fringe-threshold", category="processing", dest="fringe_threshold", default=0.0, type=float,
+    op.add_argument("--fringe-threshold", category="weights", dest="fringe_threshold", default=0.0, type=float,
                     help="only consider edges with speed above 'FLOAT' as fringe edges (default 0)")
-    op.add_argument("--allow-fringe", category="processing", dest="allow_fringe", action="store_true", default=False,
+    op.add_argument("--allow-fringe", category="weights", dest="allow_fringe", action="store_true", default=False,
                     help="Allow departing on edges that leave the network and arriving on edges " +
                     "that enter the network (via turnarounds or as 1-edge trips")
-    op.add_argument("--allow-fringe.min-length", category="processing", dest="allow_fringe_min_length", type=float,
+    op.add_argument("--allow-fringe.min-length", category="weights", dest="allow_fringe_min_length", type=float,
                     help="Allow departing on edges that leave the network and arriving on edges " +
                     "that enter the network, if they have at least the given length")
-    op.add_argument("--fringe-junctions", category="processing", action="store_true", dest="fringeJunctions",
+    op.add_argument("--fringe-junctions", category="weights", action="store_true", dest="fringeJunctions",
                     default=False, help="Determine fringe edges based on junction attribute 'fringe'")
-    op.add_argument("--min-distance", category="processing", dest="min_distance", metavar="FLOAT", default=0.0,
+    op.add_argument("--vclass", "--edge-permission", category="weights", default="passenger",
+                    help="only from and to edges which permit the given vehicle class")
+    op.add_argument("--via-edge-types", category="weights", dest="viaEdgeTypes",
+                    help="Set list of edge types that cannot be used for departure or arrival " +
+                    "(unless being on the fringe)")
+    op.add_argument("--allow-roundabouts", category="weights", dest="allowRoundabouts", action="store_true",
+                    default=False, help="Permit trips that start or end inside a roundabout")
+    # processing
+    op.add_argument("-s", "--seed", default=42, type=int,
+                    help="random seed")
+    op.add_argument("--random", action="store_true", default=False,
+                    help="use a random seed to initialize the random number generator")
+    op.add_argument("--min-distance", dest="min_distance", metavar="FLOAT", default=0.0,
                     type=float, help="require start and end edges for each trip to be at least 'FLOAT' m apart")
-    op.add_argument("--min-distance.fringe", category="processing", dest="min_dist_fringe", metavar="FLOAT", type=float,
+    op.add_argument("--min-distance.fringe", dest="min_dist_fringe", metavar="FLOAT", type=float,
                     help="require start and end edges for each fringe to fringe trip to be at least 'FLOAT' m apart")
-    op.add_argument("--max-distance", category="processing", dest="max_distance", metavar="FLOAT", type=float,
+    op.add_argument("--max-distance", dest="max_distance", metavar="FLOAT", type=float,
                     help="require start and end edges for each trip to be at most 'FLOAT' m " +
                     "apart (default 0 which disables any checks)")
-    op.add_argument("-i", "--intermediate", category="processing", default=0, type=int,
+    op.add_argument("-i", "--intermediate", default=0, type=int,
                     help="generates the given number of intermediate way points")
-    op.add_argument("--flows", category="processing", default=0, type=int,
-                    help="generates INT flows that together output vehicles with the specified period")
-    op.add_argument("--jtrrouter", category="processing", action="store_true", default=False,
+    op.add_argument("--jtrrouter", action="store_true", default=False,
                     help="Create flows without destination as input for jtrrouter")
-    op.add_argument("--maxtries",  category="processing", default=100, type=int,
+    op.add_argument("--maxtries", default=100, type=int,
                     help="number of attemps for finding a trip which meets the distance constraints")
-    op.add_argument("--binomial",  category="processing", metavar="N", type=int,
-                    help="If this is set, the number of departures per second will be drawn from a binomial " +
-                    "distribution with n=N and p=PERIOD/N where PERIOD is the argument given to --period")
-    op.add_argument("--vclass", "--edge-permission", category="processing", default="passenger",
-                    help="only from and to edges which permit the given vehicle class")
-    op.add_argument("--vehicle-class",
-                    help="The vehicle class assigned to the generated trips (adds a standard vType definition " +
-                    "to the output file).")
-    op.add_argument("--remove-loops", category="processing", dest="remove_loops", action="store_true", default=False,
+    op.add_argument("--remove-loops", dest="remove_loops", action="store_true", default=False,
                     help="Remove loops at route start and end")
-    op.add_argument("--random-routing-factor", category="processing", dest="randomRoutingFactor", default=1, type=float,
+    op.add_argument("--random-routing-factor", dest="randomRoutingFactor", default=1, type=float,
                     help="Edge weights for routing are dynamically disturbed "
                     "by a random factor drawn uniformly from [1,FLOAT)")
-    op.add_argument("--junction-taz", category="processing", dest="junctionTaz", action="store_true", default=False,
-                    help="Write trips with fromJunction and toJunction")
-    op.add_argument("--via-edge-types", category="processing", dest="viaEdgeTypes",
-                    help="Set list of edge types that cannot be used for departure or arrival " +
-                    "(unless being on the fringe)")
-    op.add_argument("--allow-roundabouts", category="processing", dest="allowRoundabouts", action="store_true",
-                    default=False, help="Permit trips that start or end inside a roundabout")
-    op.add_argument("--validate", category="processing", default=False, action="store_true",
+    op.add_argument("--validate", default=False, action="store_true",
                     help="Whether to produce trip output that is already checked for connectivity")
-    op.add_argument("-v", "--verbose", category="processing", action="store_true", default=False,
+    op.add_argument("-v", "--verbose", action="store_true", default=False,
                     help="tell me what you are doing")
-    op.add_argument("--random-departpos", category="processing", dest="randomDepartPos", action="store_true",
-                    default=False, help="Randomly choose a position on the starting edge of the trip")
-    op.add_argument("--random-arrivalpos", category="processing", dest="randomArrivalPos", action="store_true",
-                    default=False, help="Randomly choose a position on the ending edge of the trip")
-
+    # flow
+    op.add_argument("-b", "--begin", category="flow", default=0, type=op.time,
+                    help="begin time")
+    op.add_argument("-e", "--end", category="flow", default=3600, type=op.time,
+                    help="end time (default 3600)")
     group = op.add_mutually_exclusive_group()
     group.add_argument("-p", "--period", nargs="+", metavar="FLOAT", category="flow",
                        action=sumolib.options.SplitAction,
@@ -178,6 +182,13 @@
                        action=sumolib.options.SplitAction,
                        help="How much vehicles arrive in the simulation per hour per kilometer of road " +
                        "(alternative to the period option).")
+    op.add_argument("--flows", category="flow", default=0, type=int,
+                    help="generates INT flows that together output vehicles with the specified period")
+    op.add_argument("--random-depart", category="flow", action="store_true", dest="randomDepart", default=False,
+                    help="Distribute departures randomly between begin and end")
+    op.add_argument("--binomial",  category="flow", metavar="N", type=int,
+                    help="If this is set, the number of departures per second will be drawn from a binomial " +
+                    "distribution with n=N and p=PERIOD/N where PERIOD is the argument given to --period")
 
     try:
         options = op.parse_args(args=args)
@@ -223,6 +234,12 @@
             print("Error: Period must be positive", file=sys.stderr)
             sys.exit(1)
         options.period = list(map(intIfPossible, options.period))
+        if options.binomial is not None:
+            for p in options.period:
+                if 1.0 / p / options.binomial >= 1:
+                    print(("Warning: Option --binomial %s is too low for insertion period %s." % (
+                           options.binomial, p))
+                          + " Insertions will not be randomized.", file=sys.stderr)
 
     if options.jtrrouter and options.flows <= 0:
         print("Error: Option --jtrrouter must be used with option --flows", file=sys.stderr)
@@ -265,6 +282,9 @@
         print("Error: Option --random-factor requires a value >= 1.")
         sys.exit(1)
 
+    if options.fromStops or options.toStops:
+        options.edgeFromStops, options.edgeToStops = loadStops(options)
+
     if options.viaEdgeTypes:
         options.viaEdgeTypes = options.viaEdgeTypes.split(',')
     if options.fringe_speed_exponent is None:
@@ -288,6 +308,53 @@
 class InvalidGenerator(Exception):
     pass
 
+
+def loadStops(options):
+    edgeFromStops = defaultdict(list)  # edge -> [(stopType1, stopID1), ...]
+    edgeToStops = defaultdict(list)  # edge -> [(stopType1, stopID1), ...]
+    if options.additional is None:
+        print("Error: Option %s requires option --additional-files for loading infrastructure elements" %
+              ("--from-stops" if options.fromStops else "--to-stops"), file=sys.stderr)
+        sys.exit(1)
+    stopTypes = []
+    if options.fromStops:
+        options.fromStops = options.fromStops.split(',')
+        stopTypes += options.fromStops
+    else:
+        options.fromStops = []
+    if options.toStops:
+        options.toStops = options.toStops.split(',')
+        stopTypes += options.toStops
+    else:
+        options.toStops = []
+    stopTypes = list(set(stopTypes))
+    typeCounts = defaultdict(lambda: 0)
+    for additional in options.additional.split(','):
+        for stop in sumolib.xml.parse(additional, stopTypes):
+            edgeID = stop.lane.rsplit('_', 1)[0]
+            if stop.name in options.fromStops:
+                edgeFromStops[edgeID].append((stop.name, stop.id))
+            if stop.name in options.toStops:
+                edgeToStops[edgeID].append((stop.name, stop.id))
+            typeCounts[stop.name] += 1
+
+    if options.fromStops:
+        available = sum([typeCounts[t] for t in options.fromStops])
+        if available == 0:
+            print("No stops of type%s '%s' were found in additional-files %s" % (
+                ('' if len(options.fromStops) == 1 else 's'),
+                options.fromStops[0], options.additional), file=sys.stderr)
+            sys.exit(1)
+    if options.toStops:
+        available = sum([typeCounts[t] for t in options.toStops])
+        if available == 0:
+            print("No stops of type%s '%s' were found in additional-files %s" % (
+                ('' if len(options.toStops) == 1 else 's'),
+                options.toStops[0], options.additional), file=sys.stderr)
+            sys.exit(1)
+    return edgeFromStops, edgeToStops
+
+
 # assigns a weight to each edge using weight_fun and then draws from a discrete
 # distribution with these weights
 
@@ -375,10 +442,16 @@
         for roundabout in options.net.getRoundabouts():
             roundabouts.update(roundabout.getEdges())
 
+    stopDict = None
+    if options.fromStops and fringe_bonus == "_incoming":
+        stopDict = options.edgeFromStops
+    elif options.toStops and fringe_bonus == "_outgoing":
+        stopDict = options.edgeToStops
+
     def edge_probability(edge):
         bonus_connections = None if fringe_bonus is None else getattr(edge, fringe_bonus)
         forbidden_connections = None if fringe_forbidden is None else getattr(edge, fringe_forbidden)
-        if options.vclass and not edge.allows(options.vclass):
+        if options.vclass and not edge.allows(options.vclass) and not stopDict:
             return 0  # not allowed
         if fringe_bonus is None and edge.is_fringe() and not options.pedestrians:
             return 0  # not suitable as intermediate way point
@@ -394,6 +467,8 @@
         if fringe_bonus is not None and edge.getID() in roundabouts:
             return 0  # traffic typically does not start/end inside a roundabout
         prob = randomProbs[edge.getID()]
+        if stopDict:
+            prob *= len(stopDict[edge.getID()])
         if options.length:
             if (options.fringe_factor != 1.0 and fringe_bonus is not None and
                     edge.is_fringe(bonus_connections, checkJunctions=options.fringeJunctions)):
@@ -626,6 +701,10 @@
         else:
             attrFrom = ' from="%s"' % origin.getID()
             attrTo = ' to="%s"' % destination.getID()
+        if options.fromStops:
+            attrFrom = ' %s="%s"' % random.choice(options.edgeFromStops[origin.getID()])
+        if options.toStops:
+            attrTo = ' %s="%s"' % random.choice(options.edgeToStops[destination.getID()])
         via = ""
         if intermediate:
             via = ' via="%s" ' % ' '.join(
@@ -639,6 +718,9 @@
             '    \n' % (label, departureTime, personattrs))
         element = "walk"
         attrs = otherattrs
+        if options.fromStops:
+            fouttrips.write('        \n' % attrFrom)
+            attrFrom = ''
         if options.persontrips:
             element = "personTrip"
         elif options.personrides:
diff -Nru sumo-1.17.0/tools/requirements.txt sumo-1.18.0/tools/requirements.txt
--- sumo-1.17.0/tools/requirements.txt	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/requirements.txt	2023-06-28 20:02:17.000000000 +0000
@@ -1,13 +1,13 @@
-lxml
-rtree
-pandas
-matplotlib
-pulp
-pyproj
-ezdxf
-scipy
-fmpy
-ortools
-texttest
-pyautogui
-pyperclip
+lxml>=4.5.0
+rtree>=0.9.4
+pandas>=1.2.4
+matplotlib>=3.1.2
+pulp>=2.4
+pyproj>=2.5.0
+ezdxf>=1.0.0
+scipy>=1.3.3
+fmpy>=0.3.5
+ortools>=9.4.1874
+texttest>=4.2.1
+pyautogui>=0.9.53
+pyperclip>=1.7.0
diff -Nru sumo-1.17.0/tools/route/addParkingAreaStops2Routes.py sumo-1.18.0/tools/route/addParkingAreaStops2Routes.py
--- sumo-1.17.0/tools/route/addParkingAreaStops2Routes.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/route/addParkingAreaStops2Routes.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2010-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/route/addParkingAreaStops2Trips.py sumo-1.18.0/tools/route/addParkingAreaStops2Trips.py
--- sumo-1.17.0/tools/route/addParkingAreaStops2Trips.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/route/addParkingAreaStops2Trips.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2010-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/route/addStopDelay.py sumo-1.18.0/tools/route/addStopDelay.py
--- sumo-1.17.0/tools/route/addStopDelay.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/route/addStopDelay.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/route/addStops2Routes.py sumo-1.18.0/tools/route/addStops2Routes.py
--- sumo-1.17.0/tools/route/addStops2Routes.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/route/addStops2Routes.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2010-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
@@ -34,11 +34,11 @@
 
 def get_options(args=None):
     op = ArgumentParser()
-    op.add_option("-n", "--net-file", category='input', dest="netfile",
+    op.add_option("-n", "--net-file", category='input', dest="netfile", type=op.net_file,
                   help="define the net filename (mandatory)")
-    op.add_option("-r", "--route-files", category='input', dest="routefiles",
+    op.add_option("-r", "--route-files", category='input', dest="routefiles", type=op.route_file,
                   help="define the route file separated by comma (mandatory)")
-    op.add_option("-o", "--output-file", category='output', dest="outfile",
+    op.add_option("-o", "--output-file", category='output', dest="outfile", type=op.route_file,
                   help="define the output filename")
     op.add_option("-t", "--typesfile", category='input', dest="typesfile",
                   help="Give a typesfile")
@@ -56,7 +56,7 @@
                   help="relative stopping position along the route [0,1] or 'random' (1 indicates the last edge)")
     op.add_option("--probability", type=float, default=1,
                   help="app stop with the given probability ]0, 1]")
-    op.add_option("--parking-areas", dest="parkingareas", default=False,
+    op.add_option("--parking-areas", dest="parkingareas", default=False, type=op.additional_file,
                   help="load parkingarea definitions and stop at parkingarea on the arrival edge if possible")
     op.add_option("--start-at-stop", dest="startAtStop", action="store_true",
                   default=False, help="shorten route so it starts at stop")
diff -Nru sumo-1.17.0/tools/route/addTAZ.py sumo-1.18.0/tools/route/addTAZ.py
--- sumo-1.17.0/tools/route/addTAZ.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/route/addTAZ.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2010-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/route/analyzePersonPlans.py sumo-1.18.0/tools/route/analyzePersonPlans.py
--- sumo-1.17.0/tools/route/analyzePersonPlans.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/route/analyzePersonPlans.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/route/checkStopOrder.py sumo-1.18.0/tools/route/checkStopOrder.py
--- sumo-1.17.0/tools/route/checkStopOrder.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/route/checkStopOrder.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2014-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
@@ -27,6 +27,7 @@
 import os
 import sys
 from collections import defaultdict
+import fnmatch
 
 if 'SUMO_HOME' in os.environ:
     sys.path.append(os.path.join(os.environ['SUMO_HOME'], 'tools'))
@@ -46,8 +47,10 @@
                         help="Do not report conflicts with parking vehicles")
     parser.add_argument("--until-from-duration", action="store_true", default=False, dest="untilFromDuration",
                         help="Use stop arrival+duration instead of 'until' to compute overtaking")
+    parser.add_argument("--filter-ids", category="processing", dest="filterIDs",
+                        help="only consider stops for vehicles in the given list of ids")
     parser.add_argument("--stop-table", dest="stopTable",
-                        help="Print timetable information for the given busStop")
+                        help="Print timetable information for the given list of busStops")
 
     options = parser.parse_args(args=args)
     if options.routeFiles:
@@ -56,6 +59,9 @@
         print("Argument --route-files is mandatory", file=sys.stderr)
         sys.exit()
 
+    if options.filterIDs:
+        options.filterIDs = set(options.filterIDs.split(','))
+
     return options
 
 
@@ -68,6 +74,8 @@
         for vehicle in sumolib.xml.parse(routefile, ['vehicle', 'trip'], heterogeneous=True):
             if vehicle.stop is None:
                 continue
+            if options.filterIDs and vehicle.id not in options.filterIDs:
+                continue
             lastUntil = None
             stops = list(vehicle.stop)
             for i, stop in enumerate(stops):
@@ -103,6 +111,8 @@
                     flags += "F"
                 if i == len(stops) - 1:
                     flags += "L"
+                if float(stop.getAttributeSecure("speed", "0")) > 0:
+                    flags += "w"
                 stopTimes[stop.busStop].append([arrival, until, vehicle.id,
                                                 stop.getAttributeSecure("tripId", ""),
                                                 stop.getAttributeSecure("started", ""),
@@ -121,14 +131,31 @@
                         v2, tf(a2), tf(u2), v, tf(a), tf(u), stop), file=sys.stderr)
 
     if options.stopTable:
-        if options.stopTable in stopTimes:
-            times = stopTimes[options.stopTable]
-            print("# busStop: %s" % options.stopTable)
-            print("arrival\tuntil\tveh\ttripId\tstarted\tended\tflags")
-            for a, u, v, t, s, e, f in sorted(times):
-                print("%s\t%s\t%s\t%s\t%s\t%s\t%s" % (tf(a), tf(u), v, t, s, e, f))
-        else:
-            print("No vehicle stops at busStop '%s' found" % options.stopTable, file=sys.stderr)
+        times = []
+        stopIDs = []
+        for stopID in options.stopTable.split(','):
+            if stopID in stopTimes:
+                stopIDs.append(stopID)
+            elif "*" in stopID:
+                for candID in sorted(stopTimes.keys()):
+                    if fnmatch.fnmatch(candID, stopID):
+                        stopIDs.append(candID)
+            else:
+                print("No vehicle stops at busStop '%s' found" % options.stopTable, file=sys.stderr)
+
+        for stopID in stopIDs:
+            times += [t + [stopID] for t in stopTimes[stopID]]
+
+        if stopIDs:
+            print("# busStop: %s" % ','.join(stopIDs))
+            if len(stopIDs) == 1:
+                print("arrival\tuntil\tveh\ttripId\tstarted\tended\tflags")
+                for a, u, v, t, s, e, f, i in sorted(times):
+                    print("%s\t%s\t%s\t%s\t%s\t%s\t%s" % (tf(a), tf(u), v, t, s, e, f))
+            else:
+                print("arrival\tuntil\tveh\ttripId\tstarted\tended\tflags\tbusStop")
+                for a, u, v, t, s, e, f, i in sorted(times):
+                    print("%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s" % (tf(a), tf(u), v, t, s, e, f, i))
 
 
 if __name__ == "__main__":
diff -Nru sumo-1.17.0/tools/route/cutRoutes.py sumo-1.18.0/tools/route/cutRoutes.py
--- sumo-1.17.0/tools/route/cutRoutes.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/route/cutRoutes.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
@@ -62,7 +62,7 @@
 
 
 def get_options(args=None):
-    USAGE = """Usage %prog [options]   [ ...]
+    USAGE = """Usage %(prog)s [options]   [ ...]
 If the given routes contain exit times these will be used to compute new
 departure times. If the option --orig-net is given departure times will be
 extrapolated based on edge-lengths and maximum speeds multiplied with --speed-factor"""
diff -Nru sumo-1.17.0/tools/route/cutTrips.py sumo-1.18.0/tools/route/cutTrips.py
--- sumo-1.17.0/tools/route/cutTrips.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/route/cutTrips.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
@@ -40,7 +40,7 @@
 
 
 def get_options(args=None):
-    USAGE = """Usage %prog [options]   [ ...]
+    USAGE = """Usage %(prog)s [options]   [ ...]
 If the given routes contain exit times these will be used to compute new
 departure times. If the option --orig-net is given departure times will be
 extrapolated based on edge-lengths and maximum speeds multiplied with --speed-factor"""
diff -Nru sumo-1.17.0/tools/route/implausibleRoutes.py sumo-1.18.0/tools/route/implausibleRoutes.py
--- sumo-1.17.0/tools/route/implausibleRoutes.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/route/implausibleRoutes.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2014-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/route/route_1htoDay.py sumo-1.18.0/tools/route/route_1htoDay.py
--- sumo-1.17.0/tools/route/route_1htoDay.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/route/route_1htoDay.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2008-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/route/route2alts.py sumo-1.18.0/tools/route/route2alts.py
--- sumo-1.17.0/tools/route/route2alts.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/route/route2alts.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2008-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/route/route2OD.py sumo-1.18.0/tools/route/route2OD.py
--- sumo-1.17.0/tools/route/route2OD.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/route/route2OD.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2010-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/route/route2poly.py sumo-1.18.0/tools/route/route2poly.py
--- sumo-1.17.0/tools/route/route2poly.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/route/route2poly.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/route/route2sel.py sumo-1.18.0/tools/route/route2sel.py
--- sumo-1.17.0/tools/route/route2sel.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/route/route2sel.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2008-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/route/routecheck.py sumo-1.18.0/tools/route/routecheck.py
--- sumo-1.17.0/tools/route/routecheck.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/route/routecheck.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2007-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
@@ -32,17 +32,19 @@
 this is changed without adding comments. The same is true for camelCase
 changes of attributes.
 """
-from __future__ import absolute_import
 from __future__ import print_function
+from __future__ import absolute_import
+from collections import defaultdict
+from xml.sax import saxutils, make_parser, handler
 import os
 import sys
+if 'SUMO_HOME' in os.environ:
+    sys.path.append(os.path.join(os.environ['SUMO_HOME'], 'tools'))
+from sumolib.options import ArgumentParser  # noqa
 try:
     from StringIO import StringIO
 except ImportError:
     from io import StringIO
-from xml.sax import saxutils, make_parser, handler
-from optparse import OptionParser
-from collections import defaultdict
 
 camelCase = {"departlane": "departLane",
              "departpos": "departPos",
@@ -251,21 +253,18 @@
             self._out.write('' % (target, data))
 
 
-optParser = OptionParser(
-    usage=os.path.basename(__file__) + " [options] *")
-optParser.add_option("-v", "--verbose", action="store_true",
-                     default=False, help="tell me what you are doing")
-optParser.add_option("-f", "--fix", action="store_true",
-                     default=False, help="fix errors into '.fixed' file")
-optParser.add_option("-l", "--fix-length", action="store_true",
-                     default=False, help="fix vehicle type's length and guiOffset attributes")
-optParser.add_option("-i", "--inplace", action="store_true",
-                     default=False, help="replace original files")
-optParser.add_option("-n", "--net", help="network to check connectivity")
-(options, args) = optParser.parse_args()
-if len(args) == 0:
-    optParser.print_help()
-    sys.exit()
+ap = ArgumentParser()
+ap.add_argument("-v", "--verbose", action="store_true",
+                default=False, help="tell me what you are doing")
+ap.add_argument("-f", "--fix", action="store_true",
+                default=False, help="fix errors into '.fixed' file")
+ap.add_argument("-l", "--fix-length", action="store_true",
+                default=False, help="fix vehicle type's length and guiOffset attributes")
+ap.add_argument("-i", "--inplace", action="store_true",
+                default=False, help="replace original files")
+ap.add_argument("-n", "--net", category="input", type=ap.net_file, help="network to check connectivity")
+ap.add_argument("routes", category="input", type=ap.file, nargs="+", help="route files to check")
+options = ap.parse_args()
 parser = make_parser()
 net = None
 if options.net:
@@ -277,7 +276,7 @@
 if options.fix_length:
     deletedKeys["vType"] += ['guiOffset']
 
-for f in args:
+for f in options.routes:
     ffix = f + '.fixed'
     if options.fix:
         if options.verbose:
diff -Nru sumo-1.17.0/tools/route/routecompare.py sumo-1.18.0/tools/route/routecompare.py
--- sumo-1.17.0/tools/route/routecompare.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/route/routecompare.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2008-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
@@ -26,10 +26,12 @@
 """
 from __future__ import absolute_import
 from __future__ import print_function
+import os
 import sys
-import optparse
 import array
 from xml.sax import make_parser, handler
+sys.path.append(os.path.dirname(os.path.dirname(os.path.realpath(__file__))))
+from sumolib.options import ArgumentParser  # noqa
 
 SCALE = 10000
 INFINITY = 2**30
@@ -248,34 +250,31 @@
     return matchVal
 
 
-optParser = optparse.OptionParser(
-    usage="usage: %prog [options]  ")
-optParser.add_option("-d", "--districts-file", dest="districts",
-                     default="", help="read districts from FILE", metavar="FILE")
-optParser.add_option("-s", "--simple-match", action="store_true", dest="simple",
-                     default=False, help="use simple matching algorithm")
-optParser.add_option("-p", "--print-matching", action="store_true", dest="printmatch",
-                     default=False, help="print the resulting matching")
-optParser.add_option("-v", "--verbose", action="store_true", dest="verbose",
-                     default=False, help="print more info")
-(options, args) = optParser.parse_args()
-
-
-if len(args) < 2:
-    optParser.print_help()
-    sys.exit()
+ap = ArgumentParser(usage="usage: %prog [options]  ")
+ap.add_argument("-d", "--districts-file", dest="districts", category="input", type=ap.file,
+                default="", help="read districts from FILE", metavar="FILE")
+ap.add_argument("-s", "--simple-match", action="store_true", dest="simple",
+                default=False, help="use simple matching algorithm")
+ap.add_argument("-p", "--print-matching", action="store_true", dest="printmatch",
+                default=False, help="print the resulting matching")
+ap.add_argument("-v", "--verbose", action="store_true", dest="verbose",
+                default=False, help="print more info")
+ap.add_argument("routes1", category="input", type=ap.route_file, help="first route file of comparison")
+ap.add_argument("routes2", category="input", type=ap.route_file, help="second route file of comparison")
+options = ap.parse_args()
+
 edges = {}
 routes1 = {}
 routes2 = {}
 parser = make_parser()
 if options.verbose:
-    print("Reading first routes file %s" % args[0])
+    print("Reading first routes file %s" % options.routes1)
 parser.setContentHandler(RouteReader(routes1, edges))
-parser.parse(args[0])
+parser.parse(options.routes1)
 if options.verbose:
-    print("Reading second routes file %s" % args[1])
+    print("Reading second routes file %s" % options.routes2)
 parser.setContentHandler(RouteReader(routes2, edges))
-parser.parse(args[1])
+parser.parse(options.routes2)
 
 routeMatrix1 = {}
 routeMatrix2 = {}
diff -Nru sumo-1.17.0/tools/route/route_departOffset.py sumo-1.18.0/tools/route/route_departOffset.py
--- sumo-1.17.0/tools/route/route_departOffset.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/route/route_departOffset.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2008-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/route/routeStats.py sumo-1.18.0/tools/route/routeStats.py
--- sumo-1.17.0/tools/route/routeStats.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/route/routeStats.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2014-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
@@ -36,7 +36,7 @@
 
 
 def get_options():
-    USAGE = """Usage %prog [options]  []"""
+    USAGE = """Usage %(prog)s [options]  []"""
     optParser = sumolib.options.ArgumentParser(usage=USAGE)
     optParser.add_option("-v", "--verbose", action="store_true",
                          default=False, help="Give more output")
diff -Nru sumo-1.17.0/tools/route/scaleTimeLine.py sumo-1.18.0/tools/route/scaleTimeLine.py
--- sumo-1.17.0/tools/route/scaleTimeLine.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/route/scaleTimeLine.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2010-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
@@ -48,25 +48,24 @@
 
 
 def get_options(args=None):
-    optParser = sumolib.options.ArgumentParser()
-    optParser.add_option("-r", "--route-files", dest="routefiles",
-                         help="define the route file separated by comma (mandatory)")
-    optParser.add_option("-o", "--output-file", dest="outfile",
-                         help="define the output filename")
-    optParser.add_option("--timeline-list", dest="timelinelist", type=str,
-                         default="3600,200,200,200,200,200,200,200,200,200,200,200,200",
-                         help="Define the interval duration and then the scaled percentage for each interval; "
-                              "e.g. 200% of the current demand")
-    optParser.add_option("--timeline-pair", dest="timelinepair", type=str,
-                         default="7200,200;7200,200;7200,200;7200,200;7200,200;7200,200",
-                         help="Define the timeline pairs (duration, scacled percentage)")
-    optParser.add_option("--random", action="store_true", dest="random",
-                         default=False, help="use a random seed to initialize the random number generator")
-    optParser.add_option("-s", "--seed", type=int, dest="seed", default=42, help="random seed")
-    optParser.add_option("-v", "--verbose", dest="verbose", action="store_true",
-                         default=False, help="tell me what you are doing")
-
-    options, args = optParser.parse_known_args(args=args)
+    ap = sumolib.options.ArgumentParser()
+    ap.add_argument("-r", "--route-files", dest="routefiles", category="input", type=ap.file_list,
+                    required=True, help="define the route file separated by comma (mandatory)")
+    ap.add_argument("-o", "--output-file", dest="outfile", category="output", type=ap.file,
+                    help="define the output filename")
+    ap.add_argument("--timeline-list", dest="timelinelist", type=str,
+                    default="3600,200,200,200,200,200,200,200,200,200,200,200,200",
+                    help="Define the interval duration and then the scaled percentage for each interval; "
+                    "e.g. 200% of the current demand")
+    ap.add_argument("--timeline-pair", dest="timelinepair", type=str,
+                    default="7200,200;7200,200;7200,200;7200,200;7200,200;7200,200",
+                    help="Define the timeline pairs (duration, scacled percentage)")
+    ap.add_argument("--random", action="store_true", dest="random", category="random",
+                    default=False, help="use a random seed to initialize the random number generator")
+    ap.add_argument("-s", "--seed", type=int, dest="seed", category="random", default=42, help="random seed")
+    ap.add_argument("-v", "--verbose", dest="verbose", action="store_true",
+                    default=False, help="tell me what you are doing")
+    options = ap.parse_args(args=args)
 
     if options.timelinelist:
         duration = float(options.timelinelist.split(",")[0])
@@ -79,14 +78,9 @@
             options.timelinelist.append([float(x) for x in data])
         # options.timelinelist = list(map(float, templist))
 
-    if not options.routefiles:
-        optParser.print_help()
-        sys.exit("--route-files missing")
-    else:
-        options.routefiles = options.routefiles.split(',')
-        if not options.outfile:
-            options.outfile = options.routefiles[0][:-4] + "_scaled.rou.xml"
-
+    options.routefiles = options.routefiles.split(',')
+    if not options.outfile:
+        options.outfile = options.routefiles[0][:-4] + "_scaled.rou.xml"
     return options
 
 
@@ -206,4 +200,4 @@
 
 
 if __name__ == "__main__":
-    main(get_options(sys.argv))
+    main(get_options(sys.argv[1:]))
diff -Nru sumo-1.17.0/tools/route/sort_routes.py sumo-1.18.0/tools/route/sort_routes.py
--- sumo-1.17.0/tools/route/sort_routes.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/route/sort_routes.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2007-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
@@ -24,25 +24,21 @@
 from xml.dom import pulldom
 from xml.sax import handler
 from xml.sax import make_parser
-from optparse import OptionParser
 
 sys.path.append(os.path.dirname(os.path.dirname(os.path.realpath(__file__))))
-import sumolib  # noqa
+from sumolib.options import ArgumentParser  # noqa
 from sumolib.miscutils import parseTime  # noqa
 
 DEPART_ATTRS = {'vehicle': 'depart', 'trip': 'depart', 'flow': 'begin', 'person': 'depart'}
 
 
 def get_options(args=None):
-    USAGE = "Usage: " + sys.argv[0] + " "
-    optParser = OptionParser()
-    optParser.add_option("-o", "--outfile", help="name of output file")
-    optParser.add_option("-b", "--big", action="store_true", default=False,
-                         help="Use alternative sorting strategy for large files (slower but more memory efficient)")
-    options, args = optParser.parse_args(args=args)
-    if len(args) != 1:
-        sys.exit(USAGE)
-    options.routefile = args[0]
+    ap = ArgumentParser()
+    ap.add_argument("-o", "--outfile", category="output", type=ap.file, help="name of output file")
+    ap.add_argument("-b", "--big", action="store_true", default=False,
+                    help="Use alternative sorting strategy for large files (slower but more memory efficient)")
+    ap.add_argument("routefile", category="input", type=ap.file, help="route file whose routes should be sorted")
+    options = ap.parse_args(args=args)
     if options.outfile is None:
         options.outfile = options.routefile + ".sorted"
     return options
diff -Nru sumo-1.17.0/tools/route/splitRandom.py sumo-1.18.0/tools/route/splitRandom.py
--- sumo-1.17.0/tools/route/splitRandom.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/route/splitRandom.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2010-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
@@ -23,7 +23,6 @@
 from __future__ import absolute_import
 import os
 import sys
-import optparse
 import random
 
 # (seed)
@@ -35,27 +34,28 @@
     sys.exit("please declare environment variable 'SUMO_HOME'")
 
 import sumolib  # noqa
+from sumolib.options import ArgumentParser  # noqa
 
 
 def get_options(args=None):
-    optParser = optparse.OptionParser()
-    optParser.add_option("-r", "--route-file", dest="routefile",
-                         help="define the input route file with trips or vehicles")
-    optParser.add_option("-n", "--number", dest="number",
-                         help="number of trips/vehicles to split (not together with percent)")
-    optParser.add_option("-p", "--percent", dest="percent",
-                         help="percent of trips/vehicles to split (not together with number")
-    optParser.add_option("-a", "--output-file-a", dest="outputA", default="tripsA.rou.xml",
-                         help="define the first output route file")
-    optParser.add_option("-b", "--output-file-b", dest="outputB", default="tripsB.rou.xml",
-                         help="define the second output route file")
-    optParser.add_option("--random", action="store_true", default=False,
-                         help="use a random seed to initialize the random number generator")
-    optParser.add_option("-s", "--seed", type="int", default=42,
-                         help="random seed")
-    (options, args) = optParser.parse_args(args=args)
+    ap = ArgumentParser()
+    ap.add_argument("-r", "--route-file", dest="routefile", category="input", type=ap.route_file,
+                    help="define the input route file with trips or vehicles")
+    ap.add_argument("-n", "--number", dest="number", category="input", type=int,
+                    help="number of trips/vehicles to split (not together with percent)")
+    ap.add_argument("-p", "--percent", dest="percent", category="input", type=float,
+                    help="percent of trips/vehicles to split (not together with number")
+    ap.add_argument("-a", "--output-file-a", dest="outputA", default="tripsA.rou.xml",
+                    category="output", type=ap.route_file, help="define the first output route file")
+    ap.add_argument("-b", "--output-file-b", dest="outputB", default="tripsB.rou.xml",
+                    category="output", type=ap.route_file, help="define the second output route file")
+    ap.add_argument("--random", action="store_true", default=False, category="random",
+                    help="use a random seed to initialize the random number generator")
+    ap.add_argument("-s", "--seed", type=int, default=42, category="random",
+                    help="random seed")
+    options = ap.parse_args(args=args)
     if not options.routefile or not (options.number or options.percent) or (options.number and options.percent):
-        optParser.print_help()
+        ap.print_help()
         sys.exit()
     return options
 
@@ -110,5 +110,5 @@
 
 
 if __name__ == "__main__":
-    options = get_options(sys.argv)
+    options = get_options(sys.argv[1:])
     main(options)
diff -Nru sumo-1.17.0/tools/route/splitRouteFiles.py sumo-1.18.0/tools/route/splitRouteFiles.py
--- sumo-1.17.0/tools/route/splitRouteFiles.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/route/splitRouteFiles.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2010-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
@@ -25,14 +25,12 @@
 import sys
 import re
 import random
-import glob
 import pickle
 import bisect
 import ctypes
 
 from xml.sax import make_parser, handler
 from collections import defaultdict
-from optparse import OptionParser
 
 sys.path += [os.path.join(os.environ['SUMO_HOME'], 'tools'),
              os.path.join(os.environ['SUMO_HOME'], 'tools', 'detector')]
@@ -254,41 +252,34 @@
 
 
 def main(args=None):
-    optParser = OptionParser(usage="usage: %prog [options] ")
-    optParser.add_option("-f", "--detector-file", dest="detfile",
-                         help="read detectors from FILE", metavar="FILE")
-    optParser.add_option("-v", "--verbose", action="store_true", dest="verbose",
-                         default=False, help="tell me what you are doing")
-    optParser.add_option("-s", "--step", dest="step", type="int", default=900,
-                         help="time split step in seconds")
-    optParser.add_option("-n", "--next-day", dest="nextday", type="int", default=2700,
-                         help="how far to go into the next day in seconds")
-    optParser.add_option("-t", "--types-file", dest="typesfile", default="vehtypes.xml",
-                         help="write vehicle types to FILE", metavar="FILE")
-    optParser.add_option("-c", "--route-collection", dest="collectfile",
-                         help="write route collection for the distributions to FILE", metavar="FILE")
-    optParser.add_option("-o", "--routes-prefix", dest="routesprefix", default="validate/validate_mofr_",
-                         help="let time splitted route files start with PREFIX", metavar="PREFIX")
-    optParser.add_option("-e", "--edge-count", dest="edgecount",
-                         help="dump number of routes for each edge to FILE", metavar="FILE")
-    optParser.add_option("-p", "--pickle-edges", dest="pickleedge",
-                         help="dump used edges as pickled set to FILE", metavar="FILE")
-    optParser.add_option("-a", "--saturday-factor", dest="safact", type="float", default=0.,
-                         help="generate saturday files scaled down by FACTOR", metavar="FACTOR")
-    optParser.add_option("-u", "--sunday-factor", dest="sufact", type="float", default=0.,
-                         help="generate sunday files scaled down by FACTOR", metavar="FACTOR")
-    optParser.add_option("-m", "--modify-id", action="store_true", dest="modifyid",
-                         default=False, help="try to make vehicle and route ids unique")
-    (options, args) = optParser.parse_args(args=args)
-    if len(args) == 0:
-        optParser.print_help()
-        sys.exit()
-    if os.name == "posix":
-        expandedArgs = args
-    else:
-        expandedArgs = []
-        for arg in args:
-            expandedArgs += glob.glob(arg)
+    ap = sumolib.options.ArgumentParser(usage="usage: %prog [options] ")
+    ap.add_argument("-f", "--detector-file", dest="detfile", category="input", type=ap.file,
+                    help="read detectors from FILE", metavar="FILE")
+    ap.add_argument("-v", "--verbose", action="store_true", dest="verbose",
+                    default=False, help="tell me what you are doing")
+    ap.add_argument("-s", "--step", dest="step", type=int, default=900,
+                    help="time split step in seconds")
+    ap.add_argument("-n", "--next-day", dest="nextday", type=int, default=2700,
+                    help="how far to go into the next day in seconds")
+    ap.add_argument("-t", "--types-file", dest="typesfile", default="vehtypes.xml",
+                    help="write vehicle types to FILE", metavar="FILE")
+    ap.add_argument("--route-collection", dest="collectfile", category="output", type=ap.route_file,
+                    help="write route collection for the distributions to FILE", metavar="FILE")
+    ap.add_argument("-o", "--routes-prefix", dest="routesprefix", default="validate/validate_mofr_",
+                    help="let time splitted route files start with PREFIX", metavar="PREFIX")
+    ap.add_argument("-e", "--edge-count", dest="edgecount",
+                    help="dump number of routes for each edge to FILE", metavar="FILE")
+    ap.add_argument("-p", "--pickle-edges", dest="pickleedge",
+                    help="dump used edges as pickled set to FILE", metavar="FILE")
+    ap.add_argument("-a", "--saturday-factor", dest="safact", type=float, default=0.,
+                    help="generate saturday files scaled down by FACTOR", metavar="FACTOR")
+    ap.add_argument("-u", "--sunday-factor", dest="sufact", type=float, default=0.,
+                    help="generate sunday files scaled down by FACTOR", metavar="FACTOR")
+    ap.add_argument("-m", "--modify-id", action="store_true", dest="modifyid",
+                    default=False, help="try to make vehicle and route ids unique")
+    ap.add_argument("routefiles", category="input", type=ap.file_list,
+                    nargs="+", help="list of route files")
+    options = ap.parse_args(args=args)
     tempPrefix = options.routesprefix
     reader = None
     if options.detfile:
@@ -302,7 +293,7 @@
             reader.addEdge(edge)
     elif options.collectfile:
         reader = RouteReader(options.collectfile, options.edgecount, options.pickleedge, True)
-    splitFiles(expandedArgs, options.typesfile, tempPrefix, options.step,
+    splitFiles(options.routefiles, options.typesfile, tempPrefix, options.step,
                options.verbose, options.modifyid, options.safact, options.sufact)
     if reader:
         parser = make_parser()
diff -Nru sumo-1.17.0/tools/route/tracegenerator.py sumo-1.18.0/tools/route/tracegenerator.py
--- sumo-1.17.0/tools/route/tracegenerator.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/route/tracegenerator.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2013-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
@@ -20,7 +20,6 @@
 from __future__ import absolute_import
 import os
 import sys
-from optparse import OptionParser
 sys.path.append(os.path.join(os.path.dirname(__file__), '..'))
 
 import sumolib  # noqa
@@ -37,29 +36,26 @@
 
 
 if __name__ == "__main__":
-    optParser = OptionParser()
-    optParser.add_option("-v", "--verbose", action="store_true",
-                         default=False, help="tell me what you are doing")
-    optParser.add_option("-n", "--net",
-                         help="SUMO network to use (mandatory)", metavar="FILE")
-    optParser.add_option("-2", "--net2",
-                         help="immediately match routes to a second network", metavar="FILE")
-    optParser.add_option("-r", "--routes",
-                         help="route file to use (mandatory)", metavar="FILE")
-    optParser.add_option("-s", "--step", default="10",
-                         type="float", help="distance between successive trace points")
-    optParser.add_option("-d", "--delta", default="1", type="float",
-                         help="maximum distance between edge and trace points when matching to the second net")
-    optParser.add_option("-x", "--x-offset", default=0.,
-                         type="float", help="offset to add to traces")
-    optParser.add_option("-y", "--y-offset", default=0.,
-                         type="float", help="offset to add to traces")
-    optParser.add_option("-o", "--output",
-                         help="trace or route output (mandatory)", metavar="FILE")
-    (options, args) = optParser.parse_args()
-
-    if not options.output or not options.net or not options.routes:
-        optParser.exit("missing input or output")
+    ap = sumolib.options.ArgumentParser()
+    ap.add_argument("-v", "--verbose", action="store_true",
+                    default=False, help="tell me what you are doing")
+    ap.add_argument("-n", "--net", category="input", type=ap.net_file,
+                    required=True, help="SUMO network to use (mandatory)", metavar="FILE")
+    ap.add_argument("-2", "--net2", category="input", type=ap.net_file,
+                    help="immediately match routes to a second network", metavar="FILE")
+    ap.add_argument("-r", "--routes", category="input", type=ap.route_file,
+                    required=True, help="route file to use (mandatory)", metavar="FILE")
+    ap.add_argument("-s", "--step", default="10",
+                    type=float, help="distance between successive trace points")
+    ap.add_argument("-d", "--delta", default="1", type=float,
+                    help="maximum distance between edge and trace points when matching to the second net")
+    ap.add_argument("-x", "--x-offset", default=0.,
+                    type=float, help="offset to add to traces")
+    ap.add_argument("-y", "--y-offset", default=0.,
+                    type=float, help="offset to add to traces")
+    ap.add_argument("-o", "--output", category="output", type=ap.file,
+                    required=True, help="trace or route output (mandatory)", metavar="FILE")
+    options = ap.parse_args()
 
     if options.verbose:
         print("Reading net ...")
diff -Nru sumo-1.17.0/tools/route/tracemapper.py sumo-1.18.0/tools/route/tracemapper.py
--- sumo-1.17.0/tools/route/tracemapper.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/route/tracemapper.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2009-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
@@ -64,45 +64,46 @@
             trace = [tuple(map(float, pos.split(","))) for pos in traceString.split()]
             if geo:
                 trace = [net.convertLonLat2XY(*pos) for pos in trace]
-            yield tid, trace
+            yield tid.strip(), trace
 
 
 if __name__ == "__main__":
-    optParser = sumolib.options.ArgumentParser()
-    optParser.add_option("-v", "--verbose", action="store_true",
-                         default=False, help="tell me what you are doing")
-    optParser.add_option("-n", "--net", help="SUMO network to use", metavar="FILE", required=True)
-    optParser.add_option("-t", "--trace",
-                         help="trace files to use, separated by comma", metavar="FILE", required=True)
-    optParser.add_option("-d", "--delta", default=1., type=float,
-                         help="maximum distance between edge and trace points")
-    optParser.add_option("-a", "--air-dist-factor", default=2., type=float,
-                         help="maximum factor between airline and route distance between successive trace points")
-    optParser.add_option("-o", "--output", help="route output", metavar="FILE", required=True)
-    optParser.add_option("-p", "--poi-output",
-                         help="generate POI output for the trace", metavar="FILE")
-    optParser.add_option("-y", "--polygon-output",
-                         help="generate polygon output for the mapped edges", metavar="FILE")
-    optParser.add_option("--geo", action="store_true",
-                         default=False, help="read trace with geo-coordinates")
-    optParser.add_option("--direction", action="store_true",
-                         default=False, help="try to use direction of consecutive points when mapping")
-    optParser.add_option("--vehicle-class", default=None,
-                         help="filters the edges by the vehicle class the route is meant for")
-    optParser.add_option("--fill-gaps", default=0., type=float,
-                         help="repair disconnected routes bridging gaps of up to x meters")
-    optParser.add_option("-g", "--gap-penalty", default=-1, type=float,
-                         help="penalty to add for disconnected routes " +
-                              "(default of -1 adds the distance between the two endpoints as penalty)")
-    optParser.add_option("--internal", action="store_true",
-                         default=False, help="include internal edges in generated shapes")
-    optParser.add_option("--spread", type=float, help="spread polygons laterally to avoid overlap")
-    optParser.add_option("--blur", type=float,
-                         default=0, help="maximum random disturbance to route geometry")
-    optParser.add_option("-l", "--layer", default=100, help="layer for generated polygons")
-    optParser.add_option("-b", "--debug", action="store_true",
-                         default=False, help="print out the debugging messages")
-    options = optParser.parse_args()
+    ap = sumolib.options.ArgumentParser()
+    ap.add_argument("-v", "--verbose", action="store_true",
+                    default=False, help="tell me what you are doing")
+    ap.add_argument("-n", "--net", help="SUMO network to use", category="input",
+                    type=ap.net_file, metavar="FILE", required=True)
+    ap.add_argument("-t", "--trace", category="input", type=ap.file,
+                    help="trace files to use, separated by comma", metavar="FILE", required=True)
+    ap.add_argument("-d", "--delta", default=1., type=float,
+                    help="maximum distance between edge and trace points")
+    ap.add_argument("-a", "--air-dist-factor", default=2., type=float,
+                    help="maximum factor between airline and route distance between successive trace points")
+    ap.add_argument("-o", "--output", help="route output", metavar="FILE", required=True)
+    ap.add_argument("-p", "--poi-output", category="output", type=ap.file,
+                    help="generate POI output for the trace", metavar="FILE")
+    ap.add_argument("-y", "--polygon-output", category="output", type=ap.file,
+                    help="generate polygon output for the mapped edges", metavar="FILE")
+    ap.add_argument("--geo", action="store_true",
+                    default=False, help="read trace with geo-coordinates")
+    ap.add_argument("--direction", action="store_true",
+                    default=False, help="try to use direction of consecutive points when mapping")
+    ap.add_argument("--vehicle-class", default=None,
+                    help="filters the edges by the vehicle class the route is meant for")
+    ap.add_argument("--fill-gaps", default=0., type=float,
+                    help="repair disconnected routes bridging gaps of up to x meters")
+    ap.add_argument("-g", "--gap-penalty", default=-1, type=float,
+                    help="penalty to add for disconnected routes " +
+                    "(default of -1 adds the distance between the two endpoints as penalty)")
+    ap.add_argument("--internal", action="store_true",
+                    default=False, help="include internal edges in generated shapes")
+    ap.add_argument("--spread", type=float, help="spread polygons laterally to avoid overlap")
+    ap.add_argument("--blur", type=float,
+                    default=0, help="maximum random disturbance to route geometry")
+    ap.add_argument("-l", "--layer", default=100, help="layer for generated polygons")
+    ap.add_argument("-b", "--debug", action="store_true",
+                    default=False, help="print out the debugging messages")
+    options = ap.parse_args()
 
     if options.verbose:
         print("Reading net ...")
@@ -150,7 +151,7 @@
             for tid, trace in traces:
                 if poiOut is not None:
                     for idx, pos in enumerate(trace):
-                        poiOut.write('\n' % (tid, idx, pos[0], pos[1]))
+                        poiOut.write('    \n' % (tid, idx, pos[0], pos[1]))
                 edges = [e.getID() for e in sumolib.route.mapTrace(
                     trace, net, *mapOpts) if e.getFunction() != "internal"]
                 if polyOut is not None and edges:
diff -Nru sumo-1.17.0/tools/route/vehicle2flow.py sumo-1.18.0/tools/route/vehicle2flow.py
--- sumo-1.17.0/tools/route/vehicle2flow.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/route/vehicle2flow.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2013-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/routeSampler.py sumo-1.18.0/tools/routeSampler.py
--- sumo-1.17.0/tools/routeSampler.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/routeSampler.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
@@ -39,6 +39,7 @@
     sys.path.append(os.path.join(os.environ['SUMO_HOME'], 'tools'))
 import sumolib  # noqa
 from sumolib.miscutils import parseTime, humanReadableTime  # noqa
+from sumolib.statistics import setPrecision  # noqa
 
 PRESERVE_INPUT_COUNT = 'input'
 
@@ -66,86 +67,102 @@
 
 def get_options(args=None):
     op = sumolib.options.ArgumentParser(description="Sample routes to match counts")
+    # input
     op.add_argument("-r", "--route-files", category="input", dest="routeFiles", type=op.route_file_list,
                     help="Input route file")
     op.add_argument("-t", "--turn-files", category="input", dest="turnFiles", type=op.file_list,
                     help="Input turn-count file")
+    op.add_argument("-T", "--turn-ratio-files", category="input", dest="turnRatioFiles", type=op.file_list,
+                    help="Input turn-ratio file")
     op.add_argument("-d", "--edgedata-files", category="input", dest="edgeDataFiles", type=op.file_list,
                     help="Input edgeData file (for counts)")
     op.add_argument("-O", "--od-files", category="input", dest="odFiles", type=op.file_list,
-                    help="Input edgeRelation file for origin-destination counts")
-    op.add_argument("--edgedata-attribute", category="attribute", dest="edgeDataAttr", default="entered",
+                    help="Input edgeRelation and tazRelation files for origin-destination counts")
+    op.add_argument("--taz-files", category="input", dest="tazFiles", type=op.file_list,
+                    help="Input TAZ (district) definitions for interpreting tazRelation files")
+    op.add_argument("--edgedata-attribute", category="input", dest="edgeDataAttr", default="entered",
                     help="Read edgeData counts from the given attribute")
-    op.add_argument("--arrival-attribute", category="attribute", dest="arrivalAttr",
+    op.add_argument("--arrival-attribute", category="input", dest="arrivalAttr",
                     help="Read arrival counts from the given edgeData file attribute")
-    op.add_argument("--depart-attribute", category="attribute", dest="departAttr",
+    op.add_argument("--depart-attribute", category="input", dest="departAttr",
                     help="Read departure counts from the given edgeData file attribute")
-    op.add_argument("--turn-attribute", category="turn-ratio", dest="turnAttr", default="count",
-                    help="Read turning counts from the given attribute")
-    op.add_argument("--turn-ratio-attribute", category="turn-ratio", dest="turnRatioAttr",
+    op.add_argument("--turn-attribute", category="input", dest="turnAttr", default="count",
+                    help="Read turning counts and origin-destination counts from the given attribute")
+    op.add_argument("--turn-ratio-attribute", category="input", dest="turnRatioAttr", default="probability",
                     help="Read turning ratios from the given attribute")
-    op.add_argument("--turn-ratio-total", category="turn-ratio", dest="turnRatioTotal", type=float, default=1,
-                    help="Set value for normalizing turning ratios (default 1)")
-    op.add_argument("--turn-ratio-tolerance", category="turn-ratio", dest="turnRatioTolerance", type=float,
-                    help="Set tolerance for error in resulting ratios (relative to turn-ratio-total)")
-    op.add_argument("--turn-ratio-abs-tolerance", category="turn-ratio", dest="turnRatioAbsTolerance", type=int,
-                    default=1, help="Set tolerance for error in resulting turning ratios as absolute count")
-    op.add_argument("--turn-max-gap", category="turn-ratio", type=int, dest="turnMaxGap", default=0,
-                    help="Allow at most a gap of INT edges between from-edge and to-edge")
-    op.add_argument("--total-count", category="processing", dest="totalCount",
-                    help="Set a total count that should be reached (either as single value that is split " +
-                    " proportionally among all intervals or as a list of counts per interval)." +
-                    " Setting the value 'input' preserves input vehicle counts in each interval.")
+    # output
     op.add_argument("-o", "--output-file", category="output", dest="out", default="out.rou.xml", type=op.route_file,
                     help="Output route file")
-    op.add_argument("--prefix", category="processing", dest="prefix", default="",
-                    help="prefix for the vehicle ids")
-    op.add_argument("-a", "--attributes", category="processing", dest="vehattrs", default="",
-                    help="additional vehicle attributes")
-    op.add_argument("-s", "--seed", category="seed", type=int, default=42,
-                    help="random seed")
-    op.add_argument("--mismatch-output", category="processing", dest="mismatchOut",
+    op.add_argument("--mismatch-output", category="output", dest="mismatchOut",
                     help="write cout-data with overflow/underflow information to FILE")
-    op.add_argument("--weighted", category="processing", dest="weighted", action="store_true", default=False,
-                    help="Sample routes according to their probability (or count)")
-    op.add_argument("--keep-stops", category="outut", dest="keepStops", action="store_true", default=False,
+    op.add_argument("--precision", category="output", type=int, dest="precision", default=2,
+                    help="Number of decimal digits in output")
+    op.add_argument("--keep-stops", category="output", dest="keepStops", action="store_true", default=False,
                     help="Preserve stops from the input routes")
-    op.add_argument("--optimize", category="processing",
-                    help="set optimization method level (full, INT boundary)")
-    op.add_argument("--optimize-input", category="processing", dest="optimizeInput", action="store_true", default=False,
-                    help="Skip resampling and run optimize directly on the input routes")
-    op.add_argument("--min-count",  category="processing", dest="minCount", type=int, default=1,
-                    help="Set minimum number of counting locations that a route must visit")
-    op.add_argument("--minimize-vehicles", category="processing", dest="minimizeVehs", type=float, default=0,
-                    help="Set optimization factor from [0, 1[ for reducing the number of vehicles" +
-                    "(prefer routes that pass multiple counting locations over routes that pass fewer)")
-    op.add_argument("--geh-ok", category="processing", dest="gehOk", type=float, default=5,
-                    help="threshold for acceptable GEH values")
-    op.add_argument("-f", "--write-flows", category="output", dest="writeFlows",
+    op.add_argument("-v", "--verbose", category="output", action="store_true", default=False,
+                    help="tell me what you are doing")
+    op.add_argument("-V", "--verbose.histograms", category="output", dest="verboseHistogram", action="store_true",
+                    default=False, help="print histograms of edge numbers and detector passing count")
+    # attributes
+    op.add_argument("--prefix", category="attributes", dest="prefix", default="",
+                    help="prefix for the vehicle ids")
+    op.add_argument("-a", "--attributes", category="attributes", dest="vehattrs", default="",
+                    help="additional vehicle attributes")
+    op.add_argument("-f", "--write-flows", category="attributes", dest="writeFlows",
                     help="write flows with the give style instead of vehicles [number|probability|poisson]")
-    op.add_argument("-I", "--write-route-ids", category="output", dest="writeRouteIDs", action="store_true",
+    op.add_argument("-I", "--write-route-ids", category="attributes", dest="writeRouteIDs", action="store_true",
                     default=False, help="write routes with ids")
-    op.add_argument("-u", "--write-route-distribution", category="output", dest="writeRouteDist",
+    op.add_argument("-u", "--write-route-distribution", category="attributes", dest="writeRouteDist",
                     help="write routeDistribution with the given ID instead of individual routes")
-    op.add_argument("--pedestrians", category="output", action="store_true", default=False,
+    op.add_argument("--pedestrians", category="attributes", action="store_true", default=False,
                     help="write person walks instead of vehicle routes")
+    # time
     op.add_argument("-b", "--begin", category="time",
                     help="custom begin time (seconds or H:M:S)")
     op.add_argument("-e", "--end", category="time",
                     help="custom end time (seconds or H:M:S)")
     op.add_argument("-i", "--interval", category="time",
                     help="custom aggregation interval (seconds or H:M:S)")
-    op.add_argument("-v", "--verbose", action="store_true", default=False,
-                    help="tell me what you are doing")
-    op.add_argument("-V", "--verbose.histograms", dest="verboseHistogram", action="store_true", default=False,
-                    help="print histograms of edge numbers and detector passing count")
-    op.add_argument("--threads", category="processing", dest="threads", type=int, default=1,
+    # processing
+    op.add_argument("--turn-max-gap", type=int, dest="turnMaxGap", default=0,
+                    help="Allow at most a gap of INT edges between from-edge and to-edge")
+    op.add_argument("--total-count", dest="totalCount",
+                    help="Set a total count that should be reached (either as single value that is split " +
+                    " proportionally among all intervals or as a list of counts per interval)." +
+                    " Setting the value 'input' preserves input vehicle counts in each interval.")
+    op.add_argument("--extra-od", dest="extraOD", action="store_true", default=False,
+                    help="Permit traffic between OD-pairs that did not occur in the input")
+    op.add_argument("-s", "--seed", type=int, default=42,
+                    help="random seed")
+    op.add_argument("--weighted", dest="weighted", action="store_true", default=False,
+                    help="Sample routes according to their probability (or count)")
+    op.add_argument("--optimize",
+                    help="set optimization method level (full, INT boundary)")
+    op.add_argument("--optimize-input", dest="optimizeInput", action="store_true", default=False,
+                    help="Skip resampling and run optimize directly on the input routes")
+    op.add_argument("--min-count", dest="minCount", type=int, default=1,
+                    help="Set minimum number of counting locations that a route must visit")
+    op.add_argument("--minimize-vehicles", dest="minimizeVehs", type=float, default=0,
+                    help="Set optimization factor from [0, 1[ for reducing the number of vehicles" +
+                    "(prefer routes that pass multiple counting locations over routes that pass fewer)")
+    op.add_argument("--geh-ok", dest="gehOk", type=float, default=5,
+                    help="threshold for acceptable GEH values")
+    op.add_argument("--turn-ratio-total", dest="turnRatioTotal", type=float, default=1,
+                    help="Set value for normalizing turning ratios (default 1)")
+    op.add_argument("--turn-ratio-tolerance", dest="turnRatioTolerance", type=float,
+                    help="Set tolerance for error in resulting ratios (relative to turn-ratio-total)")
+    op.add_argument("--turn-ratio-abs-tolerance", dest="turnRatioAbsTolerance", type=int,
+                    default=1, help="Set tolerance for error in resulting turning ratios as absolute count")
+    op.add_argument("--threads", dest="threads", type=int, default=1,
                     help="If parallelization is desired, enter the number of CPUs to use. Set to a value >> then " +
                     "your machines CPUs if you want to utilize all CPUs (Default is 1)")
 
     options = op.parse_args(args=args)
     if (options.routeFiles is None or
-            (options.turnFiles is None and options.edgeDataFiles is None and options.odFiles is None)):
+            (options.turnFiles is None
+             and options.turnRatioFiles is None
+             and options.edgeDataFiles is None
+             and options.odFiles is None)):
         op.print_help()
         sys.exit()
     if options.writeRouteIDs and options.writeRouteDist:
@@ -157,8 +174,10 @@
 
     options.routeFiles = options.routeFiles.split(',')
     options.turnFiles = options.turnFiles.split(',') if options.turnFiles is not None else []
+    options.turnRatioFiles = options.turnRatioFiles.split(',') if options.turnRatioFiles is not None else []
     options.edgeDataFiles = options.edgeDataFiles.split(',') if options.edgeDataFiles is not None else []
     options.odFiles = options.odFiles.split(',') if options.odFiles is not None else []
+    options.tazFiles = options.tazFiles.split(',') if options.tazFiles is not None else []
     if options.vehattrs and options.vehattrs[0] != ' ':
         options.vehattrs = ' ' + options.vehattrs
 
@@ -191,7 +210,7 @@
 
 
 class CountData:
-    def __init__(self, count, edgeTuple, allRoutes, isOrigin, isDest, isRatio, options):
+    def __init__(self, count, edgeTuple, allRoutes, isOrigin, isDest, isRatio, isTaz, options):
         self.index = None
         self.origCount = count
         self.count = count
@@ -199,6 +218,7 @@
         self.isOrigin = isOrigin
         self.isDest = isDest
         self.isRatio = isRatio
+        self.isTaz = isTaz
         self.ratioSiblings = []
         self.assignedCount = 0
         self.options = options  # multiprocessing had issue with sumolib.options.getOptions().turnMaxGap
@@ -206,11 +226,14 @@
         for routeIndex, edges in enumerate(allRoutes.unique):
             if self.routePasses(edges) is not None:
                 self.routeSet.add(routeIndex)
-        if isRatio:
-            self.count = options.turnRatioAbsTolerance
 
     def routePasses(self, edges):
-
+        if self.isTaz:
+            if (inTaz(self.options, edges[0], self.edgeTuple[0], True) and
+                    inTaz(self.options, edges[-1], self.edgeTuple[-1], False)):
+                return 0
+            else:
+                return None
         if self.isOrigin or self.isDest:
             passes = ((not self.isOrigin or edges[0] == self.edgeTuple[0]) and
                       (not self.isDest or edges[-1] == self.edgeTuple[-1]))
@@ -254,7 +277,7 @@
 
     def updateTurnRatioCounts(self, openRoutes, openCounts, updateSiblings=False):
         if self.isRatio:
-            total = sum([cd2.assignedCount for cd2 in self.ratioSiblings])
+            total = self.getSiblingCount()
             permitted = total * self.origCount + self.options.turnRatioAbsTolerance
             if permitted > self.assignedCount:
                 self.count = permitted - self.assignedCount
@@ -268,18 +291,49 @@
                     if cd2 != self:
                         cd2.updateTurnRatioCounts(openRoutes, openCounts)
 
+    def getSiblingCount(self):
+        if not self.isRatio:
+            return None
+        return sum([cd2.assignedCount for cd2 in self.ratioSiblings])
+
+    def assignedProbability(self):
+        if not self.isRatio:
+            return None
+        sibCount = self.getSiblingCount()
+        return 0 if sibCount == 0 else self.assignedCount / sibCount
+
     def __repr__(self):
         return "CountData(edges=%s, count=%s, origCount=%s%s%s%s%s)\n" % (
             self.edgeTuple, self.count, self.origCount,
             ", isOrigin=True" if self.isOrigin else "",
             ", isDest=True" if self.isDest else "",
             ", isRatio=True" if self.isRatio else "",
-            (", sibs=%s" % len(self.ratioSiblings)) if self.isRatio else ""
-        )
+            (", sibs=%s" % len(self.ratioSiblings)) if self.isRatio else "")
+
+
+def inTaz(options, edge, tazID, isOrigin):
+    if not hasattr(options, "tazEdges"):
+        # tazID -> (originEdges, destEdges)
+        options.tazEdges = defaultdict(lambda: (set(), set()))
+        for tazFile in options.tazFiles:
+            for taz in sumolib.xml.parse(tazFile, 'taz'):
+                if taz.edges:
+                    edgeIDs = taz.edges.split()
+                    options.tazEdges[taz.id] = (set(edgeIDs), set(edgeIDs))
+                if taz.tazSource:
+                    for ts in taz.tazSource:
+                        options.tazEdges[taz.id][0].add(ts.id)
+                if taz.tazSink:
+                    for ts in taz.tazSink:
+                        options.tazEdges[taz.id][1].add(ts.id)
+    result = edge in options.tazEdges[tazID][0 if isOrigin else 1]
+    # print(edge, tazID, isOrigin, options.tazEdges[tazID][0 if isOrigin else 1], result)
+    return result
 
 
 def getIntervals(options):
-    begin, end, interval = parseTimeRange(options.turnFiles + options.edgeDataFiles + options.odFiles)
+    begin, end, interval = parseTimeRange(options.turnFiles + options.turnRatioFiles
+                                          + options.edgeDataFiles + options.odFiles)
     if options.begin is not None:
         begin = parseTime(options.begin)
     if options.end is not None:
@@ -316,10 +370,20 @@
             edges = tuple([edgeRel.attr_from] + via + [edgeRel.to])
             value = getattr(edgeRel, attr)
             yield edges, value
-    elif warn:
+    elif interval.tazRelation is None and warn:
         sys.stderr.write("Warning: No edgeRelations in interval from=%s to=%s\n" % (interval.begin, interval.end))
 
 
+def parseTazCounts(interval, attr, warn):
+    if interval.tazRelation is not None:
+        for tazRel in interval.tazRelation:
+            tazs = tuple([tazRel.attr_from] + [tazRel.to])
+            value = getattr(tazRel, attr)
+            yield tazs, value
+    elif interval.edgeRelation is None and warn:
+        sys.stderr.write("Warning: No tazRelations in interval from=%s to=%s\n" % (interval.begin, interval.end))
+
+
 def parseEdgeCounts(interval, attr, warn):
     if interval.edge is not None:
         for edge in interval.edge:
@@ -329,7 +393,7 @@
 
 
 def parseDataIntervals(parseFun, fnames, begin, end, allRoutes, attr, options,
-                       isOrigin=False, isDest=False, isRatio=False, warn=False):
+                       isOrigin=False, isDest=False, isRatio=False, isTaz=False, warn=False):
     locations = {}  # edges -> CountData
     result = []
     if attr is None or attr == "None":
@@ -348,7 +412,7 @@
                                   (attr, fname, ' '.join(edges)), file=sys.stderr)
                         continue
                     if edges not in locations:
-                        result.append(CountData(0, edges, allRoutes, isOrigin, isDest, isRatio, options))
+                        result.append(CountData(0, edges, allRoutes, isOrigin, isDest, isRatio, isTaz, options))
                         locations[edges] = result[-1]
                     elif (isOrigin and isDest) != (locations[edges].isOrigin and locations[edges].isDest):
                         print("Warning: Edge relation '%s' occurs as turn relation and also as OD-relation" %
@@ -571,7 +635,7 @@
             outf.write('%s\n' % indent)
 
 
-def initTurnRatioSiblings(routes, countData):
+def initTurnRatioSiblings(routes, countData, turnTotal):
     ratioIndices = set()
     # todo: use routes to complete incomplete sibling lists
     ratioOrigins = defaultdict(list)
@@ -579,6 +643,7 @@
         if cd.isRatio:
             ratioOrigins[cd.edgeTuple[0]].append(cd)
             ratioIndices.add(cd.index)
+            cd.origCount /= turnTotal
 
     for edge, cDs in ratioOrigins.items():
         for cd in cDs:
@@ -720,6 +785,7 @@
     underflowSummary = sumolib.miscutils.Statistics("avg interval underflow")
     overflowSummary = sumolib.miscutils.Statistics("avg interval overflow")
     gehSummary = sumolib.miscutils.Statistics("avg interval GEH%")
+    ratioSummary = sumolib.miscutils.Statistics("avg interval ratio mismatch%")
     inputCountSummary = sumolib.miscutils.Statistics("avg interval input count")
     usedRoutesSummary = sumolib.miscutils.Statistics("avg interval written vehs")
 
@@ -735,18 +801,21 @@
                     underflowSummary.add(result[1][i], begin)
                     overflowSummary.add(result[2][i], begin)
                     gehSummary.add(result[3][i], begin)
-                    inputCountSummary.add(result[4][i], begin)
-                    usedRoutesSummary.add(result[5][i], begin)
+                    if result[4][i] is not None:
+                        ratioSummary.add(result[4][i], begin)
+                    inputCountSummary.add(result[5][i], begin)
+                    usedRoutesSummary.add(result[6][i], begin)
         else:
             for i, (begin, end) in enumerate(intervals):
                 intervalPrefix = "" if len(intervals) == 1 else "%s_" % int(begin)
                 intervalCount = options.totalCount[i] if options.totalCount else None
-                uFlow, oFlow, gehOK, inputCount, usedRoutes, _ = solveInterval(options, routes, begin, end,
-                                                                               intervalPrefix, outf, mismatchf, rng,
-                                                                               intervalCount)
+                uFlow, oFlow, gehOK, ratioPerc, inputCount, usedRoutes, _ = solveInterval(
+                    options, routes, begin, end, intervalPrefix, outf, mismatchf, rng, intervalCount)
                 underflowSummary.add(uFlow, begin)
                 overflowSummary.add(oFlow, begin)
                 gehSummary.add(gehOK, begin)
+                if ratioPerc is not None:
+                    ratioSummary.add(ratioPerc, begin)
                 inputCountSummary.add(inputCount, begin)
                 usedRoutesSummary.add(usedRoutes, begin)
         outf.write('\n')
@@ -761,6 +830,8 @@
         print(underflowSummary)
         print(overflowSummary)
         print(gehSummary)
+        if ratioSummary.count() > 0:
+            print(ratioSummary)
 
 
 def _sample_skewed(sampleSet, rng, probabilityMap):
@@ -784,10 +855,10 @@
         local_mismatch_outf = StringIO() if options.mismatchOut else None
         intervalPrefix = "%s_" % int(begin)
         intervalCount = options.totalCount[i] if options.totalCount else None
-        uFlow, oFlow, gehOKNum, inputCount, usedRoutes, local_outf = solveInterval(
+        uFlow, oFlow, gehOKPerc, ratioPerc, inputCount, usedRoutes, local_outf = solveInterval(
             options, routes, begin, end, intervalPrefix, local_outf, local_mismatch_outf, rng, intervalCount)
 
-        output_list.append([begin, uFlow, oFlow, gehOKNum, inputCount, usedRoutes, local_outf.getvalue(),
+        output_list.append([begin, uFlow, oFlow, gehOKPerc, ratioPerc, inputCount, usedRoutes, local_outf.getvalue(),
                             local_mismatch_outf.getvalue() if options.mismatchOut else None])
     output_lst = list(zip(*output_list))
     return output_lst
@@ -796,7 +867,7 @@
 def parseCounts(options, routes, b, e, warn=False):
     countData = (parseDataIntervals(parseTurnCounts, options.turnFiles, b, e,
                                     routes, options.turnAttr, options=options, warn=warn)
-                 + parseDataIntervals(parseTurnCounts, options.turnFiles, b, e,
+                 + parseDataIntervals(parseTurnCounts, options.turnRatioFiles, b, e,
                                       routes, options.turnRatioAttr, options=options, isRatio=True, warn=warn)
                  + parseDataIntervals(parseEdgeCounts, options.edgeDataFiles, b, e,
                                       routes, options.edgeDataAttr, options=options, warn=warn)
@@ -808,17 +879,29 @@
                  + parseDataIntervals(parseEdgeCounts, options.edgeDataFiles, b, e,
                                       routes, options.arrivalAttr, options=options, isDest=True, warn=warn)
                  )
+    if options.tazFiles is not None:
+        countData += parseDataIntervals(parseTazCounts, options.odFiles, b, e,
+                                        routes, options.turnAttr, options=options,
+                                        isTaz=True, warn=warn)
     for i, cd in enumerate(countData):
         cd.index = i
     return countData
 
 
+def hasODCount(cdIndices, countData):
+    for i in cdIndices:
+        cd = countData[i]
+        if cd.isTaz or (cd.isOrigin and cd.isDest):
+            return True
+    return False
+
+
 def solveInterval(options, routes, begin, end, intervalPrefix, outf, mismatchf, rng, intervalCount):
     countData = parseCounts(options, routes, begin, end)
 
     ratioIndices = None
-    if options.turnFiles and options.turnRatioAttr:
-        ratioIndices = initTurnRatioSiblings(routes, countData)
+    if options.turnRatioFiles:
+        ratioIndices = initTurnRatioSiblings(routes, countData, options.turnRatioTotal)
 
     routeUsage = getRouteUsage(routes, countData)
     unrestricted_list = [r for r, usage in enumerate(routeUsage) if len(usage) < options.minCount]
@@ -835,6 +918,9 @@
 
     openRoutes = updateOpenRoutes(range(0, routes.number), routeUsage, countData)
     openRoutes = [r for r in openRoutes if r not in unrestricted]
+    if options.odFiles and not options.extraOD:
+        openRoutes = [r for r in openRoutes if hasODCount(routeUsage[r], countData)]
+
     openCounts = updateOpenCounts(range(0, len(countData)), countData, openRoutes)
 
     usedRoutes = []
@@ -850,9 +936,10 @@
             if ratioIndices and intervalCount is None:
                 realCounts = [cdi for cdi in openCounts if cdi not in ratioIndices]
                 if not realCounts:
-                    print("Stopped sampling routes because only ratios are still open."
-                          + " Set option --total-count to sample ratios without local counts",
-                          file=sys.stderr)
+                    if numSampled == 0:
+                        print("Stopped sampling routes because only ratios are still open."
+                              + " Set option --total-count to sample ratios without local counts",
+                              file=sys.stderr)
                     break
 
             if options.weighted:
@@ -1045,12 +1132,20 @@
     underflow = sumolib.miscutils.Statistics("underflow locations")
     overflow = sumolib.miscutils.Statistics("overflow locations")
     gehStats = sumolib.miscutils.Statistics("GEH")
+    ratioStats = sumolib.miscutils.Statistics("turnRatio")
     numGehOK = 0.0
+    gehOKPerc = 100
+    ratioPerc = None
     hourFraction = (end - begin) / 3600.0
     totalCount = 0
     totalOrigCount = 0
+    totalRatioCount = 0
     for cd in countData:
         if cd.isRatio:
+            aProb = setPrecision("%.2f", options.precision) % cd.assignedProbability()
+            cdID = "[%s] %s %s" % (' '.join(cd.edgeTuple), cd.origCount, aProb)
+            ratioStats.add(cd.assignedProbability() - cd.origCount, cdID)
+            totalRatioCount += cd.assignedCount
             continue
         localCount = cd.origCount - cd.count
         totalCount += localCount
@@ -1064,18 +1159,33 @@
         geh = sumolib.miscutils.geh(origHourly, localHourly)
         if geh < options.gehOk:
             numGehOK += 1
-        gehStats.add(geh, "[%s] %s %s" % (
-            ' '.join(cd.edgeTuple), int(origHourly), int(localHourly)))
+        cdID = "[%s] %s %s" % (' '.join(cd.edgeTuple), int(origHourly), int(localHourly))
+        gehStats.add(geh, cdID)
+
+    gehInfo = ""
+    ratioInfo = ""
+    if gehStats.count() > 0:
+        countPercentage = "%.2f%%" % (100 * totalCount / float(totalOrigCount)) if totalOrigCount else "-"
+        gehOKPerc = 100 * numGehOK / float(gehStats.count()) if countData else 100
+        gehOK = "%.2f%%" % gehOKPerc if countData else "-"
+        gehInfo = "total count %s (%s) at %s locations. GEH<%s for %s" % (
+            totalCount, countPercentage,
+            gehStats.count(),
+            options.gehOk, gehOK)
+
+    if ratioStats.count() > 0:
+        if gehStats.count() > 0:
+            ratioInfo = " and "
+        ratioPerc = ratioStats.avg_abs() * 100
+        ratioInfo += setPrecision("avg ratio mismatch %.2f%% at %s ratio locations (count %s)", options.precision) % (
+            ratioPerc, ratioStats.count(), totalRatioCount)
 
     outputIntervalPrefix = "" if intervalPrefix == "" else "%s: " % int(begin)
-    countPercentage = "%.2f%%" % (100 * totalCount / float(totalOrigCount)) if totalOrigCount else "-"
-    gehOKNum = 100 * numGehOK / float(len(countData)) if countData else 100
-    gehOK = "%.2f%%" % gehOKNum if countData else "-"
-    print("%sWrote %s routes (%s distinct) achieving total count %s (%s) at %s locations. GEH<%s for %s" % (
+    print("%sWrote %s routes (%s distinct) %s%s%s" % (
         outputIntervalPrefix,
         len(usedRoutes), len(set(usedRoutes)),
-        totalCount, countPercentage, len(countData),
-        options.gehOk, gehOK))
+        ("achieving " if countData else "no data"),
+        gehInfo, ratioInfo))
 
     if options.verboseHistogram:
         edgeCount = sumolib.miscutils.Statistics("route edge count", histogram=True)
@@ -1100,14 +1210,19 @@
                 mismatchf.write('        \n' % (
                     cd.edgeTuple[0], cd.origCount, cd.count))
             elif len(cd.edgeTuple) == 2:
-                mismatchf.write('        \n' % (
-                    cd.edgeTuple[0], cd.edgeTuple[1], cd.origCount, cd.count))
+                if cd.isRatio:
+                    deficit = setPrecision("%.2f",  options.precision) % (cd.assignedProbability() - cd.origCount)
+                    mismatchf.write('        \n' % (  # noqa
+                        cd.edgeTuple[0], cd.edgeTuple[1], cd.origCount, deficit, cd.getSiblingCount()))
+                else:
+                    mismatchf.write('        \n' % (
+                        cd.edgeTuple[0], cd.edgeTuple[1], cd.origCount, cd.count))
             else:
                 print("Warning: output for edge relations with more than 2 edges not supported (%s)" % cd.edgeTuple,
                       file=sys.stderr)
         mismatchf.write('    \n')
 
-    return sum(underflow.values), sum(overflow.values), gehOKNum, totalOrigCount, len(usedRoutes), outf
+    return sum(underflow.values), sum(overflow.values), gehOKPerc, ratioPerc, totalOrigCount, len(usedRoutes), outf
 
 
 if __name__ == "__main__":
diff -Nru sumo-1.17.0/tools/runSeeds.py sumo-1.18.0/tools/runSeeds.py
--- sumo-1.17.0/tools/runSeeds.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/runSeeds.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2008-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
@@ -41,12 +41,16 @@
     ap = sumolib.options.ArgumentParser()
     ap.add_option("-v", "--verbose", category="processing", action="store_true", default=False,
                   help="tell me what you are doing")
-    ap.add_option("-k", "--configuration", category="input", metavar="FILE", required=True, type=ap.file_list,
-                  help="configuration to run")
+    ap.add_option("-k", "--configuration", category="input", metavar="FILE", required=True,
+                  type=ap.sumoconfig_file_list,
+                  help="configuration to run or comma-separated list of configurations")
     ap.add_option("-a", "--application", category="processing", default="sumo", metavar="FILE",
-                  help="application to run")
+                  help="application to run or comma-separated list of applications")
     ap.add_option("-p", "--output-prefix",  category="processing", default="SEED.", dest="prefix",
                   help="output prefix",)
+    ap.add_option("--no-folders", action="store_true", category="output", default=False, dest="noFolders",
+                  help=("do not create folders to distinguish multiple configurations or applications" +
+                        "but use prefixes instead"))
     ap.add_option("--seeds", category="processing", default="0:10",
                   help="which seeds to run")
     ap.add_option("--threads", category="processing", type=int, default=1,
@@ -84,7 +88,6 @@
 
 def getUniqueFolder(options, app, cfg, folders):
     key = []
-    i = 0
     if len(options.application) > 1:
         key.append(os.path.basename(app))
     if len(options.configuration) > 1:
@@ -92,16 +95,35 @@
     if not key:
         return ""
 
-    folder = '_'.join(key + [str(i)])
-    while folder in folders:
-        i += 1
+    folder = '_'.join(key)
+    if folder in folders:
+        i = 0
         folder = '_'.join(key + [str(i)])
+        while folder in folders:
+            i += 1
+            folder = '_'.join(key + [str(i)])
+
     folders.add(folder)
-    if not os.path.exists(folder):
+    if not options.noFolders and not os.path.exists(folder):
         os.makedirs(folder)
     return folder
 
 
+def getCommExtensionLength(names):
+    if not names or len(names) == 1:
+        return 0
+    common = reversed(names[0])
+    for n in names[1:]:
+        common2 = []
+        for c1, c2 in zip(common, reversed(n)):
+            if c1 == c2:
+                common2.append(c1)
+            else:
+                break
+        common = ''.join(common2)
+    return len(common)
+
+
 def main(options):
     q = Queue()
 
@@ -110,7 +132,10 @@
             app, cfg, seed, folder = q.get()
             prefix = options.prefix.replace("SEED", str(seed))
             if folder:
-                prefix = os.path.join(folder, prefix)
+                if options.noFolders:
+                    prefix = "%s_%s" % (folder, prefix)
+                else:
+                    prefix = os.path.join(folder, prefix)
             if options.verbose:
                 print("running seed %s" % seed)
             args = [app,
@@ -127,9 +152,10 @@
 
     folders = set()
 
+    cEL = getCommExtensionLength(options.configuration)
     for app in options.application:
         for cfg in options.configuration:
-            folder = getUniqueFolder(options, app, cfg, folders)
+            folder = getUniqueFolder(options, app, cfg[:-cEL], folders)
             for seed in options.seeds:
                 q.put((app, cfg, seed, folder))
     q.join()
diff -Nru sumo-1.17.0/tools/shapes/circlePolygon.py sumo-1.18.0/tools/shapes/circlePolygon.py
--- sumo-1.17.0/tools/shapes/circlePolygon.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/shapes/circlePolygon.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2010-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
@@ -20,9 +20,12 @@
 
 from __future__ import print_function
 from __future__ import absolute_import
+import os
 import sys
 import math
-from optparse import OptionParser
+THIS_DIR = os.path.dirname(os.path.abspath(__file__))
+sys.path.append(os.path.join(THIS_DIR, '..'))
+import sumolib  # noqa
 
 
 def setCircle(idx, x, y, r, c, prefix, type, color, fill, layer, output):
@@ -40,32 +43,37 @@
 
 
 if __name__ == "__main__":
-    optParser = OptionParser()
-    optParser.add_option("-r", "--radius", type="float", default=100,
-                         help="default radius")
-    optParser.add_option("-p", "--prefix", default="poly",
-                         help="id prefix")
-    optParser.add_option("-t", "--type", default="unknown",
-                         help="type string")
-    optParser.add_option("-c", "--color", default="1,0,0",
-                         help="color string")
-    optParser.add_option("-f", "--fill", action="store_true",
-                         default=False, help="fill the polygons")
-    optParser.add_option("-l", "--layer", type="int", default=-1,
-                         help="layer")
-    optParser.add_option("-x", "--corners", type="int", default=100,
-                         help="default number of corners")
-    optParser.add_option(
-        "-o", "--output-file", help="output file (default: standard output)")
-    (options, args) = optParser.parse_args()
-
-    if len(args) == 0:
-        print("Usage: " + sys.argv[0] + " x,y[[,r],c] ...", file=sys.stderr)
-        sys.exit()
+
+    op = sumolib.options.ArgumentParser(description="Make a circle polygon")
+
+    op.add_option("files", nargs='+', category="input", type=op.file_list,
+                  help="List of XML files to plot")
+    op.add_option("-r", "--radius", type=float, default=100,
+                  help="default radius")
+    op.add_option("-p", "--prefix", default="poly",
+                  help="id prefix")
+    op.add_option("-t", "--type", default="unknown",
+                  help="type string")
+    op.add_option("--color", default="1,0,0",
+                  help="color string")
+    op.add_option("-f", "--fill", action="store_true",
+                  default=False, help="fill the polygons")
+    op.add_option("-l", "--layer", type=float, default=-1,
+                  help="layer")
+    op.add_option("-x", "--corners", type=int, default=100,
+                  help="default number of corners")
+    op.add_option("-o", "--output-file", category="output", type=op.file,
+                  help="output file (default: standard output)")
+
+    try:
+        options = op.parse_args()
+    except (NotImplementedError, ValueError) as e:
+        print(e, file=sys.stderr)
+        sys.exit(1)
 
     output = sys.stdout if options.output_file is None else open(options.output_file, 'w')
     print("", file=output)
-    for idx, d in enumerate(args):
+    for idx, d in enumerate(options.files):
         desc = d.split(",")
         x = float(desc[0])
         y = float(desc[1])
diff -Nru sumo-1.17.0/tools/shapes/CSV2polyconvertXML.py sumo-1.18.0/tools/shapes/CSV2polyconvertXML.py
--- sumo-1.17.0/tools/shapes/CSV2polyconvertXML.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/shapes/CSV2polyconvertXML.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2008-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/shapes/poi_alongRoads.py sumo-1.18.0/tools/shapes/poi_alongRoads.py
--- sumo-1.17.0/tools/shapes/poi_alongRoads.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/shapes/poi_alongRoads.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2009-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/shapes/poi_at_stops.py sumo-1.18.0/tools/shapes/poi_at_stops.py
--- sumo-1.17.0/tools/shapes/poi_at_stops.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/shapes/poi_at_stops.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2010-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/shapes/poi_atTLS.py sumo-1.18.0/tools/shapes/poi_atTLS.py
--- sumo-1.17.0/tools/shapes/poi_atTLS.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/shapes/poi_atTLS.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2010-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/simpla/_config.py sumo-1.18.0/tools/simpla/_config.py
--- sumo-1.17.0/tools/simpla/_config.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/simpla/_config.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/simpla/__init__.py sumo-1.18.0/tools/simpla/__init__.py
--- sumo-1.17.0/tools/simpla/__init__.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/simpla/__init__.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
@@ -185,3 +185,19 @@
     else:
         raise SimplaException("call simpla.load() before simpla.getPlatoonInfo()!")
     return 0
+
+
+def getPlatoonID(vehicleID):
+    '''
+
+    getPlatoonID(string) -> integer
+
+    Returns the platoon ID the vehicle given by its ID belongs too. If the vehicle does not belong to
+    any platoon, -1 is returned.
+    '''
+    global _mgr, warn
+    if _mgr is not None:
+        return _mgr.getPlatoonID(vehicleID)
+    else:
+        raise SimplaException("call simpla.load() before simpla.getPlatoonID()!")
+    return 0
diff -Nru sumo-1.17.0/tools/simpla/_platoonmanager.py sumo-1.18.0/tools/simpla/_platoonmanager.py
--- sumo-1.17.0/tools/simpla/_platoonmanager.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/simpla/_platoonmanager.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
@@ -249,6 +249,15 @@
         else:
             return {}
 
+    def getPlatoonID(self, vehicleID):
+        '''getPlatoonID(vehicleID) -> integer
+
+        Returns the ID of the platoon a vehicle belongs to
+        '''
+        if vehicleID in self._connectedVehicles:
+            return self._connectedVehicles[vehicleID].getPlatoon().getID()
+        return -1
+
     def getPlatoonLeaders(self):
         '''getPlatoonLeaders() -> list(PVehicle)
 
diff -Nru sumo-1.17.0/tools/simpla/_platoonmode.py sumo-1.18.0/tools/simpla/_platoonmode.py
--- sumo-1.17.0/tools/simpla/_platoonmode.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/simpla/_platoonmode.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/simpla/_platoon.py sumo-1.18.0/tools/simpla/_platoon.py
--- sumo-1.17.0/tools/simpla/_platoon.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/simpla/_platoon.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/simpla/_pvehicle.py sumo-1.18.0/tools/simpla/_pvehicle.py
--- sumo-1.17.0/tools/simpla/_pvehicle.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/simpla/_pvehicle.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/simpla/_reporting.py sumo-1.18.0/tools/simpla/_reporting.py
--- sumo-1.17.0/tools/simpla/_reporting.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/simpla/_reporting.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2014-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/simpla/_utils.py sumo-1.18.0/tools/simpla/_utils.py
--- sumo-1.17.0/tools/simpla/_utils.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/simpla/_utils.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/stateReplay.py sumo-1.18.0/tools/stateReplay.py
--- sumo-1.17.0/tools/stateReplay.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/stateReplay.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2008-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/sumolib/color.py sumo-1.18.0/tools/sumolib/color.py
--- sumo-1.17.0/tools/sumolib/color.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/sumolib/color.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/sumolib/datastructures/__init__.py sumo-1.18.0/tools/sumolib/datastructures/__init__.py
--- sumo-1.17.0/tools/sumolib/datastructures/__init__.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/sumolib/datastructures/__init__.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/sumolib/datastructures/OrderedMultiSet.py sumo-1.18.0/tools/sumolib/datastructures/OrderedMultiSet.py
--- sumo-1.17.0/tools/sumolib/datastructures/OrderedMultiSet.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/sumolib/datastructures/OrderedMultiSet.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2011-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/sumolib/files/additional.py sumo-1.18.0/tools/sumolib/files/additional.py
--- sumo-1.17.0/tools/sumolib/files/additional.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/sumolib/files/additional.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2008-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/sumolib/files/__init__.py sumo-1.18.0/tools/sumolib/files/__init__.py
--- sumo-1.17.0/tools/sumolib/files/__init__.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/sumolib/files/__init__.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/sumolib/files/selection.py sumo-1.18.0/tools/sumolib/files/selection.py
--- sumo-1.17.0/tools/sumolib/files/selection.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/sumolib/files/selection.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2008-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/sumolib/fpdiff.py sumo-1.18.0/tools/sumolib/fpdiff.py
--- sumo-1.17.0/tools/sumolib/fpdiff.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/sumolib/fpdiff.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2011-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/sumolib/geomhelper.py sumo-1.18.0/tools/sumolib/geomhelper.py
--- sumo-1.17.0/tools/sumolib/geomhelper.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/sumolib/geomhelper.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2013-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/sumolib/__init__.py sumo-1.18.0/tools/sumolib/__init__.py
--- sumo-1.17.0/tools/sumolib/__init__.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/sumolib/__init__.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2011-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/sumolib/miscutils.py sumo-1.18.0/tools/sumolib/miscutils.py
--- sumo-1.17.0/tools/sumolib/miscutils.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/sumolib/miscutils.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
@@ -235,15 +235,25 @@
     return sign + result
 
 
+SPECIAL_TIME_STRINGS = ["triggered", "containerTriggered", "split", "begin"]
+
+
 def parseTime(t, factor=1):
     try:
         return float(t) * factor
     except ValueError:
         pass
-    # prepended zero is ignored if the date value already contains days
-    days, hours, minutes, seconds = ([0] + list(map(float, t.split(':'))))[-4:]
-    sign = -1 if t.strip()[0] == '-' else 1
-    return (3600 * 24 * days + 3600 * hours + 60 * minutes + seconds) * sign
+    try:
+        # prepended zero is ignored if the date value already contains days
+        days, hours, minutes, seconds = ([0] + list(map(float, t.split(':'))))[-4:]
+        sign = -1 if t.strip()[0] == '-' else 1
+        return (3600 * 24 * days + 3600 * hours + 60 * minutes + seconds) * sign * factor
+    except ValueError:
+        if t in SPECIAL_TIME_STRINGS:
+            # signal special case but don't crash
+            return None
+        else:
+            raise
 
 
 def parseBool(val):
diff -Nru sumo-1.17.0/tools/sumolib/net/connection.py sumo-1.18.0/tools/sumolib/net/connection.py
--- sumo-1.17.0/tools/sumolib/net/connection.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/sumolib/net/connection.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2011-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/sumolib/net/edge.py sumo-1.18.0/tools/sumolib/net/edge.py
--- sumo-1.17.0/tools/sumolib/net/edge.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/sumolib/net/edge.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2011-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/sumolib/net/generator/corridor.py sumo-1.18.0/tools/sumolib/net/generator/corridor.py
--- sumo-1.17.0/tools/sumolib/net/generator/corridor.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/sumolib/net/generator/corridor.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2013-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/sumolib/net/generator/cross.py sumo-1.18.0/tools/sumolib/net/generator/cross.py
--- sumo-1.17.0/tools/sumolib/net/generator/cross.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/sumolib/net/generator/cross.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2013-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/sumolib/net/generator/demand.py sumo-1.18.0/tools/sumolib/net/generator/demand.py
--- sumo-1.17.0/tools/sumolib/net/generator/demand.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/sumolib/net/generator/demand.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2013-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/sumolib/net/generator/grid.py sumo-1.18.0/tools/sumolib/net/generator/grid.py
--- sumo-1.17.0/tools/sumolib/net/generator/grid.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/sumolib/net/generator/grid.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2013-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/sumolib/net/generator/__init__.py sumo-1.18.0/tools/sumolib/net/generator/__init__.py
--- sumo-1.17.0/tools/sumolib/net/generator/__init__.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/sumolib/net/generator/__init__.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2013-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/sumolib/net/generator/network.py sumo-1.18.0/tools/sumolib/net/generator/network.py
--- sumo-1.17.0/tools/sumolib/net/generator/network.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/sumolib/net/generator/network.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2013-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/sumolib/net/generator/straight.py sumo-1.18.0/tools/sumolib/net/generator/straight.py
--- sumo-1.17.0/tools/sumolib/net/generator/straight.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/sumolib/net/generator/straight.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2013-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/sumolib/net/__init__.py sumo-1.18.0/tools/sumolib/net/__init__.py
--- sumo-1.17.0/tools/sumolib/net/__init__.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/sumolib/net/__init__.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2008-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
@@ -166,7 +166,7 @@
         self._nodes = []
         self._edges = []
         self._tlss = []
-        self._ranges = [[10000, -10000], [10000, -10000]]
+        self._ranges = [[sys.float_info.max, -sys.float_info.max], [sys.float_info.max, -sys.float_info.max]]
         self._roundabouts = []
         self._rtreeEdges = None
         self._rtreeLanes = None
diff -Nru sumo-1.17.0/tools/sumolib/net/lane.py sumo-1.18.0/tools/sumolib/net/lane.py
--- sumo-1.17.0/tools/sumolib/net/lane.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/sumolib/net/lane.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2011-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/sumolib/net/netshiftadaptor.py sumo-1.18.0/tools/sumolib/net/netshiftadaptor.py
--- sumo-1.17.0/tools/sumolib/net/netshiftadaptor.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/sumolib/net/netshiftadaptor.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2008-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/sumolib/net/node.py sumo-1.18.0/tools/sumolib/net/node.py
--- sumo-1.17.0/tools/sumolib/net/node.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/sumolib/net/node.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2011-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/sumolib/net/roundabout.py sumo-1.18.0/tools/sumolib/net/roundabout.py
--- sumo-1.17.0/tools/sumolib/net/roundabout.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/sumolib/net/roundabout.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2008-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/sumolib/options.py sumo-1.18.0/tools/sumolib/options.py
--- sumo-1.17.0/tools/sumolib/options.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/sumolib/options.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
@@ -186,10 +186,26 @@
         return s
 
     @staticmethod
+    def edge(s):
+        return s
+
+    @staticmethod
+    def edge_list(s):
+        return s
+
+    @staticmethod
     def data_file(s):
         # arbitrary data file (i.e. for attributeStats.py and plotXMLAttributes.py)
         return s
 
+    @staticmethod
+    def sumoconfig_file(s):
+        return s
+
+    @staticmethod
+    def sumoconfig_file_list(s):
+        return s
+
     def __init__(self, *args, **kwargs):
         self._allowed_programs = kwargs.get("allowed_programs", [])
         if "allowed_programs" in kwargs:
@@ -251,14 +267,16 @@
         group.add_argument = handleCatoryWrapper(group.add_argument)
         return group
 
-    def write_config_file(self, namespace, exit=True, toString=False):
+    def _write_config_file(self, namespace, toString=False):
         if namespace.save_configuration:
-            out_file = namespace.save_configuration
-            print_template = False
-        elif namespace.save_template:
-            out_file = namespace.save_template
-            print_template = True
-        elif toString:
+            with openz(namespace.save_configuration, "w") as out:
+                self.write_config_to_file(out, namespace, False)
+            sys.exit()
+        if namespace.save_template:
+            with openz(namespace.save_template, "w") as out:
+                self.write_config_to_file(out, namespace, True)
+            sys.exit()
+        if toString:
             out = io.StringIO()
             try:
                 self.write_config_to_file(out, namespace, False)
@@ -267,12 +285,6 @@
                 out = io.BytesIO()
                 self.write_config_to_file(out, namespace, False)
             return out.getvalue()
-        else:
-            return
-        with openz(out_file, "w") as out:
-            self.write_config_to_file(out, namespace, print_template)
-        if exit:
-            sys.exit()
 
     def write_config_to_file(self, out, namespace, print_template):
         out.write(u'\n')
@@ -314,10 +326,11 @@
                                 typeName = a.type.__name__
                                 if typeName == 'parseTime':
                                     typeName = 'time'
-                                knownTypes = ['bool', 'float', 'int',
-                                              'time', 'file', 'net_file', 'route_file',
-                                              'additional_file', 'edgedata_file', 'data_file',
-                                              'file_list', 'route_file_list']
+                                knownTypes = ['bool', 'float', 'int', 'time', 'file',
+                                              'net_file', 'route_file', 'additional_file',
+                                              'edgedata_file', 'data_file', 'file_list',
+                                              'route_file_list', 'sumoconfig_file',
+                                              'sumoconfig_file_list', 'edge', 'edge_list']
                                 if typeName not in knownTypes:
                                     typeName = 'string'
                                 elif typeName.endswith("_list"):
@@ -341,25 +354,16 @@
         out.write(u'\n')
 
     def parse_args(self, args=None, namespace=None):
-        if args is not None:
-            # gracefully handle non-string args passed from another script
-            args = map(str, args)
-        args_namespace, unknown_args = self.parse_known_args(args, namespace)
-        if unknown_args:
-            if self._catch_all:
-                setattr(args_namespace, self._catch_all.dest,
-                        getattr(args_namespace, self._catch_all.dest) + unknown_args)
-            else:
-                self.error('unrecognized arguments: %s' % ' '.join(unknown_args))
-        return args_namespace
+        return self.parse_known_args(args, namespace, True)[0]
 
-    def parse_known_args(self, args=None, namespace=None):
+    def parse_known_args(self, args=None, namespace=None, check_unknown=False):
         if args is None:
             args = sys.argv[1:]
         elif isinstance(args, str):
             args = args.split()
         else:
-            args = list(args)
+            # gracefully handle non-string args passed from another script
+            args = list(map(str, args))
         idx = -1
         if '-c' in args:
             idx = args.index('-c') + 1
@@ -442,10 +446,16 @@
                 option[0] = program + '-' + option[0]
             namespace_as_dict.update(dict(prefixed_options))
 
-        extended_namespace = argparse.Namespace(**namespace_as_dict)
+        if check_unknown and remaining_args:
+            if self._catch_all:
+                setattr(namespace, self._catch_all.dest,
+                        getattr(namespace, self._catch_all.dest) + remaining_args)
+            else:
+                self.error('unrecognized arguments: %s' % ' '.join(remaining_args))
 
-        self.write_config_file(extended_namespace)
-        namespace.config_as_string = self.write_config_file(extended_namespace, toString=True)
+        extended_namespace = argparse.Namespace(**namespace_as_dict)
+        self._write_config_file(extended_namespace)
+        namespace.config_as_string = self._write_config_file(extended_namespace, toString=True)
         return namespace, remaining_args
 
 
diff -Nru sumo-1.17.0/tools/sumolib/output/convert/fcdfilter.py sumo-1.18.0/tools/sumolib/output/convert/fcdfilter.py
--- sumo-1.17.0/tools/sumolib/output/convert/fcdfilter.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/sumolib/output/convert/fcdfilter.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/sumolib/output/convert/gpsdat.py sumo-1.18.0/tools/sumolib/output/convert/gpsdat.py
--- sumo-1.17.0/tools/sumolib/output/convert/gpsdat.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/sumolib/output/convert/gpsdat.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2013-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/sumolib/output/convert/gpx.py sumo-1.18.0/tools/sumolib/output/convert/gpx.py
--- sumo-1.17.0/tools/sumolib/output/convert/gpx.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/sumolib/output/convert/gpx.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2014-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/sumolib/output/convert/__init__.py sumo-1.18.0/tools/sumolib/output/convert/__init__.py
--- sumo-1.17.0/tools/sumolib/output/convert/__init__.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/sumolib/output/convert/__init__.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/sumolib/output/convert/ipg.py sumo-1.18.0/tools/sumolib/output/convert/ipg.py
--- sumo-1.17.0/tools/sumolib/output/convert/ipg.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/sumolib/output/convert/ipg.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2013-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/sumolib/output/convert/keplerjson.py sumo-1.18.0/tools/sumolib/output/convert/keplerjson.py
--- sumo-1.17.0/tools/sumolib/output/convert/keplerjson.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/sumolib/output/convert/keplerjson.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2014-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/sumolib/output/convert/kml.py sumo-1.18.0/tools/sumolib/output/convert/kml.py
--- sumo-1.17.0/tools/sumolib/output/convert/kml.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/sumolib/output/convert/kml.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2014-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/sumolib/output/convert/ns2.py sumo-1.18.0/tools/sumolib/output/convert/ns2.py
--- sumo-1.17.0/tools/sumolib/output/convert/ns2.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/sumolib/output/convert/ns2.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2013-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/sumolib/output/convert/omnet.py sumo-1.18.0/tools/sumolib/output/convert/omnet.py
--- sumo-1.17.0/tools/sumolib/output/convert/omnet.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/sumolib/output/convert/omnet.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2013-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/sumolib/output/convert/phem.py sumo-1.18.0/tools/sumolib/output/convert/phem.py
--- sumo-1.17.0/tools/sumolib/output/convert/phem.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/sumolib/output/convert/phem.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2013-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/sumolib/output/convert/poi.py sumo-1.18.0/tools/sumolib/output/convert/poi.py
--- sumo-1.17.0/tools/sumolib/output/convert/poi.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/sumolib/output/convert/poi.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2014-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/sumolib/output/convert/shawn.py sumo-1.18.0/tools/sumolib/output/convert/shawn.py
--- sumo-1.17.0/tools/sumolib/output/convert/shawn.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/sumolib/output/convert/shawn.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2013-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/sumolib/output/convert/trj.py sumo-1.18.0/tools/sumolib/output/convert/trj.py
--- sumo-1.17.0/tools/sumolib/output/convert/trj.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/sumolib/output/convert/trj.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2013-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/sumolib/output/dump.py sumo-1.18.0/tools/sumolib/output/dump.py
--- sumo-1.17.0/tools/sumolib/output/dump.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/sumolib/output/dump.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2008-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/sumolib/output/inductionloop.py sumo-1.18.0/tools/sumolib/output/inductionloop.py
--- sumo-1.17.0/tools/sumolib/output/inductionloop.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/sumolib/output/inductionloop.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2008-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/sumolib/output/__init__.py sumo-1.18.0/tools/sumolib/output/__init__.py
--- sumo-1.17.0/tools/sumolib/output/__init__.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/sumolib/output/__init__.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2011-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/sumolib/route.py sumo-1.18.0/tools/sumolib/route.py
--- sumo-1.17.0/tools/sumolib/route.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/sumolib/route.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2009-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
@@ -86,7 +86,7 @@
 
 
 def mapTrace(trace, net, delta, verbose=False, airDistFactor=2, fillGaps=0, gapPenalty=-1,
-             debug=False, direction=False, vClass=None):
+             debug=False, direction=False, vClass=None, vias=None):
     """
     matching a list of 2D positions to consecutive edges in a network.
     The positions are assumed to be dense (i.e. covering each edge of the route) and in the correct order.
@@ -96,9 +96,16 @@
     lastPos = None
     if verbose:
         print("mapping trace with %s points" % len(trace))
-    for pos in trace:
+    for idx, pos in enumerate(trace):
         newPaths = {}
-        candidates = net.getNeighboringEdges(pos[0], pos[1], delta, not net.hasInternal)
+        if vias and idx in vias:
+            if net.hasEdge(vias[idx]):
+                candidates = [(net.getEdge(vias[idx]), 0.)]
+            else:
+                print("Unknown via edge %s for %s,%s" % (vias[idx], pos[0], pos[1]))
+                candidates = []
+        else:
+            candidates = net.getNeighboringEdges(pos[0], pos[1], delta, not net.hasInternal)
         if debug:
             print("\n\npos:%s, %s" % (pos[0], pos[1]))
             print("candidates:%s\n" % candidates)
diff -Nru sumo-1.17.0/tools/sumolib/scenario/checkFlows.py sumo-1.18.0/tools/sumolib/scenario/checkFlows.py
--- sumo-1.17.0/tools/sumolib/scenario/checkFlows.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/sumolib/scenario/checkFlows.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/sumolib/scenario/__init__.py sumo-1.18.0/tools/sumolib/scenario/__init__.py
--- sumo-1.17.0/tools/sumolib/scenario/__init__.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/sumolib/scenario/__init__.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2011-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/sumolib/scenario/pop2.py sumo-1.18.0/tools/sumolib/scenario/pop2.py
--- sumo-1.17.0/tools/sumolib/scenario/pop2.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/sumolib/scenario/pop2.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/sumolib/scenario/runsdb.py sumo-1.18.0/tools/sumolib/scenario/runsdb.py
--- sumo-1.17.0/tools/sumolib/scenario/runsdb.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/sumolib/scenario/runsdb.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/sumolib/scenario/scenarios/basic_corridor.py sumo-1.18.0/tools/sumolib/scenario/scenarios/basic_corridor.py
--- sumo-1.17.0/tools/sumolib/scenario/scenarios/basic_corridor.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/sumolib/scenario/scenarios/basic_corridor.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/sumolib/scenario/scenarios/basic_crossl.py sumo-1.18.0/tools/sumolib/scenario/scenarios/basic_crossl.py
--- sumo-1.17.0/tools/sumolib/scenario/scenarios/basic_crossl.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/sumolib/scenario/scenarios/basic_crossl.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/sumolib/scenario/scenarios/basic_cross.py sumo-1.18.0/tools/sumolib/scenario/scenarios/basic_cross.py
--- sumo-1.17.0/tools/sumolib/scenario/scenarios/basic_cross.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/sumolib/scenario/scenarios/basic_cross.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/sumolib/scenario/scenarios/basic_net.py sumo-1.18.0/tools/sumolib/scenario/scenarios/basic_net.py
--- sumo-1.17.0/tools/sumolib/scenario/scenarios/basic_net.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/sumolib/scenario/scenarios/basic_net.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/sumolib/scenario/scenarios/basic_rilsacorridor3.py sumo-1.18.0/tools/sumolib/scenario/scenarios/basic_rilsacorridor3.py
--- sumo-1.17.0/tools/sumolib/scenario/scenarios/basic_rilsacorridor3.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/sumolib/scenario/scenarios/basic_rilsacorridor3.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/sumolib/scenario/scenarios/basic_rilsanet2x2.py sumo-1.18.0/tools/sumolib/scenario/scenarios/basic_rilsanet2x2.py
--- sumo-1.17.0/tools/sumolib/scenario/scenarios/basic_rilsanet2x2.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/sumolib/scenario/scenarios/basic_rilsanet2x2.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/sumolib/scenario/scenarios/basic_rilsanet.py sumo-1.18.0/tools/sumolib/scenario/scenarios/basic_rilsanet.py
--- sumo-1.17.0/tools/sumolib/scenario/scenarios/basic_rilsanet.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/sumolib/scenario/scenarios/basic_rilsanet.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/sumolib/scenario/scenarios/__init__.py sumo-1.18.0/tools/sumolib/scenario/scenarios/__init__.py
--- sumo-1.17.0/tools/sumolib/scenario/scenarios/__init__.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/sumolib/scenario/scenarios/__init__.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/sumolib/scenario/scenarios/RealWorld/RiLSA_example1/makeRoutes.py sumo-1.18.0/tools/sumolib/scenario/scenarios/RealWorld/RiLSA_example1/makeRoutes.py
--- sumo-1.17.0/tools/sumolib/scenario/scenarios/RealWorld/RiLSA_example1/makeRoutes.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/sumolib/scenario/scenarios/RealWorld/RiLSA_example1/makeRoutes.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/sumolib/scenario/scenarios/RealWorld/RiLSA_example2/makeRoutes.py sumo-1.18.0/tools/sumolib/scenario/scenarios/RealWorld/RiLSA_example2/makeRoutes.py
--- sumo-1.17.0/tools/sumolib/scenario/scenarios/RealWorld/RiLSA_example2/makeRoutes.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/sumolib/scenario/scenarios/RealWorld/RiLSA_example2/makeRoutes.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/sumolib/scenario/scenarios/RealWorld/RiLSA_example3/makeRoutes.py sumo-1.18.0/tools/sumolib/scenario/scenarios/RealWorld/RiLSA_example3/makeRoutes.py
--- sumo-1.17.0/tools/sumolib/scenario/scenarios/RealWorld/RiLSA_example3/makeRoutes.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/sumolib/scenario/scenarios/RealWorld/RiLSA_example3/makeRoutes.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/sumolib/scenario/scenarios/RealWorld/RiLSA_example4/makeRoutes.py sumo-1.18.0/tools/sumolib/scenario/scenarios/RealWorld/RiLSA_example4/makeRoutes.py
--- sumo-1.17.0/tools/sumolib/scenario/scenarios/RealWorld/RiLSA_example4/makeRoutes.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/sumolib/scenario/scenarios/RealWorld/RiLSA_example4/makeRoutes.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/sumolib/scenario/scenarios/real_world.py sumo-1.18.0/tools/sumolib/scenario/scenarios/real_world.py
--- sumo-1.17.0/tools/sumolib/scenario/scenarios/real_world.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/sumolib/scenario/scenarios/real_world.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/sumolib/scenario/scenarios/rilsa1_both_tls24.py sumo-1.18.0/tools/sumolib/scenario/scenarios/rilsa1_both_tls24.py
--- sumo-1.17.0/tools/sumolib/scenario/scenarios/rilsa1_both_tls24.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/sumolib/scenario/scenarios/rilsa1_both_tls24.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/sumolib/scenario/scenarios/rilsa1_both_tls.py sumo-1.18.0/tools/sumolib/scenario/scenarios/rilsa1_both_tls.py
--- sumo-1.17.0/tools/sumolib/scenario/scenarios/rilsa1_both_tls.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/sumolib/scenario/scenarios/rilsa1_both_tls.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/sumolib/scenario/scenarios/rilsa1_out_tls24.py sumo-1.18.0/tools/sumolib/scenario/scenarios/rilsa1_out_tls24.py
--- sumo-1.17.0/tools/sumolib/scenario/scenarios/rilsa1_out_tls24.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/sumolib/scenario/scenarios/rilsa1_out_tls24.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/sumolib/scenario/scenarios/rilsa1_out_tls.py sumo-1.18.0/tools/sumolib/scenario/scenarios/rilsa1_out_tls.py
--- sumo-1.17.0/tools/sumolib/scenario/scenarios/rilsa1_out_tls.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/sumolib/scenario/scenarios/rilsa1_out_tls.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/sumolib/scenario/scenarios/rilsa1.py sumo-1.18.0/tools/sumolib/scenario/scenarios/rilsa1.py
--- sumo-1.17.0/tools/sumolib/scenario/scenarios/rilsa1.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/sumolib/scenario/scenarios/rilsa1.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/sumolib/sensors/inductive_loop.py sumo-1.18.0/tools/sumolib/sensors/inductive_loop.py
--- sumo-1.17.0/tools/sumolib/sensors/inductive_loop.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/sumolib/sensors/inductive_loop.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2010-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/sumolib/sensors/__init__.py sumo-1.18.0/tools/sumolib/sensors/__init__.py
--- sumo-1.17.0/tools/sumolib/sensors/__init__.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/sumolib/sensors/__init__.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/sumolib/shapes/__init__.py sumo-1.18.0/tools/sumolib/shapes/__init__.py
--- sumo-1.17.0/tools/sumolib/shapes/__init__.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/sumolib/shapes/__init__.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/sumolib/shapes/poi.py sumo-1.18.0/tools/sumolib/shapes/poi.py
--- sumo-1.17.0/tools/sumolib/shapes/poi.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/sumolib/shapes/poi.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2010-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/sumolib/shapes/polygon.py sumo-1.18.0/tools/sumolib/shapes/polygon.py
--- sumo-1.17.0/tools/sumolib/shapes/polygon.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/sumolib/shapes/polygon.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/sumolib/statistics.py sumo-1.18.0/tools/sumolib/statistics.py
--- sumo-1.17.0/tools/sumolib/statistics.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/sumolib/statistics.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/sumolib/translation.py sumo-1.18.0/tools/sumolib/translation.py
--- sumo-1.17.0/tools/sumolib/translation.py	1970-01-01 00:00:00.000000000 +0000
+++ sumo-1.18.0/tools/sumolib/translation.py	2023-06-28 20:02:17.000000000 +0000
@@ -0,0 +1,52 @@
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
+# Copyright (C) 2009-2023 German Aerospace Center (DLR) and others.
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# https://www.eclipse.org/legal/epl-2.0/
+# This Source Code 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
+
+# @file    translation.py
+# @author  Mirko Barthauer
+# @date    2023-05-10
+
+from __future__ import print_function
+import gettext
+import os
+
+SUMO_HOME = os.environ.get('SUMO_HOME',
+                           os.path.join(os.path.dirname(os.path.abspath(__file__)), '..', '..'))
+LOCALEDIR = os.path.join(SUMO_HOME, 'data', 'locale')
+CURRENT_LANG = None
+
+
+def addLanguageOption(parser):
+    parser.add_option("--language", type=str, default="en", help="Defines the language of the GUI")
+
+
+def setLanguage(lang):
+    global CURRENT_LANG
+    try:
+        translation = gettext.translation("sumo", localedir=LOCALEDIR, languages=[lang])
+        translation.install()
+        CURRENT_LANG = translation
+    except:  # noqa
+        CURRENT_LANG = None
+
+
+def TL(msgid):
+    if CURRENT_LANG is None:
+        return msgid
+    return CURRENT_LANG.gettext(msgid)
+
+
+def TLF(msgid, *args):
+    msg = TL(msgid)
+    varCount = min(msg.count('%'), len(args))
+    for val in args[:varCount]:
+        msg = msg.replace('%', str(val), 1)
+    return msg
diff -Nru sumo-1.17.0/tools/sumolib/vehicletype.py sumo-1.18.0/tools/sumolib/vehicletype.py
--- sumo-1.17.0/tools/sumolib/vehicletype.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/sumolib/vehicletype.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2008-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/sumolib/version.py sumo-1.18.0/tools/sumolib/version.py
--- sumo-1.17.0/tools/sumolib/version.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/sumolib/version.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2008-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/sumolib/visualization/helpers.py sumo-1.18.0/tools/sumolib/visualization/helpers.py
--- sumo-1.17.0/tools/sumolib/visualization/helpers.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/sumolib/visualization/helpers.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2013-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
@@ -27,6 +27,7 @@
 if 'matplotlib.backends' not in sys.modules:
     if 'TEXTTEST_SANDBOX' in os.environ or (os.name == 'posix' and 'DISPLAY' not in os.environ):
         matplotlib.use('Agg')
+from ..options import ArgumentParser
 from pylab import arange, close, cm, get_cmap, figure, legend, log, plt, savefig, show, title  # noqa
 from pylab import xlabel, xlim, xticks, ylabel, ylim, yticks  # noqa
 from matplotlib.ticker import FuncFormatter as ff  # noqa
@@ -53,77 +54,78 @@
     return '%(h)02d:%(m)02d:%(s)02d' % {'h': h, 'm': m, 's': s}
 
 
-def addPlotOptions(optParser):
-    optParser.add_option("--colors", dest="colors",
-                         default=None, help="Defines the colors to use")
-    optParser.add_option("--colormap", dest="colormap",
-                         default="nipy_spectral", help="Defines the colormap to use")
-    optParser.add_option("-l", "--labels", dest="labels",
-                         default=None, help="Defines the labels to use")
-    optParser.add_option("--xlim", dest="xlim",
-                         default=None, help="Defines x-limits of the figure XMIN,XMAX")
-    optParser.add_option("--ylim", dest="ylim",
-                         default=None, help="Defines y-limits of the figure YMIN,YMAX")
-    optParser.add_option("--xticks", dest="xticks",
-                         default=None, help="Set x-axis ticks XMIN,XMAX,XSTEP,XSIZE or XSIZE")
-    optParser.add_option("--yticks", dest="yticks",
-                         default=None, help="Set y-axis ticks YMIN,YMAX,YSTEP,YSIZE or YSIZE")
-    optParser.add_option("--xticks-file", dest="xticksFile",
-                         default=None, help="Load x-axis ticks from file (LABEL or FLOAT:LABEL per line)")
-    optParser.add_option("--yticks-file", dest="yticksFile",
-                         default=None, help="Load y-axis ticks from file (LABEL or FLOAT:LABEL per line)")
-    optParser.add_option("--xtime0", dest="xtime0", action="store_true",
-                         default=False, help="Use a time formatter for x-ticks (hh)")
-    optParser.add_option("--ytime0", dest="ytime0", action="store_true",
-                         default=False, help="Use a time formatter for y-ticks (hh)")
-    optParser.add_option("--xtime1", dest="xtime1", action="store_true",
-                         default=False, help="Use a time formatter for x-ticks (hh:mm)")
-    optParser.add_option("--ytime1", dest="ytime1", action="store_true",
-                         default=False, help="Use a time formatter for y-ticks (hh:mm)")
-    optParser.add_option("--xtime2", dest="xtime2", action="store_true",
-                         default=False, help="Use a time formatter for x-ticks (hh:mm:ss)")
-    optParser.add_option("--ytime2", dest="ytime2", action="store_true",
-                         default=False, help="Use a time formatter for y-ticks (hh:mm:ss)")
-    optParser.add_option("--xgrid", dest="xgrid", action="store_true",
-                         default=False, help="Enable grid on x-axis")
-    optParser.add_option("--ygrid", dest="ygrid", action="store_true",
-                         default=False, help="Enable grid on y-axis")
-    optParser.add_option("--xticksorientation", dest="xticksorientation",
-                         type=float, default=None, help="Set the orientation of the x-axis ticks")
-    optParser.add_option("--yticksorientation", dest="yticksorientation",
-                         type=float, default=None, help="Set the orientation of the x-axis ticks")
-    optParser.add_option("--xlabel", dest="xlabel",
-                         default=None, help="Set the x-axis label")
-    optParser.add_option("--ylabel", dest="ylabel",
-                         default=None, help="Set the y-axis label")
-    optParser.add_option("--xlabelsize", dest="xlabelsize",
-                         type=int, default=16, help="Set the size of the x-axis label")
-    optParser.add_option("--ylabelsize", dest="ylabelsize",
-                         type=int, default=16, help="Set the size of the x-axis label")
-    optParser.add_option("--marker", dest="marker", default=None,
-                         help="marker for single points (default o for scatter, None otherwise)")
-    optParser.add_option("--linestyle", dest="linestyle", default="-",
-                         help="plot line style (default -)")
-    optParser.add_option("--title", dest="title",
-                         default=None, help="Set the title")
-    optParser.add_option("--titlesize", dest="titlesize",
-                         type=int, default=16, help="Set the title size")
-    optParser.add_option("--adjust", dest="adjust",
-                         default=None, help="Adjust the subplots LEFT,BOTTOM or LEFT,BOTTOM,RIGHT,TOP")
-    optParser.add_option("-s", "--size", dest="size",
-                         default=False, help="Defines the figure size X,Y")
-    optParser.add_option("--no-legend", dest="nolegend", action="store_true",
-                         default=False, help="Disables the legend")
-    optParser.add_option("--legend-position", dest="legendposition",
-                         default=None, help="Sets the legend position")
-    optParser.add_option("--dpi", dest="dpi", type=float,
-                         default=None, help="Define dpi resolution for figures")
-    optParser.add_option("--alpha", type=float,
-                         default=1., help="Define background transparency of the figure in the range 0..1")
+def addPlotOptions(ap):
+    ap.add_argument("--colors", dest="colors", category="visualization",
+                    default=None, help="Defines the colors to use")
+    ap.add_argument("--colormap", dest="colormap", category="visualization",
+                    default="nipy_spectral", help="Defines the colormap to use")
+    ap.add_argument("-l", "--labels", dest="labels", category="visualization",
+                    default=None, help="Defines the labels to use")
+    ap.add_argument("--xlim", dest="xlim", category="visualization",
+                    default=None, help="Defines x-limits of the figure XMIN,XMAX")
+    ap.add_argument("--ylim", dest="ylim", category="visualization",
+                    default=None, help="Defines y-limits of the figure YMIN,YMAX")
+    ap.add_argument("--xticks", dest="xticks", category="visualization",
+                    default=None, help="Set x-axis ticks XMIN,XMAX,XSTEP,XSIZE or XSIZE")
+    ap.add_argument("--yticks", dest="yticks", category="visualization",
+                    default=None, help="Set y-axis ticks YMIN,YMAX,YSTEP,YSIZE or YSIZE")
+    ap.add_argument("--xticks-file", dest="xticksFile", category="input", type=ap.file,
+                    default=None, help="Load x-axis ticks from file (LABEL or FLOAT:LABEL per line)")
+    ap.add_argument("--yticks-file", dest="yticksFile", category="input", type=ap.file,
+                    default=None, help="Load y-axis ticks from file (LABEL or FLOAT:LABEL per line)")
+    ap.add_argument("--xtime0", dest="xtime0", action="store_true", category="time",
+                    default=False, help="Use a time formatter for x-ticks (hh)")
+    ap.add_argument("--ytime0", dest="ytime0", action="store_true", category="time",
+                    default=False, help="Use a time formatter for y-ticks (hh)")
+    ap.add_argument("--xtime1", dest="xtime1", action="store_true", category="time",
+                    default=False, help="Use a time formatter for x-ticks (hh:mm)")
+    ap.add_argument("--ytime1", dest="ytime1", action="store_true", category="time",
+                    default=False, help="Use a time formatter for y-ticks (hh:mm)")
+    ap.add_argument("--xtime2", dest="xtime2", action="store_true", category="time",
+                    default=False, help="Use a time formatter for x-ticks (hh:mm:ss)")
+    ap.add_argument("--ytime2", dest="ytime2", action="store_true", category="time",
+                    default=False, help="Use a time formatter for y-ticks (hh:mm:ss)")
+    ap.add_argument("--xgrid", dest="xgrid", action="store_true", category="visualization",
+                    default=False, help="Enable grid on x-axis")
+    ap.add_argument("--ygrid", dest="ygrid", action="store_true", category="visualization",
+                    default=False, help="Enable grid on y-axis")
+    ap.add_argument("--xticksorientation", dest="xticksorientation", category="visualization",
+                    type=float, default=None, help="Set the orientation of the x-axis ticks")
+    ap.add_argument("--yticksorientation", dest="yticksorientation", category="visualization",
+                    type=float, default=None, help="Set the orientation of the x-axis ticks")
+    ap.add_argument("--xlabel", dest="xlabel", category="visualization",
+                    default=None, help="Set the x-axis label")
+    ap.add_argument("--ylabel", dest="ylabel", category="visualization",
+                    default=None, help="Set the y-axis label")
+    ap.add_argument("--xlabelsize", dest="xlabelsize", category="visualization",
+                    type=int, default=16, help="Set the size of the x-axis label")
+    ap.add_argument("--ylabelsize", dest="ylabelsize", category="visualization",
+                    type=int, default=16, help="Set the size of the x-axis label")
+    ap.add_argument("--marker", dest="marker", default=None, category="visualization",
+                    help="marker for single points (default o for scatter, None otherwise)")
+    ap.add_argument("--linestyle", dest="linestyle", default="-", category="visualization",
+                    help="plot line style (default -)")
+    ap.add_argument("--title", dest="title", category="visualization",
+                    default=None, help="Set the title")
+    ap.add_argument("--titlesize", dest="titlesize", category="visualization",
+                    type=int, default=16, help="Set the title size")
+    ap.add_argument("--adjust", dest="adjust", category="visualization",
+                    default=None, help="Adjust the subplots LEFT,BOTTOM or LEFT,BOTTOM,RIGHT,TOP")
+    ap.add_argument("-s", "--size", dest="size", category="visualization",
+                    default=False, help="Defines the figure size X,Y")
+    ap.add_argument("--no-legend", dest="nolegend", action="store_true", category="visualization",
+                    default=False, help="Disables the legend")
+    ap.add_argument("--legend-position", dest="legendposition", category="visualization",
+                    default=None, help="Sets the legend position")
+    ap.add_argument("--dpi", dest="dpi", type=float, category="visualization",
+                    default=None, help="Define dpi resolution for figures")
+    ap.add_argument("--alpha", type=float,
+                    default=1., help="Define background transparency of the figure in the range 0..1")
 
 
 def addInteractionOptions(optParser):
-    optParser.add_option("-o", "--output", dest="output", metavar="FILE",
+    optParser.add_option("-o", "--output", category="output", dest="output", metavar="FILE",
+                         type=ArgumentParser.file_list,
                          default=None, help="Comma separated list of filename(s) the figure shall be written to")
     optParser.add_option("-b", "--blind", dest="blind", action="store_true",
                          default=False, help="If set, the figure will not be shown")
diff -Nru sumo-1.17.0/tools/sumolib/visualization/__init__.py sumo-1.18.0/tools/sumolib/visualization/__init__.py
--- sumo-1.17.0/tools/sumolib/visualization/__init__.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/sumolib/visualization/__init__.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2008-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/sumolib/xml.py sumo-1.18.0/tools/sumolib/xml.py
--- sumo-1.17.0/tools/sumolib/xml.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/sumolib/xml.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2011-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/tileGet.py sumo-1.18.0/tools/tileGet.py
--- sumo-1.17.0/tools/tileGet.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/tileGet.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2009-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
@@ -21,6 +21,8 @@
 import math
 import os
 import sys
+from multiprocessing.pool import Pool
+import signal
 
 try:
     # python3
@@ -74,6 +76,13 @@
     return center, zoom, width, height
 
 
+def worker(options, request, filename):
+    # print(request)
+    urllib.urlretrieve(request, filename)
+    if os.stat(filename).st_size < options.min_file_size:
+        raise ValueError("small file")
+
+
 def retrieveMapServerTiles(options, west, south, east, north, decals, net):
     zoom = 20
     numTiles = options.tiles + 1
@@ -82,17 +91,25 @@
         sx, sy = fromLatLonToTile(north, west, zoom)
         ex, ey = fromLatLonToTile(south, east, zoom)
         numTiles = (ex - sx + 1) * (ey - sy + 1)
+
+    # opener = urllib.build_opener()
+    # opener.addheaders = [('User-agent', 'Mozilla/5.0')]
+    # urllib.install_opener(opener)
+
+    if options.parallel_jobs != 0:
+        original_sigint_handler = signal.signal(signal.SIGINT, signal.SIG_IGN)
+        pool = Pool(options.parallel_jobs)
+        signal.signal(signal.SIGINT, original_sigint_handler)
+
+    futures = []
     for x in range(sx, ex + 1):
         for y in range(sy, ey + 1):
             request = "%s/%s/%s/%s" % (options.url, zoom, y, x)
-#            print(request)
-#            opener = urllib.build_opener()
-#            opener.addheaders = [('User-agent', 'Mozilla/5.0')]
-#            urllib.install_opener(opener)
             filename = os.path.join(options.output_dir, "%s%s_%s.jpeg" % (options.prefix, x, y))
-            urllib.urlretrieve(request, filename)
-            if os.stat(filename).st_size < options.min_file_size:
-                raise ValueError("small file")
+            if options.parallel_jobs == 0:
+                worker(options, request, filename)
+            else:
+                futures.append((x, y, pool.apply_async(worker, (options, request, filename))))
             if net is not None:
                 lat, lon = fromTileToLatLon(x, y, zoom)
                 upperLeft = net.convertLonLat2XY(lon, lat)
@@ -101,6 +118,8 @@
                 print('    ' %
                       (os.path.basename(filename), center[0], center[1],
                        2 * (center[0] - upperLeft[0]), 2 * (upperLeft[1] - center[1]), options.layer), file=decals)
+    for x, y, future in futures:
+        future.get()
 
 
 def get_options(args=None):
@@ -112,7 +131,7 @@
                          help="maximum number of tiles the output gets split into")
     optParser.add_option("-d", "--output-dir", category="output", default=".",
                          help="optional output directory (must already exist)")
-    optParser.add_option("-s", "--decals-file", category="input",
+    optParser.add_option("-s", "--decals-file", category="output",
                          default="settings.xml", help="name of decals settings file")
     optParser.add_option("-l", "--layer", category="processing", type=int, default=0,
                          help="(int) layer at which the image will appear, default 0")
@@ -125,6 +144,8 @@
                          help="Download from the given tile server")
     optParser.add_option("-f", "--min-file-size", category="processing", type=int, default=3000,
                          help="maximum number of tiles the output gets split into")
+    optParser.add_option("-j", "--parallel-jobs", category="processing", type=int, default=8,
+                         help="Number of parallel jobs to run when downloading tiles. 0 means no parallelism.")
     URL_SHORTCUTS = {
         "arcgis": "https://services.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer/tile",
         "mapquest": "https://open.mapquestapi.com/staticmap/v4/getmap",
@@ -170,7 +191,7 @@
 
     prefix = os.path.join(options.output_dir, options.prefix)
     mapQuest = "mapquest" in options.url
-    with open(os.path.join(options.output_dir, options.decals_file), "w") as decals:
+    with sumolib.openz(os.path.join(options.output_dir, options.decals_file), "w") as decals:
         sumolib.xml.writeHeader(decals, root="viewsettings")
         if "MapServer" in options.url:
             retrieveMapServerTiles(options, west, south, east, north, decals, net)
diff -Nru sumo-1.17.0/tools/tls/buildTransitions.py sumo-1.18.0/tools/tls/buildTransitions.py
--- sumo-1.17.0/tools/tls/buildTransitions.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/tls/buildTransitions.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
@@ -18,7 +18,7 @@
 """
 Create tlLogic definitions with branching signal plans based on a simplified
 input: named green phases and list of successor green phases names
-The corresponding yellow and red phases will be build and the 'next' attribute
+The corresponding yellow and red phases will be built and the 'next' attribute
 will be set to the appropriate transition phase.
 """
 
@@ -26,28 +26,24 @@
 from __future__ import print_function
 import os
 import sys
-import argparse
 from collections import defaultdict
 sys.path.append(os.path.join(os.environ['SUMO_HOME'], 'tools'))
 import sumolib  # noqa
 
 
 def get_options(args=None):
-    parser = argparse.ArgumentParser()
-    parser.add_argument("-d", "--description-file", dest="logic",
-                        help="Input logic description file (mandatory)")
-    parser.add_argument("-o", "--output-file", dest="out",
-                        help="Output route file (mandatory)")
-    parser.add_argument("-y", "--yellow-time", type=int, default=3, dest="yellowTime",
-                        help="Duration of yellow phase")
-    parser.add_argument("-r", "--red-time", type=int, default=0, dest="redTime",
-                        help="Duration of all-red phase durating each transition")
-
-    options = parser.parse_args()
-
-    if options.logic is None or options.out is None:
-        parser.print_help()
-        sys.exit()
+    optParser = sumolib.options.ArgumentParser(
+        description="Create tlLogic definitions with branching plans based on simplified input.")
+    optParser.add_option("-d", "--description-file", category="input", dest="logic", required=True,
+                         type=optParser.data_file, help="Input logic description file (mandatory)")
+    optParser.add_option("-o", "--output-file", category="output", dest="out", required=True,
+                         type=optParser.data_file, help="Output route file (mandatory)")
+    optParser.add_option("-y", "--yellow-time", default=3, dest="yellowTime",
+                         type=int, help="Duration of yellow phase")
+    optParser.add_option("-r", "--red-time", default=0, dest="redTime",
+                         type=int, help="Duration of all-red phase during each transition")
+
+    options = optParser.parse_args()
 
     return options
 
diff -Nru sumo-1.17.0/tools/tls/createTlsCsv.py sumo-1.18.0/tools/tls/createTlsCsv.py
--- sumo-1.17.0/tools/tls/createTlsCsv.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/tls/createTlsCsv.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2017-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
@@ -23,18 +23,27 @@
 """
 from __future__ import absolute_import
 from __future__ import print_function
-
-import argparse
+import os
+import sys
 from lxml import etree
+THIS_DIR = os.path.dirname(os.path.abspath(__file__))
+sys.path.append(os.path.join(THIS_DIR, '..'))
+import sumolib  # noqa
 
-parser = argparse.ArgumentParser(
+op = sumolib.options.ArgumentParser(
     description='Create tls links from sumo net as needed by tls_csv2SUMO.py. You have to edit the link number ' +
     'field (preset with g). The comment gives the link number shown on demand in SUMO-GUI')
-parser.add_argument('net', help='Input file name')
 
-args = parser.parse_args()
+op.add_argument("-n", "--net-file", category="input", type=op.net_file,
+                dest="net", required=True, help='Input file name')
+
+try:
+    options = op.parse_args()
+except (NotImplementedError, ValueError) as e:
+    print(e, file=sys.stderr)
+    sys.exit(1)
 
-doc = etree.parse(args.net)
+doc = etree.parse(options.net)
 
 connections = {}
 
diff -Nru sumo-1.17.0/tools/tls/tls_check.py sumo-1.18.0/tools/tls/tls_check.py
--- sumo-1.17.0/tools/tls/tls_check.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/tls/tls_check.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2009-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/tls/tls_csv2SUMO.py sumo-1.18.0/tools/tls/tls_csv2SUMO.py
--- sumo-1.17.0/tools/tls/tls_csv2SUMO.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/tls/tls_csv2SUMO.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2009-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
@@ -35,12 +35,11 @@
 from __future__ import absolute_import
 from __future__ import print_function
 
-import sys
 import os
-import argparse
+import sys
 
 sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
-import sumolib.net  # noqa
+import sumolib  # noqa
 
 
 class Logic:
@@ -98,11 +97,11 @@
         logic.defs.append(newPhases)
 
 
-parser = argparse.ArgumentParser(description='Create tls xml def from csv.')
-parser.add_argument('TLS_CSV', help='tls definition')
-parser.add_argument('NET', help='sumo net file')
-parser.add_argument('-d', '--debug', action='store_true', help='print additional debug info')
-args = parser.parse_args()
+optParser = sumolib.options.ArgumentParser(description='Create TLS XML file from CSV file.')
+optParser.add_argument('TLS_CSV', category="input", type=optParser.data_file, help='TLS definition CSV file ')
+optParser.add_argument('NET', category="input", type=optParser.net_file, help='Network file')
+optParser.add_argument('-d', '--debug', action='store_true', help='Print additional debug info')
+args = optParser.parse_args()
 
 allLogics = []
 
diff -Nru sumo-1.17.0/tools/tls/tls_csvSignalGroups.py sumo-1.18.0/tools/tls/tls_csvSignalGroups.py
--- sumo-1.17.0/tools/tls/tls_csvSignalGroups.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/tls/tls_csvSignalGroups.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2009-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
@@ -668,30 +668,30 @@
 
 
 def getOptions():
-    ap = sumolib.options.ArgumentParser()
-    ap.add_argument("-o", "--output", action="store", default="tls.add.xml",
-                    help="File path to tll output file (SUMO additional file) / prefix for generated csv files")
-    ap.add_argument("-i", "--input", action="store", default="",
-                    help="File path to input csv or tll file(s). Multiple file paths have to be separated by ','.")
-    ap.add_argument("-r", "--reverse", action="store_true", default=False,
-                    help="Interpret input files in tll format and convert them to csv files.")
-    ap.add_argument("-g", "--group", action="store_true", default=False,
-                    help="Join signals with identical states into one signal group when converting to csv format.")
-    ap.add_argument("--tls-from-net", action="store_true", default=False, dest="tlsFromNet",
-                    help="Convert TL programs stored within the net file to csv format.")
-    ap.add_argument("--tls-filter", action="store", default="", dest="tlsFilter",
-                    help="Comma-separated list of traffic lights " +
-                    "which the reverse conversion from tll to csv should be limited to.")
-    ap.add_argument("--delimiter", action="store", default=";",
-                    help="CSV delimiter used for input and template files.")
-    ap.add_argument("-n", "--net", action="store", default="",
-                    help="File path to SUMO network file. Optional for creating TL xml, " +
-                    "obligatory for converting TL xml to csv.")
-    ap.add_argument("-m", "--make-input-dir", action="store", default="",
-                    help="Create input file template(s) from the SUMO network file in the given directory.")
-    ap.add_argument("-d", "--debug", action="store_true", default=False, help="Output debugging information")
-    options = ap.parse_args()
-    return options
+    ap = sumolib.options.ArgumentParser(
+        description="Converts a CSV file with green times per signal group into the SUMO format.")
+    ap.add_option("-o", "--output", category="output", action="store", default="tls.add.xml", type=ap.data_file,
+                  help="File path to TLL output file (SUMO additional file) / prefix for generated CSV files.")
+    ap.add_option("-i", "--input", category="input", action="store", default="", type=ap.data_file,
+                  help="File path to input CSV or TLL file(s). Multiple file paths have to be separated by ','.")
+    ap.add_option("-r", "--reverse", action="store_true", default=False,
+                  help="Interpret input files in TLL format and convert them to CSV files.")
+    ap.add_option("-g", "--group", action="store_true", default=False,
+                  help="Join signals with identical states into one signal group when converting to CSV format.")
+    ap.add_option("--tls-from-net", action="store_true", default=False, dest="tlsFromNet",
+                  help="Convert TL programs stored within the net file to CSV format.")
+    ap.add_option("--tls-filter", action="store", default="", dest="tlsFilter",
+                  help="Comma-separated list of traffic lights " +
+                  "which the reverse conversion from TLL to CSV should be limited to.")
+    ap.add_option("--delimiter", action="store", default=";",
+                  help="CSV delimiter used for input and template files.")
+    ap.add_option("-n", "--net", category="input", required=True, action="store", default="",
+                  type=ap.net_file, help="File path to SUMO network file. Optional for creating TL XML, " +
+                  "obligatory for converting TL XML to CSV.")
+    ap.add_option("-m", "--make-input-dir", action="store", default="",
+                  help="Create input file template(s) from the SUMO network file in the given directory.")
+    ap.add_option("-d", "--debug", action="store_true", default=False, help="Output debugging information")
+    return ap.parse_args()
 
 
 # this is the main entry point of this script
diff -Nru sumo-1.17.0/tools/tlsCoordinator.py sumo-1.18.0/tools/tlsCoordinator.py
--- sumo-1.17.0/tools/tlsCoordinator.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/tlsCoordinator.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2010-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/tlsCycleAdaptation.py sumo-1.18.0/tools/tlsCycleAdaptation.py
--- sumo-1.17.0/tools/tlsCycleAdaptation.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/tlsCycleAdaptation.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2010-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
@@ -20,29 +20,70 @@
   and the green times of the traffic lights at common intersections
   in a sumo network with a given route file (vehicles and bicycles).
 
+- One hour flow is considered. If the flow arrival situation within
+  1 hour is "turbulent", i.e. 1-h flow arrives within 15 min, then
+  a poor result is expected.
+
+- The signal at each intersection is optimized independently. Thus,
+  some poor result may occur if there is conflict between the singal
+  programs of different intersections. Signal coordination is not
+  handled here, but in tlsCoordinator.py.
+
+- The parameters in the Webster's equation may need to be adjusted
+  according to the respective user case. Otherwise, worse results
+  may occur. E.g. minimal green time, minimal cycle length and
+  saturation headway. The latter one can affect the calcuated
+  road capacity.
+
+- The allowed movements per lane in the network should correspond to
+  those in the respective signal group/phase. E.g. if through and
+  right movements are allowed in a phase, they should be able to
+  share their lanes without conflicts.  Otherwise, worse results
+  may occur.
+
 - Traffic lights without traffic flows will not be optimized.
 
+- Flows are considered only for one hour, corresponding to
+  the Webster's equation. Using the option --begin to define the
+  start time of the investigated one hour.
+
 - PCE is used instead of the number of vehicles.
 
 - If a lane group has green times in more than one phase,
   the respective flows will be equally divided into the corresponding
   phases for calculating the green splits.
 
+- If multiple major greens exist, the respective flows will be evenly
+  distributed in each major green.
+
+- Flows only with minor greens at a certain direction is considered.
+
 - If the critical flow or the sum of the critical flows is larger than 1,
- the optimal cycle length will be set to 120 sec.
+  the optimal cycle length will be set to 120 sec which can be adjusted
+  in the option.
 
 - Duration for yellow phase will be adjusted according to
   the defined option value
 
-- Duration for all-red phase will be not adjusted.
+- Duration for all-red phase will not be adjusted.
+
+- Pedestrians are not considered yet.
 
-- Pedestrains are not considered yet.
+- Triggered vehicles are not considered.
+
+- The begin time is the first vehicle's departure time, if it is not given.
+
+- If the period is less than 1 hour, the flow will be scaled up to 1-hour flow.
+
+- If the period is longer than 1 hour and no begin time is given, the 1-hour
+  peak-flow will be used.
 """
 
 from __future__ import absolute_import
 from __future__ import print_function
 
 import collections
+import sys
 
 import sumolib
 
@@ -55,8 +96,8 @@
                          default="tlsAdaptation.add.xml", help="define the output filename")
     optParser.add_option("-r", "--route-files", category="input", dest="routefiles", required=True,
                          help="define the route file separated by comma (mandatory)")
-    optParser.add_option("-b", "--begin", category="time", dest="begin", type=int,
-                         default=0, help="begin time of the optimization period with unit second")
+    optParser.add_option("-b", "--begin", category="time", dest="begin", type=float,
+                         help="begin time of the optimization period with unit second (mandatory)")
     optParser.add_option("-y", "--yellow-time", category="processing", dest="yellowtime", type=int,
                          default=4, help="yellow time")
     optParser.add_option("-a", "--all-red", category="processing", dest="allred", type=int,
@@ -108,7 +149,7 @@
     return route_dict
 
 
-def getFlows(net, routeFiles, tlsList, begin, verbose, isSorted=False):
+def getFlows(net, routeFiles, tlsList, begin, scale_fac, verbose, isSorted=False):
     tlsFlowsMap = {}
     end = begin + 3600
     for tls in tlsList:
@@ -151,6 +192,13 @@
             print("Warning: No vehicles parsed from %s." % file)
         elif verbose:
             print("Parsed %s vehicles from %s." % (parsed, file))
+    # scale up flow
+    if scale_fac != 1.:
+        for t in tlsList:
+            for subRoute in tlsFlowsMap[t.getID()]:
+                for conn in tlsFlowsMap[t.getID()][subRoute]:
+                    tlsFlowsMap[t.getID()][subRoute][conn] *= scale_fac
+
     # remove the doubled counts
     connFlowsMap = {}
     for t in tlsList:
@@ -388,6 +436,7 @@
     sumCriticalFlows = sum(criticalFlowRateMap.values())
     if options.write_critical_flows:
         print(tl.getID(), criticalFlowRateMap)
+        print('sum of the critical flow ratios: ', sumCriticalFlows)
 
     if options.existcycle:
         optCycle = currentLength
@@ -395,6 +444,7 @@
         optCycle = options.maxcycle
         if options.verbose:
             print("Warning: the sum of the critical flows >= 1:%s" % sumCriticalFlows)
+            print('Warning: the maximal cycle defined in the option will be used as the optimal cycle.')
     else:
         optCycle = int(round((1.5 * lostTime + 5.) / (1. - sumCriticalFlows)))
 
@@ -451,7 +501,88 @@
     return groupFlowsMap
 
 
+def checkRoutePeriod(routefiles, begin):
+    scale_fac = 1.
+    # find the last vehicle's departure time
+    veh_starttime = -1.
+    veh_endtime = -1.
+    for file in routefiles.split(','):
+        for veh in sumolib.output.parse(file, 'vehicle'):
+            if veh.depart != "triggered":
+                depart = float(veh.depart)
+                if veh_starttime == -1.:
+                    veh_starttime = veh_endtime = depart
+
+                if veh_endtime < depart:
+                    veh_endtime = depart
+                if veh_starttime > depart:
+                    veh_starttime = depart
+
+    # check the begin time
+    checkPeak = False
+    if begin is None or begin < 0.:
+        print("Warning: The begin time '%s' is not valid." % begin)
+        begin = veh_starttime
+        print("Warning: The begin time is set to the first vehicle's departure time: %s." % veh_starttime)
+        checkPeak = True
+
+    # check how to process the flow
+    end = begin + 3599.
+    if veh_endtime < end:
+        scale_fac += (end - veh_endtime)/3600.
+        print("Warning: The period is less than 1 hour. "
+              "The flows will be proportionally scaled up to 1-hour flow with the scaling factor %s." % scale_fac)
+    elif checkPeak and veh_endtime > end:
+        begin, peakFlow = getPeakFlowBegin(routefiles, begin, veh_endtime)
+        print("Warning: The period (begining with %s) with the peak flow (%s) is used." % (begin, peakFlow))
+
+    return begin, scale_fac
+
+
+def getPeakFlowBegin(routefiles, begin, veh_endtime):
+    minuteFlowMap = {}
+    end_intl = int(veh_endtime//60.)+1
+    for n in range(0, end_intl+1):
+        minuteFlowMap[n] = 0.
+    peak_begin = begin
+    peakFlow = 0.
+
+    for file in routefiles.split(','):
+        for veh in sumolib.output.parse(file, 'vehicle'):
+            if veh.depart != "triggered" and sumolib.miscutils.parseTime(veh.depart) >= begin:
+                pce = 1.
+                if veh.type == "bicycle":
+                    pce = 0.2
+                elif veh.type in ["moped", "motorcycle"]:
+                    pce = 0.5
+                elif veh.type in ["truck", "trailer", "bus", "coach"]:
+                    pce = 3.5
+                intl = int(float(veh.depart)//60.)
+                minuteFlowMap[intl] += pce
+
+    for i in range(0, end_intl-59):
+        temp_sum = 0
+        sub_end = i + 60
+        if sub_end > end_intl:
+            print("Warning: The end time is larger and set to the last vehicle's departure time(%s)" % end_intl)
+            sub_end = end_intl+1
+        for j in range(i, sub_end):
+            temp_sum += minuteFlowMap[j]
+        if temp_sum > peakFlow:
+            peakFlow = temp_sum
+            peak_begin = i
+
+    return peak_begin, peakFlow
+
+
 def main(options):
+    if not options.netfile or not options.routefiles:
+        print("Error: Either both the net file and the route file or one of them are/is missing.", file=sys.stderr)
+        sys.exit(1)
+
+    # check the period of the given route files, and find the peak-flow period if necessary
+    begin, scale_fac = checkRoutePeriod(options.routefiles, options.begin)
+
     net = sumolib.net.readNet(options.netfile, withPrograms=True, withPedestrianConnections=True)
     tlsList = net.getTrafficLights()
     skipList = []
@@ -459,9 +590,10 @@
 
     if options.verbose:
         print("the total number of tls: %s" % len(tlsList))
-    print("Begin time:%s" % options.begin)
+
+    print("Begin time:%s" % begin)
     # get traffic flows for each connection at each TL
-    connFlowsMap = getFlows(net, options.routefiles, tlsList, options.begin, options.verbose, options.sorted)
+    connFlowsMap = getFlows(net, options.routefiles, tlsList, begin, scale_fac, options.verbose, options.sorted)
 
     # remove the tls where no traffic volumes exist and which should be skipped
     effectiveTlsList = getEffectiveTlsList(tlsList, connFlowsMap, skipList, options.verbose)
diff -Nru sumo-1.17.0/tools/traceExporter.py sumo-1.18.0/tools/traceExporter.py
--- sumo-1.17.0/tools/traceExporter.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/traceExporter.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2013-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/traci/_busstop.py sumo-1.18.0/tools/traci/_busstop.py
--- sumo-1.17.0/tools/traci/_busstop.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/traci/_busstop.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2008-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/traci/_calibrator.py sumo-1.18.0/tools/traci/_calibrator.py
--- sumo-1.17.0/tools/traci/_calibrator.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/traci/_calibrator.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2008-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/traci/_chargingstation.py sumo-1.18.0/tools/traci/_chargingstation.py
--- sumo-1.17.0/tools/traci/_chargingstation.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/traci/_chargingstation.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2008-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/traci/check_constants.py sumo-1.18.0/tools/traci/check_constants.py
--- sumo-1.17.0/tools/traci/check_constants.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/traci/check_constants.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2019-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/traci/connection.py sumo-1.18.0/tools/traci/connection.py
--- sumo-1.17.0/tools/traci/connection.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/traci/connection.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2008-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
@@ -134,7 +134,7 @@
         if not result:
             self._socket.close()
             self._socket = None
-            raise FatalTraCIError("connection closed by SUMO")
+            raise FatalTraCIError("Connection closed by SUMO.")
         for command in self._queue:
             prefix = result.read("!BBB")
             err = result.readString()
@@ -169,8 +169,8 @@
             elif f == "u":  # raw unsigned byte needed for distance command and subscribe
                 packed += struct.pack("!B", int(v))
             elif f == "s":
-                v = str(v)
-                packed += struct.pack("!Bi", tc.TYPE_STRING, len(v)) + v.encode("latin1")
+                v = str(v).encode("utf8")
+                packed += struct.pack("!Bi", tc.TYPE_STRING, len(v)) + v
             elif f == "p":  # polygon
                 if len(v) <= 255:
                     packed += struct.pack("!BB", tc.TYPE_POLYGON, len(v))
@@ -186,7 +186,8 @@
             elif f == "l":  # string list
                 packed += struct.pack("!Bi", tc.TYPE_STRINGLIST, len(v))
                 for s in v:
-                    packed += struct.pack("!i", len(s)) + s.encode("latin1")
+                    s = str(s).encode("utf8")
+                    packed += struct.pack("!i", len(s)) + s
             elif f == "f":  # float list
                 packed += struct.pack("!Bi", tc.TYPE_DOUBLELIST, len(v))
                 for x in v:
@@ -200,7 +201,8 @@
             elif f == "G":
                 packed += struct.pack("!Bddd", tc.POSITION_LON_LAT_ALT, *v)
             elif f == "r":
-                packed += struct.pack("!Bi", tc.POSITION_ROADMAP, len(v[0])) + v[0].encode("latin1")
+                s = str(v[0]).encode("utf8")
+                packed += struct.pack("!Bi", tc.POSITION_ROADMAP, len(s)) + s
                 packed += struct.pack("!dB", v[1], v[2])
         return packed
 
@@ -208,6 +210,7 @@
         with self._lock:
             self._queue.append(cmdID)
             packed = self._pack(format, *values)
+            objID = str(objID).encode("utf8")
             length = len(packed) + 1 + 1  # length and command
             if varID is not None:
                 if isinstance(varID, tuple):  # begin and end of a subscription
@@ -223,7 +226,7 @@
                     self._string += struct.pack("!dd", *varID)
                 else:
                     self._string += struct.pack("!B", varID)
-                self._string += struct.pack("!i", len(objID)) + objID.encode("latin1")
+                self._string += struct.pack("!i", len(objID)) + objID
             self._string += packed
             return self._sendExact()
 
@@ -238,7 +241,7 @@
                                    response <= tc.RESPONSE_SUBSCRIBE_OVERHEADWIRE_VARIABLE))
         objectID = result.readString()
         if not isVariableSubscription:
-            domain = result.read("!B")[0]
+            result.read("!B")  # domain
         numVars = result.read("!B")[0]
         if isVariableSubscription:
             while numVars > 0:
@@ -253,18 +256,17 @@
                 numVars -= 1
         else:
             objectNo = result.read("!i")[0]
+            self._subscriptionMapping[response].addContext(objectID)
             for _ in range(objectNo):
                 oid = result.readString()
                 if numVars == 0:
-                    self._subscriptionMapping[response].addContext(
-                        objectID, self._subscriptionMapping[domain], oid)
+                    self._subscriptionMapping[response].addContext(objectID, oid)
                 for __ in range(numVars):
                     varID, status = result.read("!BB")
                     if status:
                         print("Error!", result.readTypedString())
                     elif response in self._subscriptionMapping:
-                        self._subscriptionMapping[response].addContext(
-                            objectID, self._subscriptionMapping[domain], oid, varID, result)
+                        self._subscriptionMapping[response].addContext(objectID, oid, varID, result)
                     else:
                         raise FatalTraCIError(
                             "Cannot handle subscription response %02x for %s." % (response, objectID))
diff -Nru sumo-1.17.0/tools/traci/constants.py sumo-1.18.0/tools/traci/constants.py
--- sumo-1.17.0/tools/traci/constants.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/traci/constants.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2009-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
@@ -12,7 +12,7 @@
 
 # @file    constants.py
 # @author  generated by "rebuildConstants.py"
-# @date    2023-04-13 10:01:10.121108
+# @date    2023-06-09 11:55:37.565651
 
 """
 This script contains TraCI constant definitions from /src/libsumo/TraCIConstants.h.
@@ -889,7 +889,7 @@
 #  list of allowed vehicle classes for lane changes (get&set: lanes)
 LANE_CHANGES = 0x3c
 
-#  list of foe lanes (get: lanes)
+#  list of foe lanes (get: lane, vehicle)
 VAR_FOES = 0x37
 
 #  slope (get: edge, lane, vehicle, person)
@@ -919,7 +919,7 @@
 #  position (3D) (get: vehicle, poi, set: poi)
 VAR_POSITION3D = 0x39
 
-#  angle (get: vehicle, poi, gui; set: poi, gui)
+#  angle (get: vehicle, edge, lane, poi, gui; set: poi, gui)
 VAR_ANGLE = 0x43
 
 #  length (get: vehicle types, lanes, lane area detector, set: lanes)
@@ -1124,6 +1124,9 @@
 #  boarding time (get: vehicle type, vehicle, person)
 VAR_BOARDING_DURATION = 0x2f
 
+#  impatience (get,set: vehicle type, vehicle, person)
+VAR_IMPATIENCE = 0x26
+
 VAR_BUS_STOP_ID_LIST = 0x9f
 
 #  number of persons waiting at a defined bus stop (get: simulation)
@@ -1309,7 +1312,6 @@
 #  retrieves abstract parameter and returns (key, value) tuple
 VAR_PARAMETER_WITH_KEY = 0x3e
 
-
 #  add an instance (poi, polygon, vehicle, person, route, gui)
 ADD = 0x80
 
diff -Nru sumo-1.17.0/tools/traci/domain.py sumo-1.18.0/tools/traci/domain.py
--- sumo-1.17.0/tools/traci/domain.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/traci/domain.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2008-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
@@ -88,10 +88,10 @@
             return self._results
         return self._results.get(refID, {})
 
-    def addContext(self, refID, domain, objID, varID=None, data=None):
+    def addContext(self, refID, objID=None, varID=None, data=None):
         if refID not in self._contextResults:
             self._contextResults[refID] = {}
-        if objID not in self._contextResults[refID]:
+        if objID is not None and objID not in self._contextResults[refID]:
             self._contextResults[refID][objID] = {}
         if varID is not None and data is not None:
             self._contextResults[refID][objID][varID] = _parse(self._valueFunc, varID, data)
diff -Nru sumo-1.17.0/tools/traci/_edge.py sumo-1.18.0/tools/traci/_edge.py
--- sumo-1.17.0/tools/traci/_edge.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/traci/_edge.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2011-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
@@ -193,6 +193,15 @@
         """
         return self._getUniversal(tc.VAR_PENDING_VEHICLES, edgeID)
 
+    def getAngle(self, edgeID, relativePosition=tc.INVALID_DOUBLE_VALUE):
+        """getAngle(string, double) -> double
+        Returns the heading of the straight line segment formed by the first lane of the edge at the given position.
+        If the given position equals TraCI constant INVALID_DOUBLE_VALUE, it returns the total angle
+        formed by the edge, from its start point to its end point. If the edge doesn't have any lanes,
+        then INVALID_DOUBLE_VALUE is returned.
+        """
+        return self._getUniversal(tc.VAR_ANGLE, edgeID, "d", relativePosition)
+
     def adaptTraveltime(self, edgeID, time, begin=None, end=None):
         """adaptTraveltime(string, double, double, double) -> None
 
diff -Nru sumo-1.17.0/tools/traci/exceptions.py sumo-1.18.0/tools/traci/exceptions.py
--- sumo-1.17.0/tools/traci/exceptions.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/traci/exceptions.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2008-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/traci/_gui.py sumo-1.18.0/tools/traci/_gui.py
--- sumo-1.17.0/tools/traci/_gui.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/traci/_gui.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2011-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/traci/_inductionloop.py sumo-1.18.0/tools/traci/_inductionloop.py
--- sumo-1.17.0/tools/traci/_inductionloop.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/traci/_inductionloop.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2011-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/traci/__init__.py sumo-1.18.0/tools/traci/__init__.py
--- sumo-1.17.0/tools/traci/__init__.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/traci/__init__.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2008-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/traci/_junction.py sumo-1.18.0/tools/traci/_junction.py
--- sumo-1.17.0/tools/traci/_junction.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/traci/_junction.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2011-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/traci/_lanearea.py sumo-1.18.0/tools/traci/_lanearea.py
--- sumo-1.17.0/tools/traci/_lanearea.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/traci/_lanearea.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2011-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/traci/_lane.py sumo-1.18.0/tools/traci/_lane.py
--- sumo-1.17.0/tools/traci/_lane.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/traci/_lane.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2011-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
@@ -278,22 +278,30 @@
 
     def getFoes(self, laneID, toLaneID):
         """getFoes(string, string) -> list(string)
-        Returns the ids of incoming lanes that have right of way over the connection from laneID to toLaneID
+        Returns the ids of incoming lanes that have right of way over the connection from laneID to toLaneID.
         """
         return self._getUniversal(tc.VAR_FOES, laneID, "s", toLaneID)
 
     def getInternalFoes(self, laneID):
         """getFoes(string) -> list(string)
-        Returns the ids of internal lanes that are in conflict with the given internal lane id
+        Returns the ids of internal lanes that are in conflict with the given internal lane id.
         """
         return self.getFoes(laneID, "")
 
     def getPendingVehicles(self, laneID):
         """getPendingVehicles(string) -> list(string)
-        Returns a list of all vehicle ids waiting for insertion on this lane (with depart delay)
+        Returns a list of all vehicle ids waiting for insertion on this lane (with depart delay).
         """
         return self._getUniversal(tc.VAR_PENDING_VEHICLES, laneID)
 
+    def getAngle(self, laneID, relativePosition=tc.INVALID_DOUBLE_VALUE):
+        """getAngle(string, double) -> double
+        Returns the heading of the straight line segment formed by the lane at the given position.
+        If the given position equals TraCI constant INVALID_DOUBLE_VALUE, it returns the total angle
+        formed by the lane, from its start point to its end point.
+        """
+        return self._getUniversal(tc.VAR_ANGLE, laneID, "d", relativePosition)
+
     def setAllowed(self, laneID, allowedClasses):
         """setAllowed(string, list) -> None
 
diff -Nru sumo-1.17.0/tools/traci/main.py sumo-1.18.0/tools/traci/main.py
--- sumo-1.17.0/tools/traci/main.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/traci/main.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2008-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
@@ -190,11 +190,21 @@
 
 
 def simulationStep(step=0):
+    """simulationStep(float) -> None
+    Make a simulation step and simulate up to the given second in sim time.
+    If the given value is 0 or absent, exactly one step is performed.
+    Values smaller than or equal to the current sim time result in no action.
+    """
+    connection.check().simulationStep(step)
+
+
+def simulationStepLegacy(step=0):
     """simulationStep(float) -> list
     Make a simulation step and simulate up to the given second in sim time.
     If the given value is 0 or absent, exactly one step is performed.
     Values smaller than or equal to the current sim time result in no action.
-    It returns the subscription results for the current step in a list.
+    This is a legacy function which returns the subscription results for the
+    current step in a list.
     """
     return connection.check().simulationStep(step)
 
diff -Nru sumo-1.17.0/tools/traci/_meandata.py sumo-1.18.0/tools/traci/_meandata.py
--- sumo-1.17.0/tools/traci/_meandata.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/traci/_meandata.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2008-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/traci/_multientryexit.py sumo-1.18.0/tools/traci/_multientryexit.py
--- sumo-1.17.0/tools/traci/_multientryexit.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/traci/_multientryexit.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2011-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/traci/_overheadwire.py sumo-1.18.0/tools/traci/_overheadwire.py
--- sumo-1.17.0/tools/traci/_overheadwire.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/traci/_overheadwire.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2008-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/traci/_parkingarea.py sumo-1.18.0/tools/traci/_parkingarea.py
--- sumo-1.17.0/tools/traci/_parkingarea.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/traci/_parkingarea.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2008-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/traci/_person.py sumo-1.18.0/tools/traci/_person.py
--- sumo-1.17.0/tools/traci/_person.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/traci/_person.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2011-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/traci/_poi.py sumo-1.18.0/tools/traci/_poi.py
--- sumo-1.17.0/tools/traci/_poi.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/traci/_poi.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2008-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/traci/_polygon.py sumo-1.18.0/tools/traci/_polygon.py
--- sumo-1.17.0/tools/traci/_polygon.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/traci/_polygon.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2011-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/traci/rebuildConstants.py sumo-1.18.0/tools/traci/rebuildConstants.py
--- sumo-1.17.0/tools/traci/rebuildConstants.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/traci/rebuildConstants.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2009-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
@@ -85,7 +85,7 @@
 argParser.add_argument("-o", "--output",
                        help="File to save constants into", metavar="FILE")
 options = argParser.parse_args()
-header = """# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+header = """# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2009-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/traci/_rerouter.py sumo-1.18.0/tools/traci/_rerouter.py
--- sumo-1.17.0/tools/traci/_rerouter.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/traci/_rerouter.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2008-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/traci/_routeprobe.py sumo-1.18.0/tools/traci/_routeprobe.py
--- sumo-1.17.0/tools/traci/_routeprobe.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/traci/_routeprobe.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2008-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/traci/_route.py sumo-1.18.0/tools/traci/_route.py
--- sumo-1.17.0/tools/traci/_route.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/traci/_route.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2008-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/traci/_simulation.py sumo-1.18.0/tools/traci/_simulation.py
--- sumo-1.17.0/tools/traci/_simulation.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/traci/_simulation.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2011-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
@@ -271,7 +271,7 @@
         """
         if self._connection is None:
             raise FatalTraCIError("Not connected.")
-        return self._connection.simulationStep(time)
+        self._connection.simulationStep(time)
 
     def executeMove(self):
         """executeMove() -> None
diff -Nru sumo-1.17.0/tools/traci/step.py sumo-1.18.0/tools/traci/step.py
--- sumo-1.17.0/tools/traci/step.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/traci/step.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2008-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/traci/storage.py sumo-1.18.0/tools/traci/storage.py
--- sumo-1.17.0/tools/traci/storage.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/traci/storage.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2008-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
@@ -66,7 +66,7 @@
 
     def readString(self):
         length = self.read("!i")[0]
-        return str(self.read("!%ss" % length)[0].decode("latin1"))
+        return str(self.read("!%ss" % length)[0].decode("utf8"))
 
     def readTypedString(self):
         t = self.read("!B")[0]
diff -Nru sumo-1.17.0/tools/traci/traciToHex.py sumo-1.18.0/tools/traci/traciToHex.py
--- sumo-1.17.0/tools/traci/traciToHex.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/traci/traciToHex.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2010-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/traci/_trafficlight.py sumo-1.18.0/tools/traci/_trafficlight.py
--- sumo-1.17.0/tools/traci/_trafficlight.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/traci/_trafficlight.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2011-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/traci/_variablespeedsign.py sumo-1.18.0/tools/traci/_variablespeedsign.py
--- sumo-1.17.0/tools/traci/_variablespeedsign.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/traci/_variablespeedsign.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2008-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/traci/_vehicle.py sumo-1.18.0/tools/traci/_vehicle.py
--- sumo-1.17.0/tools/traci/_vehicle.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/traci/_vehicle.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2011-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
@@ -230,6 +230,34 @@
     return tuple(links)
 
 
+def _readJunctionFoes(result):
+    result.read("!Bi")
+    nbJunctionFoes = result.readInt()
+    junctionFoes = []
+    for _ in range(nbJunctionFoes):
+        result.read("!B")
+        foeId = result.readString()
+        result.read("!B")
+        egoDist = result.readDouble()
+        result.read("!B")
+        foeDist = result.readDouble()
+        result.read("!B")
+        egoExitDist = result.readDouble()
+        result.read("!B")
+        foeExitDist = result.readDouble()
+        result.read("!B")
+        egoLane = result.readString()
+        result.read("!B")
+        foeLane = result.readString()
+        result.read("!B")
+        egoResponse = bool(result.read("!B")[0])
+        result.read("!B")
+        foeResponse = bool(result.read("!B")[0])
+        junctionFoes.append((foeId, egoDist, foeDist, egoExitDist, foeExitDist,
+                             egoLane, foeLane, egoResponse, foeResponse))
+    return tuple(junctionFoes)
+
+
 _RETURN_VALUE_FUNC = {tc.VAR_ROUTE_VALID: lambda result: bool(result.read("!i")[0]),
                       tc.VAR_BEST_LANES: _readBestLanes,
                       tc.VAR_LEADER: _readLeader,
@@ -239,6 +267,7 @@
                       tc.VAR_NEXT_STOPS: _readNextStops,
                       tc.VAR_NEXT_LINKS: _readNextLinks,
                       tc.VAR_NEXT_STOPS2: _readStopData,
+                      tc.VAR_FOES: _readJunctionFoes,
                       # ignore num compounds and type int
                       tc.CMD_CHANGELANE: lambda result: result.read("!iBiBi")[2::2]}
 
@@ -729,6 +758,14 @@
         """
         return self._getUniversal(tc.VAR_NEXT_TLS, vehID)
 
+    def getJunctionFoes(self, vehID, distance):
+        """getJunctionFoes(string, double) -> complex
+
+        Return list of junction foes [(foeId, egoDist, foeDist, egoExitDist, foeExitDist,
+        egoLane, foeLane, egoResponse, foeResponse), ...] within the given distance to the given vehicle.
+        """
+        return self._getUniversal(tc.VAR_FOES, vehID, "d", distance)
+
     @deprecated()
     def getNextStops(self, vehID):
         """getNextStop(string) -> [(string, double, string, int, double, double), ...]
@@ -808,13 +845,15 @@
         """
         return self._getUniversal(tc.VAR_DISTANCE, vehID)
 
-    def getStopParameter(self, vehID, nextStopIndex, param):
+    def getStopParameter(self, vehID, nextStopIndex, param, customParam=False):
         """getStopParameter(string, int, string) -> string
         Gets the value of the given parameter for the stop at the given index
         Negative indices permit access to past stops.
         Supported params correspond to all legal stop xml-attributes
+        If customParam is set to True, the user defined stop parameter with the
+        specified param name will be returned instead (or "" if undefined)
         """
-        return self._getUniversal(tc.VAR_STOP_PARAMETER, vehID, "tis", 2, nextStopIndex, param)
+        return self._getUniversal(tc.VAR_STOP_PARAMETER, vehID, "tisb", 3, nextStopIndex, param, customParam)
 
     def getStopState(self, vehID):
         """getStopState(string) -> integer
@@ -1049,14 +1088,16 @@
         self._setCmd(tc.CMD_INSERT_STOP, vehID, "tsdbdiddib", 9, edgeID, pos,
                      laneIndex, duration, flags, startPos, until, nextStopIndex, teleport)
 
-    def setStopParameter(self, vehID, nextStopIndex, param, value):
+    def setStopParameter(self, vehID, nextStopIndex, param, value, customParam=False):
         """setStopParameter(string, int, string, string) -> None
         Sets the value of the given parameter for the (upcoming) stop at the
         given index (within the list of all stops).
         Supported params correspond to (almost) all legal stop xml-attributes
         and their value semantics
+        If customParam is set to True, the user defined stop parameter with the
+        specified param name will be set instead
         """
-        self._setCmd(tc.VAR_STOP_PARAMETER, vehID, "tiss", 3, nextStopIndex, param, value)
+        self._setCmd(tc.VAR_STOP_PARAMETER, vehID, "tissb", 4, nextStopIndex, param, value, customParam)
 
     def resume(self, vehID):
         """resume(string) -> None
diff -Nru sumo-1.17.0/tools/traci/_vehicletype.py sumo-1.18.0/tools/traci/_vehicletype.py
--- sumo-1.17.0/tools/traci/_vehicletype.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/traci/_vehicletype.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2008-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
@@ -217,6 +217,29 @@
         """
         return self._getUniversal(tc.VAR_BOARDING_DURATION, typeID)
 
+    def getImpatience(self, typeID):
+        """getImpatience(string) -> double
+
+        Returns the Impatience of this type
+        """
+        return self._getUniversal(tc.VAR_IMPATIENCE, typeID)
+
+    def setImpatience(self, typeID, impatience):
+        """setImpatience(string, double) -> None
+
+        Sets the impatience of the this type.
+        If called in the context of a person or vehicle, it will change the value just for the single instance.
+        """
+        self._setCmd(tc.VAR_IMPATIENCE, typeID, "d", impatience)
+
+    def setBoardingDuration(self, typeID, boardingDuration):
+        """setBoardingDuration(string, double) -> None
+
+        Sets the boarding duration of the this type.
+        If called in the context of a person or vehicle, it will change the value just for the single instance.
+        """
+        self._setCmd(tc.VAR_BOARDING_DURATION, typeID, "d", boardingDuration)
+
     def setLength(self, typeID, length):
         """setLength(string, double) -> None
 
diff -Nru sumo-1.17.0/tools/trigger/csv2vss.py sumo-1.18.0/tools/trigger/csv2vss.py
--- sumo-1.17.0/tools/trigger/csv2vss.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/trigger/csv2vss.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2013-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/turn-defs/collectinghandler.py sumo-1.18.0/tools/turn-defs/collectinghandler.py
--- sumo-1.17.0/tools/turn-defs/collectinghandler.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/turn-defs/collectinghandler.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,41 +0,0 @@
-# -*- coding: utf-8 -*-
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
-# Copyright (C) 2011-2023 German Aerospace Center (DLR) and others.
-# This program and the accompanying materials are made available under the
-# terms of the Eclipse Public License 2.0 which is available at
-# https://www.eclipse.org/legal/epl-2.0/
-# This Source Code 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
-
-# @file    collectinghandler.py
-# @author  Karol Stosiek
-# @date    2011-10-26
-
-from __future__ import absolute_import
-
-import logging
-
-
-class CollectingHandler(logging.Handler):
-
-    """ Handler for loggers from logging module. Collects all log messages. """
-
-    def __init__(self, level=0):
-        """ Constructor. The level parameter stands for logging level. """
-
-        self.log_records = []
-        logging.Handler.__init__(self, level)
-
-    def handle(self, record):
-        """ See logging.Handler.handle(self, record) docs. """
-
-        self.log_records.append(record)
-
-    def emit(self, record):
-        """ See logging.Handler.emit(self, record) docs. """
-
-        pass  # do not emit the record. Other handlers can do that.
diff -Nru sumo-1.17.0/tools/turn-defs/connections.py sumo-1.18.0/tools/turn-defs/connections.py
--- sumo-1.17.0/tools/turn-defs/connections.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/turn-defs/connections.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2011-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/turn-defs/generateTurnDefs.py sumo-1.18.0/tools/turn-defs/generateTurnDefs.py
--- sumo-1.17.0/tools/turn-defs/generateTurnDefs.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/turn-defs/generateTurnDefs.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2011-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/turn-defs/generateTurnRatios.py sumo-1.18.0/tools/turn-defs/generateTurnRatios.py
--- sumo-1.17.0/tools/turn-defs/generateTurnRatios.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/turn-defs/generateTurnRatios.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2010-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/turn-defs/turnCount2EdgeCount.py sumo-1.18.0/tools/turn-defs/turnCount2EdgeCount.py
--- sumo-1.17.0/tools/turn-defs/turnCount2EdgeCount.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/turn-defs/turnCount2EdgeCount.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/turn-defs/turndefinitions.py sumo-1.18.0/tools/turn-defs/turndefinitions.py
--- sumo-1.17.0/tools/turn-defs/turndefinitions.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/turn-defs/turndefinitions.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2011-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
@@ -30,7 +30,6 @@
 
 import sumolib  # noqa
 import connections  # noqa
-import collectinghandler  # noqa
 
 LOGGER = logging.getLogger(__name__)
 
diff -Nru sumo-1.17.0/tools/turn-defs/turnFile2EdgeRelations.py sumo-1.18.0/tools/turn-defs/turnFile2EdgeRelations.py
--- sumo-1.17.0/tools/turn-defs/turnFile2EdgeRelations.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/turn-defs/turnFile2EdgeRelations.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/visualization/macrOutput.py sumo-1.18.0/tools/visualization/macrOutput.py
--- sumo-1.17.0/tools/visualization/macrOutput.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/visualization/macrOutput.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2021-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
@@ -19,22 +19,29 @@
 
 from __future__ import absolute_import
 from __future__ import print_function
+import os
 import sys
-from collections import Counter
-
-import numpy as np
-import pandas as pd
-import pandas_read_xml as pdx
 import matplotlib.pyplot as plt
+import pandas_read_xml as pdx
+import pandas as pd
+import numpy as np
+from collections import Counter
+if "SUMO_HOME" in os.environ:
+    sys.path.append(os.path.join(os.environ['SUMO_HOME'], 'tools'))
+import sumolib  # noqa
 
 
 def main(args):
 
+    ap = sumolib.options.ArgumentParser()
+    ap.add_argument("file", dest="file", category="input", type=ap.file, required=True, help="An XML input file")
+    options = ap.parse_args(args=args)
+
     if args is None or len(args) < 2:
         print("Error: An xml file must be given as input")
         sys.exit(1)
 
-    df = pdx.read_xml(sys.argv[1], ['meandata'])
+    df = pdx.read_xml(options.file, ['meandata'])
 
     df = pdx.flatten(df)
     df = df.pipe(pdx.flatten)
@@ -175,4 +182,4 @@
 
 
 if __name__ == "__main__":
-    sys.exit(main(sys.argv))
+    sys.exit(main())
diff -Nru sumo-1.17.0/tools/visualization/mpl_dump_onNet.py sumo-1.18.0/tools/visualization/mpl_dump_onNet.py
--- sumo-1.17.0/tools/visualization/mpl_dump_onNet.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/visualization/mpl_dump_onNet.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2007-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/visualization/mpl_dump_timeline.py sumo-1.18.0/tools/visualization/mpl_dump_timeline.py
--- sumo-1.17.0/tools/visualization/mpl_dump_timeline.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/visualization/mpl_dump_timeline.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2008-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/visualization/mpl_dump_twoAgainst.py sumo-1.18.0/tools/visualization/mpl_dump_twoAgainst.py
--- sumo-1.17.0/tools/visualization/mpl_dump_twoAgainst.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/visualization/mpl_dump_twoAgainst.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2008-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/visualization/mpl_tripinfos_twoAgainst.py sumo-1.18.0/tools/visualization/mpl_tripinfos_twoAgainst.py
--- sumo-1.17.0/tools/visualization/mpl_tripinfos_twoAgainst.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/visualization/mpl_tripinfos_twoAgainst.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2008-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/visualization/plot_csv_bars.py sumo-1.18.0/tools/visualization/plot_csv_bars.py
--- sumo-1.17.0/tools/visualization/plot_csv_bars.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/visualization/plot_csv_bars.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2008-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
@@ -30,39 +30,39 @@
 
 sys.path.append(os.path.dirname(os.path.dirname(os.path.realpath(__file__))))
 from sumolib.visualization import helpers  # noqa
+from sumolib.options import ArgumentParser  # noqa
 import matplotlib.pyplot as plt  # noqa
 
 
 def main(args=None):
     """The main function; parses options and plots"""
     # ---------- build and read options ----------
-    from optparse import OptionParser
-    optParser = OptionParser()
-    optParser.add_option("-i", "--input", dest="input", metavar="FILE",
-                         help="Defines the csv file to use as input")
-    optParser.add_option("-c", "--column", dest="column",
-                         type="int", default=1, help="Selects the column to read values from")
-    optParser.add_option("-r", "--revert", dest="revert", action="store_true",
-                         default=False, help="Reverts the order of read values")
-    optParser.add_option("-w", "--width", dest="width",
-                         type="float", default=.8, help="Defines the width of the bars")
-    optParser.add_option("--space", dest="space",
-                         type="float", default=.2, help="Defines the space between the bars")
-    optParser.add_option("--norm", dest="norm",
-                         type="float", default=1., help="Divides the read numbers by this value before plotting them")
-    optParser.add_option("--show-values", dest="showValues", action="store_true",
-                         default=False, help="Shows the values")
-    optParser.add_option("--values-offset", dest="valuesOffset",
-                         type="float", default=1., help="Position offset for values")
-    optParser.add_option("--vertical", dest="vertical", action="store_true",
-                         default=False, help="vertical bars are used")
-    optParser.add_option("-v", "--verbose", dest="verbose", action="store_true",
-                         default=False, help="If set, the script says what it's doing")
+    ap = ArgumentParser()
+    ap.add_argument("-i", "--input", category="input", dest="input", metavar="FILE", type=ap.file,
+                    help="Defines the csv file to use as input")
+    ap.add_argument("--column", dest="column",
+                    type=int, default=1, help="Selects the column to read values from")
+    ap.add_argument("-r", "--revert", dest="revert", action="store_true",
+                    default=False, help="Reverts the order of read values")
+    ap.add_argument("-w", "--width", dest="width", category="visualization",
+                    type=float, default=.8, help="Defines the width of the bars")
+    ap.add_argument("--space", dest="space", category="visualization",
+                    type=float, default=.2, help="Defines the space between the bars")
+    ap.add_argument("--norm", dest="norm",
+                    type=float, default=1., help="Divides the read numbers by this value before plotting them")
+    ap.add_argument("--show-values", dest="showValues", action="store_true", category="visualization",
+                    default=False, help="Shows the values")
+    ap.add_argument("--values-offset", dest="valuesOffset", category="visualization",
+                    type=float, default=1., help="Position offset for values")
+    ap.add_argument("--vertical", dest="vertical", action="store_true", category="visualization",
+                    default=False, help="vertical bars are used")
+    ap.add_argument("-v", "--verbose", dest="verbose", action="store_true",
+                    default=False, help="If set, the script says what it's doing")
     # standard plot options
-    helpers.addInteractionOptions(optParser)
-    helpers.addPlotOptions(optParser)
+    helpers.addInteractionOptions(ap)
+    helpers.addPlotOptions(ap)
     # parse
-    options, remaining_args = optParser.parse_args(args=args)
+    options = ap.parse_args(args=args)
 
     if options.input is None:
         raise ValueError("Error: at least one csv file must be given")
@@ -127,6 +127,6 @@
 
 if __name__ == "__main__":
     try:
-        main(sys.argv)
+        main()
     except ValueError as e:
         sys.exit(e)
diff -Nru sumo-1.17.0/tools/visualization/plot_csv_pie.py sumo-1.18.0/tools/visualization/plot_csv_pie.py
--- sumo-1.17.0/tools/visualization/plot_csv_pie.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/visualization/plot_csv_pie.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2014-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
@@ -31,37 +31,33 @@
 
 sys.path.append(os.path.dirname(os.path.dirname(os.path.realpath(__file__))))
 from sumolib.visualization import helpers  # noqa
+from sumolib.options import ArgumentParser  # noqa
 import matplotlib.pyplot as plt  # noqa
 
 
 def main(args=None):
     """The main function; parses options and plots"""
     # ---------- build and read options ----------
-    from optparse import OptionParser
-    optParser = OptionParser()
-    optParser.add_option("-i", "--input", dest="input", metavar="FILE",
-                         help="Defines the csv file to use as input")
-    optParser.add_option("-p", "--percentage", dest="percentage", action="store_true",
-                         default=False, help="Interprets read measures as percentages")
-    optParser.add_option("-r", "--revert", dest="revert", action="store_true",
-                         default=False, help="Reverts the order of read values")
-    optParser.add_option("--no-labels", dest="nolabels", action="store_true",
-                         default=False, help="Does not plot the labels")
-    optParser.add_option("--shadow", dest="shadow", action="store_true",
-                         default=False, help="Puts a shadow below the circle")
-    optParser.add_option("--startangle", dest="startangle",
-                         type="float", default=0, help="Sets the start angle")
-    optParser.add_option("-v", "--verbose", dest="verbose", action="store_true",
-                         default=False, help="If set, the script says what it's doing")
+    ap = ArgumentParser()
+    ap.add_argument("-i", "--input", dest="input", category="input", type=ap.file, metavar="FILE",
+                    required=True, help="Defines the csv file to use as input")
+    ap.add_argument("-p", "--percentage", dest="percentage", action="store_true",
+                    default=False, help="Interprets read measures as percentages")
+    ap.add_argument("-r", "--revert", dest="revert", action="store_true",
+                    default=False, help="Reverts the order of read values")
+    ap.add_argument("--no-labels", dest="nolabels", action="store_true",
+                    default=False, help="Does not plot the labels")
+    ap.add_argument("--shadow", dest="shadow", action="store_true",
+                    default=False, help="Puts a shadow below the circle")
+    ap.add_argument("--startangle", dest="startangle",
+                    type=float, default=0, help="Sets the start angle")
+    ap.add_argument("-v", "--verbose", dest="verbose", action="store_true",
+                    default=False, help="If set, the script says what it's doing")
     # standard plot options
-    helpers.addInteractionOptions(optParser)
-    helpers.addPlotOptions(optParser)
+    helpers.addInteractionOptions(ap)
+    helpers.addPlotOptions(ap)
     # parse
-    options, remaining_args = optParser.parse_args(args=args)
-
-    if options.input is None:
-        print("Error: at least one csv file must be given")
-        sys.exit(1)
+    options = ap.parse_args(args=args)
 
     labels = []
     vals = []
@@ -101,6 +97,6 @@
 
 if __name__ == "__main__":
     try:
-        main(sys.argv)
+        main()
     except ValueError as e:
         sys.exit(e)
diff -Nru sumo-1.17.0/tools/visualization/plot_csv_timeline.py sumo-1.18.0/tools/visualization/plot_csv_timeline.py
--- sumo-1.17.0/tools/visualization/plot_csv_timeline.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/visualization/plot_csv_timeline.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2014-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
@@ -32,6 +32,7 @@
 
 sys.path.append(os.path.join(os.environ['SUMO_HOME'], 'tools'))
 from sumolib.visualization import helpers  # noqa
+from sumolib.options import ArgumentParser  # noqa
 import matplotlib.pyplot as plt  # noqa
 
 
@@ -54,19 +55,18 @@
 def main(args=None):
     """The main function; parses options and plots"""
     # ---------- build and read options ----------
-    from optparse import OptionParser
-    optParser = OptionParser()
-    optParser.add_option("-i", "--input", dest="input", metavar="FILE",
-                         help="Defines the input file to use")
-    optParser.add_option("-v", "--verbose", dest="verbose", action="store_true",
-                         default=False, help="If set, the script says what it's doing")
-    optParser.add_option("-c", "--columns", dest="columns",
-                         default=None, help="Defines which columns shall be plotted")
+    ap = ArgumentParser()
+    ap.add_argument("-i", "--input", dest="input", category="input", type=ap.file, metavar="FILE",
+                    required=True, help="Defines the input file to use")
+    ap.add_argument("-v", "--verbose", dest="verbose", action="store_true",
+                    default=False, help="If set, the script says what it's doing")
+    ap.add_argument("--columns", dest="columns",
+                    default=None, help="Defines which columns shall be plotted")
     # standard plot options
-    helpers.addInteractionOptions(optParser)
-    helpers.addPlotOptions(optParser)
+    helpers.addInteractionOptions(ap)
+    helpers.addPlotOptions(ap)
     # parse
-    options, _ = optParser.parse_args(args=args)
+    options = ap.parse_args(args=args)
 
     if options.input is None:
         print("Error: an input file must be given")
@@ -97,6 +97,6 @@
 
 if __name__ == "__main__":
     try:
-        main(sys.argv)
+        main(sys.argv[1:])
     except ValueError as e:
         sys.exit(e)
diff -Nru sumo-1.17.0/tools/visualization/plot_net_dump.py sumo-1.18.0/tools/visualization/plot_net_dump.py
--- sumo-1.17.0/tools/visualization/plot_net_dump.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/visualization/plot_net_dump.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2008-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/visualization/plot_net_selection.py sumo-1.18.0/tools/visualization/plot_net_selection.py
--- sumo-1.17.0/tools/visualization/plot_net_selection.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/visualization/plot_net_selection.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2008-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
@@ -25,39 +25,33 @@
 sys.path.append(os.path.dirname(os.path.dirname(os.path.realpath(__file__))))
 import sumolib  # noqa
 from sumolib.visualization import helpers  # noqa
+from sumolib.options import ArgumentParser  # noqa
 
 
 def main(args=None):
     """The main function; parses options and plots"""
     # ---------- build and read options ----------
-    from optparse import OptionParser
-    optParser = OptionParser()
-    optParser.add_option("-n", "--net", dest="net", metavar="FILE",
-                         help="Defines the network to read")
-    optParser.add_option("-i", "--selection", dest="selection", metavar="FILE",
-                         help="Defines the selection to read")
-    optParser.add_option("--selected-width", dest="selectedWidth",
-                         type="float", default=1, help="Defines the width of selected edges")
-    optParser.add_option("--color", "--selected-color", dest="selectedColor",
-                         default='r', help="Defines the color of selected edges")
-    optParser.add_option("--edge-width", dest="defaultWidth",
-                         type="float", default=.2, help="Defines the width of not selected edges")
-    optParser.add_option("--edge-color", dest="defaultColor",
-                         default='#606060', help="Defines the color of not selected edges")
-    optParser.add_option("-v", "--verbose", dest="verbose", action="store_true",
-                         default=False, help="If set, the script says what it's doing")
+    ap = ArgumentParser()
+    ap.add_argument("-n", "--net", dest="net", category="input", type=ap.net_file, metavar="FILE",
+                    required=True, help="Defines the network to read")
+    ap.add_argument("-i", "--selection", dest="selection", category="input", type=ap.file, metavar="FILE",
+                    required=True, help="Defines the selection to read")
+    ap.add_argument("--selected-width", dest="selectedWidth", category="visualization",
+                    type=float, default=1, help="Defines the width of selected edges")
+    ap.add_argument("--color", "--selected-color", dest="selectedColor", category="visualization",
+                    default='r', help="Defines the color of selected edges")
+    ap.add_argument("--edge-width", dest="defaultWidth", category="visualization",
+                    type=float, default=.2, help="Defines the width of not selected edges")
+    ap.add_argument("--edge-color", dest="defaultColor", category="visualization",
+                    default='#606060', help="Defines the color of not selected edges")
+    ap.add_argument("-v", "--verbose", dest="verbose", action="store_true",
+                    default=False, help="If set, the script says what it's doing")
     # standard plot options
-    helpers.addInteractionOptions(optParser)
-    helpers.addPlotOptions(optParser)
+    helpers.addInteractionOptions(ap)
+    helpers.addPlotOptions(ap)
     # parse
-    options, remaining_args = optParser.parse_args(args=args)
+    options = ap.parse_args(args=args)
 
-    if options.net is None:
-        print("Error: a network to load must be given.")
-        return 1
-    if options.selection is None:
-        print("Error: a selection to load must be given.")
-        return 1
     if options.verbose:
         print("Reading network from '%s'" % options.net)
     net = sumolib.net.readNet(options.net)
@@ -78,6 +72,6 @@
 
 if __name__ == "__main__":
     try:
-        main(sys.argv)
+        main()
     except ValueError as e:
         sys.exit(e)
diff -Nru sumo-1.17.0/tools/visualization/plot_net_speeds.py sumo-1.18.0/tools/visualization/plot_net_speeds.py
--- sumo-1.17.0/tools/visualization/plot_net_speeds.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/visualization/plot_net_speeds.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2008-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
@@ -28,6 +28,7 @@
     sys.exit("please declare environment variable 'SUMO_HOME'")
 import sumolib  # noqa
 from sumolib.visualization import helpers  # noqa
+from sumolib.options import ArgumentParser  # noqa
 import matplotlib.pyplot as plt  # noqa
 import matplotlib  # noqa
 
@@ -35,29 +36,25 @@
 def main(args=None):
     """The main function; parses options and plots"""
     # ---------- build and read options ----------
-    from optparse import OptionParser
-    optParser = OptionParser()
-    optParser.add_option("-n", "--net", dest="net", metavar="FILE",
-                         help="Defines the network to read")
-    optParser.add_option("--edge-width", dest="defaultWidth",
-                         type="float", default=1, help="Defines the edge width")
-    optParser.add_option("--edge-color", dest="defaultColor",
-                         default='k', help="Defines the edge color")
-    optParser.add_option("--minV", dest="minV",
-                         type="float", default=None, help="Define the minimum value boundary")
-    optParser.add_option("--maxV", dest="maxV",
-                         type="float", default=None, help="Define the maximum value boundary")
-    optParser.add_option("-v", "--verbose", dest="verbose", action="store_true",
-                         default=False, help="If set, the script says what it's doing")
+    ap = ArgumentParser()
+    ap.add_argument("-n", "--net", dest="net", category="input", type=ap.net_file, metavar="FILE",
+                    required=True, help="Defines the network to read")
+    ap.add_argument("--edge-width", dest="defaultWidth", category="visualization",
+                    type=float, default=1, help="Defines the edge width")
+    ap.add_argument("--edge-color", dest="defaultColor", category="visualization",
+                    default='k', help="Defines the edge color")
+    ap.add_argument("--minV", dest="minV",
+                    type=float, default=None, help="Define the minimum value boundary")
+    ap.add_argument("--maxV", dest="maxV",
+                    type=float, default=None, help="Define the maximum value boundary")
+    ap.add_argument("-v", "--verbose", dest="verbose", action="store_true",
+                    default=False, help="If set, the script says what it's doing")
     # standard plot options
-    helpers.addInteractionOptions(optParser)
-    helpers.addPlotOptions(optParser)
+    helpers.addInteractionOptions(ap)
+    helpers.addPlotOptions(ap)
     # parse
-    options, remaining_args = optParser.parse_args(args=args)
+    options = ap.parse_args(args=args)
 
-    if options.net is None:
-        print("Error: a network to load must be given.")
-        return 1
     if options.verbose:
         print("Reading network from '%s'" % options.net)
     net = sumolib.net.readNet(options.net)
@@ -103,6 +100,6 @@
 
 if __name__ == "__main__":
     try:
-        main(sys.argv)
+        main()
     except ValueError as e:
         sys.exit(e)
diff -Nru sumo-1.17.0/tools/visualization/plot_net_trafficLights.py sumo-1.18.0/tools/visualization/plot_net_trafficLights.py
--- sumo-1.17.0/tools/visualization/plot_net_trafficLights.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/visualization/plot_net_trafficLights.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2008-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
@@ -25,35 +25,32 @@
 sys.path.append(os.path.dirname(os.path.dirname(os.path.realpath(__file__))))
 import sumolib  # noqa
 from sumolib.visualization import helpers  # noqa
+from sumolib.options import ArgumentParser  # noqa
 import matplotlib.pyplot as plt  # noqa
 
 
 def main(args=None):
     """The main function; parses options and plots"""
     # ---------- build and read options ----------
-    from optparse import OptionParser
-    optParser = OptionParser()
-    optParser.add_option("-n", "--net", dest="net", metavar="FILE",
-                         help="Defines the network to read")
-    optParser.add_option("-v", "--verbose", dest="verbose", action="store_true",
-                         default=False, help="If set, the script says what it's doing")
-    optParser.add_option("-w", "--width", dest="width",
-                         type="float", default=20, help="Defines the width of the dots")
-    optParser.add_option("-c", "--color", dest="color",
-                         default='r', help="Defines the dot color")
-    optParser.add_option("--edge-width", dest="defaultWidth",
-                         type="float", default=1, help="Defines the edge width")
-    optParser.add_option("--edge-color", dest="defaultColor",
-                         default='k', help="Defines the edge color")
+    ap = ArgumentParser()
+    ap.add_argument("-n", "--net", dest="net", category="input", type=ap.net_file, metavar="FILE",
+                    required=True, help="Defines the network to read")
+    ap.add_argument("-v", "--verbose", dest="verbose", action="store_true",
+                    default=False, help="If set, the script says what it's doing")
+    ap.add_argument("-w", "--width", dest="width",
+                    type=float, default=20, help="Defines the width of the dots")
+    ap.add_argument("--color", dest="color", category="visualization",
+                    default='r', help="Defines the dot color")
+    ap.add_argument("--edge-width", dest="defaultWidth", category="visualization",
+                    type=float, default=1, help="Defines the edge width")
+    ap.add_argument("--edge-color", dest="defaultColor", category="visualization",
+                    default='k', help="Defines the edge color")
     # standard plot options
-    helpers.addInteractionOptions(optParser)
-    helpers.addPlotOptions(optParser)
+    helpers.addInteractionOptions(ap)
+    helpers.addPlotOptions(ap)
     # parse
-    options, remaining_args = optParser.parse_args(args=args)
+    options = ap.parse_args(args=args)
 
-    if options.net is None:
-        print("Error: a network to load must be given.")
-        return 1
     if options.verbose:
         print("Reading network from '%s'" % options.net)
     net = sumolib.net.readNet(options.net)
@@ -92,6 +89,6 @@
 
 if __name__ == "__main__":
     try:
-        main(sys.argv)
+        main()
     except ValueError as e:
         sys.exit(e)
diff -Nru sumo-1.17.0/tools/visualization/plot_summary.py sumo-1.18.0/tools/visualization/plot_summary.py
--- sumo-1.17.0/tools/visualization/plot_summary.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/visualization/plot_summary.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2013-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
@@ -32,29 +32,25 @@
 sys.path.append(os.path.join(os.environ['SUMO_HOME'], 'tools'))
 import sumolib  # noqa
 from sumolib.visualization import helpers  # noqa
+from sumolib.options import ArgumentParser  # noqa
 import matplotlib.pyplot as plt  # noqa
 
 
 def main(args=None):
     """The main function; parses options and plots"""
     # ---------- build and read options ----------
-    from optparse import OptionParser
-    optParser = OptionParser()
-    optParser.add_option("-i", "--summary-inputs", dest="summary", metavar="FILE",
-                         help="Defines the summary-output files to use as input")
-    optParser.add_option("-v", "--verbose", dest="verbose", action="store_true",
-                         default=False, help="If set, the script says what it's doing")
-    optParser.add_option("-m", "--measure", dest="measure",
-                         default="running", help="Define which measure to plot")
+    ap = ArgumentParser()
+    ap.add_argument("-i", "--summary-inputs", dest="summary", category="input", type=ap.file_list, metavar="FILE",
+                    required=True, help="Defines the summary-output files to use as input")
+    ap.add_argument("-v", "--verbose", dest="verbose", action="store_true",
+                    default=False, help="If set, the script says what it's doing")
+    ap.add_argument("-m", "--measure", dest="measure", category="input",
+                    default="running", help="Define which measure to plot")
     # standard plot options
-    helpers.addInteractionOptions(optParser)
-    helpers.addPlotOptions(optParser)
+    helpers.addInteractionOptions(ap)
+    helpers.addPlotOptions(ap)
     # parse
-    options, _ = optParser.parse_args(args=args)
-
-    if options.summary is None:
-        print("Error: at least one summary file must be given")
-        sys.exit(1)
+    options = ap.parse_args(args=args)
 
     files = options.summary.split(",")
     fig, ax = helpers.openFigure(options)
@@ -74,6 +70,6 @@
 
 if __name__ == "__main__":
     try:
-        main(sys.argv)
+        main()
     except ValueError as e:
         sys.exit(e)
diff -Nru sumo-1.17.0/tools/visualization/plotXMLAttributes.py sumo-1.18.0/tools/visualization/plotXMLAttributes.py
--- sumo-1.17.0/tools/visualization/plotXMLAttributes.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/visualization/plotXMLAttributes.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2007-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
@@ -52,11 +52,12 @@
 INDEX_ATTR = "@INDEX"
 RANK_ATTR = "@RANK"
 COUNT_ATTR = "@COUNT"
+DENS_ATTR = "@DENSITY"
 BOX_ATTR = "@BOX"
 NONE_ATTR = "@NONE"
 NONE_ATTR_DEFAULT = 0
 
-POST_PROCESSING_ATTRS = [RANK_ATTR, COUNT_ATTR, BOX_ATTR]
+POST_PROCESSING_ATTRS = [RANK_ATTR, COUNT_ATTR, BOX_ATTR, DENS_ATTR]
 SYMBOLIC_ATTRS = POST_PROCESSING_ATTRS + [INDEX_ATTR]
 
 
@@ -71,20 +72,24 @@
         '    plots passengers over time for vehicles from SUMO stop output',
         formatter_class=RawDescriptionHelpFormatter, conflict_handler='resolve')
 
-    optParser.add_option("files", nargs='+', type=optParser.file_list,
+    optParser.add_option("files", nargs='+', category="input", type=optParser.file_list,
                          help="List of XML files to plot")
-    optParser.add_option("-x", "--xattr",  help="attribute for x-axis")
-    optParser.add_option("-y", "--yattr",  help="attribute for y-axis")
-    optParser.add_option("-i", "--idattr",  default="id", help="attribute for grouping data points into lines")
-    optParser.add_option("--xelem",  help="element for x-axis")
-    optParser.add_option("--yelem",  help="element for y-axis")
-    optParser.add_option("--idelem",  help="element for grouping data points into lines")
-    optParser.add_option("-s", "--show", action="store_true", default=False, help="show plot directly")
-    optParser.add_option("--csv-output", dest="csv_output", help="write plot as csv", metavar="FILE")
+    optParser.add_option("-x", "--xattr", help="attribute for x-axis")
+    optParser.add_option("-y", "--yattr", help="attribute for y-axis")
+    optParser.add_option("-i", "--idattr", default="id", help="attribute for grouping data points into lines")
+    optParser.add_option("--xelem", help="element for x-axis")
+    optParser.add_option("--yelem", help="element for y-axis")
+    optParser.add_option("--idelem", help="element for grouping data points into lines")
+    optParser.add_option("-s", "--show", action="store_true", category="output",
+                         default=False, help="show plot directly")
+    optParser.add_option("--csv-output", dest="csv_output", category="output",
+                         help="write plot as csv")
     optParser.add_option("--filter-ids", dest="filterIDs", help="only plot data points from the given list of ids")
     optParser.add_option("-p", "--pick-distance", dest="pickDist", type=float, default=1,
                          help="pick lines within the given distance in interactive plot mode")
     optParser.add_option("--label", help="plot label (default input file name")
+    optParser.add_option("-j", "--join-files", action="store_true", dest="joinFiles", default=False,
+                         help="Do not distinguis data points by file")
     optParser.add_option("--join-x", action="store_true", dest="joinx", default=False,
                          help="if --xattr is a list concatenate the values")
     optParser.add_option("--join-y", action="store_true", dest="joiny", default=False,
@@ -99,13 +104,13 @@
                          help="clamp y values to range A:B or half-range A: / :B")
     optParser.add_option("--invert-yaxis", dest="invertYAxis", action="store_true",
                          default=False, help="Invert the Y-Axis")
-    optParser.add_option("--scatterplot", action="store_true",
+    optParser.add_option("--scatterplot", action="store_true", category="visualization",
                          default=False, help="Draw a scatterplot instead of lines")
-    optParser.add_option("--barplot", action="store_true",
+    optParser.add_option("--barplot", action="store_true", category="visualization",
                          default=False, help="Draw a bar plot parallel to the y-axis")
-    optParser.add_option("--hbarplot", action="store_true",
+    optParser.add_option("--hbarplot", action="store_true", category="visualization",
                          default=False, help="Draw a bar plot parallel to the x-axis")
-    optParser.add_option("--legend", action="store_true", default=False, help="Add legend")
+    optParser.add_option("--legend", action="store_true", default=False, category="visualization", help="Add legend")
     optParser.add_option("-v", "--verbose", action="store_true", default=False, help="tell me what you are doing")
     sumolib.visualization.helpers.addPlotOptions(optParser)
     sumolib.visualization.helpers.addInteractionOptions(optParser)
@@ -146,9 +151,9 @@
 
     # keep old presets from before integration of common options
     options.nolegend = not options.legend
-    options.blind = not options.show
-    if options.output is None:
-        options.output = "plot.png"
+    if options.show:
+        sys.stderr.write("Option --show is now set by default and will be removed in the future." +
+                         "Use --blind to disable the plot window\n")
 
     if options.xattr == BOX_ATTR and options.yattr == BOX_ATTR:
         sys.exit("Boxplot can only be specified for one dimension")
@@ -192,8 +197,9 @@
 
 def write_csv(data, fname):
     with open(fname, 'w') as f:
-        for veh, vals in sorted(data.items()):
-            f.write('# "%s"\n' % veh)
+        for dataID in sorted(data.keys(), key=str):
+            vals = data[dataID]
+            f.write('# "%s"\n' % dataID)
             for x in zip(*vals):
                 f.write(" ".join(map(str, x)) + "\n")
             #  2 blank lines indicate a new data block in gnuplot
@@ -459,12 +465,16 @@
         return value
 
 
-def countPoints(xvalues):
+def countPoints(xvalues, normalize=False):
     counts = defaultdict(lambda: 0)
     for x in xvalues:
         counts[x] += 1
     xres = sorted(counts.keys())
     yres = [counts[x] for x in xres]
+    if normalize:
+        total = float(sum(yres))
+        if total > 0:
+            yres = [c / total for c in yres]
     return xres, yres
 
 
@@ -548,7 +558,7 @@
                         flag2 = True
                 if flag1 and not flag2:
                     continue
-            if len(options.files) > 1:
+            if len(options.files) > 1 and not options.joinFiles:
                 suffix = shortFileNames[fileIndex]
                 if len(suffix) > 0:
                     dataID = str(dataID) + "#" + suffix
@@ -607,6 +617,12 @@
         if options.yattr == COUNT_ATTR:
             d[xdata], d[ydata] = countPoints(d[xdata])
 
+        if options.xattr == DENS_ATTR:
+            d[ydata], d[xdata] = countPoints(d[ydata], True)
+
+        if options.yattr == DENS_ATTR:
+            d[xdata], d[ydata] = countPoints(d[xdata], True)
+
         if options.xticksFile:
             applyTicks(d, xdata, options.xticksFile)
         if options.yticksFile:
diff -Nru sumo-1.17.0/tools/webWizard/__init__.py sumo-1.18.0/tools/webWizard/__init__.py
--- sumo-1.17.0/tools/webWizard/__init__.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/webWizard/__init__.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/webWizard/SimpleWebSocketServer.py sumo-1.18.0/tools/webWizard/SimpleWebSocketServer.py
--- sumo-1.17.0/tools/webWizard/SimpleWebSocketServer.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/webWizard/SimpleWebSocketServer.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,4 +1,4 @@
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # The MIT License (MIT) Copyright (c) 2013 Dave P.
 
 # @file    SimpleWebSocketServer.py
diff -Nru sumo-1.17.0/tools/xml/addSchema.py sumo-1.18.0/tools/xml/addSchema.py
--- sumo-1.17.0/tools/xml/addSchema.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/xml/addSchema.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2010-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/xml/binary2plain.py sumo-1.18.0/tools/xml/binary2plain.py
--- sumo-1.17.0/tools/xml/binary2plain.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/xml/binary2plain.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,207 +0,0 @@
-#!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
-# Copyright (C) 2012-2023 German Aerospace Center (DLR) and others.
-# This program and the accompanying materials are made available under the
-# terms of the Eclipse Public License 2.0 which is available at
-# https://www.eclipse.org/legal/epl-2.0/
-# This Source Code 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
-
-# @file    binary2plain.py
-# @author  Michael Behrisch
-# @date    2012-03-11
-
-from __future__ import absolute_import
-from __future__ import print_function
-import sys
-import struct
-
-BYTE = 0
-INTEGER = 1
-FLOAT = 2
-STRING = 3
-LIST = 4
-XML_TAG_START = 5
-XML_TAG_END = 6
-XML_ATTRIBUTE = 7
-EDGE = 8
-LANE = 9
-POSITION_2D = 10
-POSITION_3D = 11
-BOUNDARY = 12
-COLOR = 13
-NODE_TYPE = 14
-EDGE_FUNCTION = 15
-ROUTE = 16
-SCALED2INT = 17
-SCALED2INT_POSITION_2D = 18
-SCALED2INT_POSITION_3D = 19
-
-
-def read(content, format):
-    return struct.unpack(format, content.read(struct.calcsize(format)))
-
-
-def readByte(content):
-    return read(content, "B")[0]
-
-
-def readInt(content, withType=False):
-    if withType:
-        valType = readByte(content)
-        assert(valType == INTEGER)
-    return read(content, "i")[0]
-
-
-def readDouble(content):
-    return read(content, "d")[0]
-
-
-def readString(content):
-    length = readInt(content)
-    return read(content, "%ss" % length)[0]
-
-
-def readStringList(content):
-    n = readInt(content)
-    list = []
-    for _ in range(n):
-        read(content, "B")  # type
-        list.append(readString(content))
-    return list
-
-
-def readIntListList(content):
-    n = readInt(content)
-    list = []
-    for _ in range(n):
-        read(content, "B")  # type
-        n1 = readInt(content)
-        list.append([readInt(content, True) for __ in range(n1)])
-    return list
-
-
-def readRoute(content):
-    n = readInt(content)
-    list = []
-    first = readInt(content)
-    if first < 0:
-        bits = -first
-        numFields = 8 * 4 / bits
-        mask = (1 << bits) - 1
-        edge = readInt(content)
-        list.append(edges[edge])
-        n -= 1
-        field = numFields
-        while n > 0:
-            if field == numFields:
-                data = readInt(content)
-                field = 0
-            followIndex = (data >> ((numFields - field - 1) * bits)) & mask
-            edge = followers[edge][followIndex]
-            list.append(edges[edge])
-            field += 1
-            n -= 1
-    else:
-        list.append(edges[first])
-        n -= 1
-        while n > 0:
-            list.append(edges[readInt(content)])
-            n -= 1
-    return list
-
-
-def typedValueStr(content):
-    valType = readByte(content)
-    if valType == BYTE:
-        return str(readByte(content))
-    elif valType == INTEGER:
-        return str(readInt(content))
-    elif valType == FLOAT:
-        return '%.2f' % readDouble(content)
-    elif valType == STRING:
-        return readString(content)
-    elif valType == LIST:
-        return " ".join([typedValueStr(content) for _ in range(readInt(content))])
-    elif valType == EDGE:
-        return edges[readInt(content)]
-    elif valType == LANE:
-        return '%s_%s' % (edges[readInt(content)], readByte(content))
-    elif valType == POSITION_2D:
-        return '%.2f,%.2f' % (readDouble(content), readDouble(content))
-    elif valType == POSITION_3D:
-        return '%.2f,%.2f,%.2f' % (readDouble(content), readDouble(content), readDouble(content))
-    elif valType == BOUNDARY:
-        return '%.2f,%.2f,%.2f,%.2f' % (readDouble(content), readDouble(content),
-                                        readDouble(content), readDouble(content))
-    elif valType == COLOR:
-        val = read(content, "BBBB")
-        return '%.2f,%.2f,%.2f' % (val[0] / 255., val[1] / 255., val[2] / 255.)
-    elif valType == NODE_TYPE:
-        return nodeTypes[readByte(content)]
-    elif valType == EDGE_FUNCTION:
-        return edgeTypes[readByte(content)]
-    elif valType == ROUTE:
-        return " ".join(readRoute(content))
-    elif valType == SCALED2INT:
-        return '%.2f' % (readInt(content) / 100.)
-    elif valType == SCALED2INT_POSITION_2D:
-        return '%.2f,%.2f' % (readInt(content) / 100., readInt(content) / 100.)
-    elif valType == SCALED2INT_POSITION_3D:
-        return '%.2f,%.2f,%.2f' % (readInt(content) / 100., readInt(content) / 100., readInt(content) / 100.)
-
-
-out = sys.stdout
-content = open(sys.argv[1], 'rb')
-_, version, _ = read(content, "BBB")  # type, sbx version, type
-readString(content)  # sumo version
-read(content, "B")  # type
-elements = readStringList(content)
-read(content, "B")  # type
-attributes = readStringList(content)
-read(content, "B")  # type
-nodeTypes = readStringList(content)
-read(content, "B")  # type
-edgeTypes = readStringList(content)
-read(content, "B")  # type
-edges = readStringList(content)
-read(content, "B")  # type
-followers = readIntListList(content)
-stack = []
-startOpen = False
-while True:
-    typ = readByte(content)
-    if typ == XML_TAG_START:
-        if startOpen:
-            out.write(">\n")
-        out.write("    " * len(stack))
-        tag = readByte(content)
-        if version > 1:
-            tag += 256 * readByte(content)
-        stack.append(tag)
-        out.write("<" + elements[tag])
-        startOpen = True
-    elif typ == XML_TAG_END:
-        if startOpen:
-            out.write("/>\n")
-            stack.pop()
-            startOpen = False
-        else:
-            out.write("    " * (len(stack) - 1))
-            out.write("\n" % elements[stack.pop()])
-        if version == 1:
-            readByte(content)
-        if len(stack) == 0:
-            break
-    elif typ == XML_ATTRIBUTE:
-        attr = readByte(content)
-        if version > 1:
-            attr += 256 * readByte(content)
-        out.write(' %s="%s"' %
-                  (attributes[attr], typedValueStr(content)))
-    else:
-        print("Unknown type %s" % typ, file=sys.stderr)
diff -Nru sumo-1.17.0/tools/xml/changeAttribute.py sumo-1.18.0/tools/xml/changeAttribute.py
--- sumo-1.17.0/tools/xml/changeAttribute.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/xml/changeAttribute.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2010-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
@@ -25,28 +25,21 @@
 import sys
 from lxml import etree as ET
 
-
 if 'SUMO_HOME' in os.environ:
-    tools = os.path.join(os.environ['SUMO_HOME'], 'tools')
-    sys.path.append(tools)
-else:
-    sys.exit("please declare environment variable 'SUMO_HOME'")
-
+    sys.path.append(os.path.join(os.environ['SUMO_HOME'], 'tools'))
 import sumolib  # noqa
 
 
 def get_options(args=None):
     optParser = sumolib.options.ArgumentParser(description="Set or remove an attribute for the specified XML element.")
-    optParser.add_argument("-f", "--file", category="input", dest="file", required=True,
+    optParser.add_argument("-f", "--file", category="input", required=True,
                            type=optParser.data_file, help="define the XML input file")
-    optParser.add_argument("-o", "--output", category="output", dest="output",
+    optParser.add_argument("-o", "--output", category="output", required=True,
                            type=optParser.data_file, help="define the XML output file")
-    optParser.add_argument("-t", "--tag", category="processing", dest="tag", help="tag to edit")
-    optParser.add_argument("-a", "--attribute", category="processing", dest="attribute", help="attribute to edit")
-    optParser.add_argument("-v", "--value", category="processing", dest="value",
-                           help="value to update (deletes attribute if not specified)")
-    options = optParser.parse_args(args=args)
-    return options
+    optParser.add_argument("-t", "--tag", required=True, help="tag to edit")
+    optParser.add_argument("-a", "--attribute", required=True, help="attribute to edit")
+    optParser.add_argument("-v", "--value", help="value to update (deletes attribute if not specified)")
+    return optParser.parse_args(args=args)
 
 
 def main(options):
@@ -68,5 +61,4 @@
 
 
 if __name__ == "__main__":
-    options = get_options()
-    main(options)
+    main(get_options())
diff -Nru sumo-1.17.0/tools/xml/csv2xml.py sumo-1.18.0/tools/xml/csv2xml.py
--- sumo-1.17.0/tools/xml/csv2xml.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/xml/csv2xml.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2013-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
@@ -39,20 +39,23 @@
 
 def get_options():
     optParser = sumolib.options.ArgumentParser(description="Convert a CSV file to a XML file.")
+    # input
     optParser.add_argument("source", category="input", type=optParser.data_file,
                            help="the input CSV file")
-    optParser.add_argument("-q", "--quotechar", category="processing", default="",
+    # output
+    optParser.add_argument("-o", "--output", category="output", required=True, type=optParser.file,
+                           help="name for generic output file")
+    # processing
+    optParser.add_argument("-q", "--quotechar", default="",
                            help="the quoting character for fields")
-    optParser.add_argument("-d", "--delimiter", category="processing", default=";",
+    optParser.add_argument("-d", "--delimiter", default=";",
                            help="the field separator of the input file")
-    optParser.add_argument("-p", "--skip-root", category="processing", action="store_true", default=False,
+    optParser.add_argument("-p", "--skip-root", action="store_true", default=False,
                            help="the root element is not contained")
-    optParser.add_argument("-o", "--output", category="output",
-                           help="name for generic output file")
     group = optParser.add_mutually_exclusive_group(required=True)
-    group.add_argument("-t", "--type", category="processing",
+    group.add_argument("-t", "--type",
                        help="convert the given csv-file into the specified format")
-    group.add_argument("-x", "--xsd", category="processing",
+    group.add_argument("-x", "--xsd",
                        help="xsd schema to use")
     options = optParser.parse_args()
     if not options.output:
diff -Nru sumo-1.17.0/tools/xml/filterElements.py sumo-1.18.0/tools/xml/filterElements.py
--- sumo-1.17.0/tools/xml/filterElements.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/xml/filterElements.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2010-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/xml/protobuf2xml.py sumo-1.18.0/tools/xml/protobuf2xml.py
--- sumo-1.17.0/tools/xml/protobuf2xml.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/xml/protobuf2xml.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2014-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/xml/xml2csv.py sumo-1.18.0/tools/xml/xml2csv.py
--- sumo-1.17.0/tools/xml/xml2csv.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/xml/xml2csv.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2013-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
@@ -230,20 +230,23 @@
 
 def get_options(arglist=None):
     optParser = sumolib.options.ArgumentParser(description="Convert a XML file to a CSV file")
-    optParser.add_argument("source", category="input", type=optParser.data_file,
+    # input
+    optParser.add_argument("source", category="input", type=optParser.file,
                            help="the input data (stream given by digits or file")
-    optParser.add_argument("-s", "--separator", category="processing", default=";",
+    # output
+    optParser.add_argument("-o", "--output", category="output", type=optParser.file,
+                           help="base name for output")
+    # processing
+    optParser.add_argument("-s", "--separator", default=";",
                            help="separating character for fields")
-    optParser.add_argument("-q", "--quotechar", category="processing", default='',
+    optParser.add_argument("-q", "--quotechar", default='',
                            help="quoting character for fields")
     optParser.add_argument("-x", "--xsd", category="processing",
                            help="xsd schema to use")
-    optParser.add_argument("-a", "--validation", category="processing", action="store_true", default=False,
+    optParser.add_argument("-a", "--validation", action="store_true", default=False,
                            help="enable schema validation")
-    optParser.add_argument("-p", "--split", category="processing", action="store_true", default=False,
+    optParser.add_argument("-p", "--split", action="store_true", default=False,
                            help="split in different files for the first hierarchy level")
-    optParser.add_argument("-o", "--output", category="output", type=optParser.data_file,
-                           help="base name for output")
     options = optParser.parse_args(arglist)
     if options.validation and not haveLxml:
         print("lxml not available, skipping validation", file=sys.stderr)
diff -Nru sumo-1.17.0/tools/xml/xml2protobuf.py sumo-1.18.0/tools/xml/xml2protobuf.py
--- sumo-1.17.0/tools/xml/xml2protobuf.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/xml/xml2protobuf.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2014-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/tools/xml/xsd.py sumo-1.18.0/tools/xml/xsd.py
--- sumo-1.17.0/tools/xml/xsd.py	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/tools/xml/xsd.py	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 # Copyright (C) 2014-2023 German Aerospace Center (DLR) and others.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/unittest/src/microsim/MSCFModel_IDMTest.cpp sumo-1.18.0/unittest/src/microsim/MSCFModel_IDMTest.cpp
--- sumo-1.17.0/unittest/src/microsim/MSCFModel_IDMTest.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/unittest/src/microsim/MSCFModel_IDMTest.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/unittest/src/microsim/MSCFModelTest.cpp sumo-1.18.0/unittest/src/microsim/MSCFModelTest.cpp
--- sumo-1.17.0/unittest/src/microsim/MSCFModelTest.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/unittest/src/microsim/MSCFModelTest.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/unittest/src/microsim/MSEventControlTest.cpp sumo-1.18.0/unittest/src/microsim/MSEventControlTest.cpp
--- sumo-1.17.0/unittest/src/microsim/MSEventControlTest.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/unittest/src/microsim/MSEventControlTest.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/unittest/src/netbuild/NBHeightMapperTest.cpp sumo-1.18.0/unittest/src/netbuild/NBHeightMapperTest.cpp
--- sumo-1.17.0/unittest/src/netbuild/NBHeightMapperTest.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/unittest/src/netbuild/NBHeightMapperTest.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/unittest/src/netbuild/NBTrafficLightLogicTest.cpp sumo-1.18.0/unittest/src/netbuild/NBTrafficLightLogicTest.cpp
--- sumo-1.17.0/unittest/src/netbuild/NBTrafficLightLogicTest.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/unittest/src/netbuild/NBTrafficLightLogicTest.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/unittest/src/unittest_main.cpp sumo-1.18.0/unittest/src/unittest_main.cpp
--- sumo-1.17.0/unittest/src/unittest_main.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/unittest/src/unittest_main.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/unittest/src/utils/common/CommandMock.h sumo-1.18.0/unittest/src/utils/common/CommandMock.h
--- sumo-1.17.0/unittest/src/utils/common/CommandMock.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/unittest/src/utils/common/CommandMock.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/unittest/src/utils/common/FileHelpersTest.cpp sumo-1.18.0/unittest/src/utils/common/FileHelpersTest.cpp
--- sumo-1.17.0/unittest/src/utils/common/FileHelpersTest.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/unittest/src/utils/common/FileHelpersTest.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/unittest/src/utils/common/RandHelperTest.cpp sumo-1.18.0/unittest/src/utils/common/RandHelperTest.cpp
--- sumo-1.17.0/unittest/src/utils/common/RandHelperTest.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/unittest/src/utils/common/RandHelperTest.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/unittest/src/utils/common/RGBColorTest.cpp sumo-1.18.0/unittest/src/utils/common/RGBColorTest.cpp
--- sumo-1.17.0/unittest/src/utils/common/RGBColorTest.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/unittest/src/utils/common/RGBColorTest.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2009-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/unittest/src/utils/common/StringTokenizerTest.cpp sumo-1.18.0/unittest/src/utils/common/StringTokenizerTest.cpp
--- sumo-1.17.0/unittest/src/utils/common/StringTokenizerTest.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/unittest/src/utils/common/StringTokenizerTest.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/unittest/src/utils/common/StringUtilsTest.cpp sumo-1.18.0/unittest/src/utils/common/StringUtilsTest.cpp
--- sumo-1.17.0/unittest/src/utils/common/StringUtilsTest.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/unittest/src/utils/common/StringUtilsTest.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/unittest/src/utils/common/ValueTimeLineTest.cpp sumo-1.18.0/unittest/src/utils/common/ValueTimeLineTest.cpp
--- sumo-1.17.0/unittest/src/utils/common/ValueTimeLineTest.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/unittest/src/utils/common/ValueTimeLineTest.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/unittest/src/utils/foxtools/MFXWorkerThreadTest.cpp sumo-1.18.0/unittest/src/utils/foxtools/MFXWorkerThreadTest.cpp
--- sumo-1.17.0/unittest/src/utils/foxtools/MFXWorkerThreadTest.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/unittest/src/utils/foxtools/MFXWorkerThreadTest.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/unittest/src/utils/geom/BoundaryTest.cpp sumo-1.18.0/unittest/src/utils/geom/BoundaryTest.cpp
--- sumo-1.17.0/unittest/src/utils/geom/BoundaryTest.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/unittest/src/utils/geom/BoundaryTest.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/unittest/src/utils/geom/GeoConvHelperTest.cpp sumo-1.18.0/unittest/src/utils/geom/GeoConvHelperTest.cpp
--- sumo-1.17.0/unittest/src/utils/geom/GeoConvHelperTest.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/unittest/src/utils/geom/GeoConvHelperTest.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/unittest/src/utils/geom/GeomHelperTest.cpp sumo-1.18.0/unittest/src/utils/geom/GeomHelperTest.cpp
--- sumo-1.17.0/unittest/src/utils/geom/GeomHelperTest.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/unittest/src/utils/geom/GeomHelperTest.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/unittest/src/utils/geom/PositionVectorTest.cpp sumo-1.18.0/unittest/src/utils/geom/PositionVectorTest.cpp
--- sumo-1.17.0/unittest/src/utils/geom/PositionVectorTest.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/unittest/src/utils/geom/PositionVectorTest.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/unittest/src/utils/iodevices/OutputDeviceMock.h sumo-1.18.0/unittest/src/utils/iodevices/OutputDeviceMock.h
--- sumo-1.17.0/unittest/src/utils/iodevices/OutputDeviceMock.h	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/unittest/src/utils/iodevices/OutputDeviceMock.h	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2001-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
diff -Nru sumo-1.17.0/unittest/src/utils/threadpool/ThreadPoolTest.cpp sumo-1.18.0/unittest/src/utils/threadpool/ThreadPoolTest.cpp
--- sumo-1.17.0/unittest/src/utils/threadpool/ThreadPoolTest.cpp	2023-04-24 20:20:44.000000000 +0000
+++ sumo-1.18.0/unittest/src/utils/threadpool/ThreadPoolTest.cpp	2023-06-28 20:02:17.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+// Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
 // Copyright (C) 2020-2023 German Aerospace Center (DLR) and others.
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
